From 16f3e526ba239f105abc33d2a3e20d2f207c19c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E6=A5=BD=E5=9D=82=20=E7=99=BD?= <nico@ni-co.moe>
Date: Sat, 11 Nov 2023 05:50:41 +0000
Subject: [PATCH] fixbug

---
 app/Http/Controllers/MailController.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php
index 8e5964c..ea648c2 100644
--- a/app/Http/Controllers/MailController.php
+++ b/app/Http/Controllers/MailController.php
@@ -71,10 +71,12 @@ function ($attribute, $value, $fail) {
         try {
             $key = Crypt::decryptString($key);
             $key = json_decode($key, true);
-            if (time() - $key['time'] < 300 && !empty($key['id'])) {
+            if (!empty($key['id'])) {
                 $where[] = ['id', '>', $key['id']];
+            } elseif (time() - $key['time'] < 300) {
+                $where[] = ['received_at', '>', Carbon::parse($key['time'])];
             } else {
-                $where[] = ['received_at', '>', Carbon::now()];
+                $where[] = ['received_at', '>', Carbon::now() - 60];
             }
         } catch (\Throwable $th) {
             return abort(400);
@@ -125,11 +127,14 @@ public function put(Request $request)
             return abort(401);
         }
 
+        $to   = strtolower($to);
+        $from = strtolower($from);
+
         $mail = new Mail;
 
         $mail->from      = $from;
         $mail->from_hash = hash('sha256', $from);
-        $mail->to        = strtolower($to);
+        $mail->to        = $to;
         $mail->to_hash   = hash('sha256', $to);
 
         $mail->title         = $title;