Updated CHANGELOG.md

CHANGELOG.md

@@ -7,12 +7,29 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 
 - More cool stuff coming soon
 
+## [4.0.4] - 04.03.2022
+
+### Fixed
+
+- Fixed the `id` which shows up when you add a new Expression
+- Fixed some strings which were still referring to "CustomReaction(s)" instead of "Expression(s)" 
+
+## [4.0.3] - 04.03.2022
+
+### Fixed
+
+- Console should no longer spam numbers when `.antispam` is enabled
+
 ## [4.0.2] - 03.03.2022
 
+### Fixed
+
 - Fixed `.rero` not working due to a bug introduced in 4.0
 
 ## [4.0.1] - 03.03.2022
 
+### Added
+
 - Added `usePrivilegedIntents` to creds.yml if you don't have or don't want (?) to use them
 - Added a human-readable, detailed error message if logging in fails due to missing privileged intents
 

src/NadekoBot/Bot.cs

@@ -358,7 +358,7 @@ How to enable privileged intents:
 1. Head over to the Discord Developer Portal https://discord.com/developers/applications/
 2. Select your Application.
 3. Click on `Bot` in the left side navigation panel, and scroll down to the intents section.
-4. Enable both intents.
+4. Enable all intents.
 5. Restart your bot.
 
 Read this only if your bot is in 100 or more servers:

src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs

@@ -31,7 +31,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
 
         if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
@@ -39,8 +39,8 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
 
         await ctx.Channel.EmbedAsync(_eb.Create()
                                         .WithOkColor()
-                                        .WithTitle(GetText(strs.new_cust_react))
-                                        .WithDescription($"#{ex.Id}")
+                                        .WithTitle(GetText(strs.expr_new))
+                                        .WithDescription($"#{new kwum(ex.Id)}")
                                         .AddField(GetText(strs.trigger), key)
                                         .AddField(GetText(strs.response),
                                             message.Length > 1024 ? GetText(strs.redacted_too_long) : message));
@@ -56,7 +56,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         if ((channel is null && !_creds.IsOwner(ctx.User))
             || (channel is not null && !((IGuildUser)ctx.User).GuildPermissions.Administrator))
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
@@ -65,14 +65,14 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         {
             await ctx.Channel.EmbedAsync(_eb.Create()
                                             .WithOkColor()
-                                            .WithTitle(GetText(strs.edited_cust_react))
+                                            .WithTitle(GetText(strs.expr_edited))
                                             .WithDescription($"#{id}")
                                             .AddField(GetText(strs.trigger), ex.Trigger)
                                             .AddField(GetText(strs.response),
                                                 message.Length > 1024 ? GetText(strs.redacted_too_long) : message));
         }
         else
-            await ReplyErrorLocalizedAsync(strs.edit_fail);
+            await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
     }
 
     [Cmd]
@@ -86,7 +86,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
 
         if (expressions is null || !expressions.Any())
         {
-            await ReplyErrorLocalizedAsync(strs.no_found);
+            await ReplyErrorLocalizedAsync(strs.expr_no_found);
             return;
         }
 
@@ -105,7 +105,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                                         : " // " + string.Join(" ", ex.GetReactions())))
                                       .Join('\n');
 
-                return _eb.Create().WithOkColor().WithTitle(GetText(strs.custom_reactions)).WithDescription(desc);
+                return _eb.Create().WithOkColor().WithTitle(GetText(strs.expressions)).WithDescription(desc);
             },
             expressions.Length,
             20);
@@ -118,7 +118,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
 
         if (found is null)
         {
-            await ReplyErrorLocalizedAsync(strs.no_found_id);
+            await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
             return;
         }
 
@@ -135,7 +135,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
     {
         if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
@@ -145,13 +145,13 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         {
             await ctx.Channel.EmbedAsync(_eb.Create()
                                             .WithOkColor()
-                                            .WithTitle(GetText(strs.deleted))
+                                            .WithTitle(GetText(strs.expr_deleted))
                                             .WithDescription($"#{id}")
                                             .AddField(GetText(strs.trigger), ex.Trigger.TrimTo(1024))
                                             .AddField(GetText(strs.response), ex.Response.TrimTo(1024)));
         }
         else
-            await ReplyErrorLocalizedAsync(strs.no_found_id);
+            await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
     }
 
     [Cmd]
@@ -159,21 +159,21 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
     {
         if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
         var ex = _service.GetExpression(ctx.Guild?.Id, id);
         if (ex is null)
         {
-            await ReplyErrorLocalizedAsync(strs.no_found);
+            await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
             return;
         }
 
         if (emojiStrs.Length == 0)
         {
             await _service.ResetExprReactions(ctx.Guild?.Id, id);
-            await ReplyConfirmLocalizedAsync(strs.crr_reset(Format.Bold(id.ToString())));
+            await ReplyConfirmLocalizedAsync(strs.expr_reset(Format.Bold(id.ToString())));
             return;
         }
 
@@ -204,7 +204,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         await _service.SetExprReactions(ctx.Guild?.Id, id, succ);
 
 
-        await ReplyConfirmLocalizedAsync(strs.crr_set(Format.Bold(id.ToString()),
+        await ReplyConfirmLocalizedAsync(strs.expr_set(Format.Bold(id.ToString()),
             succ.Select(static x => x.ToString()).Join(", ")));
     }
 
@@ -237,14 +237,14 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
     {
         if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
         var (success, newVal) = await _service.ToggleExprOptionAsync(id, option);
         if (!success)
         {
-            await ReplyErrorLocalizedAsync(strs.no_found_id);
+            await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
             return;
         }
 
@@ -270,7 +270,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                             .WithDescription("This will delete all custom reactions on this server.")))
         {
             var count = _service.DeleteAllExpressions(ctx.Guild.Id);
-            await ReplyConfirmLocalizedAsync(strs.cleared(count));
+            await ReplyConfirmLocalizedAsync(strs.exprs_cleared(count));
         }
     }
 
@@ -279,7 +279,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
     {
         if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
@@ -298,7 +298,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
     {
         if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.insuff_perms);
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -1,13 +1,13 @@
 {
-  "deleted": "Custom Reaction deleted",
-  "insuff_perms": "Insufficient permissions. Requires Bot ownership for global custom reactions, and Administrator for server custom reactions.",
-  "custom_reactions": "Custom Reactions",
-  "new_cust_react": "New Custom Reaction",
-  "no_found": "No custom reaction found.",
-  "no_found_id": "No custom reaction found with that id.",
-  "cleared": "All {0} custom reactions on this server have been removed.",
-  "crr_reset": "Custom reaction with id {0} will no longer add reactions.",
-  "crr_set": "Custom reaction with id {0} will add following reactions to the response message: {1}",
+  "expr_deleted": "Expression deleted",
+  "expr_insuff_perms": "Insufficient permissions. Requires Bot ownership for global expressions, and Administrator for server expressions.",
+  "expressions": "Expressions",
+  "expr_new": "New Expression",
+  "expr_no_found": "No expression found.",
+  "expr_no_found_id": "No expression found with that id.",
+  "exprs_cleared": "All {0} expressions on this server have been removed.",
+  "expr_reset": "Expression with id {0} will no longer add reactions.",
+  "expr_set": "Expression with id {0} will add following reactions to the response message: {1}",
   "invalid_emojis": "All emojis you've specified are invalid.",
   "invalid_emoji_link": "Specified link is either not an image or exceeds 256KB.",
   "emoji_add_error": "Error adding emoji. You either ran out of emoji slots, or image size is inadequate.",
@@ -636,8 +636,8 @@
   "vcrole_added": "Users who join {0} voice channel will get {1} role.",
   "vcrole_removed": "Users who join {0} voice channel will no longer get a role.",
   "vc_role_list": "Voice channel roles",
-  "option_disabled": "{0} option is now disabled for custom reaction with id {1}.",
-  "option_enabled": "{0} option is now enabled for custom reaction with id {1}.",
+  "option_disabled": "{0} option is now disabled for the expression with id {1}.",
+  "option_enabled": "{0} option is now enabled for the expression with id {1}.",
   "aliases_none": "No alias found",
   "alias_added": "Typing {0} will now be an alias of {1}.",
   "alias_list": "List of aliases",
@@ -847,7 +847,7 @@
   "club_apps_for": "Applicants for {0} club",
   "club_leaderboard": "Club leaderboard - page {0}",
   "template_reloaded": "Xp template has been reloaded.",
-  "edited_cust_react": "Custom Reaction Edited",
+  "expr_edited": "Expression Edited",
   "self_assign_are_exclusive": "You can only choose 1 role from each group.",
   "self_assign_are_not_exclusive": "You can choose any number of roles from any group.",
   "self_assign_group": "Group {0}",
@@ -870,7 +870,6 @@
   "feed_no_feed": "You haven't subscribed to any feeds on this server.",
   "restart_fail": "You must setup RestartCommand in your creds.yml",
   "restarting": "Restarting.",
-  "edit_fail": "Custom reaction with that ID does not exist.",
   "streaming": "Streaming",
   "rafflecur": "{0} Currency Raffle",
   "rafflecur_joined": "User {0} joined the raffle",