pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

调整消息获取

release
vine_liutk 2022-01-04 17:11:39 +08:00
parent 85a056bff0
commit 03a604c2ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Endpoint/Api/Http/Controllers/MessageController.php
View File

@ -51,7 +51,7 @@ class MessageController extends Controller
*/
public function batchRead(Request $request)
{
$ids = Message::with('logs')->where('user_id', 0)->whereDoesntHave('logs', function ($q) use ($request) {
$ids = Message::userMessages($request->user())->with('logs')->where('user_id', 0)->whereDoesntHave('logs', function ($q) use ($request) {
return $q->where('user_id', '=', $request->user()->id);
})->pluck('id')->toArray();

2
app/Models/Message.php
View File

@ -46,7 +46,7 @@ class Message extends Model
public static function userMessages(User $user)
{
return self::where(function ($q) use ($user) {
return self::where('created_at', '>=', $user->created_at->subDays(7))->where(function ($q) use ($user) {
$q->where('user_id', $user->id)->orWhere('user_id', 0);
});
}