From 8ae4ba722a700f741c47f454670421c0199cb7cc Mon Sep 17 00:00:00 2001
From: sam <sam@starshines.gay>
Date: Tue, 29 Oct 2024 15:24:32 +0100
Subject: [PATCH] fix: don't use Task.WhenAll() in message responders, it
 breaks ignoring them for some reason

---
 .../Messages/MessageCreateResponder.cs        | 44 +++++++++++--------
 Catalogger.Backend/Catalogger.Backend.csproj  |  4 --
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Catalogger.Backend/Bot/Responders/Messages/MessageCreateResponder.cs b/Catalogger.Backend/Bot/Responders/Messages/MessageCreateResponder.cs
index cc45edc..47cf10c 100644
--- a/Catalogger.Backend/Bot/Responders/Messages/MessageCreateResponder.cs
+++ b/Catalogger.Backend/Bot/Responders/Messages/MessageCreateResponder.cs
@@ -148,16 +148,20 @@ public partial class PkMessageHandler(ILogger logger, IServiceProvider services)
         await using var messageRepository =
             scope.ServiceProvider.GetRequiredService<MessageRepository>();
 
-        await Task.WhenAll(
-            messageRepository.SetProxiedMessageDataAsync(
-                msgId,
-                originalId,
-                authorId,
-                systemId: match.Groups[1].Value,
-                memberId: match.Groups[2].Value
-            ),
-            messageRepository.IgnoreMessageAsync(originalId)
+        _logger.Debug(
+            "Setting proxy data for {MessageId} and ignoring {OriginalId}",
+            msgId,
+            originalId
         );
+
+        await messageRepository.SetProxiedMessageDataAsync(
+            msgId,
+            originalId,
+            authorId,
+            systemId: match.Groups[1].Value,
+            memberId: match.Groups[2].Value
+        );
+        await messageRepository.IgnoreMessageAsync(originalId);
     }
 
     public async Task HandleProxiedMessageAsync(ulong msgId)
@@ -189,15 +193,19 @@ public partial class PkMessageHandler(ILogger logger, IServiceProvider services)
             return;
         }
 
-        await Task.WhenAll(
-            messageRepository.SetProxiedMessageDataAsync(
-                msgId,
-                pkMessage.Original,
-                pkMessage.Sender,
-                pkMessage.System?.Id,
-                pkMessage.Member?.Id
-            ),
-            messageRepository.IgnoreMessageAsync(pkMessage.Original)
+        _logger.Debug(
+            "Setting proxy data for {MessageId} and ignoring {OriginalId}",
+            msgId,
+            pkMessage.Original
         );
+
+        await messageRepository.SetProxiedMessageDataAsync(
+            msgId,
+            pkMessage.Original,
+            pkMessage.Sender,
+            pkMessage.System?.Id,
+            pkMessage.Member?.Id
+        );
+        await messageRepository.IgnoreMessageAsync(pkMessage.Original);
     }
 }
diff --git a/Catalogger.Backend/Catalogger.Backend.csproj b/Catalogger.Backend/Catalogger.Backend.csproj
index 436899d..b6fd02c 100644
--- a/Catalogger.Backend/Catalogger.Backend.csproj
+++ b/Catalogger.Backend/Catalogger.Backend.csproj
@@ -37,8 +37,4 @@
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1"/>
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Database\Dapper\" />
-    </ItemGroup>
-
 </Project>