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

Merge branch 'master' into sound-to-loaded

Browse source
This commit is contained in:
Macintxsh 2024-03-18 21:26:14 +03:00 • committed by GitHub
commit fb5c701808
Signed by: GitHub
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Commands/ToolsCommandGroup.cs
View file

@ -35,7 +35,7 @@ public class ToolsCommandGroup : CommandGroup
public ToolsCommandGroup( public ToolsCommandGroup(
ICommandContext context, IFeedbackService feedback, ICommandContext context, IFeedbackService feedback,
GuildDataService guildData, IDiscordRestGuildAPI guildApi, GuildDataService guildData, IDiscordRestGuildAPI guildApi,
IDiscordRestUserAPI userApi, IDiscordRestChannelAPI channelApi) IDiscordRestUserAPI userApi)
{ {
_context = context; _context = context;
_guildData = guildData; _guildData = guildData;

7
src/Services/Update/MemberUpdateService.cs
View file

@ -151,6 +151,13 @@ public sealed partial class MemberUpdateService : BackgroundService
return Result.FromSuccess(); return Result.FromSuccess();
} }
var existingBanResult = await _guildApi.GetGuildBanAsync(guildId, id, ct);
if (!existingBanResult.IsDefined())
{
data.BannedUntil = null;
return Result.FromSuccess();
}
var unbanResult = await _guildApi.RemoveGuildBanAsync( var unbanResult = await _guildApi.RemoveGuildBanAsync(
guildId, id, Messages.PunishmentExpired.EncodeHeader(), ct); guildId, id, Messages.PunishmentExpired.EncodeHeader(), ct);
if (unbanResult.IsSuccess) if (unbanResult.IsSuccess)