Noi/RegexBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from NoiTheCat/format-custom-msgs

Browse source 
Implement success message formatting
This commit is contained in:
Noi 2022-12-16 22:11:05 -08:00 committed by GitHub
commit 6af72ea518
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Modules/ModCommands/Commands/BanKick.cs
View file

@ -14,8 +14,8 @@ class Ban : BanKick {
// Ban: Unlike kick, the minimum required is just the target ID // Ban: Unlike kick, the minimum required is just the target ID
var result = await Module.Bot.BanAsync(g, msg.Author.ToString(), targetId, PurgeDays, reason, SendNotify); var result = await Module.Bot.BanAsync(g, msg.Author.ToString(), targetId, PurgeDays, reason, SendNotify);
if (result.OperationSuccess && SuccessMessage != null) { if (result.OperationSuccess && SuccessMessage != null) {
// TODO string replacement, formatting, etc var success = ProcessText(SuccessMessage, msg);
await msg.Channel.SendMessageAsync($"{SuccessMessage}\n{result.GetResultString(Module.Bot)}"); await msg.Channel.SendMessageAsync($"{success}\n{result.GetResultString(Module.Bot)}");
} else { } else {
await msg.Channel.SendMessageAsync(result.GetResultString(Module.Bot)); await msg.Channel.SendMessageAsync(result.GetResultString(Module.Bot));
} }
@ -35,8 +35,8 @@ class Kick : BanKick {
var result = await Module.Bot.KickAsync(g, msg.Author.ToString(), targetId, reason, SendNotify); var result = await Module.Bot.KickAsync(g, msg.Author.ToString(), targetId, reason, SendNotify);
if (result.OperationSuccess && SuccessMessage != null) { if (result.OperationSuccess && SuccessMessage != null) {
// TODO string replacement, formatting, etc var success = ProcessText(SuccessMessage, msg);
await msg.Channel.SendMessageAsync($"{SuccessMessage}\n{result.GetResultString(Module.Bot)}"); await msg.Channel.SendMessageAsync($"{success}\n{result.GetResultString(Module.Bot)}");
} else { } else {
await msg.Channel.SendMessageAsync(result.GetResultString(Module.Bot)); await msg.Channel.SendMessageAsync(result.GetResultString(Module.Bot));
} }

8
Modules/ModCommands/Commands/CommandConfig.cs
View file

@ -36,4 +36,12 @@ abstract class CommandConfig {
}; };
await target.SendMessageAsync(message ?? "", embed: usageEmbed.Build()); await target.SendMessageAsync(message ?? "", embed: usageEmbed.Build());
} }
protected static string ProcessText(string input, SocketMessage m) {
// TODO elaborate on this
// For now, replaces all instances of @_ with the message sender.
return input
.Replace("@_", m.Author.Mention)
.Replace("@\\_", "@_");
}
} }

4
Modules/ModCommands/Commands/Timeout.cs
View file

@ -64,8 +64,8 @@ class Timeout : CommandConfig {
var result = await Module.Bot.SetTimeoutAsync(g, msg.Author.AsEntityNameString(), targetUser, var result = await Module.Bot.SetTimeoutAsync(g, msg.Author.AsEntityNameString(), targetUser,
TimeSpan.FromMinutes(timeParam), reason, SendNotify); TimeSpan.FromMinutes(timeParam), reason, SendNotify);
if (result.Success && SuccessMessage != null) { if (result.Success && SuccessMessage != null) {
// TODO string replacement, formatting, etc var success = ProcessText(SuccessMessage, msg);
await msg.Channel.SendMessageAsync($"{SuccessMessage}\n{result.ToResultString()}"); await msg.Channel.SendMessageAsync($"{success}\n{result.ToResultString()}");
} else { } else {
await msg.Channel.SendMessageAsync(result.ToResultString()); await msg.Channel.SendMessageAsync(result.ToResultString());
} }