From 0da819063770d4c7690750082473628884442eb4 Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Sat, 11 May 2024 07:59:37 +0000
Subject: [PATCH] fix: repeat, greet, bye, boost messages can now once again
 mention anyone fix: .say #channel fixed

---
 CHANGELOG.md                                           |  4 +++-
 .../Modules/Administration/GreetBye/GreetService.cs    | 10 ++++------
 .../Modules/Utility/Repeater/RepeaterService.cs        |  6 +++++-
 src/NadekoBot/Modules/Utility/Utility.cs               |  1 +
 src/NadekoBot/_common/Sender/ResponseBuilder.cs        |  3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28d8a46a1..0e0f48602 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [5.0.5] - 
+## [5.0.5] - 11.05.2024
 
 ### Fixed
 
 - `%server.members%` placeholder fixed
+- `.say #channel <message>` should now be working properly again
+- `.repeat`, `.greet`, `.bye` and `.boost` command can now once again mention anyone
 
 ## [5.0.4] - 10.05.2024
 
diff --git a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
index 6477afeb7..82cd936ec 100644
--- a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
+++ b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
@@ -97,7 +97,7 @@ public class GreetService : INService, IReadyExecutor
         {
             var newContent = await _repSvc.ReplaceAsync(toSend,
                 new(client: _client, guild: user.Guild, channel: channel, users: user));
-            var toDelete = await _sender.Response(channel).Text(newContent).SendAsync();
+            var toDelete = await _sender.Response(channel).Text(newContent).Sanitize(false).SendAsync();
             if (conf.BoostMessageDeleteAfter > 0)
                 toDelete.DeleteAfter(conf.BoostMessageDeleteAfter);
 
@@ -217,7 +217,7 @@ public class GreetService : INService, IReadyExecutor
         text = await _repSvc.ReplaceAsync(text, repCtx);
         try
         {
-            var toDelete = await _sender.Response(channel).Text(text).SendAsync();
+            var toDelete = await _sender.Response(channel).Text(text).Sanitize(false).SendAsync();
             if (conf.AutoDeleteByeMessagesTimer > 0)
                 toDelete.DeleteAfter(conf.AutoDeleteByeMessagesTimer);
         }
@@ -258,7 +258,7 @@ public class GreetService : INService, IReadyExecutor
         text = await _repSvc.ReplaceAsync(text, repCtx);
         try
         {
-            var toDelete = await _sender.Response(channel).Text(text).SendAsync();
+            var toDelete = await _sender.Response(channel).Text(text).Sanitize(false).SendAsync();
             if (conf.AutoDeleteGreetMessagesTimer > 0)
                 toDelete.DeleteAfter(conf.AutoDeleteGreetMessagesTimer);
         }
@@ -360,7 +360,7 @@ public class GreetService : INService, IReadyExecutor
                 }
             }
 
-            await _sender.Response(user).Text(smartText).SendAsync();
+            await _sender.Response(user).Text(smartText).Sanitize(false).SendAsync();
         }
         catch
         {
@@ -573,8 +573,6 @@ public class GreetService : INService, IReadyExecutor
 
     public bool SetBoostMessage(ulong guildId, ref string message)
     {
-        message = message.SanitizeMentions();
-
         using var uow = _db.GetDbContext();
         var conf = uow.GuildConfigsForId(guildId, set => set);
         conf.BoostMessage = message;
diff --git a/src/NadekoBot/Modules/Utility/Repeater/RepeaterService.cs b/src/NadekoBot/Modules/Utility/Repeater/RepeaterService.cs
index 414244fc9..9bf15dca3 100644
--- a/src/NadekoBot/Modules/Utility/Repeater/RepeaterService.cs
+++ b/src/NadekoBot/Modules/Utility/Repeater/RepeaterService.cs
@@ -269,7 +269,11 @@ public sealed class RepeaterService : IReadyExecutor, INService
             var text = SmartText.CreateFrom(repeater.Message);
             text = await _repSvc.ReplaceAsync(text, repCtx);
 
-            var newMsg = await _sender.Response(channel).Text(text).SendAsync();
+            var newMsg = await _sender.Response(channel)
+                                      .Text(text)
+                                      .Sanitize(false)
+                                      .SendAsync();
+            
             _ = newMsg.AddReactionAsync(new Emoji("🔄"));
 
             if (_noRedundant.Contains(repeater.Id))
diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs
index 8386e1cef..6745c2297 100644
--- a/src/NadekoBot/Modules/Utility/Utility.cs
+++ b/src/NadekoBot/Modules/Utility/Utility.cs
@@ -85,6 +85,7 @@ public partial class Utility : NadekoModule
 
         await Response()
               .Text(message)
+              .Channel(channel)
               .UserBasedMentions()
               .SendAsync();
     }
diff --git a/src/NadekoBot/_common/Sender/ResponseBuilder.cs b/src/NadekoBot/_common/Sender/ResponseBuilder.cs
index 6d86cb5de..7eae8faf5 100644
--- a/src/NadekoBot/_common/Sender/ResponseBuilder.cs
+++ b/src/NadekoBot/_common/Sender/ResponseBuilder.cs
@@ -357,9 +357,10 @@ public sealed partial class ResponseBuilder
         fileName = name;
         return this;
     }
-
+    
     public PaginatedResponseBuilder Paginated()
         => new(this);
+
 }
 
 public class PaginatedResponseBuilder