From 3cd04c4b81190e4cfe6dc1def8335be02f8b4b37 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 23 May 2021 13:07:11 +0900
Subject: [PATCH 1/4] Fix agent type (#7532)

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3d84305649..9e32e6e913 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1536,9 +1536,9 @@ acorn@^8.2.1:
   integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==
 
 agent-base@6:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
-  integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 

From 7063a6925fb4cfa47747193e88c059514730ff44 Mon Sep 17 00:00:00 2001
From: okayurisotto <47853651+okayurisotto@users.noreply.github.com>
Date: Sun, 23 May 2021 18:55:21 +0900
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20Safari=E3=81=A7=E3=82=82=E3=83=A2?=
 =?UTF-8?q?=E3=83=BC=E3=83=80=E3=83=AB=E3=81=AE=E3=81=BC=E3=81=8B=E3=81=97?=
 =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E3=81=8C=E5=8A=B9=E3=81=8F=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=20(#7530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/misskey-dev/misskey/issues/7529
---
 src/client/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/style.scss b/src/client/style.scss
index 39bf6ef2d5..dc419bd872 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -146,6 +146,7 @@ hr {
 	width: 100%;
 	height: 100%;
 	background: var(--modalBg);
+	-webkit-backdrop-filter: var(--modalBgFilter);
 	backdrop-filter: var(--modalBgFilter);
 }
 

From 47aaf044813662931fbaddd965272267fd94ed6a Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 23 May 2021 18:57:12 +0900
Subject: [PATCH 3/4] Fix search-by-tag (#7531)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix search-by-tag

* Revert "Fix search-by-tag"

This reverts commit c971d1d5d82f2d8b58fdec76e42f4404339ab83a.

* Fix typo

* Remove unused var

* インジェクションは[]を返すように
---
 .../api/endpoints/notes/search-by-tag.ts      | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/server/api/endpoints/notes/search-by-tag.ts b/src/server/api/endpoints/notes/search-by-tag.ts
index 61f62dd5a6..463c5fff5a 100644
--- a/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/src/server/api/endpoints/notes/search-by-tag.ts
@@ -104,22 +104,25 @@ export default define(meta, async (ps, me) => {
 	generateVisibilityQuery(query, me);
 	if (me) generateMutedUserQuery(query, me);
 
-	if (ps.tag) {
-		if (!safeForSql(ps.tag)) return;
-		query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
-	} else {
-		let i = 0;
-		query.andWhere(new Brackets(qb => {
-			for (const tags of ps.query!) {
-				qb.orWhere(new Brackets(qb => {
-					for (const tag of tags) {
-						if (!safeForSql(tag)) return;
-						qb.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
-						i++;
-					}
-				}));
-			}
-		}));
+	try {
+		if (ps.tag) {
+			if (!safeForSql(ps.tag)) throw 'Injection';
+			query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
+		} else {
+			query.andWhere(new Brackets(qb => {
+				for (const tags of ps.query!) {
+					qb.orWhere(new Brackets(qb => {
+						for (const tag of tags) {
+							if (!safeForSql(tag)) throw 'Injection';
+							qb.andWhere(`'{"${normalizeForSearch(tag)}"}' <@ note.tags`);
+						}
+					}));
+				}
+			}));
+		}
+	} catch (e) {
+		if (e === 'Injection') return [];
+		throw e;
 	}
 
 	if (ps.reply != null) {

From f85399e355685344d45efa49d220cf1508d0bfd5 Mon Sep 17 00:00:00 2001
From: Sandy Nicko Mac Corzeta <4186454+sandycorzeta@users.noreply.github.com>
Date: Sun, 23 May 2021 09:57:33 +0000
Subject: [PATCH 4/4] Add Indonesian to index language (#7528)

Co-authored-by: Sandy Nicko Mac Corzeta <sandynicko@windowslive.com>
---
 locales/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/index.js b/locales/index.js
index 727e0e3848..35f9972ff7 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -21,6 +21,7 @@ const languages = [
 	'en-US',
 	'es-ES',
 	'fr-FR',
+	'id-ID',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',