summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-03-25 15:51:45 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-03-25 15:51:45 +0900
commita01ae38a07f949cbcd5ce555cd90e8570bb985cc (patch)
tree9227b0625a95a97ccf11970b479ac86b1f42a57b /packages/backend/src
parentenhance: チャットルームに招待されたときの通知を追加 (diff)
downloadsharkey-a01ae38a07f949cbcd5ce555cd90e8570bb985cc.tar.gz
sharkey-a01ae38a07f949cbcd5ce555cd90e8570bb985cc.tar.bz2
sharkey-a01ae38a07f949cbcd5ce555cd90e8570bb985cc.zip
enhance: モデレーターがチャットルームの内容を確認・削除できるように
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/core/ChatService.ts39
-rw-r--r--packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/chat/rooms/delete.ts9
-rw-r--r--packages/backend/src/types.ts5
4 files changed, 51 insertions, 4 deletions
diff --git a/packages/backend/src/core/ChatService.ts b/packages/backend/src/core/ChatService.ts
index 4c010b2ef7..35819a4bc2 100644
--- a/packages/backend/src/core/ChatService.ts
+++ b/packages/backend/src/core/ChatService.ts
@@ -27,6 +27,7 @@ import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
import { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { emojiRegex } from '@/misc/emoji-regex.js';
import { NotificationService } from '@/core/NotificationService.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
const MAX_ROOM_MEMBERS = 30;
const MAX_REACTIONS_PER_MESSAGE = 100;
@@ -75,6 +76,7 @@ export class ChatService {
private roleService: RoleService,
private userFollowingService: UserFollowingService,
private customEmojiService: CustomEmojiService,
+ private moderationLogService: ModerationLogService,
) {
}
@@ -286,6 +288,20 @@ export class ChatService {
}
@bindThis
+ public async hasPermissionToViewRoomTimeline(meId: MiUser['id'], room: MiChatRoom) {
+ if (await this.isRoomMember(room, meId)) {
+ return true;
+ } else {
+ const iAmModerator = await this.roleService.isModerator({ id: meId });
+ if (iAmModerator) {
+ return true;
+ }
+
+ return false;
+ }
+ }
+
+ @bindThis
public async deleteMessage(message: MiChatMessage) {
await this.chatMessagesRepository.delete(message.id);
@@ -493,8 +509,29 @@ export class ChatService {
}
@bindThis
- public async deleteRoom(room: MiChatRoom) {
+ public async hasPermissionToDeleteRoom(meId: MiUser['id'], room: MiChatRoom) {
+ if (room.ownerId === meId) {
+ return true;
+ }
+
+ const iAmModerator = await this.roleService.isModerator({ id: meId });
+ if (iAmModerator) {
+ return true;
+ }
+
+ return false;
+ }
+
+ @bindThis
+ public async deleteRoom(room: MiChatRoom, moderator?: MiUser) {
await this.chatRoomsRepository.delete(room.id);
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'deleteChatRoom', {
+ roomId: room.id,
+ room: room,
+ });
+ }
}
@bindThis
diff --git a/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts b/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts
index ccc0030403..7aef35db04 100644
--- a/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts
@@ -59,7 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
throw new ApiError(meta.errors.noSuchRoom);
}
- if (!(await this.chatService.isRoomMember(room, me.id))) {
+ if (!await this.chatService.hasPermissionToViewRoomTimeline(me.id, room)) {
throw new ApiError(meta.errors.noSuchRoom);
}
diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts b/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts
index 2ef0a778f1..1d77a06dd8 100644
--- a/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts
+++ b/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts
@@ -42,11 +42,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private chatService: ChatService,
) {
super(meta, paramDef, async (ps, me) => {
- const room = await this.chatService.findMyRoomById(me.id, ps.roomId);
+ const room = await this.chatService.findRoomById(ps.roomId);
if (room == null) {
throw new ApiError(meta.errors.noSuchRoom);
}
- await this.chatService.deleteRoom(room);
+
+ if (!await this.chatService.hasPermissionToDeleteRoom(me.id, room)) {
+ throw new ApiError(meta.errors.noSuchRoom);
+ }
+
+ await this.chatService.deleteRoom(room, me);
});
}
}
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 4e215c93c6..5d5f1e3b71 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -124,6 +124,7 @@ export const moderationLogTypes = [
'deletePage',
'deleteFlash',
'deleteGalleryPost',
+ 'deleteChatRoom',
'updateProxyAccountDescription',
] as const;
@@ -377,6 +378,10 @@ export type ModerationLogPayloads = {
postUserUsername: string;
post: any;
};
+ deleteChatRoom: {
+ roomId: string;
+ room: any;
+ };
updateProxyAccountDescription: {
before: string | null;
after: string | null;