Merge pull request #651 from andrey-helldar/patch/2024-10-03/00-12

Fix detection of command parameter without passing it
defstudio · Oct 3, 2024 · c92602b · c92602b
2 parents 353f210 + b5d066a
commit c92602b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/Handlers/WebhookHandler.php b/src/Handlers/WebhookHandler.php
@@ -370,14 +370,18 @@ protected function onFailure(Throwable $throwable): void
      */
     protected function parseCommand(Stringable $text): array
     {
-        $command = (string) $text->before('@')->before(' ');
-        $parameter = (string) $text->after('@')->after(' ');
+        $command = $text->before('@')->before(' ');
 
-        $this->commandPrefixes()->each(function (string $value) use (&$command) {
-            $command = str($command)->after($value)->toString();
-        });
+        foreach ($this->commandPrefixes() as $prefix) {
+            if ($command->startsWith($prefix)) {
+                $parameter = $text->after($command)->after('@')->after(' ');
+                $command = $command->after($prefix);
 
-        return [$command, $parameter];
+                break;
+            }
+        }
+
+        return [(string) $command, (string) ($parameter ?? '')];
     }
 
     /**

diff --git a/tests/Unit/Handlers/WebhookHandlerTest.php b/tests/Unit/Handlers/WebhookHandlerTest.php
@@ -235,6 +235,15 @@
     Facade::assertSent("Hello!! your parameter is [foo bot : :]");
 });
 
+it('can handle a command without parameter', function () {
+    $bot = bot();
+    Facade::fake();
+
+    app(TestWebhookHandler::class)->handle(webhook_command('/hello'), $bot);
+
+    Facade::assertSent("Hello!!");
+});
+
 it('cannot handle a command with custom start char', function () {
     $bot = bot();
     Facade::fake();