Bugfix: incorrect removal of custom pronunciation

ZBAGI · Mar 27, 2024 · 5039110 · 5039110
1 parent b29775b
commit 5039110
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -104,13 +104,21 @@ if(SAY_COMMAND_PRONOUNCE) {
  return;
  }
 
- const msg = "Moderator "+user+" changed pronunciation of; " + pronunciation.apply(args[0]) + "; to; " + args[1];
+ const removed = args[0].toLowerCase() == args[1].toLowerCase() || args[0].toLowerCase() == "remove";
+
+ if(removed) {
+ if(!pronunciation.remove(args[1])) {
+ console.log("Moderator "+user+" failed to removed unknown pronunciation of " + args[1]);
+ return;
+ }
+ } else {
+ pronunciation.set(args[0], args[1]);
+ }
+
+ const msg = removed ? "Moderator "+user+" removed pronunciation of; " + args[1] :
+ "Moderator "+user+" changed pronunciation of; " + args[0] + "; to; " + args[1];
  console.log(msg);
  await audio.say(msg, SAY_DEFAULT_VOICE, SAY_VOLUME);
- if(args[0] == args[1])
- pronunciation.remove(args[0]);
- else
- pronunciation.set(args[0], args[1])
  }
  });
 }
diff --git a/src/pronunciation.ts b/src/pronunciation.ts
@@ -48,12 +48,9 @@ export class Pronunciation {
  }
 
  public remove(key: string): boolean {
- if (this.map.has(key)) {
- this.map.delete(key);
- this.save();
- return true;
- }
+ const result = this.map.delete(key.toLowerCase());
+ this.save();
 
- return false;
+ return result;
  }
 }