Rename rp_command!'s self_message parameter to bot_message and …

…reorder
valentinegb · Apr 12, 2024 · bc81348 · bc81348
1 parent a7f0947
commit bc81348
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -39,8 +39,8 @@ type Context<'a> = poise::Context<'a, UserData, Error>;
 ///     context_menu_name: literal,
 ///     description: literal,
 ///     user_description: literal,
-///     self_message: literal,
 ///     [ message..: literal ],
+///     bot_message: literal,
 /// );
 /// ```
 macro_rules! rp_command {
@@ -49,8 +49,8 @@ macro_rules! rp_command {
         $context_menu_name:literal,
         $description:literal,
         $user_description:literal,
-        $self_message:literal,
-        [$($message:literal),+$(,)?]$(,)?
+        [$($message:literal),+$(,)?],
+        $bot_message:literal$(,)?
     ) => {
         #[doc = $description]
         #[poise::command(slash_command, context_menu_command = $context_menu_name)]
@@ -63,7 +63,7 @@ macro_rules! rp_command {
             data.insert::<BoredomTracker>(Arc::new(AtomicBool::new(false)));
 
             let author_mention = ctx.author().mention();
-            let self_message = format!($self_message, a = author_mention);
+            let bot_message = format!($bot_message, a = author_mention);
             let messages = [
                 $(format!(
                     $message,
@@ -74,7 +74,7 @@ macro_rules! rp_command {
             let picked_message;
 
             if (user.id == ctx.framework().bot_id) {
-                picked_message = &self_message;
+                picked_message = &bot_message;
             } else {
                 let mut rng = thread_rng();
 
@@ -96,50 +96,49 @@ rp_command!(
     "Boop",
     "Boops a being :3c",
     "Your victim >:3",
-    "I have been booped by {a} <:floofOwO:1226944711768412280>",
     [
         "{a} booped {b}!!! <:floofOwO:1226944711768412280>",
         "{b} just got booped by {a}?? <a:afloofLoad:1227015489792905360>",
         "Lmao I just saw {a} boop {b} <:floofLol:1226944692541980692>",
         "Dear {b},\n\nGet booped, nerd. <:floofSmug:1226944728734629970>\n\nSincerely, {a}",
         "{a} booped {b}, I think they're trying to pick a fight <:floofNervous:1226944704541622394>",
     ],
+    "I have been booped by {a} <:floofOwO:1226944711768412280>",
 );
 
 rp_command!(
     gnaw,
     "Gnaw Bones",
     "Embrace the bobin within us all and gnaw on one's bones",
     "The subject of today's gnawing",
-    "GRAAAHH {a} STOP GNAWING MY BONES GET OFF HELP <:floofScared:1226944726096285777>",
     [
         "{a} is gnawing on {b}'s bones <:floofNom:1226944708366831637>",
         "{a} craves the bones of {b} <:floofNom:1226944708366831637>",
         "{a} hungers for the bones of a {b} <:floofNom:1226944708366831637>",
         "Hey uh, {b}, did you know there's a {a} gnawing on your bones? <:floofLurk:1226944909446090922>",
     ],
+    "GRAAAHH {a} STOP GNAWING MY BONES GET OFF HELP <:floofScared:1226944726096285777>",
 );
 
 rp_command!(
     bite,
     "Bite",
     "Express a wide range of emotions via- your teeth in somebody's skin",
     "The skin-haver in question",
-    "Help please {a}'s biting me <:floofOwO:1226944711768412280>",
     [
         "D- did {a} just bite {b}?? <:floofOwO:1226944711768412280>",
         "Awww, {a} gave {b} a love bite... I think- actually, it's hard to say <:floofTired:1226944734640078878>",
         "The intrusive thoughts won and now {a}'s biting {b} <:floofMischief:1226944697579077692>",
         "\\*CHOMP\\*\n{a} bit {b} <:floofNom:1226944708366831637>",
     ],
+    "Help please {a}'s biting me <:floofOwO:1226944711768412280>",
 );
 
 rp_command!(
     meow,
     "Meow At",
     "You know what you are",
     "Get their attention",
-    "Hm? What's that {a}? Oh I see... mhm... okay, okay, I understand <:floofCat:1226944674988687491>",
     [
         "Uhh, {a} just meowed at {b} <:floofWhat:1226944914315804683>",
         "{a} is a furry and they want {b} to know it <:floofMischief:1226944697579077692>",
@@ -150,14 +149,14 @@ rp_command!(
         "{a} just *nya*-ed all over the place- {b}, clean this up! <:floofWhat:1226944914315804683>",
         "{b}... sire... I have a message for you, from {a}... \\*ahem\\*... \"meow meow meow, meow meow, meow meow meow meow meow, meow!\"\nI'm just the messenger please don't hurt me <:floofNervous:1226944704541622394>",
     ],
+    "Hm? What's that {a}? Oh I see... mhm... okay, okay, I understand <:floofCat:1226944674988687491>",
 );
 
 rp_command!(
     murder,
     "Murder",
     "MURRRRRDEERRRRRRRRRRR",
     "KILL THEM KILL THEM KILL THEM >:D",
-    "GAH {a} HAS A KNIFE AND IS RUNNING AT ME WAAAA <:floofScared:1226944726096285777>",
     [
         "{a} crept up behind {b} and murdered them!!! <:floofOwO:1226944711768412280>",
         "{a} just pulled out a bazooka and blew {b} up!?!? <:floofOwO:1226944711768412280>",
@@ -166,6 +165,7 @@ rp_command!(
         "{a} just went \"OOGA BOOGA\", giving {b} a fatal heart attack <:floofOwO:1226944711768412280>",
         "{a} killed {b} when the lights went out so no one would know it was them... <:floofSmug:1226944728734629970>",
     ],
+    "GAH {a} HAS A KNIFE AND IS RUNNING AT ME WAAAA <:floofScared:1226944726096285777>",
 );
 
 #[shuttle_runtime::main]