Fix logic around responding with mentions (#131)

* Fix logic around responding with mentions * Clean up code
nyxx-discord · Sep 25, 2023 · a9f3d55 · a9f3d55
1 parent a3ec0bc
commit a9f3d55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ build/
 doc/
 .vscode/
 .idea/
+pubspec_overrides.yaml
diff --git a/lib/src/util/mixins.dart b/lib/src/util/mixins.dart
@@ -819,10 +819,12 @@ mixin MessageRespondMixin implements InteractiveMixin {
     if (builder.replyId == null) {
       builder.replyId = message.id;
 
-      // Calling [AllowedMentions.allow] here will only change anything if [level.mention] is
-      // non-null, in which case we want to change it. Otherwise, this does nothing.
-      builder.allowedMentions!.parse =
-          {...(builder.allowedMentions!.parse ?? <String>[]), 'replied_user'}.toList();
+      if (level.mention case final shouldMention?) {
+        final allowedMentions = builder.allowedMentions ?? AllowedMentions();
+        final replyMentions = AllowedMentions(repliedUser: shouldMention);
+        builder.allowedMentions =
+            shouldMention ? allowedMentions | replyMentions : allowedMentions & replyMentions;
+      }
     }
 
     return channel.sendMessage(builder);