From f80bf1fb1c4b58dae105889dae6cbdb6d1ef09b9 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 9 Feb 2023 08:19:12 +0000
Subject: [PATCH 1/3] =?UTF-8?q?perf:=20renderBase=E3=81=A7Cache-Control?=
 =?UTF-8?q?=E3=82=92300=E7=A7=92=E3=81=8B=E3=82=8930=E7=A7=92=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                           | 2 +-
 packages/backend/src/server/web/ClientServerService.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a02788b7ac..07aa761853 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ You should also include the user name that made the change.
 ## 13.x.x (unreleased)
 
 ### Improvements
-- Server: UIのHTML(ノートなどの特別なページを除く)のキャッシュ時間を15秒から300秒に
+- Server: UIのHTML(ノートなどの特別なページを除く)のキャッシュ時間を15秒から30秒に
 
 ### Bugfixes
 -
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 46470246ef..c69ee33ea3 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -337,7 +337,7 @@ export class ClientServerService {
 
 		const renderBase = async (reply: FastifyReply) => {
 			const meta = await this.metaService.fetch();
-			reply.header('Cache-Control', 'public, max-age=300');
+			reply.header('Cache-Control', 'public, max-age=30');
 			return await reply.view('base', {
 				img: meta.bannerUrl,
 				title: meta.name ?? 'Misskey',

From 6e61a36d05e886393a1ee204544420ad66fc6227 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 9 Feb 2023 08:32:42 +0000
Subject: [PATCH 2/3] =?UTF-8?q?i/notifications=E3=81=AE=E3=83=AC=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=83=AA=E3=83=9F=E3=83=83=E3=83=88=E3=82=92=E7=B7=A9?=
 =?UTF-8?q?=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SubwayTooterのバグ対策でレートリミットを設定していたが、通常の使い方でも引っかかることもあるため緩和
---
 CHANGELOG.md                                                 | 1 +
 packages/backend/src/server/api/endpoints/i/notifications.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07aa761853..7840e3cc5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ You should also include the user name that made the change.
 
 ### Improvements
 - Server: UIのHTML(ノートなどの特別なページを除く)のキャッシュ時間を15秒から30秒に
+- i/notificationsのレートリミットを緩和
 
 ### Bugfixes
 -
diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts
index 13de3382dd..09bd4cfc17 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications.ts
@@ -15,7 +15,7 @@ export const meta = {
 	requireCredential: true,
 
 	limit: {
-		duration: 60000,
+		duration: 30000,
 		max: 15,
 	},
 

From 5136b05c9b14bd9f46c28276a0a602d7cc04f798 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 9 Feb 2023 17:53:21 +0900
Subject: [PATCH 3/3] New translations ja-JP.yml (Spanish) (#9839)

---
 locales/es-ES.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 2464fb1240..f3cd85e6a0 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -129,6 +129,7 @@ unblockConfirm: "¿Quiere dejar de bloquear esta cuenta?"
 suspendConfirm: "¿Quiere suspender esta cuenta?"
 unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?"
 selectList: "Seleccione una lista"
+selectChannel: "Seleccionar canal"
 selectAntenna: "Seleccionar antena"
 selectWidget: "Seleccionar widget"
 editWidgets: "Editar widgets"