diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php index 49c75a267..ff661dfcf 100644 --- a/app/Models/WebSocketDialogMsg.php +++ b/app/Models/WebSocketDialogMsg.php @@ -200,7 +200,6 @@ class WebSocketDialogMsg extends AbstractModel 'msg_id' => $this->id, 'userid' => $userid, 'after' => 1, - 'live' => 1, ]); if ($msgRead->saveOrIgnore()) { $this->send = WebSocketDialogMsgRead::whereMsgId($this->id)->count(); diff --git a/app/Models/WebSocketDialogMsgRead.php b/app/Models/WebSocketDialogMsgRead.php index 878a015cf..345d1ec15 100644 --- a/app/Models/WebSocketDialogMsgRead.php +++ b/app/Models/WebSocketDialogMsgRead.php @@ -16,7 +16,6 @@ use Carbon\Carbon; * @property int|null $email 是否发了邮件 * @property int|null $after 在阅读之后才添加的记录 * @property int|null $dot 红点标记 - * @property int|null $live 是否在会话里 * @property \Illuminate\Support\Carbon|null $read_at 阅读时间 * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend() @@ -33,7 +32,6 @@ use Carbon\Carbon; * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDot($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereEmail($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereId($value) - * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereLive($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMention($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMsgId($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereReadAt($value) diff --git a/app/Observers/WebSocketDialogObserver.php b/app/Observers/WebSocketDialogObserver.php index 7d2e8a0f0..018013dbf 100644 --- a/app/Observers/WebSocketDialogObserver.php +++ b/app/Observers/WebSocketDialogObserver.php @@ -4,7 +4,6 @@ namespace App\Observers; use App\Models\Deleted; use App\Models\WebSocketDialog; -use App\Models\WebSocketDialogMsgRead; use App\Models\WebSocketDialogUser; class WebSocketDialogObserver @@ -40,7 +39,6 @@ class WebSocketDialogObserver public function deleted(WebSocketDialog $webSocketDialog) { Deleted::record('dialog', $webSocketDialog->id, $this->userids($webSocketDialog)); - WebSocketDialogMsgRead::whereDialogId($webSocketDialog->id)->update(['live' => 0]); } /** @@ -53,7 +51,6 @@ class WebSocketDialogObserver { $userids = $this->userids($webSocketDialog); Deleted::forget('dialog', $webSocketDialog->id, $userids); - WebSocketDialogMsgRead::whereDialogId($webSocketDialog->id)->whereIn('userid', $userids)->update(['live' => 1]); } /** diff --git a/app/Observers/WebSocketDialogUserObserver.php b/app/Observers/WebSocketDialogUserObserver.php index a58c65a42..c76391004 100644 --- a/app/Observers/WebSocketDialogUserObserver.php +++ b/app/Observers/WebSocketDialogUserObserver.php @@ -3,7 +3,6 @@ namespace App\Observers; use App\Models\Deleted; -use App\Models\WebSocketDialogMsgRead; use App\Models\WebSocketDialogUser; use Carbon\Carbon; @@ -30,7 +29,6 @@ class WebSocketDialogUserObserver } } Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid); - WebSocketDialogMsgRead::whereDialogId($webSocketDialogUser->dialog_id)->whereUserid($webSocketDialogUser->userid)->update(['live' => 1]); } /** @@ -53,7 +51,6 @@ class WebSocketDialogUserObserver public function deleted(WebSocketDialogUser $webSocketDialogUser) { Deleted::record('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid); - WebSocketDialogMsgRead::whereDialogId($webSocketDialogUser->dialog_id)->whereUserid($webSocketDialogUser->userid)->update(['live' => 0]); } /** diff --git a/app/Tasks/WebSocketDialogMsgTask.php b/app/Tasks/WebSocketDialogMsgTask.php index f8f118ada..ae46f3862 100644 --- a/app/Tasks/WebSocketDialogMsgTask.php +++ b/app/Tasks/WebSocketDialogMsgTask.php @@ -128,7 +128,6 @@ class WebSocketDialogMsgTask extends AbstractTask 'mention' => $mention, 'silence' => $silence, 'dot' => $dot, - 'live' => 1, ])->saveOrIgnore(); $array[$userid] = [ 'userid' => $userid, diff --git a/database/migrations/2024_11_02_094504_remove_web_socket_dialog_msg_reads_live.php b/database/migrations/2024_11_02_094504_remove_web_socket_dialog_msg_reads_live.php new file mode 100644 index 000000000..1913b8985 --- /dev/null +++ b/database/migrations/2024_11_02_094504_remove_web_socket_dialog_msg_reads_live.php @@ -0,0 +1,36 @@ +dropIndex(['userid', 'live', 'msg_id']); + $table->dropColumn('live'); + } + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}