Merge pull request #193 from HanSon/dev

增加扩展阻拦
Hanson · Jul 17, 2017 · 88ab88a · 88ab88a
2 parents 898daaf + 86b1c06
commit 88ab88a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Core/MessageHandler.php b/src/Core/MessageHandler.php
@@ -127,10 +127,9 @@ private function handleMessage($selector)
                 if ($collection) {
                     $this->cache($msg, $collection);
                     $this->console($collection);
-                    if ($this->handler) {
+                    if (!$this->vbot->messageExtension->exec($collection) && $this->handler) {
                         call_user_func_array($this->handler, [$collection]);
                     }
-                    $this->vbot->messageExtension->exec($collection);
                 }
             }
         }

diff --git a/src/Extension/MessageExtension.php b/src/Extension/MessageExtension.php
@@ -90,12 +90,14 @@ private function initBaseExtensions()
      * 执行拓展.
      *
      * @param $collection
+     *
+     * @return bool
      */
     public function exec($collection)
     {
         foreach ($this->serviceExtensions as $extension) {
             if ($extension->messageHandler($collection)) {
-                return;
+                return true;
             }
         }
     }