Moved member permission check to utils

src/discord/Settings/Language.ts

@@ -14,12 +14,15 @@ import {
 
 import { COMMON_EMBEDS } from '.';
 import Locale from '../../providers/Locale';
+import { checkMemberPermissions } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     LANGUAGE_INFO: (data: HybridInteractionMessage, locale: I18n, currentLocale: string) => {
         return makeInfoEmbed({
             title: locale.__('settings_language.info', { LANGUAGE: currentLocale }),
-            description: locale.__('settings_language.info_description', { LANGUAGES: Locale.getLocaleProvider('en').getLocales().join(', ') }),
+            description: locale.__('settings_language.info_description', {
+                LANGUAGES: Locale.getLocaleProvider('en').getLocales().join(', ')
+            }),
             user: data.getUser()
         });
     },
@@ -33,7 +36,10 @@ const EMBEDS = {
     LANGUAGE_UPDATED: (data: HybridInteractionMessage, locale: I18n, newLanguage: string) => {
         return makeSuccessEmbed({
             title: locale.__({ phrase: 'settings_language.language_updated', locale: newLanguage }),
-            description: locale.__({ phrase: 'settings_language.language_updated_description', locale: newLanguage }, { LANGUAGE: newLanguage }),
+            description: locale.__(
+                { phrase: 'settings_language.language_updated_description', locale: newLanguage },
+                { LANGUAGE: newLanguage }
+            ),
             user: data.getUser()
         });
     }
@@ -47,12 +53,8 @@ export default async (data: HybridInteractionMessage, args: any, guild: Guild, l
     if (!GuildCache) return;
     const language = GuildCache.locale;
 
-    const requiredPermissions = [PermissionsBitField.Flags.ManageGuild];
+    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.ManageGuild] })))
-
+        return;
-    if (!member.permissions.has(requiredPermissions))
-        return await sendHybridInteractionMessageResponse(data, {
-            embeds: [COMMON_EMBEDS.NO_PERMISSION(data, locale, requiredPermissions)]
-        });
 
     let newLanguage: string | null | undefined;
     if (data.isMessage()) {
@@ -66,7 +68,8 @@ export default async (data: HybridInteractionMessage, args: any, guild: Guild, l
         __name.shift();
         _name = __name.join(' ');
         newLanguage = _name;
-    } else if (data.isApplicationCommand()) newLanguage = data.getSlashCommand().options.get('language', true).value?.toString();
+    } else if (data.isApplicationCommand())
+        newLanguage = data.getSlashCommand().options.get('language', true).value?.toString();
 
     if (!newLanguage)
         return await sendHybridInteractionMessageResponse(data, {

src/discord/Settings/Prefix.ts

@@ -14,6 +14,7 @@ import {
 } from '../../utils/DiscordMessage';
 
 import { COMMON_EMBEDS } from '.';
+import { checkMemberPermissions } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     PREFIX_INFO: (data: HybridInteractionMessage, locale: I18n, currentPrefix: string) => {
@@ -54,12 +55,8 @@ export default async (data: HybridInteractionMessage, args: any, guild: Guild, l
         if (!GuildCache) return;
     const prefix = GuildCache.prefix;
 
-    const requiredPermissions = [PermissionsBitField.Flags.ManageGuild];
+    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.ManageGuild] })))
-
+        return;
-    if (!member.permissions.has(requiredPermissions))
-        return await sendHybridInteractionMessageResponse(data, {
-            embeds: [COMMON_EMBEDS.NO_PERMISSION(data, locale, requiredPermissions)]
-        });
 
     let newPrefix: string | null | undefined;
     if (data.isMessage()) {

src/discord/Settings/ServiceAnnouncement.ts

@@ -13,6 +13,7 @@ import {
 } from '../../utils/DiscordMessage';
 
 import { COMMON_EMBEDS } from '.';
+import { checkMemberPermissions } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     SERVICE_ANNOUNCEMENT_INVALID_STATUS: (data: HybridInteractionMessage, locale: I18n) => {
@@ -103,12 +104,8 @@ export const setEnableServiceAnnouncement = async (
     let member = data.getMember();
     if (!member) return;
 
-    const requiredPermissions = [PermissionsBitField.Flags.Administrator];
+    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
-
+        return;
-    if (!member.permissions.has(requiredPermissions))
-        return await sendHybridInteractionMessageResponse(data, {
-            embeds: [COMMON_EMBEDS.NO_PERMISSION(data, locale, requiredPermissions)]
-        });
 
     let GuildCache = await Cache.getCachedGuild(guild.id);
     if(!GuildCache) return;
@@ -185,12 +182,8 @@ export const setServiceAnnouncementChannel = async (
     let member = data.getMember();
     if (!member) return;
 
-    const requiredPermissions = [PermissionsBitField.Flags.Administrator];
+    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
-
+        return;
-    if (!member.permissions.has(requiredPermissions))
-        return await sendHybridInteractionMessageResponse(data, {
-            embeds: [COMMON_EMBEDS.NO_PERMISSION(data, locale, requiredPermissions)]
-        });
 
     let channel;
     if (data.isMessage()) {

src/utils/DiscordPermission.ts

@@ -0,0 +1,26 @@
+import { GuildMember } from 'discord.js';
+import { I18n } from 'i18n';
+import { COMMON_EMBEDS } from '../discord/Settings';
+import { sendHybridInteractionMessageResponse } from './DiscordMessage';
+import { HybridInteractionMessage } from './DiscordModule';
+
+export async function checkMemberPermissions({
+    member,
+    permissions,
+    data,
+    locale
+}: {
+    member: GuildMember;
+    permissions: bigint[];
+    data?: HybridInteractionMessage;
+    locale?: I18n;
+}): Promise<boolean> {
+    const hasPermissions = member.permissions.has(permissions);
+
+    if (!hasPermissions && data && locale)
+        await sendHybridInteractionMessageResponse(data, {
+            embeds: [COMMON_EMBEDS.NO_PERMISSION(data, locale, permissions)]
+        });
+
+    return hasPermissions;
+}