From be174522a9616719b4db194172501d6209e1d94b Mon Sep 17 00:00:00 2001 From: HanSon Date: Mon, 17 Jul 2017 21:17:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E9=98=BB=E6=8B=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Core/MessageHandler.php | 3 +-- src/Extension/MessageExtension.php | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Core/MessageHandler.php b/src/Core/MessageHandler.php index 17584beb..1c0c2f03 100644 --- 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 index c85fd485..c97ff38f 100644 --- a/src/Extension/MessageExtension.php +++ b/src/Extension/MessageExtension.php @@ -90,12 +90,13 @@ private function initBaseExtensions() * 执行拓展. * * @param $collection + * @return bool */ public function exec($collection) { foreach ($this->serviceExtensions as $extension) { if ($extension->messageHandler($collection)) { - return; + return true; } } } From 1bc71050e21e7a777db91c903942a10313f8ff65 Mon Sep 17 00:00:00 2001 From: HanSon Date: Mon, 17 Jul 2017 13:18:21 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- src/Extension/MessageExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Extension/MessageExtension.php b/src/Extension/MessageExtension.php index c97ff38f..5274fcd5 100644 --- a/src/Extension/MessageExtension.php +++ b/src/Extension/MessageExtension.php @@ -90,6 +90,7 @@ private function initBaseExtensions() * 执行拓展. * * @param $collection + * * @return bool */ public function exec($collection)