feat: Add command to log when permissions are denied

schw4rzlicht · Jun 7, 2020 · 40bdf94 · 40bdf94
1 parent fd1a88f
commit 40bdf94
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/__tests__/Twitch2Ma.test.ts b/__tests__/Twitch2Ma.test.ts
@@ -294,7 +294,7 @@ test("Command permissions denied", async () => {
     await sendMessageToBotAndExpectAnswer(twitch2Ma, jest.spyOn(twitch2Ma["chatClient"], "say"), "#doesNotMatter",
         "Alice", "!red", aliceRawMessage, "@Alice, please wait \\d{1,2} seconds and try again!");
 
-    return expect(permissionDeniedHandler).toBeCalledWith("#doesNotMatter", "Alice", "cooldown");
+    return expect(permissionDeniedHandler).toBeCalledWith("#doesNotMatter", "Alice", "!red", "cooldown");
 });
 
 test("Command permissions denied but godMode enabled", async () => {

diff --git a/src/lib/Twitch2Ma.ts b/src/lib/Twitch2Ma.ts
@@ -56,7 +56,7 @@ export default class Twitch2Ma extends EventEmitter {
         this.permissionController = new PermissionController()
             .withPermissionInstance(new SACNPermission(config))
             .withPermissionInstance(new CooldownPermission())
-            .withPermissionInstance(new OwnerPermission())
+            // .withPermissionInstance(new OwnerPermission())
             .withPermissionInstance(new ModeratorPermission());
     }
 
@@ -154,10 +154,10 @@ export default class Twitch2Ma extends EventEmitter {
                         })
                         .then(() => this.emit(this.onCommandExecuted, channel, user, chatCommand, parameterName, instructions.consoleCommand))
                         .catch((error: PermissionError) => {
-                            let command = _.isString(parameterName) ? `!${chatCommand} ${parameterName}` : `${chatCommand}`;
+                            let command = _.isString(parameterName) ? `!${chatCommand} ${parameterName}` : `!${chatCommand}`;
                             let reason = error.permissionCollector.permissionDeniedReasons.shift();
                             this.chatClient.say(channel, reason.viewerMessage.replace("{command}", command));
-                            this.emit(this.onPermissionDenied, channel, user, reason.name);
+                            this.emit(this.onPermissionDenied, channel, user, command, reason.name);
                         })
                         .catch(() => this.stopWithError(new TelnetError("Sending telnet command failed!")));
                 }
@@ -224,6 +224,6 @@ export default class Twitch2Ma extends EventEmitter {
     onError = this.registerEvent<(error: Error) => any>();
     onCommandExecuted = this.registerEvent<(channel: string, user: string, chatCommand: string, parameter: string, consoleCommand: string) => any>();
     onHelpExecuted = this.registerEvent<(channel: string, user: string, helpCommand?: string) => any>();
-    onPermissionDenied = this.registerEvent<(channel: string, user: string, reason: string) => any>();
+    onPermissionDenied = this.registerEvent<(channel: string, user: string, command: string, reason: string) => any>();
     onGodMode = this.registerEvent<(channel: string, user: string, reason: string) => any>();
 }
diff --git a/src/lib/index.ts b/src/lib/index.ts
@@ -71,8 +71,8 @@ export async function attachEventHandlers(twitch2Ma: Twitch2Ma): Promise<Twitch2
     twitch2Ma.onGodMode((channel, user, reason) => channelMessage(channel,
         chalk`💪 User {bold ${user}} activated {bold.inverse  god mode } because: ${reason}.`));
 
-    twitch2Ma.onPermissionDenied((channel, user, reason) => channelMessage(channel,
-        chalk`✋ User {bold ${user}} tried to run a command but permissions were denied because of ${reason}.`))
+    twitch2Ma.onPermissionDenied((channel, user, command, reason) => channelMessage(channel,
+        chalk`✋ User {bold ${user}} tried to run {bold.blue ${command}} but permissions were denied by ${reason}.`))
 
     twitch2Ma.onError(exitWithError);