TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

meh

Browse source 
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:06:12 +03:00
parent 758f464712
commit 303b5c810c
Signed by: mctaylors
GPG key ID: 361D326747B61E65
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Responders/GuildMemberJoinedResponder.cs
View file

@ -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<IGuildMemberAdd>
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<IGuildMemberAdd>
}
private async Task<Result> 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<IGuildMemberAdd>
var assignRoles = new List<Snowflake>();
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<IGuildMemberAdd>
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();
}
}