fix: when stop non args, all stop

Romira915 · Apr 19, 2023 · 732c043 · 732c043
1 parent 5245ce9
commit 732c043
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/discord_bot_client/src/commands/ark.rs b/discord_bot_client/src/commands/ark.rs
@@ -66,18 +66,21 @@ async fn status(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
 #[command]
 #[description = "ARKサーバを停止する．args: int int int ... int"]
 async fn stop(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
+    if args.is_empty() {
+        ArkFirst::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
+        ArkSecond::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
+        ArkThird::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
+        ArkFourth::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
+
+        return Ok(());
+    }
+
     for arg in args.iter::<u32>() {
         match arg {
             Ok(1) => ArkFirst::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?,
             Ok(2) => ArkSecond::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?,
             Ok(3) => ArkThird::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?,
             Ok(4) => ArkFourth::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?,
-            Err(_) => {
-                ArkFirst::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
-                ArkSecond::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
-                ArkThird::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
-                ArkFourth::ark_command_exec(SystemctlCommand::Stop, ctx, msg).await?;
-            }
             _ => (),
         }
     }