From d92200a6d6a81ac0c6a739f0297935bb060a974f Mon Sep 17 00:00:00 2001
From: dogcraft <neko@neko.red>
Date: Sun, 10 Jul 2022 10:02:46 +0800
Subject: fix: QueryFailedError when logging user's IPs (#8973)

* fix QueryFailedError when logging user's IPs

* use `orIgnore` to fix
---
 packages/backend/src/server/api/api-handler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/backend/src')

diff --git a/packages/backend/src/server/api/api-handler.ts b/packages/backend/src/server/api/api-handler.ts
index 34ff970b4c..ec71ddd2c0 100644
--- a/packages/backend/src/server/api/api-handler.ts
+++ b/packages/backend/src/server/api/api-handler.ts
@@ -68,11 +68,11 @@ export default (endpoint: IEndpoint, ctx: Koa.Context) => new Promise<void>((res
 					}
 
 					try {
-						UserIps.insert({
+						UserIps.createQueryBuilder().insert().values({
 							createdAt: new Date(),
 							userId: user.id,
 							ip: ip,
-						});
+						}).orIgnore(true).execute();
 					} catch {
 					}
 				}
-- 
cgit v1.2.3-freya


From 83ebe79a3fe5ddb22e80d3b47b9e8ec0701286ad Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 10 Jul 2022 15:15:21 +0900
Subject: enhance(sw): If receiving a push notification issued more than a day,
 ignore it. (#8980)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(sw): ignore old push notification

* :v:

* 半日

* !==

* 1日
---
 packages/backend/src/services/push-notification.ts | 1 +
 packages/sw/src/sw.ts                              | 6 +++++-
 packages/sw/src/types.ts                           | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'packages/backend/src')

diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts
index 5c3bafbb34..393a23d050 100644
--- a/packages/backend/src/services/push-notification.ts
+++ b/packages/backend/src/services/push-notification.ts
@@ -64,6 +64,7 @@ export async function pushNotification<T extends keyof pushNotificationsTypes>(u
 			type,
 			body: type === 'notification' ? truncateNotification(body as Packed<'Notification'>) : body,
 			userId,
+			dateTime: (new Date()).getTime(),
 		}), {
 			proxy: config.proxy,
 		}).catch((err: any) => {
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index 0ba6a6e4af..872692f903 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -42,8 +42,12 @@ self.addEventListener('push', ev => {
 			// case 'driveFileCreated':
 			case 'notification':
 			case 'unreadMessagingMessage':
+				// 1日以上経過している場合は無視
+				if ((new Date()).getTime() - data.dateTime > 1000 * 60 * 60 * 24) break;
+
 				// クライアントがあったらストリームに接続しているということなので通知しない
-				if (clients.length != 0) return;
+				if (clients.length !== 0) break;
+
 				return createNotification(data);
 			case 'readAllNotifications':
 				for (const n of await self.registration.getNotifications()) {
diff --git a/packages/sw/src/types.ts b/packages/sw/src/types.ts
index 6aa3726eac..0404e21e57 100644
--- a/packages/sw/src/types.ts
+++ b/packages/sw/src/types.ts
@@ -24,6 +24,7 @@ export type pushNotificationData<K extends keyof pushNotificationDataSourceMap>
 	type: K;
 	body: pushNotificationDataSourceMap[K];
 	userId: string;
+	dateTime: number;
 };
 
 export type pushNotificationDataMap = {
-- 
cgit v1.2.3-freya


From 9107de63b42970fa309fe0a3f6214627e84d06d3 Mon Sep 17 00:00:00 2001
From: yzhe819 <68207314+yzhe819@users.noreply.github.com>
Date: Sun, 10 Jul 2022 22:47:29 +1200
Subject: chore: fix lint errors (#8981)

---
 packages/backend/src/queue/processors/db/export-custom-emojis.ts | 2 +-
 packages/backend/src/remote/activitypub/models/question.ts       | 2 +-
 packages/backend/src/remote/activitypub/renderer/like.ts         | 2 +-
 packages/client/src/components/drive-window.vue                  | 2 +-
 packages/client/src/directives/size.ts                           | 4 ++--
 packages/client/src/scripts/hpml/expr.ts                         | 2 +-
 packages/client/src/ui/deck/list-column.vue                      | 2 +-
 packages/client/src/widgets/activity.chart.vue                   | 8 ++++----
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'packages/backend/src')

diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
index 8ce1d05272..3da887cda2 100644
--- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
@@ -8,7 +8,7 @@ import { queueLogger } from '../../logger.js';
 import { addFile } from '@/services/drive/add-file.js';
 import { format as dateFormat } from 'date-fns';
 import { Users, Emojis } from '@/models/index.js';
-import {  } from '@/queue/types.js';
+import { } from '@/queue/types.js';
 import { createTemp, createTempDir } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
 import config from '@/config/index.js';
diff --git a/packages/backend/src/remote/activitypub/models/question.ts b/packages/backend/src/remote/activitypub/models/question.ts
index 034501572a..f0321fdf2f 100644
--- a/packages/backend/src/remote/activitypub/models/question.ts
+++ b/packages/backend/src/remote/activitypub/models/question.ts
@@ -1,6 +1,6 @@
 import config from '@/config/index.js';
 import Resolver from '../resolver.js';
-import { IObject, IQuestion, isQuestion  } from '../type.js';
+import { IObject, IQuestion, isQuestion } from '../type.js';
 import { apLogger } from '../logger.js';
 import { Notes, Polls } from '@/models/index.js';
 import { IPoll } from '@/models/entities/poll.js';
diff --git a/packages/backend/src/remote/activitypub/renderer/like.ts b/packages/backend/src/remote/activitypub/renderer/like.ts
index da1bfe6e8e..00fb72e8a3 100644
--- a/packages/backend/src/remote/activitypub/renderer/like.ts
+++ b/packages/backend/src/remote/activitypub/renderer/like.ts
@@ -8,7 +8,7 @@ import renderEmoji from './emoji.js';
 export const renderLike = async (noteReaction: NoteReaction, note: Note) => {
 	const reaction = noteReaction.reaction;
 
-	const object =  {
+	const object = {
 		type: 'Like',
 		id: `${config.url}/likes/${noteReaction.id}`,
 		actor: `${config.url}/users/${noteReaction.userId}`,
diff --git a/packages/client/src/components/drive-window.vue b/packages/client/src/components/drive-window.vue
index 5bbfca83c9..51ea2b5015 100644
--- a/packages/client/src/components/drive-window.vue
+++ b/packages/client/src/components/drive-window.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import {  } from 'vue';
+import { } from 'vue';
 import * as Misskey from 'misskey-js';
 import XDrive from './drive.vue';
 import XWindow from '@/components/ui/window.vue';
diff --git a/packages/client/src/directives/size.ts b/packages/client/src/directives/size.ts
index 51855e0de5..c472a528ac 100644
--- a/packages/client/src/directives/size.ts
+++ b/packages/client/src/directives/size.ts
@@ -27,8 +27,8 @@ function getClassOrder(width: number, queue: Value): ClassOrder {
 			...(queue.min ? queue.min.filter(v => width >= v).map(getMinClass) : []),
 		],
 		remove: [
-			...(queue.max ? queue.max.filter(v => width  > v).map(getMaxClass) : []),
-			...(queue.min ? queue.min.filter(v => width  < v).map(getMinClass) : []),
+			...(queue.max ? queue.max.filter(v => width > v).map(getMaxClass) : []),
+			...(queue.min ? queue.min.filter(v => width < v).map(getMinClass) : []),
 		]
 	};
 }
diff --git a/packages/client/src/scripts/hpml/expr.ts b/packages/client/src/scripts/hpml/expr.ts
index 00e3ed118b..18c7c2a14b 100644
--- a/packages/client/src/scripts/hpml/expr.ts
+++ b/packages/client/src/scripts/hpml/expr.ts
@@ -16,7 +16,7 @@ export type TextValue = ExprBase & {
 	value: string;
 };
 
-export type MultiLineTextValue = ExprBase  & {
+export type MultiLineTextValue = ExprBase & {
 	type: 'multiLineText';
 	value: string;
 };
diff --git a/packages/client/src/ui/deck/list-column.vue b/packages/client/src/ui/deck/list-column.vue
index 843a3bd1cb..a27e65594a 100644
--- a/packages/client/src/ui/deck/list-column.vue
+++ b/packages/client/src/ui/deck/list-column.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts" setup>
-import {  } from 'vue';
+import { } from 'vue';
 import XColumn from './column.vue';
 import XTimeline from '@/components/timeline.vue';
 import * as os from '@/os';
diff --git a/packages/client/src/widgets/activity.chart.vue b/packages/client/src/widgets/activity.chart.vue
index b7db2af580..b61e419f94 100644
--- a/packages/client/src/widgets/activity.chart.vue
+++ b/packages/client/src/widgets/activity.chart.vue
@@ -39,15 +39,15 @@ let pointsRenote: any = $ref(null);
 let pointsTotal: any = $ref(null);
 
 function dragListen(fn) {
-	window.addEventListener('mousemove',  fn);
+	window.addEventListener('mousemove', fn);
 	window.addEventListener('mouseleave', dragClear.bind(null, fn));
-	window.addEventListener('mouseup',    dragClear.bind(null, fn));
+	window.addEventListener('mouseup', dragClear.bind(null, fn));
 }
 
 function dragClear(fn) {
-	window.removeEventListener('mousemove',  fn);
+	window.removeEventListener('mousemove', fn);
 	window.removeEventListener('mouseleave', dragClear);
-	window.removeEventListener('mouseup',    dragClear);
+	window.removeEventListener('mouseup', dragClear);
 }
 
 function onMousedown(ev) {
-- 
cgit v1.2.3-freya


From a5648fb07f16be9b6f6ad4ad53f6cefe4292becd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 11 Jul 2022 23:13:23 +0900
Subject: re: update mfm-js 0.23.0-canary.1

---
 packages/backend/src/server/api/endpoints/i/update.ts |  2 +-
 packages/client/package.json                          |  2 +-
 packages/client/src/components/mfm.ts                 |  2 +-
 packages/client/yarn.lock                             | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'packages/backend/src')

diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 122120f275..3c2f1cea0d 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -214,7 +214,7 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	const newDescription = profileUpdates.description === undefined ? profile.description : profileUpdates.description;
 
 	if (newName != null) {
-		const tokens = mfm.parsePlain(newName);
+		const tokens = mfm.parseSimple(newName);
 		emojis = emojis.concat(extractCustomEmojisFromMfm(tokens!));
 	}
 
diff --git a/packages/client/package.json b/packages/client/package.json
index f65e70870e..7743e9e9b0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -40,7 +40,7 @@
 		"json5": "2.2.1",
 		"katex": "0.15.6",
 		"matter-js": "0.18.0",
-		"mfm-js": "0.22.1",
+		"mfm-js": "0.23.0-canary.1",
 		"misskey-js": "0.0.14",
 		"mocha": "10.0.0",
 		"ms": "2.1.3",
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index f7dbca0d30..14ec5ffc84 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -47,7 +47,7 @@ export default defineComponent({
 	render() {
 		if (this.text == null || this.text === '') return;
 
-		const ast = (this.plain ? mfm.parsePlain : mfm.parse)(this.text, { fnNameList: MFM_TAGS });
+		const ast = (this.plain ? mfm.parseSimple : mfm.parse)(this.text, { fnNameList: MFM_TAGS });
 
 		const validTime = (t: string | null | undefined) => {
 			if (t == null) return null;
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index e5459b8dda..cfb9645e7a 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -2866,12 +2866,12 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-mfm-js@0.22.1:
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/mfm-js/-/mfm-js-0.22.1.tgz#ad5f0b95cc903ca5a5e414e2edf64ac4648dc8c2"
-  integrity sha512-UV5zvDKlWPpBFeABhyCzuOTJ3RwrNrmVpJ+zz/dFX6D/ntEywljgxkfsLamcy0ZSwUAr0O+WQxGHvAwyxUgsAQ==
+mfm-js@0.23.0-canary.1:
+  version "0.23.0-canary.1"
+  resolved "https://registry.yarnpkg.com/mfm-js/-/mfm-js-0.23.0-canary.1.tgz#1b7b7635f18bed9776054406b72e6bd613c8d0eb"
+  integrity sha512-SkMrW1rQAv+mFGtLKN9DSv6vxSREDu8ChmkBl1Ch5sQfp47BhuvcRg5EKGmt3WAQRAOylXYMg8wVYR7C5BHKeA==
   dependencies:
-    twemoji-parser "14.0.x"
+    twemoji-parser "14.0.0"
 
 micromatch@^4.0.2:
   version "4.0.2"
@@ -4085,7 +4085,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-twemoji-parser@14.0.0, twemoji-parser@14.0.x:
+twemoji-parser@14.0.0:
   version "14.0.0"
   resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-14.0.0.tgz#13dabcb6d3a261d9efbf58a1666b182033bf2b62"
   integrity sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA==
-- 
cgit v1.2.3-freya


From 660781afd9fe96de44e16725ad27f82922f628e8 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 12 Jul 2022 10:38:57 +0900
Subject: Fix crash at startup if TensorFlow is not supported (#8984)

* Lazy loading tensorflow

* CHANGELOG

* CHANGELOG

* Check CPU flags

* .
---
 CHANGELOG.md                                      |  7 +++++++
 packages/backend/src/services/detect-sensitive.ts | 24 +++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'packages/backend/src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37e3d52a0e..1e35a2e66e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@
 You should also include the user name that made the change.
 -->
 
+## 12.x.x (unreleased)
+
+### Improvements
+
+### Bugfixes
+- Server: Fix crash at startup if TensorFlow is not supported @mei23
+
 ## 12.112.3 (2022/07/09)
 
 ### Improvements
diff --git a/packages/backend/src/services/detect-sensitive.ts b/packages/backend/src/services/detect-sensitive.ts
index 0fa263599b..2ade39d524 100644
--- a/packages/backend/src/services/detect-sensitive.ts
+++ b/packages/backend/src/services/detect-sensitive.ts
@@ -2,19 +2,34 @@ import * as fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
 import * as nsfw from 'nsfwjs';
-import * as tf from '@tensorflow/tfjs-node';
+import si from 'systeminformation';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
+const REQUIRED_CPU_FLAGS = ['avx2', 'fma'];
+let isSupportedCpu: undefined | boolean = undefined;
+
 let model: nsfw.NSFWJS;
 
 export async function detectSensitive(path: string): Promise<nsfw.predictionType[] | null> {
 	try {
+		if (isSupportedCpu === undefined) {
+			const cpuFlags = await getCpuFlags();
+			isSupportedCpu = REQUIRED_CPU_FLAGS.every(required => cpuFlags.includes(required));
+		}
+
+		if (!isSupportedCpu) {
+			console.error('This CPU cannot use TensorFlow.');
+			return null;
+		}
+
+		const tf = await import('@tensorflow/tfjs-node');
+
 		if (model == null) model = await nsfw.load(`file://${_dirname}/../../nsfw-model/`, { size: 299 });
 
 		const buffer = await fs.promises.readFile(path);
-		const image = await tf.node.decodeImage(buffer, 3) as tf.Tensor3D;
+		const image = await tf.node.decodeImage(buffer, 3) as any;
 		try {
 			const predictions = await model.classify(image);
 			return predictions;
@@ -26,3 +41,8 @@ export async function detectSensitive(path: string): Promise<nsfw.predictionType
 		return null;
 	}
 }
+
+async function getCpuFlags(): Promise<string[]> {
+	const str = await si.cpuFlags();
+	return str.split(/\s+/);
+}
-- 
cgit v1.2.3-freya


From 4550a4459bb9fc021211e438d135d464c018ce47 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 12 Jul 2022 12:03:38 +0900
Subject: feat: support <plain> syntax for mfm

---
 CHANGELOG.md                          | 1 +
 packages/backend/src/mfm/to-html.ts   | 6 ++++++
 packages/client/src/components/mfm.ts | 4 ++++
 3 files changed, 11 insertions(+)

(limited to 'packages/backend/src')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e35a2e66e..f6644f016c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ You should also include the user name that made the change.
 ## 12.x.x (unreleased)
 
 ### Improvements
+- Support <plain> syntax for MFM
 
 ### Bugfixes
 - Server: Fix crash at startup if TensorFlow is not supported @mei23
diff --git a/packages/backend/src/mfm/to-html.ts b/packages/backend/src/mfm/to-html.ts
index 5b382063eb..bcb5c86a3d 100644
--- a/packages/backend/src/mfm/to-html.ts
+++ b/packages/backend/src/mfm/to-html.ts
@@ -145,6 +145,12 @@ export function toHtml(nodes: mfm.MfmNode[] | null, mentionedRemoteUsers: IMenti
 			a.textContent = node.props.content;
 			return a;
 		},
+
+		plain(node) {
+			const el = doc.createElement('span');
+			appendChildren(node.children, el);
+			return el;
+		},
 	};
 
 	appendChildren(nodes, doc.body);
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 14ec5ffc84..16ae45bfe1 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -312,6 +312,10 @@ export default defineComponent({
 					})];
 				}
 
+				case 'plain': {
+					return [h('span', genEl(token.children))];
+				}
+
 				default: {
 					console.error('unrecognized ast type:', token.type);
 
-- 
cgit v1.2.3-freya


From 714c80bf3f29b92dc249ce64be9a04bcaba48997 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 13 Jul 2022 14:06:24 +0200
Subject: enhance: read theme color nodeinfo (#8977)

* provide theme color in nodeinfo metadata

* read theme color from nodeinfo

Prefer to read the theme color from the nodeinfo since it is more
performant than performing selector search on a DOM.
---
 packages/backend/src/server/nodeinfo.ts                  | 1 +
 packages/backend/src/services/fetch-instance-metadata.ts | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/backend/src')

diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts
index 13a362a75f..f139d203d2 100644
--- a/packages/backend/src/server/nodeinfo.ts
+++ b/packages/backend/src/server/nodeinfo.ts
@@ -78,6 +78,7 @@ const nodeinfo2 = async () => {
 			enableEmail: meta.enableEmail,
 			enableServiceWorker: meta.enableServiceWorker,
 			proxyAccountName: proxyAccount ? proxyAccount.username : null,
+			themeColor: meta.themeColor || '#86b300',
 		},
 	};
 };
diff --git a/packages/backend/src/services/fetch-instance-metadata.ts b/packages/backend/src/services/fetch-instance-metadata.ts
index 029c388dc2..ee1245132a 100644
--- a/packages/backend/src/services/fetch-instance-metadata.ts
+++ b/packages/backend/src/services/fetch-instance-metadata.ts
@@ -34,7 +34,7 @@ export async function fetchInstanceMetadata(instance: Instance, force = false):
 		const [favicon, icon, themeColor, name, description] = await Promise.all([
 			fetchFaviconUrl(instance, dom).catch(() => null),
 			fetchIconUrl(instance, dom, manifest).catch(() => null),
-			getThemeColor(dom, manifest).catch(() => null),
+			getThemeColor(info, dom, manifest).catch(() => null),
 			getSiteName(info, dom, manifest).catch(() => null),
 			getDescription(info, dom, manifest).catch(() => null),
 		]);
@@ -208,8 +208,8 @@ async function fetchIconUrl(instance: Instance, doc: DOMWindow['document'] | nul
 	return null;
 }
 
-async function getThemeColor(doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
-	const themeColor = doc?.querySelector('meta[name="theme-color"]')?.getAttribute('content') || manifest?.theme_color;
+async function getThemeColor(info: NodeInfo | null, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
+	const themeColor = info?.metadata?.themeColor || doc?.querySelector('meta[name="theme-color"]')?.getAttribute('content') || manifest?.theme_color;
 
 	if (themeColor) {
 		const color = new tinycolor(themeColor);
-- 
cgit v1.2.3-freya


From ae92378689e73895c3a250419a1ad874b25e40e3 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 13 Jul 2022 21:07:49 +0900
Subject: fix(sw, notification): Don't issue an event if there is no affect
 (#8979)

* test

* ]v]
---
 packages/backend/src/server/api/common/read-notification.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/backend/src')

diff --git a/packages/backend/src/server/api/common/read-notification.ts b/packages/backend/src/server/api/common/read-notification.ts
index 17dd8e6f02..cf993ade3e 100644
--- a/packages/backend/src/server/api/common/read-notification.ts
+++ b/packages/backend/src/server/api/common/read-notification.ts
@@ -12,13 +12,15 @@ export async function readNotification(
 	if (notificationIds.length === 0) return;
 
 	// Update documents
-	await Notifications.update({
+	const result = await Notifications.update({
 		id: In(notificationIds),
 		isRead: false,
 	}, {
 		isRead: true,
 	});
 
+	if (result.affected === 0) return;
+
 	if (!await Users.getHasUnreadNotification(userId)) return postReadAllNotifications(userId);
 	else return postReadNotifications(userId, notificationIds);
 }
-- 
cgit v1.2.3-freya