drop messaging (#9919)

* drop messaging (from backend) * wip
2023-02-15 13:06:06 +09:00
parent d0aba46ee3
commit 8f2049bcd2
47 changed files with 18 additions and 3292 deletions
--- a/packages/backend/src/server/api/stream/ChannelsService.ts
+++ b/packages/backend/src/server/api/stream/ChannelsService.ts
@@ -1,5 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
 import { HybridTimelineChannelService } from './channels/hybrid-timeline.js';
 import { LocalTimelineChannelService } from './channels/local-timeline.js';
 import { HomeTimelineChannelService } from './channels/home-timeline.js';
@@ -11,11 +12,8 @@ import { ServerStatsChannelService } from './channels/server-stats.js';
 import { QueueStatsChannelService } from './channels/queue-stats.js';
 import { UserListChannelService } from './channels/user-list.js';
 import { AntennaChannelService } from './channels/antenna.js';
-import { MessagingChannelService } from './channels/messaging.js';
-import { MessagingIndexChannelService } from './channels/messaging-index.js';
 import { DriveChannelService } from './channels/drive.js';
 import { HashtagChannelService } from './channels/hashtag.js';
-import { bindThis } from '@/decorators.js';

@Injectable()
 export class ChannelsService {
@@ -29,8 +27,6 @@ export class ChannelsService {
 		private hashtagChannelService: HashtagChannelService,
 		private antennaChannelService: AntennaChannelService,
 		private channelChannelService: ChannelChannelService,
-		private messagingChannelService: MessagingChannelService,
-		private messagingIndexChannelService: MessagingIndexChannelService,
 		private driveChannelService: DriveChannelService,
 		private serverStatsChannelService: ServerStatsChannelService,
 		private queueStatsChannelService: QueueStatsChannelService,
@@ -50,8 +46,6 @@ export class ChannelsService {
 			case 'hashtag': return this.hashtagChannelService;
 			case 'antenna': return this.antennaChannelService;
 			case 'channel': return this.channelChannelService;
-			case 'messaging': return this.messagingChannelService;
-			case 'messagingIndex': return this.messagingIndexChannelService;
 			case 'drive': return this.driveChannelService;
 			case 'serverStats': return this.serverStatsChannelService;
 			case 'queueStats': return this.queueStatsChannelService;
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -1,32 +1,25 @@
 import { Inject, Injectable } from '@nestjs/common';
-import type { NotesRepository, UsersRepository } from '@/models/index.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
-import type { User } from '@/models/entities/User.js';
 import type { Packed } from '@/misc/schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
-import type { StreamMessages } from '../types.js';

 class ChannelChannel extends Channel {
 	public readonly chName = 'channel';
 	public static shouldShare = false;
 	public static requireCredential = false;
 	private channelId: string;
-	private typers: Record<User['id'], Date> = {};
-	private emitTypersIntervalId: ReturnType<typeof setInterval>;

 	constructor(
 		private noteEntityService: NoteEntityService,
-		private userEntityService: UserEntityService,

 		id: string,
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
 		//this.onNote = this.onNote.bind(this);
-		//this.emitTypers = this.emitTypers.bind(this);
 	}

 	@bindThis
@@ -35,8 +28,6 @@ class ChannelChannel extends Channel {

 		// Subscribe stream
 		this.subscriber.on('notesStream', this.onNote);
-		this.subscriber.on(`channelStream:${this.channelId}`, this.onEvent);
-		this.emitTypersIntervalId = setInterval(this.emitTypers, 5000);
 	}

 	@bindThis
@@ -66,42 +57,10 @@ class ChannelChannel extends Channel {
 		this.send('note', note);
 	}

-	@bindThis
-	private onEvent(data: StreamMessages['channel']['payload']) {
-		if (data.type === 'typing') {
-			const id = data.body;
-			const begin = this.typers[id] == null;
-			this.typers[id] = new Date();
-			if (begin) {
-				this.emitTypers();
-			}
-		}
-	}
-
-	@bindThis
-	private async emitTypers() {
-		const now = new Date();
-
-		// Remove not typing users
-		for (const [userId, date] of Object.entries(this.typers)) {
-			if (now.getTime() - date.getTime() > 5000) delete this.typers[userId];
-		}
-
-		const users = await this.userEntityService.packMany(Object.keys(this.typers), null, { detail: false });
-
-		this.send({
-			type: 'typers',
-			body: users,
-		});
-	}
-
 	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
-		this.subscriber.off(`channelStream:${this.channelId}`, this.onEvent);
-
-		clearInterval(this.emitTypersIntervalId);
 	}
 }

@@ -112,7 +71,6 @@ export class ChannelChannelService {

 	constructor(
 		private noteEntityService: NoteEntityService,
-		private userEntityService: UserEntityService,
 	) {
 	}

@@ -120,7 +78,6 @@ export class ChannelChannelService {
 	public create(id: string, connection: Channel['connection']): ChannelChannel {
 		return new ChannelChannel(
 			this.noteEntityService,
-			this.userEntityService,
 			id,
 			connection,
 		);
--- a/packages/backend/src/server/api/stream/channels/messaging-index.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging-index.ts
@@ -1,35 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { bindThis } from '@/decorators.js';
-import Channel from '../channel.js';
-
-class MessagingIndexChannel extends Channel {
-	public readonly chName = 'messagingIndex';
-	public static shouldShare = true;
-	public static requireCredential = true;
-
-	@bindThis
-	public async init(params: any) {
-		// Subscribe messaging index stream
-		this.subscriber.on(`messagingIndexStream:${this.user!.id}`, data => {
-			this.send(data);
-		});
-	}
-}
-
-@Injectable()
-export class MessagingIndexChannelService {
-	public readonly shouldShare = MessagingIndexChannel.shouldShare;
-	public readonly requireCredential = MessagingIndexChannel.requireCredential;
-
-	constructor(
-	) {
-	}
-
-	@bindThis
-	public create(id: string, connection: Channel['connection']): MessagingIndexChannel {
-		return new MessagingIndexChannel(
-			id,
-			connection,
-		);
-	}
-}
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -1,159 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import type { UserGroupJoiningsRepository, UsersRepository, MessagingMessagesRepository } from '@/models/index.js';
-import type { User, LocalUser, RemoteUser } from '@/models/entities/User.js';
-import type { UserGroup } from '@/models/entities/UserGroup.js';
-import { MessagingService } from '@/core/MessagingService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
-import Channel from '../channel.js';
-import type { StreamMessages } from '../types.js';
-
-class MessagingChannel extends Channel {
-	public readonly chName = 'messaging';
-	public static shouldShare = false;
-	public static requireCredential = true;
-
-	private otherpartyId: string | null;
-	private otherparty: User | null;
-	private groupId: string | null;
-	private subCh: `messagingStream:${User['id']}-${User['id']}` | `messagingStream:${UserGroup['id']}`;
-	private typers: Record<User['id'], Date> = {};
-	private emitTypersIntervalId: ReturnType<typeof setInterval>;
-
-	constructor(
-		private usersRepository: UsersRepository,
-		private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-		private messagingMessagesRepository: MessagingMessagesRepository,
-		private userEntityService: UserEntityService,
-		private messagingService: MessagingService,
-
-		id: string,
-		connection: Channel['connection'],
-	) {
-		super(id, connection);
-		//this.onEvent = this.onEvent.bind(this);
-		//this.onMessage = this.onMessage.bind(this);
-		//this.emitTypers = this.emitTypers.bind(this);
-	}
-
-	@bindThis
-	public async init(params: any) {
-		this.otherpartyId = params.otherparty;
-		this.otherparty = this.otherpartyId ? await this.usersRepository.findOneByOrFail({ id: this.otherpartyId }) : null;
-		this.groupId = params.group;
-
-		// Check joining
-		if (this.groupId) {
-			const joining = await this.userGroupJoiningsRepository.findOneBy({
-				userId: this.user!.id,
-				userGroupId: this.groupId,
-			});
-
-			if (joining == null) {
-				return;
-			}
-		}
-
-		this.emitTypersIntervalId = setInterval(this.emitTypers, 5000);
-
-		this.subCh = this.otherpartyId
-			? `messagingStream:${this.user!.id}-${this.otherpartyId}`
-			: `messagingStream:${this.groupId}`;
-
-		// Subscribe messaging stream
-		this.subscriber.on(this.subCh, this.onEvent);
-	}
-
-	@bindThis
-	private onEvent(data: StreamMessages['messaging']['payload'] | StreamMessages['groupMessaging']['payload']) {
-		if (data.type === 'typing') {
-			const id = data.body;
-			const begin = this.typers[id] == null;
-			this.typers[id] = new Date();
-			if (begin) {
-				this.emitTypers();
-			}
-		} else {
-			this.send(data);
-		}
-	}
-
-	@bindThis
-	public onMessage(type: string, body: any) {
-		switch (type) {
-			case 'read':
-				if (this.otherpartyId) {
-					this.messagingService.readUserMessagingMessage(this.user!.id, this.otherpartyId, [body.id]);
-
-					// リモートユーザーからのメッセージだったら既読配信
-					if (this.userEntityService.isLocalUser(this.user!) && this.userEntityService.isRemoteUser(this.otherparty!)) {
-						this.messagingMessagesRepository.findOneBy({ id: body.id }).then(message => {
-							if (message) this.messagingService.deliverReadActivity(this.user as LocalUser, this.otherparty as RemoteUser, message);
-						});
-					}
-				} else if (this.groupId) {
-					this.messagingService.readGroupMessagingMessage(this.user!.id, this.groupId, [body.id]);
-				}
-				break;
-		}
-	}
-
-	@bindThis
-	private async emitTypers() {
-		const now = new Date();
-
-		// Remove not typing users
-		for (const [userId, date] of Object.entries(this.typers)) {
-			if (now.getTime() - date.getTime() > 5000) delete this.typers[userId];
-		}
-
-		const users = await this.userEntityService.packMany(Object.keys(this.typers), null, { detail: false });
-
-		this.send({
-			type: 'typers',
-			body: users,
-		});
-	}
-
-	@bindThis
-	public dispose() {
-		this.subscriber.off(this.subCh, this.onEvent);
-
-		clearInterval(this.emitTypersIntervalId);
-	}
-}
-
-@Injectable()
-export class MessagingChannelService {
-	public readonly shouldShare = MessagingChannel.shouldShare;
-	public readonly requireCredential = MessagingChannel.requireCredential;
-
-	constructor(
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
-		@Inject(DI.userGroupJoiningsRepository)
-		private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-
-		@Inject(DI.messagingMessagesRepository)
-		private messagingMessagesRepository: MessagingMessagesRepository,
-
-		private userEntityService: UserEntityService,
-		private messagingService: MessagingService,
-	) {
-	}
-
-	@bindThis
-	public create(id: string, connection: Channel['connection']): MessagingChannel {
-		return new MessagingChannel(
-			this.usersRepository,
-			this.userGroupJoiningsRepository,
-			this.messagingMessagesRepository,
-			this.userEntityService,
-			this.messagingService,
-			id,
-			connection,
-		);
-	}
-}
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -147,12 +147,6 @@ export default class Connection {
 			case 'disconnect': this.onChannelDisconnectRequested(body); break;
 			case 'channel': this.onChannelMessageRequested(body); break;
 			case 'ch': this.onChannelMessageRequested(body); break; // alias
-
-			// 個々のチャンネルではなくルートレベルでこれらのメッセージを受け取る理由は、
-			// クライアントの事情を考慮したとき、入力フォームはノートチャンネルやメッセージのメインコンポーネントとは別
-			// なこともあるため、それらのコンポーネントがそれぞれ各チャンネルに接続するようにするのは面倒なため。
-			case 'typingOnChannel': this.typingOnChannel(body.channel); break;
-			case 'typingOnMessaging': this.typingOnMessaging(body); break;
 		}
 	}

@@ -325,24 +319,6 @@ export default class Connection {
 		}
 	}

-	@bindThis
-	private typingOnChannel(channel: ChannelModel['id']) {
-		if (this.user) {
-			this.globalEventService.publishChannelStream(channel, 'typing', this.user.id);
-		}
-	}
-
-	@bindThis
-	private typingOnMessaging(param: { partner?: User['id']; group?: UserGroup['id']; }) {
-		if (this.user) {
-			if (param.partner) {
-				this.globalEventService.publishMessagingStream(param.partner, this.user.id, 'typing', this.user.id);
-			} else if (param.group) {
-				this.globalEventService.publishGroupMessagingStream(param.group, 'typing', this.user.id);
-			}
-		}
-	}
-
 	@bindThis
 	private async updateFollowing() {
 		const followings = await this.followingsRepository.find({
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -6,7 +6,6 @@ import type { Antenna } from '@/models/entities/Antenna.js';
 import type { DriveFile } from '@/models/entities/DriveFile.js';
 import type { DriveFolder } from '@/models/entities/DriveFolder.js';
 import type { UserList } from '@/models/entities/UserList.js';
-import type { MessagingMessage } from '@/models/entities/MessagingMessage.js';
 import type { UserGroup } from '@/models/entities/UserGroup.js';
 import type { AbuseUserReport } from '@/models/entities/AbuseUserReport.js';
 import type { Signin } from '@/models/entities/Signin.js';
@@ -96,9 +95,6 @@ export interface MainStreamTypes {
 	readAllUnreadMentions: undefined;
 	unreadSpecifiedNote: Note['id'];
 	readAllUnreadSpecifiedNotes: undefined;
-	readAllMessagingMessages: undefined;
-	messagingMessage: Packed<'MessagingMessage'>;
-	unreadMessagingMessage: Packed<'MessagingMessage'>;
 	readAllAntennas: undefined;
 	unreadAntenna: Antenna;
 	readAllAnnouncements: undefined;
@@ -153,10 +149,6 @@ type NoteStreamEventTypes = {
 	};
 };

-export interface ChannelStreamTypes {
-	typing: User['id'];
-}
-
 export interface UserListStreamTypes {
 	userAdded: Packed<'User'>;
 	userRemoved: Packed<'User'>;
@@ -166,28 +158,6 @@ export interface AntennaStreamTypes {
 	note: Note;
 }

-export interface MessagingStreamTypes {
-	read: MessagingMessage['id'][];
-	typing: User['id'];
-	message: Packed<'MessagingMessage'>;
-	deleted: MessagingMessage['id'];
-}
-
-export interface GroupMessagingStreamTypes {
-	read: {
-		ids: MessagingMessage['id'][];
-		userId: User['id'];
-	};
-	typing: User['id'];
-	message: Packed<'MessagingMessage'>;
-	deleted: MessagingMessage['id'];
-}
-
-export interface MessagingIndexStreamTypes {
-	read: MessagingMessage['id'][];
-	message: Packed<'MessagingMessage'>;
-}
-
 export interface AdminStreamTypes {
 	newAbuseUserReport: {
 		id: AbuseUserReport['id'];
@@ -242,10 +212,6 @@ export type StreamMessages = {
 		name: `noteStream:${Note['id']}`;
 		payload: EventUnionFromDictionary<SerializedAll<NoteStreamEventTypes>>;
 	};
-	channel: {
-		name: `channelStream:${Channel['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<ChannelStreamTypes>>;
-	};
 	userList: {
 		name: `userListStream:${UserList['id']}`;
 		payload: EventUnionFromDictionary<SerializedAll<UserListStreamTypes>>;
@@ -254,18 +220,6 @@ export type StreamMessages = {
 		name: `antennaStream:${Antenna['id']}`;
 		payload: EventUnionFromDictionary<SerializedAll<AntennaStreamTypes>>;
 	};
-	messaging: {
-		name: `messagingStream:${User['id']}-${User['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<MessagingStreamTypes>>;
-	};
-	groupMessaging: {
-		name: `messagingStream:${UserGroup['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<GroupMessagingStreamTypes>>;
-	};
-	messagingIndex: {
-		name: `messagingIndexStream:${User['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<MessagingIndexStreamTypes>>;
-	};
 	admin: {
 		name: `adminStream:${User['id']}`;
 		payload: EventUnionFromDictionary<SerializedAll<AdminStreamTypes>>;