changed how commands get invoked

regex_command_attr/src/lib.rs

@@ -57,11 +57,15 @@ pub fn command(attr: TokenStream, input: TokenStream) -> TokenStream {
         let name = &name[..];
 
         match_options!(name, values, options, span => [
-            permission_level
+            permission_level;
+            allow_slash
         ]);
     }
 
-    let Options { permission_level } = options;
+    let Options {
+        permission_level,
+        allow_slash,
+    } = options;
 
     propagate_err!(create_declaration_validations(&mut fun, DeclarFor::Command));
 
@@ -88,6 +92,7 @@ pub fn command(attr: TokenStream, input: TokenStream) -> TokenStream {
             func: #name,
             name: #lit_name,
             required_perms: #permission_level,
+            allow_slash: #allow_slash,
         };
 
         #visibility fn #name<'fut> (#(#args),*) -> ::serenity::futures::future::BoxFuture<'fut, #ret> {

regex_command_attr/src/structures.rs

@@ -226,11 +226,15 @@ impl ToTokens for PermissionLevel {
 #[derive(Debug, Default)]
 pub struct Options {
     pub permission_level: PermissionLevel,
+    pub allow_slash: bool,
 }
 
 impl Options {
     #[inline]
     pub fn new() -> Self {
-        Self::default()
+        Self {
+            permission_level: PermissionLevel::default(),
+            allow_slash: false,
+        }
     }
 }

regex_command_attr/src/util.rs

@@ -182,7 +182,7 @@ pub fn create_declaration_validations(fun: &mut CommandFun, dec_for: DeclarFor)
     }
 
     let context: Type = parse_quote!(&serenity::client::Context);
-    let message: Type = parse_quote!(&serenity::model::channel::Message);
+    let message: Type = parse_quote!(&(dyn crate::framework::CommandInvoke + Sync + Send));
     let args: Type = parse_quote!(serenity::framework::standard::Args);
     let args2: Type = parse_quote!(&mut serenity::framework::standard::Args);
     let options: Type = parse_quote!(&serenity::framework::standard::CommandOptions);