1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com>
Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
This commit is contained in:
Macintxsh 2023-09-28 14:24:32 +03:00
parent 303b5c810c
commit 2f189dbd79
Signed by: mctaylors
GPG key ID: 361D326747B61E65

View file

@ -42,7 +42,7 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
var cfg = data.Settings; var cfg = data.Settings;
var memberData = data.GetOrCreateMemberData(user.ID); 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) if (!returnRolesResult.IsSuccess)
{ {
return Result.FromError(returnRolesResult.Error); return Result.FromError(returnRolesResult.Error);
@ -81,8 +81,8 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
allowedMentions: Boyfriend.NoMentions, ct: ct); allowedMentions: Boyfriend.NoMentions, ct: ct);
} }
private async Task<Result> ReturnRolesOnRejoinAsync( private async Task<Result> TryReturnRolesAsync(
JsonNode cfg, MemberData memberData, IGuildMemberAdd gatewayEvent, Snowflake userId, CancellationToken ct) JsonNode cfg, MemberData memberData, Snowflake guildId, Snowflake userId, CancellationToken ct)
{ {
if (!GuildSettings.ReturnRolesOnRejoin.Get(cfg)) if (!GuildSettings.ReturnRolesOnRejoin.Get(cfg))
{ {
@ -102,7 +102,6 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
} }
return await _guildApi.ModifyGuildMemberAsync( return await _guildApi.ModifyGuildMemberAsync(
gatewayEvent.GuildID, userId, guildId, userId, roles: assignRoles, ct: ct);
roles: assignRoles, ct: ct);
} }
} }