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

Custom duration parser + bugfixes

Browse source
This commit is contained in:
Octol1ttle 2022-08-22 19:48:51 +05:00
parent c57b845217
commit 51c24c1e23
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
5 changed files with 786 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Boyfriend/Commands/MuteCommand.cs
View file

@ -17,11 +17,12 @@ public class MuteCommand : Command {
if (duration.TotalSeconds < 0) {
Warn(Messages.DurationParseFailed);
reason = Utils.JoinString(ref args, 1);
}
if (reason is "") {
Error(Messages.ReasonRequired, false);
return;
}
if (reason is "") {
Error(Messages.ReasonRequired, false);
return;
}
if (toMute == null) {
@ -65,10 +66,6 @@ public class MuteCommand : Command {
}
await MuteMember(guild, author, toMute, duration, reason);
Success(
string.Format(Messages.FeedbackMemberMuted, toMute.Mention, Utils.GetHumanizedTimeOffset(ref duration),
Utils.Wrap(reason)), author.Mention, true);
}
private static async Task MuteMember(SocketGuild guild, SocketUser author, SocketGuildUser toMute,
@ -86,8 +83,7 @@ public class MuteCommand : Command {
if (userRole == guild.EveryoneRole || userRole == role) continue;
await toMute.RemoveRoleAsync(role);
rolesRemoved.Add(userRole.Id);
}
catch (HttpException e) {
} catch (HttpException e) {
Warn(string.Format(Messages.RoleRemovalFailed, $"<@&{userRole}>", Utils.Wrap(e.Reason)));
}
@ -105,9 +101,8 @@ public class MuteCommand : Command {
}
await toMute.AddRoleAsync(role, requestOptions);
}
else {
if (!hasDuration) {
} else {
if (!hasDuration || duration.TotalDays > 28) {
Error(Messages.DurationRequiredForTimeOuts, false);
return;
}
@ -119,5 +114,11 @@ public class MuteCommand : Command {
await toMute.SetTimeOutAsync(duration, requestOptions);
}
var feedback = string.Format(Messages.FeedbackMemberMuted, toMute.Mention,
Utils.GetHumanizedTimeOffset(ref duration),
Utils.Wrap(reason));
Success(feedback, author.Mention, false, false);
await Utils.SendFeedback(feedback, guild.Id, author.Mention, true);
}
}
}