From 26c04824d79db8eb33204beb89262bb2332eb7ae Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 2 Jul 2020 09:22:30 +0800
Subject: [PATCH] extend valid time of cookie `locale`

---
 app/Http/Kernel.php                          |  2 +-
 app/Http/Middleware/DetectLanguagePrefer.php | 12 ++++++++----
 app/Http/Middleware/EncryptCookies.php       | 17 -----------------
 resources/misc/changelogs/en/5.0.0.md        |  1 +
 resources/misc/changelogs/zh_CN/5.0.0.md     |  1 +
 5 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 app/Http/Middleware/EncryptCookies.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index e678ad70..439a0151 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -27,7 +27,7 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
diff --git a/app/Http/Middleware/DetectLanguagePrefer.php b/app/Http/Middleware/DetectLanguagePrefer.php
index a52725f1..69eed5be 100644
--- a/app/Http/Middleware/DetectLanguagePrefer.php
+++ b/app/Http/Middleware/DetectLanguagePrefer.php
@@ -2,12 +2,13 @@
 
 namespace App\Http\Middleware;
 
-use Cookie;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Support\Arr;
 
 class DetectLanguagePrefer
 {
-    public function handle($request, \Closure $next)
+    public function handle(Request $request, \Closure $next)
     {
         $locale = $request->input('lang')
             ?? $request->cookie('locale')
@@ -24,8 +25,11 @@ class DetectLanguagePrefer
         }
 
         app()->setLocale($locale);
-        Cookie::queue('locale', $locale);
 
-        return $next($request);
+        /** @var Response */
+        $response = $next($request);
+        $response->cookie('locale', $locale, 120);
+
+        return $response;
     }
 }
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
deleted file mode 100644
index b46067d5..00000000
--- a/app/Http/Middleware/EncryptCookies.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
-
-class EncryptCookies extends Middleware
-{
-    /**
-     * The names of the cookies that should not be encrypted.
-     *
-     * @var array
-     */
-    protected $except = [
-        'locale',
-    ];
-}
diff --git a/resources/misc/changelogs/en/5.0.0.md b/resources/misc/changelogs/en/5.0.0.md
index e2023d58..33aac9a2 100644
--- a/resources/misc/changelogs/en/5.0.0.md
+++ b/resources/misc/changelogs/en/5.0.0.md
@@ -54,6 +54,7 @@
 - Changed format of avatar and 2D preview to WebP.
 - Reduced some unnecessary SQL queries.
 - Improved email input control.
+- Extended valid time of Cookie `locale`.
 
 ## Fixed
 
diff --git a/resources/misc/changelogs/zh_CN/5.0.0.md b/resources/misc/changelogs/zh_CN/5.0.0.md
index 238f0e07..b30e8030 100644
--- a/resources/misc/changelogs/zh_CN/5.0.0.md
+++ b/resources/misc/changelogs/zh_CN/5.0.0.md
@@ -54,6 +54,7 @@
 - 头像和预览图的格式改为 WebP
 - 减少不必要的 SQL 查询语句
 - 改进邮箱地址输入框
+- 延长 `locale` Cookie 的有效时间
 
 ## 修复