Merge pull request #156 from destinygg/chore/redirect-dgg-addban

chore: redirect !addban and !removeban to native versions
destinygg · Apr 11, 2024 · 141003a · 141003a
2 parents 6c20d1e + d0c7d64
commit 141003a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 64 deletions.
diff --git a/index.js b/index.js
@@ -70,7 +70,6 @@ services
       services.scheduledCommands,
       services.fakeScheduler,
       services.messageRelay,
-      services.bannedPhrases,
     );
     chatServiceRouter.create();
   })

diff --git a/lib/chat-utils/parse-commands-from-chat.js b/lib/chat-utils/parse-commands-from-chat.js
@@ -60,14 +60,6 @@ function parseCommand(message) {
   return { commandString: commandString.toLowerCase(), input };
 }
 
-function formatAddPhrase(phrase) {
-  return `ADDPHRASE ${JSON.stringify({ data: phrase })}`;
-}
-
-function formatRemovePhrase(phrase) {
-  return `REMOVEPHRASE ${JSON.stringify({ data: phrase })}`;
-}
-
 module.exports = {
   parseMessage,
   parseCommand,
@@ -79,6 +71,4 @@ module.exports = {
   formatPoll,
   parseWhisper,
   formatWhisper,
-  formatAddPhrase,
-  formatRemovePhrase,
 };
diff --git a/lib/commands/implementations/banphrase.js b/lib/commands/implementations/banphrase.js
@@ -51,11 +51,8 @@ function banPhraseTwitch(defaultPunishmentDuration, punishmentType) {
 }
 
 function banPhraseDGG() {
-  return (input, services) => {
-    const matched = /(\d+[HMDSWwhmds])?\s?(.*)/.exec(input);
-    const bannedPhrase = _.get(matched, 2, '');
-    services.bannedPhrases.addBannedPhrase(bannedPhrase);
-    return new CommandOutput(null, 'Phrase banned!');
+  return () => {
+    return new CommandOutput(null, 'This command has been removed, use native /addban instead.');
   };
 }
 

diff --git a/lib/commands/implementations/unbanphrase.js b/lib/commands/implementations/unbanphrase.js
@@ -20,10 +20,8 @@ function unbanPhraseTwitch() {
 }
 
 function unbanPhraseDGG() {
-  return (input, services) => {
-    const bannedPhrase = input;
-    services.bannedPhrases.removeBannedPhrase(bannedPhrase);
-    return new CommandOutput(null, 'Phrase unbanned! AngelThump');
+  return () => {
+    return new CommandOutput(null, 'This command has been removed, use native /removeban instead.');
   };
 }
 

diff --git a/lib/message-routing/chat-service-router.js b/lib/message-routing/chat-service-router.js
@@ -11,7 +11,6 @@ class ChatServiceRouter {
     messageSchedulerStream,
     fakeScheduler,
     messageRelay,
-    bannedPhrases,
   ) {
     this.messageRouter = messageRouter;
     this.commandRouter = commandRouter;
@@ -23,7 +22,6 @@ class ChatServiceRouter {
     this.fakeScheduler = fakeScheduler;
     // TODO just refactor other things to use the message relay
     this.messageRelay = messageRelay;
-    this.bannedPhrases = bannedPhrases;
   }
 
   create() {
@@ -162,19 +160,6 @@ class ChatServiceRouter {
         this.bot.sendMessage(punishmentObject.reason);
       }
     });
-
-    this.bannedPhrases.on('data', (obj) => {
-      switch (obj.action) {
-        case 'add':
-          this.bot.sendAddPhrase(obj.phrase);
-          break;
-        case 'remove':
-          this.bot.sendRemovePhrase(obj.phrase);
-          break;
-        default:
-          break;
-      }
-    })
   }
 }
 

diff --git a/lib/services/banned-phrase-emitter.js b/lib/services/banned-phrase-emitter.js
diff --git a/lib/services/destinychat.js b/lib/services/destinychat.js
@@ -12,8 +12,6 @@ const {
   formatUnmute,
   formatBan,
   formatUnban,
-  formatAddPhrase,
-  formatRemovePhrase,
   formatPoll,
 } = require('../chat-utils/parse-commands-from-chat');
 
@@ -121,14 +119,6 @@ class DestinyChat extends EventEmitter {
     });
   }
 
-  sendAddPhrase(phrase) {
-    this.ws.send(formatAddPhrase(phrase));
-  }
-
-  sendRemovePhrase(phrase) {
-    this.ws.send(formatRemovePhrase(phrase));
-  }
-
   handleError(event) {
     this.emit('error', event);
   }

diff --git a/lib/services/service-index.js b/lib/services/service-index.js
@@ -19,7 +19,6 @@ const RedditVote = require('./reddit-vote');
 const MessageRelay = require('./message-relay');
 const messageMatchingService = require('./message-matching');
 const HTMLMetadata = require('./html-metadata');
-const BannedPhrases = require('./banned-phrase-emitter')
 
 class Services {
   constructor(serviceConfigurations, chatConnectedTo) {
@@ -50,7 +49,6 @@ class Services {
     if (chatConnectedTo === 'dgg') {
       this.redditVote = new RedditVote(serviceConfigurations.redditVote, this.logger);
     }
-    this.bannedPhrases = new BannedPhrases();
   }
 
   prepareAsyncServices() {