Rearranged some commands
Working on a macro to automatically add option wrappers
This commit is contained in:
		
							
								
								
									
										22
									
								
								src/main.rs
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								src/main.rs
									
									
									
									
									
								
							@@ -34,7 +34,7 @@ use sqlx::{MySql, Pool};
 | 
			
		||||
use tokio::sync::{broadcast, broadcast::Sender, RwLock};
 | 
			
		||||
 | 
			
		||||
use crate::{
 | 
			
		||||
    commands::{command_macro, info_cmds, moderation_cmds, reminder_cmds, todo_cmds},
 | 
			
		||||
    commands::{command_macro, info_cmds, moderation_cmds, reminder_cmds, timer, todo_cmds},
 | 
			
		||||
    consts::THEME_COLOR,
 | 
			
		||||
    event_handlers::listener,
 | 
			
		||||
    hooks::all_checks,
 | 
			
		||||
@@ -126,13 +126,13 @@ async fn _main(tx: Sender<()>) -> Result<(), Box<dyn StdError + Send + Sync>> {
 | 
			
		||||
            moderation_cmds::webhook(),
 | 
			
		||||
            poise::Command {
 | 
			
		||||
                subcommands: vec![
 | 
			
		||||
                    command_macro::delete::delete_macro(),
 | 
			
		||||
                    command_macro::record::finish_macro(),
 | 
			
		||||
                    command_macro::list::list_macro(),
 | 
			
		||||
                    command_macro::record::record_macro(),
 | 
			
		||||
                    command_macro::run::run_macro(),
 | 
			
		||||
                    command_macro::delete_macro::delete_macro(),
 | 
			
		||||
                    command_macro::finish_macro::finish_macro(),
 | 
			
		||||
                    command_macro::list_macro::list_macro(),
 | 
			
		||||
                    command_macro::record_macro::record_macro(),
 | 
			
		||||
                    command_macro::run_macro::run_macro(),
 | 
			
		||||
                ],
 | 
			
		||||
                ..command_macro::macro_base()
 | 
			
		||||
                ..command_macro::macro_base::macro_base()
 | 
			
		||||
            },
 | 
			
		||||
            reminder_cmds::pause(),
 | 
			
		||||
            reminder_cmds::offset(),
 | 
			
		||||
@@ -141,11 +141,11 @@ async fn _main(tx: Sender<()>) -> Result<(), Box<dyn StdError + Send + Sync>> {
 | 
			
		||||
            reminder_cmds::delete(),
 | 
			
		||||
            poise::Command {
 | 
			
		||||
                subcommands: vec![
 | 
			
		||||
                    reminder_cmds::list_timer(),
 | 
			
		||||
                    reminder_cmds::start_timer(),
 | 
			
		||||
                    reminder_cmds::delete_timer(),
 | 
			
		||||
                    timer::list_timer::list_timer(),
 | 
			
		||||
                    timer::start_timer::start_timer(),
 | 
			
		||||
                    timer::delete_timer::delete_timer(),
 | 
			
		||||
                ],
 | 
			
		||||
                ..reminder_cmds::timer_base()
 | 
			
		||||
                ..timer::timer_base::timer_base()
 | 
			
		||||
            },
 | 
			
		||||
            reminder_cmds::multiline(),
 | 
			
		||||
            reminder_cmds::remind(),
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user