zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 00:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix issue #140

Browse Source
This commit is contained in:
crazywhalecc
2022-08-05 15:49:02 +08:00
parent af75fc2f94
commit fc8c0b540a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ZM/Module/QQBot.php
View File

@@ -176,7 +176,6 @@ class QQBot
switch ($policy) { switch ($policy) {
case 'interrupt': case 'interrupt':
EventDispatcher::interrupt(); EventDispatcher::interrupt();
break;
case 'continue': case 'continue':
break; break;
default: default:
@@ -189,8 +188,8 @@ class QQBot
$msg_dispatcher = new EventDispatcher(CQMessage::class); $msg_dispatcher = new EventDispatcher(CQMessage::class);
$msg_dispatcher->setRuleFunction(function ($v) { $msg_dispatcher->setRuleFunction(function ($v) {
return ($v->message == '' || ($v->message == ctx()->getMessage())) return ($v->message == '' || ($v->message == ctx()->getMessage()))
&& ($v->user_id == 0 || ($v->user_id == ctx()->getUserId())) && (empty($v->user_id) || ($v->user_id == ctx()->getUserId()))
&& ($v->group_id == 0 || ($v->group_id == (ctx()->getGroupId() ?? 0))) && (empty($v->group_id) || ($v->group_id == (ctx()->getGroupId() ?? 0)))
&& ($v->message_type == '' || ($v->message_type == ctx()->getMessageType())) && ($v->message_type == '' || ($v->message_type == ctx()->getMessageType()))
&& ($v->raw_message == '' || ($v->raw_message == context()->getData()['raw_message'])); && ($v->raw_message == '' || ($v->raw_message == context()->getData()['raw_message']));
}); });
@@ -216,8 +215,8 @@ class QQBot
return return
($v->notice_type == '' || ($v->notice_type == ctx()->getData()['notice_type'])) ($v->notice_type == '' || ($v->notice_type == ctx()->getData()['notice_type']))
&& ($v->sub_type == '' || ($v->sub_type == ctx()->getData()['sub_type'])) && ($v->sub_type == '' || ($v->sub_type == ctx()->getData()['sub_type']))
&& ($v->group_id == '' || ($v->group_id == ctx()->getData()['group_id'])) && (empty($v->group_id) || ($v->group_id == ctx()->getData()['group_id']))
&& ($v->operator_id == '' || ($v->operator_id == ctx()->getData()['operator_id'])); && (empty($v->group_id) || ($v->operator_id == ctx()->getData()['operator_id']));
}); });
$dispatcher->dispatchEvents(ctx()->getData()); $dispatcher->dispatchEvents(ctx()->getData());
return; return;
@@ -226,7 +225,7 @@ class QQBot
$dispatcher->setRuleFunction(function (CQRequest $v) { $dispatcher->setRuleFunction(function (CQRequest $v) {
return ($v->request_type == '' || ($v->request_type == ctx()->getData()['request_type'])) return ($v->request_type == '' || ($v->request_type == ctx()->getData()['request_type']))
&& ($v->sub_type == '' || ($v->sub_type == ctx()->getData()['sub_type'])) && ($v->sub_type == '' || ($v->sub_type == ctx()->getData()['sub_type']))
&& ($v->user_id == 0 || ($v->user_id == ctx()->getData()['user_id'])) && (empty($v->user_id) || ($v->user_id == ctx()->getData()['user_id']))
&& ($v->comment == '' || ($v->comment == ctx()->getData()['comment'])); && ($v->comment == '' || ($v->comment == ctx()->getData()['comment']));
}); });
$dispatcher->dispatchEvents(ctx()->getData()); $dispatcher->dispatchEvents(ctx()->getData());