Merge branch 'dev'

src/commands/gambling/shop.rs

@@ -37,9 +37,10 @@ async fn autocomplete_shop<'a>(
 
 #[poise::command(slash_command, prefix_command)]
 pub async fn buy(ctx: Context<'_>,
+    count: Option<i32>,
     #[autocomplete = "autocomplete_shop"]
-    item: String,
-    count: Option<i32>) -> Result<(), Error>
+    #[rest]
+    item: String) -> Result<(), Error>
 {
     let count = count.unwrap_or(1);
 

src/commands/gambling/wager.rs

@@ -8,6 +8,7 @@ pub async fn wager(
     ctx: Context<'_>,
     amount: String,
     #[autocomplete = "super::autocomplete_inventory"]
+    #[rest]
     item: Option<String>) -> Result<(), Error>
 {
     let mut tx = ctx.data().database.begin().await?;

src/commands/mod.rs

@@ -15,6 +15,7 @@ use crate::common::{Data, Error, Context};
 #[poise::command(prefix_command, slash_command)]
 async fn help(ctx: Context<'_>,
     #[description = "Specific command to get help with"]
+    #[rest]
     command: Option<String>) -> Result<(), Error>
 {
     poise::builtins::help(ctx, command.as_deref(), poise::builtins::HelpConfiguration::default()).await?;

src/commands/self_roles/color.rs

@@ -61,7 +61,11 @@ async fn autocomplete_colors<'a>(
 
 /// Change the color of your personal role
 #[poise::command(slash_command, prefix_command)]
-pub async fn color(ctx: Context<'_>, #[autocomplete = "autocomplete_colors"] color: String) -> Result<(), Error> {
+pub async fn color(ctx: Context<'_>,
+    #[autocomplete = "autocomplete_colors"]
+    #[rest]
+    color: String) -> Result<(), Error>
+{
     let color = if let Some(named) = COLORS.get(color.as_str()) {
         named.clone()
     } else {

src/commands/self_roles/name.rs

@@ -5,7 +5,7 @@ use poise::serenity_prelude::EditRole;
 
 /// Change the name of your personal role
 #[poise::command(slash_command, prefix_command)]
-pub async fn name(ctx: Context<'_>, name: String) -> Result<(), Error> {
+pub async fn name(ctx: Context<'_>, #[rest] name: String) -> Result<(), Error> {
     let guild = if let Some(guild) = ctx.guild_id() {
         guild
     } else {