From 892eed4196f72270ed66a01f5e68e45a248c5df1 Mon Sep 17 00:00:00 2001 From: Toastie Date: Sat, 14 Sep 2024 00:45:49 +1200 Subject: [PATCH] Added custom status overload for .adpl. Removed some mentions of nsfw in strings' --- .../PlayingRotate/PlayingRotateCommands.cs | 9 +++- .../Modules/Expressions/EllieExpressions.cs | 6 +-- .../data/strings/commands/commands.en-US.yml | 44 ++++++++++--------- .../strings/responses/responses.en-US.json | 1 - 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/EllieBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs b/src/EllieBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs index bf4909e..cb0384f 100644 --- a/src/EllieBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs +++ b/src/EllieBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs @@ -20,9 +20,14 @@ public partial class Administration [Cmd] [OwnerOnly] - public async Task AddPlaying(ActivityType t, [Leftover] string status) + public Task AddPlaying([Leftover] string status) + => AddPlaying(ActivityType.CustomStatus, status); + + [Cmd] + [OwnerOnly] + public async Task AddPlaying(ActivityType statusType, [Leftover] string status) { - await _service.AddPlaying(t, status); + await _service.AddPlaying(statusType, status); await Response().Confirm(strs.ropl_added).SendAsync(); } diff --git a/src/EllieBot/Modules/Expressions/EllieExpressions.cs b/src/EllieBot/Modules/Expressions/EllieExpressions.cs index e034ad5..d79539c 100644 --- a/src/EllieBot/Modules/Expressions/EllieExpressions.cs +++ b/src/EllieBot/Modules/Expressions/EllieExpressions.cs @@ -57,14 +57,14 @@ public partial class EllieExpressions : EllieModule [Cmd] [UserPerm(GuildPerm.Administrator)] - public async Task ExprAddServer(string key, [Leftover] string message) + public async Task ExprAddServer(string trigger, [Leftover] string response) { - if (string.IsNullOrWhiteSpace(message) || string.IsNullOrWhiteSpace(key)) + if (string.IsNullOrWhiteSpace(response) || string.IsNullOrWhiteSpace(trigger)) { return; } - await ExprAddInternalAsync(key, message); + await ExprAddInternalAsync(trigger, response); } diff --git a/src/EllieBot/data/strings/commands/commands.en-US.yml b/src/EllieBot/data/strings/commands/commands.en-US.yml index de8c200..a86baed 100644 --- a/src/EllieBot/data/strings/commands/commands.en-US.yml +++ b/src/EllieBot/data/strings/commands/commands.en-US.yml @@ -175,9 +175,9 @@ logignore: params: - { } - target: - desc: "The channel to ignore or show the list of ignored channels for." + desc: "The channel to ignore." - target: - desc: "The user or channel being targeted for logging ignore or inclusion." + desc: "The user to ignore." repeatlist: desc: Lists currently repeating messages and their indexes. ex: @@ -283,10 +283,12 @@ addplaying: - Playing with you - Watching you sleep params: - - t: + - statusType: desc: "The type of status, allowed values are `Playing`, `Watching`, or `Listening`." status: desc: "The status text." + - status: + desc: "The status text." listplaying: desc: Lists all playing statuses and their indexes. ex: @@ -387,18 +389,18 @@ expradd: - '"hello" Hi there %user.mention%' params: - trigger: - desc: "The trigger word or phrase for the bot to respond to users typing." + desc: "The trigger word or phrase (phrase must be in quotes)." response: - desc: "The text of the message that shows up when a user types the trigger word." + desc: "The text of the message that shows up when a user types the trigger word or phrase." expraddserver: desc: 'Add an expression with a trigger and a response in this server. Bot will post a response whenever someone types the trigger word. This command is useful if you want to lower the permission requirement for managing expressions by using `{0}dpo`. Guide [here]().' ex: - '"hello" Hi there %user.mention%' params: - - key: - desc: "The trigger word or phrase for the bot to respond to users typing." - message: - desc: "The text of the message that shows up when a user types the trigger word." + - trigger: + desc: "The trigger word or phrase (phrase must be in quotes)." + response: + desc: "The text of the message that shows up when a user types the trigger word or phrase." exprlist: desc: |- Lists global or server expressions (20 expressions per page). @@ -496,21 +498,21 @@ delmsgoncmd: - list params: - _: - desc: "The list of channels or servers where the automatic deletion is enabled, disabled, or inherited." + desc: "The word 'list'" - _: - desc: "The server where the command is being executed or monitored for chat flood prevention." + desc: "The word 'server'" - _: - desc: "The channel where the automatic deletion of successful command messages should be toggled." + desc: "The word 'channel'" s: - desc: "The state of whether automatic deletion is enabled or disabled for a specific channel." + desc: "The state to set. One of 'enable', 'disable', or 'inherit'." ch: - desc: "The channel where the automatic deletion of successful command messages should be toggled for." + desc: "Channel in which to set" - _: - desc: "The channel where the automatic deletion of successful command messages should be toggled." + desc: "The word 'channel'" s: - desc: "The state of whether automatic deletion is enabled or disabled for a specific channel." + desc: "The state to set. One of 'enable', 'disable', or 'inherit'." chId: - desc: "The ID of a channel where the automatic deletion should be toggled or inherited." + desc: "Optional channel id. If omitted, defaults to the current channel." restart: desc: Restarts the bot. Might not work. ex: @@ -1623,7 +1625,7 @@ gencurlist: - page: desc: "The current page number for pagination." choose: - desc: Chooses a thing from a list of things. Seperate items with a semicolon ; + desc: Chooses a thing from a list of things. Separate items with a semicolon ; ex: - Get up;Sleep;Sleep more params: @@ -3341,7 +3343,7 @@ globalcommand: globalmodule: desc: Toggles whether a module can be used on any server. ex: - - nsfw + - 'Gambling' params: - module: desc: "The type of module or configuration information being toggled." @@ -4563,4 +4565,6 @@ leaveunkeptservers: - '' params: - shardId: - desc: "Shard id from which to start leaving unkept servers." \ No newline at end of file + desc: "Shard id from which to start leaving unkept servers." + - delay: + desc: "Delay in miliseconds between leaves" \ No newline at end of file diff --git a/src/EllieBot/data/strings/responses/responses.en-US.json b/src/EllieBot/data/strings/responses/responses.en-US.json index 3402440..a1ff710 100644 --- a/src/EllieBot/data/strings/responses/responses.en-US.json +++ b/src/EllieBot/data/strings/responses/responses.en-US.json @@ -991,7 +991,6 @@ "module_description_help": "Get command help, descriptions and usage examples", "module_description_gambling": "Bet on dice rolls, blackjack, slots, coinflips and others", "module_description_games": "Play trivia, nunchi, hangman, connect4 and other games", - "module_description_nsfw": "NSFW commands.", "module_description_music": "Play music from youtube, local files and radio streams", "module_description_utility": "Manage custom quotes, repeating messages and check facts about the server", "module_description_administration": "Moderation, punish users, setup self assignable roles and greet messages",