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

Fixed broken @Mention prefix

Browse Source
This commit is contained in:
yuzu
2022-06-07 14:11:52 +07:00
parent 0ac3c75070
commit f9d271dd90
1 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/Discord.ts
+17 -31
View File
@@ -26,12 +26,11 @@ import Discord_MusicPlayer_Loop from '../discord/MusicPlayer/Loop';
import Discord_MusicPlayer_Pause from '../discord/MusicPlayer/Pause'; import Discord_MusicPlayer_Pause from '../discord/MusicPlayer/Pause';
import Discord_MusicPlayer_Resume from '../discord/MusicPlayer/Resume'; import Discord_MusicPlayer_Resume from '../discord/MusicPlayer/Resume';
import Discord_Developer_ServiceAnnouncement from '../discord/developer/ServiceAnnouncement'; import Discord_Developer_ServiceAnnouncement from '../discord/Developer/ServiceAnnouncement';
import Discord_Developer_Debug from '../discord/developer/Debug'; import Discord_Developer_Debug from '../discord/Developer/Debug';
import Cache from './Cache'; import Cache from './Cache';
import DiscordModule from '../utils/DiscordModule'; import DiscordModule from '../utils/DiscordModule';
import { Map } from 'typescript';
class Discord { class Discord {
public client: Client; public client: Client;
@@ -87,17 +86,12 @@ class Discord {
if (_module.id) { if (_module.id) {
if (this.loaded_module.has(_module.id)) if (this.loaded_module.has(_module.id))
Logger.error( Logger.error(
`Module ${ `Module ${_module.constructor.name} is trying to assign a conflicting module id ${
_module.constructor.name _module.id
} is trying to assign a conflicting module id ${_module.id}. ${ }. ${this.loaded_module.get(_module.id)!.constructor.name} is already assigned to this id.`
this.loaded_module.get(_module.id)!.constructor.name
} is already assigned to this id.`
); );
else this.loaded_module.set(_module.id, _module); else this.loaded_module.set(_module.id, _module);
} else } else Logger.error(`Invalid module ${_module.constructor.name}. The module does not have an id.`);
Logger.error(
`Invalid module ${_module.constructor.name}. The module does not have an id.`
);
} }
Logger.info(`Loaded ${this.loaded_module.size} Discord Modules`); Logger.info(`Loaded ${this.loaded_module.size} Discord Modules`);
@@ -125,9 +119,7 @@ class Discord {
// Interaction create event to modules // Interaction create event to modules
this.client.on('interactionCreate', async (interaction: Interaction) => { this.client.on('interactionCreate', async (interaction: Interaction) => {
if (!Cache.isUserCached(interaction.user.id)) await Cache.updateUserCache(interaction.user.id);
if(!Cache.isUserCached(interaction.user.id))
await Cache.updateUserCache(interaction.user.id);
for (const module of this.loaded_module) { for (const module of this.loaded_module) {
let thisModule: DiscordModule = module[1]; let thisModule: DiscordModule = module[1];
@@ -135,16 +127,9 @@ class Discord {
if (interaction.guild) { if (interaction.guild) {
thisModule.GuildInteractionCreate(interaction); thisModule.GuildInteractionCreate(interaction);
if ( if (interaction.isCommand() && interaction.commandName && thisModule.commandInteractionName) {
interaction.isCommand() &&
interaction.commandName &&
thisModule.commandInteractionName
) {
thisModule.GuildCommandInteractionCreate(interaction); thisModule.GuildCommandInteractionCreate(interaction);
if ( if (interaction.commandName.toLowerCase() === thisModule.commandInteractionName)
interaction.commandName.toLowerCase() ===
thisModule.commandInteractionName
)
thisModule.GuildModuleCommandInteractionCreate(interaction); thisModule.GuildModuleCommandInteractionCreate(interaction);
} else if (interaction.isButton()) { } else if (interaction.isButton()) {
thisModule.GuildButtonInteractionCreate(interaction); thisModule.GuildButtonInteractionCreate(interaction);
@@ -180,8 +165,7 @@ class Discord {
if (typeof message.guild?.id === 'undefined') return; if (typeof message.guild?.id === 'undefined') return;
let GuildCache = await Cache.getCachedGuild(message.guild.id); let GuildCache = await Cache.getCachedGuild(message.guild.id);
if (typeof GuildCache === 'undefined' || typeof GuildCache.prefix === 'undefined') if (typeof GuildCache === 'undefined' || typeof GuildCache.prefix === 'undefined') return;
return;
if (!message.content.startsWith(GuildCache.prefix)) return; if (!message.content.startsWith(GuildCache.prefix)) return;
@@ -263,8 +247,7 @@ class Discord {
if (args.length === 0) args = []; if (args.length === 0) args = [];
if(!Cache.isUserCached(message.author.id)) if (!Cache.isUserCached(message.author.id)) await Cache.updateUserCache(message.author.id);
await Cache.updateUserCache(message.author.id);
for (const module of this.loaded_module) { for (const module of this.loaded_module) {
let thisModule: DiscordModule = module[1]; let thisModule: DiscordModule = module[1];
@@ -285,7 +268,11 @@ class Discord {
if (!message.mentions.users) return; if (!message.mentions.users) return;
if (message.mentions.users.first()?.id !== this.client.user?.id) return; if (message.mentions.users.first()?.id !== this.client.user?.id) return;
if (!message.content.startsWith(`<@!${this.client.user?.id}>`)) return; if (
!message.content.startsWith(`<@!${this.client.user?.id}>`) &&
!message.content.startsWith(`<@${this.client.user?.id}>`)
)
return;
let args = message.content.split(' '); let args = message.content.split(' ');
let command = args[1]; let command = args[1];
@@ -296,8 +283,7 @@ class Discord {
if (args.length === 0) args = []; if (args.length === 0) args = [];
if(!Cache.isUserCached(message.author.id)) if (!Cache.isUserCached(message.author.id)) await Cache.updateUserCache(message.author.id);
await Cache.updateUserCache(message.author.id);
for (const module of this.loaded_module) { for (const module of this.loaded_module) {
let thisModule: DiscordModule = module[1]; let thisModule: DiscordModule = module[1];