kirameki-cafe-mirror/Yumi
1
0
Fork 0
mirror of https://github.com/kirameki-cafe/Yumi.git synced 2026-09-13 10:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed functions for permission checks

Browse Source
This commit is contained in:
yuzu
2022-07-05 20:40:16 +07:00
parent d349103b1f
commit 00b44a0600
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/MusicPlayer/Join.ts
+1 -1
View File
@@ -34,7 +34,7 @@ import DiscordMusicPlayer, {
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule'; import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import Locale from '../../services/Locale'; import Locale from '../../services/Locale';
import { SpotifyTrack, YouTubeVideo } from 'play-dl'; import { SpotifyTrack, YouTubeVideo } from 'play-dl';
import { checkBotPermissions, checkBotPermissionsInChannel } from '../../utils/DiscordPermission'; import { checkBotPermissionsInChannel } from '../../utils/DiscordPermission';
const EMBEDS = { const EMBEDS = {
VOICECHANNEL_JOINED: (data: HybridInteractionMessage, locale: I18n) => { VOICECHANNEL_JOINED: (data: HybridInteractionMessage, locale: I18n) => {
src/discord/Settings/Language.ts
+2 -2
View File
@@ -14,7 +14,7 @@ import {
import { COMMON_EMBEDS } from '.'; import { COMMON_EMBEDS } from '.';
import Locale from '../../providers/Locale'; import Locale from '../../providers/Locale';
import { checkMemberPermissions } from '../../utils/DiscordPermission'; import { checkMemberPermissionsInGuild } from '../../utils/DiscordPermission';
const EMBEDS = { const EMBEDS = {
LANGUAGE_INFO: (data: HybridInteractionMessage, locale: I18n, currentLocale: string) => { 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; if (!GuildCache) return;
const language = GuildCache.locale; 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; return;
let newLanguage: string | null | undefined; let newLanguage: string | null | undefined;
src/discord/Settings/Prefix.ts
+2 -2
View File
@@ -14,7 +14,7 @@ import {
} from '../../utils/DiscordMessage'; } from '../../utils/DiscordMessage';
import { COMMON_EMBEDS } from '.'; import { COMMON_EMBEDS } from '.';
import { checkMemberPermissions } from '../../utils/DiscordPermission'; import { checkMemberPermissionsInGuild } from '../../utils/DiscordPermission';
const EMBEDS = { const EMBEDS = {
PREFIX_INFO: (data: HybridInteractionMessage, locale: I18n, currentPrefix: string) => { 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; if (!GuildCache) return;
const prefix = GuildCache.prefix; 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; return;
let newPrefix: string | null | undefined; let newPrefix: string | null | undefined;
src/discord/Settings/ServiceAnnouncement.ts
+3 -3
View File
@@ -13,7 +13,7 @@ import {
} from '../../utils/DiscordMessage'; } from '../../utils/DiscordMessage';
import { COMMON_EMBEDS } from '.'; import { COMMON_EMBEDS } from '.';
import { checkMemberPermissions } from '../../utils/DiscordPermission'; import { checkMemberPermissionsInGuild } from '../../utils/DiscordPermission';
const EMBEDS = { const EMBEDS = {
SERVICE_ANNOUNCEMENT_INVALID_STATUS: (data: HybridInteractionMessage, locale: I18n) => { SERVICE_ANNOUNCEMENT_INVALID_STATUS: (data: HybridInteractionMessage, locale: I18n) => {
@@ -104,7 +104,7 @@ export const setEnableServiceAnnouncement = async (
let member = data.getMember(); let member = data.getMember();
if (!member) return; if (!member) return;
if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] }))) if (!(await checkMemberPermissionsInGuild({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
return; return;
let GuildCache = await Cache.getCachedGuild(guild.id); let GuildCache = await Cache.getCachedGuild(guild.id);
@@ -182,7 +182,7 @@ export const setServiceAnnouncementChannel = async (
let member = data.getMember(); let member = data.getMember();
if (!member) return; if (!member) return;
if (!(await checkMemberPermissions({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] }))) if (!(await checkMemberPermissionsInGuild({ member, data, locale, permissions: [PermissionsBitField.Flags.Administrator] })))
return; return;
let channel; let channel;
src/utils/DiscordPermission.ts
+2 -2
View File
@@ -4,7 +4,7 @@ import { COMMON_EMBEDS } from '../discord/Settings';
import { sendHybridInteractionMessageResponse } from './DiscordMessage'; import { sendHybridInteractionMessageResponse } from './DiscordMessage';
import { HybridInteractionMessage } from './DiscordModule'; import { HybridInteractionMessage } from './DiscordModule';
export async function checkMemberPermissions({ export async function checkMemberPermissionsInGuild({
member, member,
permissions, permissions,
data, data,
@@ -25,7 +25,7 @@ export async function checkMemberPermissions({
return hasPermissions; return hasPermissions;
} }
export async function checkBotPermissions({ export async function checkBotPermissionsInGuild({
guild, guild,
permissions, permissions,
data, data,