Merge pull request #24 from SergiX44/add-fallback-hook

Add fallback listener
badfarm · Dec 27, 2020 · c22f565 · c22f565
2 parents d90f782 + 84ebd52
commit c22f565
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/src/Zanzara/Listener/ListenerCollector.php b/src/Zanzara/Listener/ListenerCollector.php
@@ -56,6 +56,11 @@ abstract class ListenerCollector
      */
     protected $listeners = [];
 
+    /**
+     * @var Listener
+     */
+    protected $fallbackListener;
+
     /**
      * @var ContainerInterface
      */
@@ -421,6 +426,21 @@ public function onUpdate($callback): MiddlewareCollector
         return $listener;
     }
 
+    /**
+     * If no listener matches the current update, this listener will be called if specified.
+     *
+     * @param $callback
+     * @return MiddlewareCollector
+     * @throws DependencyException
+     * @throws NotFoundException
+     */
+    public function fallback($callback): MiddlewareCollector
+    {
+        $listener = new Listener($callback, $this->container);
+        $this->fallbackListener = $listener;
+        return $listener;
+    }
+
     /**
      * Define a middleware that will be executed for every listener function and before listener-specific middleware.
      *

diff --git a/src/Zanzara/Listener/ListenerResolver.php b/src/Zanzara/Listener/ListenerResolver.php
@@ -120,6 +120,12 @@ private function findListenerAndPush(array &$listeners, string $listenerType, st
                 return $listener;
             }
         }
+
+        if ($this->fallbackListener !== null) {
+            $listeners[] = $this->fallbackListener;
+            return $this->fallbackListener;
+        }
+
         return null;
     }
 

diff --git a/tests/Listener/UpdateTest.php b/tests/Listener/UpdateTest.php
@@ -33,4 +33,24 @@ public function testUpdate()
         $bot->run();
     }
 
+    /**
+     *
+     */
+    public function testFallback()
+    {
+        $config = new Config();
+        $config->setUpdateMode(Config::WEBHOOK_MODE);
+        $config->setUpdateStream(__DIR__ . '/../update_types/command.json');
+        $bot = new Zanzara("test", $config);
+
+        $bot->onText('testCommand', function (Context $ctx){});
+
+        $bot->fallback(function (Context $ctx) {
+            $update = $ctx->getUpdate();
+            $this->assertSame(52259544, $update->getUpdateId());
+        });
+
+        $bot->run();
+    }
+
 }