diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 218a9103a..4341f2627 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -579,9 +579,12 @@ class DialogController extends AbstractController
* @apiName msg__sendtext
*
* @apiParam {Number} dialog_id 对话ID
+ * @apiParam {String} text 消息内容
* @apiParam {Number} [update_id] 更新消息ID(优先大于reply_id)
* @apiParam {Number} [reply_id] 回复ID
- * @apiParam {String} text 消息内容
+ * @apiParam {String} [silence] 是否静默发送
+ * - no: 正常发送(默认)
+ * - yes: 静默发送
*
* @apiSuccess {Number} ret 返回状态码(1正确、0错误)
* @apiSuccess {String} msg 返回信息(错误描述)
@@ -608,6 +611,7 @@ class DialogController extends AbstractController
$update_id = Base::getPostInt('update_id');
$reply_id = Base::getPostInt('reply_id');
$text = trim(Base::getPostValue('text'));
+ $silence = trim(Base::getPostValue('silence')) === 'yes';
//
WebSocketDialog::checkDialog($dialog_id);
//
@@ -648,10 +652,10 @@ class DialogController extends AbstractController
'height' => -1,
'ext' => 'htm',
];
- return WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid);
+ return WebSocketDialogMsg::sendMsg($action, $dialog_id, 'file', $fileData, $user->userid, false, false, $silence);
}
//
- return WebSocketDialogMsg::sendMsg($action, $dialog_id, 'text', ['text' => $text], $user->userid);
+ return WebSocketDialogMsg::sendMsg($action, $dialog_id, 'text', ['text' => $text], $user->userid, false, false, $silence);
}
/**
diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php
index 17e95fb08..2ad6ea8e4 100644
--- a/app/Tasks/BotReceiveMsgTask.php
+++ b/app/Tasks/BotReceiveMsgTask.php
@@ -224,7 +224,7 @@ class BotReceiveMsgTask extends AbstractTask
])->render();
$text = preg_replace("/^\x20+/", "", $text);
$text = preg_replace("/\n\x20+/", "\n", $text);
- WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $this->userid); // todo 未能在任务end事件来发送任务
+ WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $this->userid, false, false, true); // todo 未能在任务end事件来发送任务
}
}
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index 72ac565c7..fff213f9d 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -66,6 +66,7 @@
--header 'token: {机器人Token}' \
--form 'dialog_id="{对话ID}"' \
--form 'text="{消息内容}"'
+ --form 'silence="[yes|no]"'
@elseif ($type === 'notice')
{{$notice}}
@else