From 00b44a0600d8160a2fc1a046ce9cd711c8af070b Mon Sep 17 00:00:00 2001
From: Yuzu <yuzu@kirameki.cafe>
Date: Tue, 5 Jul 2022 20:40:16 +0700
Subject: [PATCH] Renamed functions for permission checks

---
 src/discord/MusicPlayer/Join.ts             | 2 +-
 src/discord/Settings/Language.ts            | 4 ++--
 src/discord/Settings/Prefix.ts              | 4 ++--
 src/discord/Settings/ServiceAnnouncement.ts | 6 +++---
 src/utils/DiscordPermission.ts              | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/discord/MusicPlayer/Join.ts b/src/discord/MusicPlayer/Join.ts
index f5f6b8d..7e288e9 100644
--- a/src/discord/MusicPlayer/Join.ts
+++ b/src/discord/MusicPlayer/Join.ts
@@ -34,7 +34,7 @@ import DiscordMusicPlayer, {
 import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
 import Locale from '../../services/Locale';
 import { SpotifyTrack, YouTubeVideo } from 'play-dl';
-import { checkBotPermissions, checkBotPermissionsInChannel } from '../../utils/DiscordPermission';
+import { checkBotPermissionsInChannel } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     VOICECHANNEL_JOINED: (data: HybridInteractionMessage, locale: I18n) => {
diff --git a/src/discord/Settings/Language.ts b/src/discord/Settings/Language.ts
index 4c51cda..f1faa1b 100644
--- a/src/discord/Settings/Language.ts
+++ b/src/discord/Settings/Language.ts
@@ -14,7 +14,7 @@ import {
 
 import { COMMON_EMBEDS } from '.';
 import Locale from '../../providers/Locale';
-import { checkMemberPermissions } from '../../utils/DiscordPermission';
+import { checkMemberPermissionsInGuild } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     LANGUAGE_INFO: (data: HybridInteractionMessage, locale: I18n, currentLocale: string) => {
@@ -53,7 +53,7 @@ export default async (data: HybridInteractionMessage, args: any, guild: Guild, l
     if (!GuildCache) return;
     const language = GuildCache.locale;
 
-    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.ManageGuild] })))
+    if (!(await checkMemberPermissionsInGuild({ member, data, locale, permissions: [PermissionsBitField.Flags.ManageGuild] })))
         return;
 
     let newLanguage: string | null | undefined;
diff --git a/src/discord/Settings/Prefix.ts b/src/discord/Settings/Prefix.ts
index e4c5a37..c4162a5 100644
--- a/src/discord/Settings/Prefix.ts
+++ b/src/discord/Settings/Prefix.ts
@@ -14,7 +14,7 @@ import {
 } from '../../utils/DiscordMessage';
 
 import { COMMON_EMBEDS } from '.';
-import { checkMemberPermissions } from '../../utils/DiscordPermission';
+import { checkMemberPermissionsInGuild } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     PREFIX_INFO: (data: HybridInteractionMessage, locale: I18n, currentPrefix: string) => {
@@ -55,7 +55,7 @@ export default async (data: HybridInteractionMessage, args: any, guild: Guild, l
         if (!GuildCache) return;
     const prefix = GuildCache.prefix;
 
-    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.ManageGuild] })))
+    if (!(await checkMemberPermissionsInGuild({ member, data, locale, permissions: [PermissionsBitField.Flags.ManageGuild] })))
         return;
 
     let newPrefix: string | null | undefined;
diff --git a/src/discord/Settings/ServiceAnnouncement.ts b/src/discord/Settings/ServiceAnnouncement.ts
index f524a5c..c00ce0e 100644
--- a/src/discord/Settings/ServiceAnnouncement.ts
+++ b/src/discord/Settings/ServiceAnnouncement.ts
@@ -13,7 +13,7 @@ import {
 } from '../../utils/DiscordMessage';
 
 import { COMMON_EMBEDS } from '.';
-import { checkMemberPermissions } from '../../utils/DiscordPermission';
+import { checkMemberPermissionsInGuild } from '../../utils/DiscordPermission';
 
 const EMBEDS = {
     SERVICE_ANNOUNCEMENT_INVALID_STATUS: (data: HybridInteractionMessage, locale: I18n) => {
@@ -104,7 +104,7 @@ export const setEnableServiceAnnouncement = async (
     let member = data.getMember();
     if (!member) return;
 
-    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
+    if (!(await checkMemberPermissionsInGuild({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
         return;
 
     let GuildCache = await Cache.getCachedGuild(guild.id);
@@ -182,7 +182,7 @@ export const setServiceAnnouncementChannel = async (
     let member = data.getMember();
     if (!member) return;
 
-    if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
+    if (!(await checkMemberPermissionsInGuild({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
         return;
 
     let channel;
diff --git a/src/utils/DiscordPermission.ts b/src/utils/DiscordPermission.ts
index 29ec053..d9dcf28 100644
--- a/src/utils/DiscordPermission.ts
+++ b/src/utils/DiscordPermission.ts
@@ -4,7 +4,7 @@ import { COMMON_EMBEDS } from '../discord/Settings';
 import { sendHybridInteractionMessageResponse } from './DiscordMessage';
 import { HybridInteractionMessage } from './DiscordModule';
 
-export async function checkMemberPermissions({
+export async function checkMemberPermissionsInGuild({
     member,
     permissions,
     data,
@@ -25,7 +25,7 @@ export async function checkMemberPermissions({
     return hasPermissions;
 }
 
-export async function checkBotPermissions({
+export async function checkBotPermissionsInGuild({
     guild,
     permissions,
     data,