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

Fix mute role returning when rejoining server

Browse source
This commit is contained in:
Macintxsh 2023-09-27 22:20:47 +03:00
parent e907930623
commit e8c72080ba
Signed by: mctaylors
GPG key ID: 361D326747B61E65
1 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Responders/GuildMemberJoinedResponder.cs
View file

@ -1,10 +1,13 @@
using System.Text.Json.Nodes;
using Boyfriend.Data; using Boyfriend.Data;
using Boyfriend.Services; using Boyfriend.Services;
using JetBrains.Annotations; using JetBrains.Annotations;
using Remora.Discord.API.Abstractions.Gateway.Events; using Remora.Discord.API.Abstractions.Gateway.Events;
using Remora.Discord.API.Abstractions.Objects;
using Remora.Discord.API.Abstractions.Rest; using Remora.Discord.API.Abstractions.Rest;
using Remora.Discord.Extensions.Embeds; using Remora.Discord.Extensions.Embeds;
using Remora.Discord.Gateway.Responders; using Remora.Discord.Gateway.Responders;
using Remora.Rest.Core;
using Remora.Results; using Remora.Results;
namespace Boyfriend.Responders; namespace Boyfriend.Responders;
@ -40,15 +43,10 @@ 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);
if (GuildSettings.ReturnRolesOnRejoin.Get(cfg)) var returnRolesResult = await ReturnRolesOnRejoinAsync(cfg, memberData, gatewayEvent, user, ct);
if (!returnRolesResult.IsSuccess)
{ {
var result = await _guildApi.ModifyGuildMemberAsync( return Result.FromError(returnRolesResult.Error);
gatewayEvent.GuildID, user.ID,
roles: memberData.Roles.ConvertAll(r => r.ToSnowflake()), ct: ct);
if (!result.IsSuccess)
{
return Result.FromError(result.Error);
}
} }
if (GuildSettings.PublicFeedbackChannel.Get(cfg).Empty() if (GuildSettings.PublicFeedbackChannel.Get(cfg).Empty()
@ -83,4 +81,30 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
GuildSettings.PublicFeedbackChannel.Get(cfg), embeds: new[] { built }, GuildSettings.PublicFeedbackChannel.Get(cfg), embeds: new[] { built },
allowedMentions: Boyfriend.NoMentions, ct: ct); allowedMentions: Boyfriend.NoMentions, ct: ct);
} }
private async Task<Result> ReturnRolesOnRejoinAsync(
JsonNode cfg, MemberData memberData, IGuildMemberAdd gatewayEvent, IUser user, CancellationToken ct)
{
if (!GuildSettings.ReturnRolesOnRejoin.Get(cfg))
{
return Result.FromSuccess();
}
var assignRoles = new List<Snowflake>();
if (!GuildSettings.RemoveRolesOnMute.Get(cfg))
{
assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake()));
}
if (memberData.MutedUntil is not null)
{
assignRoles.Add(GuildSettings.MuteRole.Get(cfg));
}
var result = await _guildApi.ModifyGuildMemberAsync(
gatewayEvent.GuildID, user.ID,
roles: assignRoles, ct: ct);
return !result.IsSuccess ? Result.FromError(result.Error) : Result.FromSuccess();
}
} }