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

Use one common method in /mute

Browse source 
Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
This commit is contained in:
Macintxsh 2023-10-03 16:50:11 +03:00
parent 413b8a4781
commit 9771aefb6f
Signed by: mctaylors
GPG key ID: 361D326747B61E65
1 changed files with 41 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/Commands/MuteCommandGroup.cs
View file

@ -101,17 +101,11 @@ public class MuteCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(embed, CancellationToken); return await _feedback.SendContextualEmbedResultAsync(embed, CancellationToken);
} }
if (!GuildSettings.MuteRole.Get(data.Settings).Empty()) return await MuteUserAsync(
{
return await RoleMuteUserAsync(
target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken);
}
return await TimeoutUserAsync(
target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken); target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken);
} }
private async Task<Result> RoleMuteUserAsync( private async Task<Result> MuteUserAsync(
IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId, IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId,
IUser user, IUser currentUser, CancellationToken ct = default) IUser user, IUser currentUser, CancellationToken ct = default)
{ {
@ -132,23 +126,28 @@ public class MuteCommandGroup : CommandGroup
} }
var until = DateTimeOffset.UtcNow.Add(duration); // >:) var until = DateTimeOffset.UtcNow.Add(duration); // >:)
var memberData = data.GetOrCreateMemberData(target.ID); var memberData = data.GetOrCreateMemberData(target.ID);
memberData.MutedUntil = until; var muteRole = GuildSettings.MuteRole.Get(data.Settings);
var assignRoles = new List<Snowflake>
if (!muteRole.Empty())
{ {
GuildSettings.MuteRole.Get(data.Settings) var muteRoleAsync =
}; await RoleMuteUserAsync(target, reason, guildId, data, memberData, user, until, muteRole, CancellationToken);
if (!GuildSettings.RemoveRolesOnMute.Get(data.Settings)) if (!muteRoleAsync.IsSuccess)
{ {
assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake())); return Result.FromError(muteRoleAsync.Error);
}
} }
var muteResult = await _guildApi.ModifyGuildMemberAsync( if (muteRole.Empty())
guildId, target.ID, roles: assignRoles,
reason: $"({user.GetTag()}) {reason}".EncodeHeader(), ct: ct);
if (!muteResult.IsSuccess)
{ {
return Result.FromError(muteResult.Error); var timeoutResult =
await TimeoutUserAsync(target, reason, duration, guildId, user, currentUser, until, CancellationToken);
if (!timeoutResult.IsSuccess)
{
return Result.FromError(timeoutResult.Error);
}
} }
var title = string.Format(Messages.UserMuted, target.GetTag()); var title = string.Format(Messages.UserMuted, target.GetTag());
@ -170,9 +169,28 @@ public class MuteCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(embed, ct); return await _feedback.SendContextualEmbedResultAsync(embed, ct);
} }
private async Task<Result> RoleMuteUserAsync(
IUser target, string reason, Snowflake guildId, GuildData data, MemberData memberData,
IUser user, DateTimeOffset until, Snowflake muteRole, CancellationToken ct = default)
{
memberData.MutedUntil = until;
var assignRoles = new List<Snowflake> { muteRole };
if (!GuildSettings.RemoveRolesOnMute.Get(data.Settings))
{
assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake()));
}
var muteResult = await _guildApi.ModifyGuildMemberAsync(
guildId, target.ID, roles: assignRoles,
reason: $"({user.GetTag()}) {reason}".EncodeHeader(), ct: ct);
return !muteResult.IsSuccess ? Result.FromError(muteResult.Error) : Result.FromSuccess();
}
private async Task<Result> TimeoutUserAsync( private async Task<Result> TimeoutUserAsync(
IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId, IUser target, string reason, TimeSpan duration, Snowflake guildId,
IUser user, IUser currentUser, CancellationToken ct = default) IUser user, IUser currentUser, DateTimeOffset until, CancellationToken ct = default)
{ {
if (duration.TotalDays >= 28) if (duration.TotalDays >= 28)
{ {
@ -183,49 +201,10 @@ public class MuteCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, CancellationToken); return await _feedback.SendContextualEmbedResultAsync(failedEmbed, CancellationToken);
} }
var interactionResult
= await _utility.CheckInteractionsAsync(
guildId, user.ID, target.ID, "Mute", ct);
if (!interactionResult.IsSuccess)
{
return Result.FromError(interactionResult);
}
if (interactionResult.Entity is not null)
{
var failedEmbed = new EmbedBuilder().WithSmallTitle(interactionResult.Entity, currentUser)
.WithColour(ColorsList.Red).Build();
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
}
var until = DateTimeOffset.UtcNow.Add(duration); // >:)
var muteResult = await _guildApi.ModifyGuildMemberAsync( var muteResult = await _guildApi.ModifyGuildMemberAsync(
guildId, target.ID, reason: $"({user.GetTag()}) {reason}".EncodeHeader(), guildId, target.ID, reason: $"({user.GetTag()}) {reason}".EncodeHeader(),
communicationDisabledUntil: until, ct: ct); communicationDisabledUntil: until, ct: ct);
return !muteResult.IsSuccess ? Result.FromError(muteResult.Error) : Result.FromSuccess();
if (!muteResult.IsSuccess)
{
return Result.FromError(muteResult.Error);
}
var title = string.Format(Messages.UserMuted, target.GetTag());
var description = new StringBuilder().Append("- ").AppendLine(string.Format(Messages.DescriptionActionReason, reason))
.Append("- ").Append(string.Format(
Messages.DescriptionActionExpiresAt, Markdown.Timestamp(until))).ToString();
var logResult = _utility.LogActionAsync(
data.Settings, channelId, user, title, description, target, ColorsList.Red, ct: ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.UserMuted, target.GetTag()), target)
.WithColour(ColorsList.Green).Build();
return await _feedback.SendContextualEmbedResultAsync(embed, ct);
} }
/// <summary> /// <summary>