Noi/BirthdayBot
1
0
Fork 0
mirror of https://github.com/NoiTheCat/BirthdayBot.git synced 2024-11-21 21:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update command reporting format

Browse source
This commit is contained in:
Noi 2022-02-01 20:01:33 -08:00
parent f8b3f429bb
commit b0c5ea4e3b
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ShardInstance.cs
View file

@ -186,14 +186,17 @@ class ShardInstance : IDisposable {
/// </summary> /// </summary>
private async Task DiscordClient_SlashCommandExecuted(SocketSlashCommand arg) { private async Task DiscordClient_SlashCommandExecuted(SocketSlashCommand arg) {
SocketGuildChannel? rptChannel = arg.Channel as SocketGuildChannel; SocketGuildChannel? rptChannel = arg.Channel as SocketGuildChannel;
string rpt = "";
if (rptChannel != null) rpt += rptChannel.Guild.Name + "!";
rpt += arg.User;
var rptId = rptChannel?.Guild.Id ?? arg.User.Id; var rptId = rptChannel?.Guild.Id ?? arg.User.Id;
var logLine = $"/{arg.CommandName} by {arg.User} in { (rptChannel != null ? "guild" : "DM. User") } ID {rptId}. Result: "; var logLine = $"/{arg.CommandName} at {rpt}; { (rptChannel != null ? "Guild" : "User") } ID {rptId}.";
// Specific reply for DM messages // Specific reply for DM messages
if (rptChannel == null) { if (rptChannel == null) {
// TODO do not hardcode message // TODO do not hardcode message
// TODO figure out appropriate message // TODO figure out appropriate message
Log("Command", logLine + "Sending message."); Log("Command", logLine + " Sending default reply.");
await arg.RespondAsync("don't dm me").ConfigureAwait(false); await arg.RespondAsync("don't dm me").ConfigureAwait(false);
return; return;
} }
@ -206,18 +209,18 @@ class ShardInstance : IDisposable {
} }
if (handler == null) { // Handler not found if (handler == null) { // Handler not found
Log("Command", logLine + "Unknown command."); Log("Command", logLine + " Unknown command.");
await arg.RespondAsync("Oops, that command isn't supposed to be there... Please try something else.", await arg.RespondAsync("Oops, that command isn't supposed to be there... Please try something else.",
ephemeral: true).ConfigureAwait(false); ephemeral: true).ConfigureAwait(false);
return; return;
} }
var gconf = await GuildConfiguration.LoadAsync(rptChannel.Guild.Id, false); var gconf = await GuildConfiguration.LoadAsync(rptChannel.Guild.Id, false);
// Block check here // Blocklist/moderated check
if (!gconf!.IsBotModerator((SocketGuildUser)arg.User)) // Except if moderator if (!gconf!.IsBotModerator((SocketGuildUser)arg.User)) // Except if moderator
{ {
if (await gconf.IsUserBlockedAsync(arg.User.Id)) { if (await gconf.IsUserBlockedAsync(arg.User.Id)) {
Log("Command", logLine + "Blocked per guild policy."); Log("Command", logLine + " Blocked per guild policy.");
await arg.RespondAsync(AccessDeniedError, ephemeral: true).ConfigureAwait(false); await arg.RespondAsync(AccessDeniedError, ephemeral: true).ConfigureAwait(false);
return; return;
} }
@ -226,9 +229,9 @@ class ShardInstance : IDisposable {
// Execute the handler // Execute the handler
try { try {
await handler(this, gconf, arg).ConfigureAwait(false); await handler(this, gconf, arg).ConfigureAwait(false);
Log("Command", logLine + "Executed normally."); Log("Command", logLine);
} catch (Exception ex) when (ex is not HttpException) { } catch (Exception e) when (e is not HttpException) {
Log("Command", logLine + ex.ToString()); Log("Command", $"{logLine} {e}");
} }
} }
} }