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

fix: 修复账号被禁用之后还能收到推送和邮件

Browse Source
This commit is contained in:
kuaifan 2024-11-22 16:50:13 +08:00
parent bcc7d6d35c
commit 88aee1e3bf
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Tasks/EmailNoticeTask.php
View File

@ -124,7 +124,7 @@ class EmailNoticeTask extends AbstractTask
private function sendUserEmail(int $userId, string $dialogType, Carbon $startTime, Carbon $endTime): void private function sendUserEmail(int $userId, string $dialogType, Carbon $startTime, Carbon $endTime): void
{ {
// 验证用户 // 验证用户
$user = User::find($userId); $user = User::whereDisableAt(null)->find($userId);
if (!$user || $user->bot || !is_null($user->disable_at) || !Base::isEmail($user->email)) { if (!$user || $user->bot || !is_null($user->disable_at) || !Base::isEmail($user->email)) {
return; return;
} }

1
app/Tasks/WebSocketDialogMsgTask.php
View File

@ -191,6 +191,7 @@ class WebSocketDialogMsgTask extends AbstractTask
} }
$langs = User::select(['userid', 'lang']) $langs = User::select(['userid', 'lang'])
->whereIn('userid', $umengUserid) ->whereIn('userid', $umengUserid)
->whereDisableAt(null)
->get() ->get()
->groupBy('lang') ->groupBy('lang')
->map(function($group) { ->map(function($group) {