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

no message

Browse Source
This commit is contained in:
kuaifan 2024-12-10 23:34:31 +08:00
parent 3c57cf8d81
commit c7f5c62e71
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1019,7 +1019,7 @@ class DialogController extends AbstractController
* @apiParam {Number} [reply_id] 回复ID
* @apiParam {String} [reply_check] 配合 reply_id 使用，判断是否需要验证回复ID的有效性
* - no: 不进行判断，直接使用提供的 reply_id（默认）
* - yes: 进行判断，如果上一条消息（非机器人）的 ID 为 reply_id，则认为 reply_id 无效
* - yes: 进行判断，如果 reply_id 到最新消息都没有会员发的消息，则 reply_id 无效
* @apiParam {String} [silence] 是否静默发送
* - no: 正常发送（默认）
* - yes: 静默发送
@ -1056,8 +1056,8 @@ class DialogController extends AbstractController
} elseif ($reply_id > 0) {
$action = "reply-$reply_id";
if ($reply_check === 'yes') {
$lastMsgId = WebSocketDialogMsg::whereDialogId($dialog_id)->orderByDesc('id')->value('id');
if ($lastMsgId == $reply_id) {
$exisUserMsg = WebSocketDialogMsg::whereDialogId($dialog_id)->where('id', '>', $reply_id)->whereBot(0)->exists();
if (!$exisUserMsg) {
$action = "";
}
}

17
app/Models/User.php
View File

@ -683,4 +683,21 @@ class User extends AbstractModel
}
return $botUser;
}
/**
* 是否机器人
* @param $userid
* @return bool|mixed
*/
public static function isBot($userid)
{
if (empty($userid)) {
return false;
}
$userid = intval($userid);
if (RequestContext::has("isBot_" . $userid)) {
return RequestContext::get("isBot_" . $userid);
}
return (bool)User::find($userid)?->bot;
}
}

3
app/Models/WebSocketDialogMsg.php
View File

@ -30,6 +30,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int|null $todo 设为待办会员ID
* @property int|null $link 是否存在链接
* @property int|null $modify 是否编辑
* @property int $bot
* @property int|null $reply_num 有多少条回复
* @property int|null $reply_id 回复ID
* @property int|null $forward_id 转发ID
@ -50,6 +51,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg query()
* @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
* @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereBot($value)
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDialogId($value)
@ -1169,6 +1171,7 @@ class WebSocketDialogMsg extends AbstractModel
'type' => $type,
'mtype' => $mtype,
'link' => $link,
'bot' => User::isBot($sender) ? 1 : 0,
'msg' => $msg,
'read' => 0,
]);