From 7431019016aaf21a4c9320b65b92706332ca2e49 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Mon, 29 May 2023 19:42:48 +0900
Subject: [PATCH] refactor

---
 packages/backend/src/models/json-schema/user.ts        |  4 ----
 .../src/server/api/endpoints/antennas/update.ts        |  3 +++
 .../src/server/api/endpoints/messaging/messages.ts     |  8 ++++----
 .../server/api/endpoints/messaging/messages/create.ts  | 10 +++++-----
 packages/sw/src/sw.ts                                  |  6 +++---
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 0a15de4faa..c4eed9db3d 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -340,10 +340,6 @@ export const packedMeDetailedOnlySchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
-		hasUnreadMessagingMessage: {
-			type: 'boolean',
-			nullable: false, optional: false,
-		},
 		hasUnreadNotification: {
 			type: 'boolean',
 			nullable: false, optional: false,
diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts
index 0abdaf4252..204173b85d 100644
--- a/packages/backend/src/server/api/endpoints/antennas/update.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/update.ts
@@ -81,6 +81,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		@Inject(DI.userListsRepository)
 		private userListsRepository: UserListsRepository,
 
+		@Inject(DI.userGroupJoiningsRepository)
+		private userGroupJoiningsRepository: UserGroupJoiningsRepository,
+
 		private antennaEntityService: AntennaEntityService,
 		private globalEventService: GlobalEventService,
 	) {
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index 55ea653b22..c16a34d004 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -1,14 +1,14 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Brackets } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { UsersRepository, UserGroupsRepository, MessagingMessagesRepository, UserGroupJoiningsRepository } from '@/models/index.js';
+import type { UserGroupsRepository, MessagingMessagesRepository, UserGroupJoiningsRepository } from '@/models/index.js';
 import { QueryService } from '@/core/QueryService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { MessagingMessageEntityService } from '@/core/entities/MessagingMessageEntityService.js';
 import { MessagingService } from '@/core/MessagingService.js';
 import { DI } from '@/di-symbols.js';
-import { ApiError } from '../../error.js';
 import { GetterService } from '@/server/api/GetterService.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['messaging'],
@@ -121,11 +121,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 				// Mark all as read
 				if (ps.markAsRead) {
-					this.messagingService.readUserMessagingMessage(me.id, recipient.id, messages.filter(m => m.recipientId === me.id).map(x => x.id));
+					await this.messagingService.readUserMessagingMessage(me.id, recipient.id, messages.filter(m => m.recipientId === me.id).map(x => x.id));
 
 					// リモートユーザーとのメッセージだったら既読配信
 					if (this.userEntityService.isLocalUser(me) && this.userEntityService.isRemoteUser(recipient)) {
-						this.messagingService.deliverReadActivity(me, recipient, messages);
+						await this.messagingService.deliverReadActivity(me, recipient, messages);
 					}
 				}
 
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
index e9ffc7a9eb..ad35bd2903 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -1,5 +1,5 @@
-import { Inject, Injectable } from '@nestjs/common';
 import ms from 'ms';
+import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { BlockingsRepository, UserGroupJoiningsRepository, DriveFilesRepository, UserGroupsRepository } from '@/models/index.js';
 import type { User } from '@/models/entities/User.js';
@@ -12,15 +12,15 @@ import { ApiError } from '../../../error.js';
 export const meta = {
 	tags: ['messaging'],
 
-	requireCredential: true,
-
-	kind: 'write:messaging',
-
 	limit: {
 		duration: ms('1hour'),
 		max: 120,
 	},
 
+	requireCredential: true,
+
+	kind: 'write:messaging',
+
 	res: {
 		type: 'object',
 		optional: false, nullable: false,
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index 7f134b698d..92db6fb7e4 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -70,9 +70,9 @@ globalThis.addEventListener('push', ev => {
 						&& ('userId' in data.body
 							? data.body.userId === n.data.body.userId
 							: data.body.groupId === n.data.body.groupId)
-						) {
-							n.close();
-						}
+					) {
+						n.close();
+					}
 				}
 				break;
 		}