ソースを参照

Fix loop when dm

ghorsington 4 年 前
コミット
e2683290a6
1 ファイル変更14 行追加14 行削除
  1. 14 14
      bot/src/main.ts

+ 14 - 14
bot/src/main.ts

@@ -52,16 +52,16 @@ client.bot.on("ready", async () => {
 });
 
 client.bot.on("message", async m => {
+    if (m.author.id == client.botUser.id)
+        return;
+
     if (m.channel.type != "text") {
         logger.warn("User %s (%s#%s) tried to execute command in DMs. Message: %s.", m.author.id, m.author.username, m.author.discriminator, m.content);
         await m.reply("DM commands are disabled, sorry!");
         return;
     }
 
-    if (m.author.id == client.botUser.id)
-        return;
-
-    if(process.env.FOOLS == "TRUE" && (m.channel.id == "297109482905796608" || m.channel.id == "429295461099110402") && Math.random() <= 0.01) {
+    if (process.env.FOOLS == "TRUE" && (m.channel.id == "297109482905796608" || m.channel.id == "429295461099110402") && Math.random() <= 0.01) {
         const neighs = ["*NEIGH*", "neeeeeigh!", "Gimme carrots!", "NEEEEIIIIGH", "**N E I G H**"];
         await m.channel.send(neighs[Math.floor(Math.random() * neighs.length)]);
         return;
@@ -131,15 +131,15 @@ async function getGreeting(member: GuildMember | PartialGuildMember) {
         return undefined;
     }
 
-    return {guildGreeting, greetingChannel};
+    return { guildGreeting, greetingChannel };
 }
 
 client.bot.on("guildMemberAdd", async member => {
     const result = await getGreeting(member);
-    if(!result)
+    if (!result)
         return;
-    const {guildGreeting, greetingChannel} = result;
-    
+    const { guildGreeting, greetingChannel } = result;
+
     await greetingChannel.send(formatString(guildGreeting.onJoinMessage, {
         memberID: member.id,
         memberTag: member.user?.tag ?? member.displayName,
@@ -149,10 +149,10 @@ client.bot.on("guildMemberAdd", async member => {
 
 client.bot.on("guildMemberRemove", async member => {
     const result = await getGreeting(member);
-    if(!result)
+    if (!result)
         return;
-    const {guildGreeting, greetingChannel} = result;
-    
+    const { guildGreeting, greetingChannel } = result;
+
     await greetingChannel.send(formatString(guildGreeting.onLeaveMessage, {
         memberID: member.id,
         memberTag: member.user?.tag ?? member.displayName,
@@ -169,7 +169,7 @@ function loadCommand(mod: Record<string, unknown>) {
         // Ensure this is indeed a command class
         if (!mCmd.isCommandSet(commandClass))
             continue;
-        
+
         const cmd = new commandClass();
         commandSets.push(cmd);
 
@@ -181,7 +181,7 @@ function loadCommand(mod: Record<string, unknown>) {
                 botEvents[+i as mCmd.ActionType].push((event as mCmd.BotAction).bind(cmd));
             }
 
-        if(cmd.onStart)
+        if (cmd.onStart)
             startActions.push(cmd.onStart.bind(cmd));
     }
 }
@@ -193,7 +193,7 @@ interface IDocumentationData {
     auth: boolean;
 }
 
-export function getDocumentation() : IDocumentationData[] {
+export function getDocumentation(): IDocumentationData[] {
     return botCommands.filter(m => m.documentation !== undefined).map(m => ({
         name: m.pattern.toString(),
         doc: m.documentation?.description,