From 03a604c2ff3629de8586170652cd26bd6f708fac Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 4 Jan 2022 17:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Endpoint/Api/Http/Controllers/MessageController.php | 2 +-
 app/Models/Message.php                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/MessageController.php b/app/Endpoint/Api/Http/Controllers/MessageController.php
index a871ad8a..5ba48d1d 100644
--- a/app/Endpoint/Api/Http/Controllers/MessageController.php
+++ b/app/Endpoint/Api/Http/Controllers/MessageController.php
@@ -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();
 
diff --git a/app/Models/Message.php b/app/Models/Message.php
index a5d6782b..a35be9c9 100644
--- a/app/Models/Message.php
+++ b/app/Models/Message.php
@@ -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);
         });
     }