From 2f189dbd792022f1ecd08b23c90e2e227a781905 Mon Sep 17 00:00:00 2001
From: Macintosh II <mctaylxrs@outlook.com>
Date: Thu, 28 Sep 2023 14:24:32 +0300
Subject: [PATCH] duh

Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com>
Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
---
 src/Responders/GuildMemberJoinedResponder.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Responders/GuildMemberJoinedResponder.cs b/src/Responders/GuildMemberJoinedResponder.cs
index 2403014..849ff5e 100644
--- a/src/Responders/GuildMemberJoinedResponder.cs
+++ b/src/Responders/GuildMemberJoinedResponder.cs
@@ -42,7 +42,7 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
         var cfg = data.Settings;
         var memberData = data.GetOrCreateMemberData(user.ID);
 
-        var returnRolesResult = await ReturnRolesOnRejoinAsync(cfg, memberData, gatewayEvent, user.ID, ct);
+        var returnRolesResult = await TryReturnRolesAsync(cfg, memberData, gatewayEvent.GuildID, user.ID, ct);
         if (!returnRolesResult.IsSuccess)
         {
             return Result.FromError(returnRolesResult.Error);
@@ -81,8 +81,8 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
             allowedMentions: Boyfriend.NoMentions, ct: ct);
     }
 
-    private async Task<Result> ReturnRolesOnRejoinAsync(
-        JsonNode cfg, MemberData memberData, IGuildMemberAdd gatewayEvent, Snowflake userId, CancellationToken ct)
+    private async Task<Result> TryReturnRolesAsync(
+        JsonNode cfg, MemberData memberData, Snowflake guildId, Snowflake userId, CancellationToken ct)
     {
         if (!GuildSettings.ReturnRolesOnRejoin.Get(cfg))
         {
@@ -102,7 +102,6 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
         }
 
         return await _guildApi.ModifyGuildMemberAsync(
-            gatewayEvent.GuildID, userId,
-            roles: assignRoles, ct: ct);
+            guildId, userId, roles: assignRoles, ct: ct);
     }
 }