From a6e48321183b1c2e5cc414d16429db0a1d6288a8 Mon Sep 17 00:00:00 2001
From: Macintosh II <mctaylxrs@outlook.com>
Date: Wed, 4 Oct 2023 15:37:33 +0300
Subject: [PATCH] Resolve conversations

Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
---
 src/Responders/GuildUnloadedResponder.cs | 13 ++++++++-----
 src/Services/GuildDataService.cs         |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Responders/GuildUnloadedResponder.cs b/src/Responders/GuildUnloadedResponder.cs
index bdc181e..65bb677 100644
--- a/src/Responders/GuildUnloadedResponder.cs
+++ b/src/Responders/GuildUnloadedResponder.cs
@@ -9,7 +9,7 @@ using Remora.Results;
 namespace Octobot.Responders;
 
 /// <summary>
-///     Handles removing guild ID from <see cref="GuildData" /> if bot leaves the guild.
+///     Handles removing guild ID from <see cref="GuildData" /> if the guild becomes unavailable.
 /// </summary>
 [UsedImplicitly]
 public class GuildUnloadedResponder : IResponder<IGuildDelete>
@@ -24,12 +24,15 @@ public class GuildUnloadedResponder : IResponder<IGuildDelete>
         _logger = logger;
     }
 
-    public async Task<Result> RespondAsync(IGuildDelete gatewayEvent, CancellationToken ct = default)
+    public Task<Result> RespondAsync(IGuildDelete gatewayEvent, CancellationToken ct = default)
     {
         var guildId = gatewayEvent.ID;
-        await _guildData.RemoveGuildId(guildId);
-        _logger.LogInformation("Left guild {guildId}", guildId);
+        var removeGuildSucceed = _guildData.RemoveGuildId(guildId);
+        if (removeGuildSucceed)
+        {
+            _logger.LogInformation("Left guild {GuildId}", guildId);
+        }
 
-        return Result.FromSuccess();
+        return Task.FromResult(Result.FromSuccess());
     }
 }
diff --git a/src/Services/GuildDataService.cs b/src/Services/GuildDataService.cs
index 88f205f..66e9c7d 100644
--- a/src/Services/GuildDataService.cs
+++ b/src/Services/GuildDataService.cs
@@ -143,8 +143,8 @@ public sealed class GuildDataService : IHostedService
         return _datas.Keys;
     }
 
-    public Task RemoveGuildId(Snowflake id)
+    public bool RemoveGuildId(Snowflake id)
     {
-        return Task.FromResult(_datas.TryRemove(id, out _));
+        return _datas.TryRemove(id, out _);
     }
 }