From 303b5c810cdf488d93a814641b0472c1cc429416 Mon Sep 17 00:00:00 2001 From: Macintosh II Date: Thu, 28 Sep 2023 14:06:12 +0300 Subject: [PATCH] meh Co-authored-by: Octol1ttle Signed-off-by: Macintosh II --- src/Responders/GuildMemberJoinedResponder.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Responders/GuildMemberJoinedResponder.cs b/src/Responders/GuildMemberJoinedResponder.cs index 6856f25..2403014 100644 --- a/src/Responders/GuildMemberJoinedResponder.cs +++ b/src/Responders/GuildMemberJoinedResponder.cs @@ -3,7 +3,6 @@ using Boyfriend.Data; using Boyfriend.Services; using JetBrains.Annotations; using Remora.Discord.API.Abstractions.Gateway.Events; -using Remora.Discord.API.Abstractions.Objects; using Remora.Discord.API.Abstractions.Rest; using Remora.Discord.Extensions.Embeds; using Remora.Discord.Gateway.Responders; @@ -43,7 +42,7 @@ public class GuildMemberJoinedResponder : IResponder var cfg = data.Settings; var memberData = data.GetOrCreateMemberData(user.ID); - var returnRolesResult = await ReturnRolesOnRejoinAsync(cfg, memberData, gatewayEvent, user, ct); + var returnRolesResult = await ReturnRolesOnRejoinAsync(cfg, memberData, gatewayEvent, user.ID, ct); if (!returnRolesResult.IsSuccess) { return Result.FromError(returnRolesResult.Error); @@ -83,7 +82,7 @@ public class GuildMemberJoinedResponder : IResponder } private async Task ReturnRolesOnRejoinAsync( - JsonNode cfg, MemberData memberData, IGuildMemberAdd gatewayEvent, IUser user, CancellationToken ct) + JsonNode cfg, MemberData memberData, IGuildMemberAdd gatewayEvent, Snowflake userId, CancellationToken ct) { if (!GuildSettings.ReturnRolesOnRejoin.Get(cfg)) { @@ -92,7 +91,7 @@ public class GuildMemberJoinedResponder : IResponder var assignRoles = new List(); - if (!GuildSettings.RemoveRolesOnMute.Get(cfg) || memberData.MutedUntil is null) + if (memberData.MutedUntil is null || !GuildSettings.RemoveRolesOnMute.Get(cfg)) { assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake())); } @@ -102,9 +101,8 @@ public class GuildMemberJoinedResponder : IResponder assignRoles.Add(GuildSettings.MuteRole.Get(cfg)); } - var result = await _guildApi.ModifyGuildMemberAsync( - gatewayEvent.GuildID, user.ID, + return await _guildApi.ModifyGuildMemberAsync( + gatewayEvent.GuildID, userId, roles: assignRoles, ct: ct); - return !result.IsSuccess ? Result.FromError(result.Error) : Result.FromSuccess(); } }