github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-14 12:42:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复机器人发送消息接口

Browse Source
This commit is contained in:
kuaifan 2025-07-16 23:14:45 +08:00
parent cc96fcd6a0
commit ef67dc144f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Api/DialogController.php
View File

@ -1612,6 +1612,8 @@ class DialogController extends AbstractController
* - check-in: 签到打卡 * - check-in: 签到打卡
* - approval-alert: 审批 * - approval-alert: 审批
* - meeting-alert: 会议通知 * - meeting-alert: 会议通知
* - xxxxxx: 其他机器人，xxxxxx 是任意6-20个字符串（如果不存在，则自动创建）
* @apiParam {String} [bot_name] 机器人名称（bot_type 为 xxxxxx 时有效）
* @apiParam {Boolean} [silence] 静默发送 * @apiParam {Boolean} [silence] 静默发送
* *
* @apiSuccess {Number} ret 返回状态码（1正确、0错误） * @apiSuccess {Number} ret 返回状态码（1正确、0错误）
@ -1620,11 +1622,12 @@ class DialogController extends AbstractController
*/ */
public function msg__sendbot() public function msg__sendbot()
{ {
User::auth(); $user = User::auth();
// //
$userid = intval(Request::input('userid')); $userid = intval(Request::input('userid'));
$text = trim(Request::input('text')); $text = trim(Request::input('text'));
$botType = trim(Request::input('bot_type', 'system-msg')); $botType = trim(Request::input('bot_type', 'system-msg'));
$botName = trim(Request::input('bot_name'));
$silence = Request::input('silence', false); $silence = Request::input('silence', false);
// //
$toUser = User::whereUserid($userid)->first(); $toUser = User::whereUserid($userid)->first();
@ -1642,6 +1645,7 @@ class DialogController extends AbstractController
return Base::retError('消息内容最大不能超过2000字'); return Base::retError('消息内容最大不能超过2000字');
} }
// //
$botUpdate = [];
if (!in_array($botType, [ if (!in_array($botType, [
'system-msg', 'system-msg',
'task-alert', 'task-alert',
@ -1650,9 +1654,16 @@ class DialogController extends AbstractController
'meeting-alert', 'meeting-alert',
'bot-manager', 'bot-manager',
])) { ])) {
return Base::retError('机器人类型错误'); if (strlen($botType) < 6 || strlen($botType) > 20) {
return Base::retError("机器人类型由6-20个字符组成。");
}
if ($botName && (strlen($botName) < 2 || strlen($botName) > 20)) {
return Base::retError("机器人名称由2-20个字符组成。");
}
$botType = 'user-auto-' . $botType;
$botUpdate['nickname'] = $botName;
} }
$botUser = User::botGetOrCreate($botType); $botUser = User::botGetOrCreate($botType, $botUpdate, $user->userid);
if (empty($botUser)) { if (empty($botUser)) {
return Base::retError('机器人不存在'); return Base::retError('机器人不存在');
} }

4
app/Models/User.php
View File

@ -753,11 +753,11 @@ class User extends AbstractModel
} }
} }
if ($update) { if ($update) {
$botUser->updateInstance($update); if (isset($update['nickname']) && $botUser->nickname != $update['nickname']) {
if (isset($update['nickname'])) {
$botUser->az = Base::getFirstCharter($botUser->nickname); $botUser->az = Base::getFirstCharter($botUser->nickname);
$botUser->pinyin = Base::cn2pinyin($botUser->nickname); $botUser->pinyin = Base::cn2pinyin($botUser->nickname);
} }
$botUser->updateInstance($update);
$botUser->save(); $botUser->save();
} }
return $botUser; return $botUser;