TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-05-14 09:46:09 +03:00
Code Issues Wiki Activity

Resolve conversations

Browse source 
Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
This commit is contained in:
Macintxsh 2023-10-04 16:17:58 +03:00
parent 598ad34038
commit d74d97f9f4
Signed by: mctaylors
GPG key ID: 361D326747B61E65
1 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/Commands/MuteCommandGroup.cs
View file

@ -127,27 +127,11 @@ public class MuteCommandGroup : CommandGroup
var until = DateTimeOffset.UtcNow.Add(duration); // >:) var until = DateTimeOffset.UtcNow.Add(duration); // >:)
var memberData = data.GetOrCreateMemberData(target.ID); var muteMethodResult = await SelectMuteMethodAsync(
var muteRole = GuildSettings.MuteRole.Get(data.Settings); target, reason, duration, guildId, data, user, currentUser, until, ct);
if (!muteMethodResult.IsSuccess)
if (!muteRole.Empty())
{ {
var muteRoleAsync = return Result.FromError(muteMethodResult.Error);
await RoleMuteUserAsync(target, reason, guildId, data, memberData, user, until, muteRole, CancellationToken);
if (!muteRoleAsync.IsSuccess)
{
return Result.FromError(muteRoleAsync.Error);
}
}
if (muteRole.Empty())
{
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());
@ -169,12 +153,30 @@ public class MuteCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(embed, ct); return await _feedback.SendContextualEmbedResultAsync(embed, ct);
} }
private async Task<Result> SelectMuteMethodAsync(
IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data,
IUser user, IUser currentUser, DateTimeOffset until, CancellationToken ct)
{
var muteRole = GuildSettings.MuteRole.Get(data.Settings);
if (muteRole.Empty())
{
var timeoutResult =
await TimeoutUserAsync(target, reason, duration, guildId, user, currentUser, until, ct);
return timeoutResult;
}
var muteRoleResult =
await RoleMuteUserAsync(target, reason, guildId, data, user, until, muteRole, ct);
return muteRoleResult;
}
private async Task<Result> RoleMuteUserAsync( private async Task<Result> RoleMuteUserAsync(
IUser target, string reason, Snowflake guildId, GuildData data, MemberData memberData, IUser target, string reason, Snowflake guildId, GuildData data,
IUser user, DateTimeOffset until, Snowflake muteRole, CancellationToken ct = default) IUser user, DateTimeOffset until, Snowflake muteRole, CancellationToken ct)
{ {
var assignRoles = new List<Snowflake> { muteRole }; var assignRoles = new List<Snowflake> { muteRole };
var memberData = data.GetOrCreateMemberData(target.ID);
if (!GuildSettings.RemoveRolesOnMute.Get(data.Settings)) if (!GuildSettings.RemoveRolesOnMute.Get(data.Settings))
{ {
assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake())); assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake()));
@ -193,7 +195,7 @@ public class MuteCommandGroup : CommandGroup
private async Task<Result> TimeoutUserAsync( private async Task<Result> TimeoutUserAsync(
IUser target, string reason, TimeSpan duration, Snowflake guildId, IUser target, string reason, TimeSpan duration, Snowflake guildId,
IUser user, IUser currentUser, DateTimeOffset until, CancellationToken ct = default) IUser user, IUser currentUser, DateTimeOffset until, CancellationToken ct)
{ {
if (duration.TotalDays >= 28) if (duration.TotalDays >= 28)
{ {