mirror of
https://github.com/TeamOctolings/Octobot.git
synced 2025-04-19 16:33:36 +03:00
fucked around and made a workaround
Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
This commit is contained in:
parent
b42308e4b6
commit
c1ef183710
2 changed files with 9 additions and 5 deletions
|
@ -181,17 +181,19 @@ public class BanCommandGroup : CommandGroup
|
||||||
await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
|
await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var memberData = data.GetOrCreateMemberData(target.ID);
|
||||||
|
memberData.BannedUntil
|
||||||
|
= duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
|
||||||
|
|
||||||
var banResult = await _guildApi.CreateGuildBanAsync(
|
var banResult = await _guildApi.CreateGuildBanAsync(
|
||||||
guild.ID, target.ID, reason: $"({executor.GetTag()}) {reason}".EncodeHeader(),
|
guild.ID, target.ID, reason: $"({executor.GetTag()}) {reason}".EncodeHeader(),
|
||||||
ct: ct);
|
ct: ct);
|
||||||
if (!banResult.IsSuccess)
|
if (!banResult.IsSuccess)
|
||||||
{
|
{
|
||||||
|
memberData.BannedUntil = null;
|
||||||
return Result.FromError(banResult.Error);
|
return Result.FromError(banResult.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
var memberData = data.GetOrCreateMemberData(target.ID);
|
|
||||||
memberData.BannedUntil
|
|
||||||
= duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
|
|
||||||
memberData.Roles.Clear();
|
memberData.Roles.Clear();
|
||||||
|
|
||||||
var embed = new EmbedBuilder().WithSmallTitle(
|
var embed = new EmbedBuilder().WithSmallTitle(
|
||||||
|
|
|
@ -143,17 +143,19 @@ public class KickCommandGroup : CommandGroup
|
||||||
await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
|
await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var memberData = data.GetOrCreateMemberData(target.ID);
|
||||||
|
memberData.Kicked = true;
|
||||||
|
|
||||||
var kickResult = await _guildApi.RemoveGuildMemberAsync(
|
var kickResult = await _guildApi.RemoveGuildMemberAsync(
|
||||||
guild.ID, target.ID, $"({executor.GetTag()}) {reason}".EncodeHeader(),
|
guild.ID, target.ID, $"({executor.GetTag()}) {reason}".EncodeHeader(),
|
||||||
ct);
|
ct);
|
||||||
if (!kickResult.IsSuccess)
|
if (!kickResult.IsSuccess)
|
||||||
{
|
{
|
||||||
|
memberData.Kicked = false;
|
||||||
return Result.FromError(kickResult.Error);
|
return Result.FromError(kickResult.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
var memberData = data.GetOrCreateMemberData(target.ID);
|
|
||||||
memberData.Roles.Clear();
|
memberData.Roles.Clear();
|
||||||
memberData.Kicked = true;
|
|
||||||
|
|
||||||
var title = string.Format(Messages.UserKicked, target.GetTag());
|
var title = string.Format(Messages.UserKicked, target.GetTag());
|
||||||
var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
|
var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
|
||||||
|
|
Loading…
Add table
Reference in a new issue