refactor: introduce bindThis decorator to bind this automaticaly

18 files changed, 124 insertions, 23 deletions

diff --git a/packages/backend/src/server/api/stream/ChannelsService.ts b/packages/backend/src/server/api/stream/ChannelsService.ts
index d6005b1ee8..198fc190d4 100644
--- a/packages/backend/src/server/api/stream/ChannelsService.ts
+++ b/packages/backend/src/server/api/stream/ChannelsService.ts
@@ -15,6 +15,7 @@ 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 {
@@ -37,6 +38,7 @@ export class ChannelsService {
 	) {
 	}
 
+	@bindThis
 	public getChannelService(name: string) {
 		switch (name) {
 			case 'main': return this.mainChannelService;
diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index 5480c12c09..3e67880b45 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -1,3 +1,4 @@
+import { bindThis } from '@/decorators.js';
 import type Connection from '.';
 
 /**
@@ -43,6 +44,7 @@ export default abstract class Channel {
 		this.connection = connection;
 	}
 
+	@bindThis
 	public send(typeOrPayload: any, payload?: any) {
 		const type = payload === undefined ? typeOrPayload.type : typeOrPayload;
 		const body = payload === undefined ? typeOrPayload.body : payload;
diff --git a/packages/backend/src/server/api/stream/channels/admin.ts b/packages/backend/src/server/api/stream/channels/admin.ts
index 8c3c0d2adf..210e016a7e 100644
--- a/packages/backend/src/server/api/stream/channels/admin.ts
+++ b/packages/backend/src/server/api/stream/channels/admin.ts
@@ -1,4 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class AdminChannel extends Channel {
@@ -6,6 +7,7 @@ class AdminChannel extends Channel {
 	public static shouldShare = true;
 	public static requireCredential = true;
 
+	@bindThis
 	public async init(params: any) {
 		// Subscribe admin stream
 		this.subscriber.on(`adminStream:${this.user!.id}`, data => {
@@ -23,6 +25,7 @@ export class AdminChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): AdminChannel {
 		return new AdminChannel(
 			id,
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 7c34aef495..44beef2da2 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -2,6 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import type { NotesRepository } from '@/models/index.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 import type { StreamMessages } from '../types.js';
 
@@ -18,9 +19,10 @@ class AntennaChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onEvent = this.onEvent.bind(this);
+		//this.onEvent = this.onEvent.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		this.antennaId = params.antennaId as string;
 
@@ -28,6 +30,7 @@ class AntennaChannel extends Channel {
 		this.subscriber.on(`antennaStream:${this.antennaId}`, this.onEvent);
 	}
 
+	@bindThis
 	private async onEvent(data: StreamMessages['antenna']['payload']) {
 		if (data.type === 'note') {
 			const note = await this.noteEntityService.pack(data.body.id, this.user, { detail: true });
@@ -45,6 +48,7 @@ class AntennaChannel extends Channel {
 		}
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off(`antennaStream:${this.antennaId}`, this.onEvent);
@@ -61,6 +65,7 @@ export class AntennaChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): AntennaChannel {
 		return new AntennaChannel(
 			this.noteEntityService,
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 2ef70e62e9..5ba84e43c4 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -5,6 +5,7 @@ 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';
 
@@ -24,10 +25,11 @@ class ChannelChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
-		this.emitTypers = this.emitTypers.bind(this);
+		//this.onNote = this.onNote.bind(this);
+		//this.emitTypers = this.emitTypers.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		this.channelId = params.channelId as string;
 
@@ -37,6 +39,7 @@ class ChannelChannel extends Channel {
 		this.emitTypersIntervalId = setInterval(this.emitTypers, 5000);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		if (note.channelId !== this.channelId) return;
 
@@ -63,6 +66,7 @@ class ChannelChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	private onEvent(data: StreamMessages['channel']['payload']) {
 		if (data.type === 'typing') {
 			const id = data.body;
@@ -74,6 +78,7 @@ class ChannelChannel extends Channel {
 		}
 	}
 
+	@bindThis
 	private async emitTypers() {
 		const now = new Date();
 
@@ -90,6 +95,7 @@ class ChannelChannel extends Channel {
 		});
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
@@ -110,6 +116,7 @@ export class ChannelChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): ChannelChannel {
 		return new ChannelChannel(
 			this.noteEntityService,
diff --git a/packages/backend/src/server/api/stream/channels/drive.ts b/packages/backend/src/server/api/stream/channels/drive.ts
index 80d83cd690..cfcb125b6b 100644
--- a/packages/backend/src/server/api/stream/channels/drive.ts
+++ b/packages/backend/src/server/api/stream/channels/drive.ts
@@ -1,4 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class DriveChannel extends Channel {
@@ -6,6 +7,7 @@ class DriveChannel extends Channel {
 	public static shouldShare = true;
 	public static requireCredential = true;
 
+	@bindThis
 	public async init(params: any) {
 		// Subscribe drive stream
 		this.subscriber.on(`driveStream:${this.user!.id}`, data => {
@@ -23,6 +25,7 @@ export class DriveChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): DriveChannel {
 		return new DriveChannel(
 			id,
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index a8617582dc..34f782e580 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -6,6 +6,7 @@ import { isUserRelated } from '@/misc/is-user-related.js';
 import type { Packed } from '@/misc/schema.js';
 import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class GlobalTimelineChannel extends Channel {
@@ -21,9 +22,10 @@ class GlobalTimelineChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
+		//this.onNote = this.onNote.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		const meta = await this.metaService.fetch();
 		if (meta.disableGlobalTimeline) {
@@ -34,6 +36,7 @@ class GlobalTimelineChannel extends Channel {
 		this.subscriber.on('notesStream', this.onNote);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		if (note.visibility !== 'public') return;
 		if (note.channelId != null) return;
@@ -78,6 +81,7 @@ class GlobalTimelineChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
@@ -95,6 +99,7 @@ export class GlobalTimelineChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): GlobalTimelineChannel {
 		return new GlobalTimelineChannel(
 			this.metaService,
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index 0f6c081c12..073b737079 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -4,6 +4,7 @@ import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import type { Packed } from '@/misc/schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class HashtagChannel extends Channel {
@@ -19,9 +20,10 @@ class HashtagChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
+		//this.onNote = this.onNote.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		this.q = params.q;
 
@@ -31,6 +33,7 @@ class HashtagChannel extends Channel {
 		this.subscriber.on('notesStream', this.onNote);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		const noteTags = note.tags ? note.tags.map((t: string) => t.toLowerCase()) : [];
 		const matched = this.q.some(tags => tags.every(tag => noteTags.includes(normalizeForSearch(tag))));
@@ -53,6 +56,7 @@ class HashtagChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
@@ -69,6 +73,7 @@ export class HashtagChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): HashtagChannel {
 		return new HashtagChannel(
 			this.noteEntityService,
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index 16e0cebc72..5707ddd821 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -5,6 +5,7 @@ import { isUserRelated } from '@/misc/is-user-related.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import type { Packed } from '@/misc/schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class HomeTimelineChannel extends Channel {
@@ -19,14 +20,16 @@ class HomeTimelineChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
+		//this.onNote = this.onNote.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		// Subscribe events
 		this.subscriber.on('notesStream', this.onNote);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		if (note.channelId) {
 			if (!this.followingChannels.has(note.channelId)) return;
@@ -85,6 +88,7 @@ class HomeTimelineChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
@@ -101,6 +105,7 @@ export class HomeTimelineChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): HomeTimelineChannel {
 		return new HomeTimelineChannel(
 			this.noteEntityService,
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index f1ce822583..6c6afb12bf 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -7,6 +7,7 @@ import type { Packed } from '@/misc/schema.js';
 import { DI } from '@/di-symbols.js';
 import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class HybridTimelineChannel extends Channel {
@@ -22,9 +23,10 @@ class HybridTimelineChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
+		//this.onNote = this.onNote.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any): Promise<void> {
 		const meta = await this.metaService.fetch();
 		if (meta.disableLocalTimeline && !this.user!.isAdmin && !this.user!.isModerator) return;
@@ -33,6 +35,7 @@ class HybridTimelineChannel extends Channel {
 		this.subscriber.on('notesStream', this.onNote);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		// チャンネルの投稿ではなく、自分自身の投稿 または
 		// チャンネルの投稿ではなく、その投稿のユーザーをフォローしている または
@@ -95,6 +98,7 @@ class HybridTimelineChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	public dispose(): void {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
@@ -112,6 +116,7 @@ export class HybridTimelineChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): HybridTimelineChannel {
 		return new HybridTimelineChannel(
 			this.metaService,
diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
index 5a5a43f845..54388787ef 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -5,6 +5,7 @@ import { isUserRelated } from '@/misc/is-user-related.js';
 import type { Packed } from '@/misc/schema.js';
 import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class LocalTimelineChannel extends Channel {
@@ -20,9 +21,10 @@ class LocalTimelineChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
+		//this.onNote = this.onNote.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		const meta = await this.metaService.fetch();
 		if (meta.disableLocalTimeline) {
@@ -33,6 +35,7 @@ class LocalTimelineChannel extends Channel {
 		this.subscriber.on('notesStream', this.onNote);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		if (note.user.host !== null) return;
 		if (note.visibility !== 'public') return;
@@ -75,6 +78,7 @@ class LocalTimelineChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off('notesStream', this.onNote);
@@ -92,6 +96,7 @@ export class LocalTimelineChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): LocalTimelineChannel {
 		return new LocalTimelineChannel(
 			this.metaService,
diff --git a/packages/backend/src/server/api/stream/channels/main.ts b/packages/backend/src/server/api/stream/channels/main.ts
index 12908e07b4..42f255b8fe 100644
--- a/packages/backend/src/server/api/stream/channels/main.ts
+++ b/packages/backend/src/server/api/stream/channels/main.ts
@@ -2,6 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import type { NotesRepository } from '@/models/index.js';
 import { isInstanceMuted, isUserFromMutedInstance } from '@/misc/is-instance-muted.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class MainChannel extends Channel {
@@ -18,6 +19,7 @@ class MainChannel extends Channel {
 		super(id, connection);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		// Subscribe main stream channel
 		this.subscriber.on(`mainStream:${this.user!.id}`, async data => {
@@ -66,6 +68,7 @@ export class MainChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): MainChannel {
 		return new MainChannel(
 			this.noteEntityService,
diff --git a/packages/backend/src/server/api/stream/channels/messaging-index.ts b/packages/backend/src/server/api/stream/channels/messaging-index.ts
index bebc07f4ad..66cb79f7a7 100644
--- a/packages/backend/src/server/api/stream/channels/messaging-index.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging-index.ts
@@ -1,4 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class MessagingIndexChannel extends Channel {
@@ -6,6 +7,7 @@ class MessagingIndexChannel extends Channel {
 	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 => {
@@ -23,6 +25,7 @@ export class MessagingIndexChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): MessagingIndexChannel {
 		return new MessagingIndexChannel(
 			id,
diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts
index b6ce6c217e..92af6b591c 100644
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -5,6 +5,7 @@ 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';
 
@@ -31,11 +32,12 @@ class MessagingChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.onEvent = this.onEvent.bind(this);
-		this.onMessage = this.onMessage.bind(this);
-		this.emitTypers = this.emitTypers.bind(this);
+		//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;
@@ -63,6 +65,7 @@ class MessagingChannel extends Channel {
 		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;
@@ -76,6 +79,7 @@ class MessagingChannel extends Channel {
 		}
 	}
 
+	@bindThis
 	public onMessage(type: string, body: any) {
 		switch (type) {
 			case 'read':
@@ -95,6 +99,7 @@ class MessagingChannel extends Channel {
 		}
 	}
 
+	@bindThis
 	private async emitTypers() {
 		const now = new Date();
 
@@ -111,6 +116,7 @@ class MessagingChannel extends Channel {
 		});
 	}
 
+	@bindThis
 	public dispose() {
 		this.subscriber.off(this.subCh, this.onEvent);
 
@@ -138,6 +144,7 @@ export class MessagingChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): MessagingChannel {
 		return new MessagingChannel(
 			this.usersRepository,
diff --git a/packages/backend/src/server/api/stream/channels/queue-stats.ts b/packages/backend/src/server/api/stream/channels/queue-stats.ts
index 1802c6723b..c773916103 100644
--- a/packages/backend/src/server/api/stream/channels/queue-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/queue-stats.ts
@@ -1,5 +1,6 @@
 import Xev from 'xev';
 import { Inject, Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 const ev = new Xev();
@@ -11,18 +12,21 @@ class QueueStatsChannel extends Channel {
 
 	constructor(id: string, connection: Channel['connection']) {
 		super(id, connection);
-		this.onStats = this.onStats.bind(this);
-		this.onMessage = this.onMessage.bind(this);
+		//this.onStats = this.onStats.bind(this);
+		//this.onMessage = this.onMessage.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		ev.addListener('queueStats', this.onStats);
 	}
 
+	@bindThis
 	private onStats(stats: any) {
 		this.send('stats', stats);
 	}
 
+	@bindThis
 	public onMessage(type: string, body: any) {
 		switch (type) {
 			case 'requestLog':
@@ -37,6 +41,7 @@ class QueueStatsChannel extends Channel {
 		}
 	}
 
+	@bindThis
 	public dispose() {
 		ev.removeListener('queueStats', this.onStats);
 	}
@@ -51,6 +56,7 @@ export class QueueStatsChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): QueueStatsChannel {
 		return new QueueStatsChannel(
 			id,
diff --git a/packages/backend/src/server/api/stream/channels/server-stats.ts b/packages/backend/src/server/api/stream/channels/server-stats.ts
index e2b00de25f..492912dbe6 100644
--- a/packages/backend/src/server/api/stream/channels/server-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/server-stats.ts
@@ -1,5 +1,6 @@
 import Xev from 'xev';
 import { Inject, Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 const ev = new Xev();
@@ -11,18 +12,21 @@ class ServerStatsChannel extends Channel {
 
 	constructor(id: string, connection: Channel['connection']) {
 		super(id, connection);
-		this.onStats = this.onStats.bind(this);
-		this.onMessage = this.onMessage.bind(this);
+		//this.onStats = this.onStats.bind(this);
+		//this.onMessage = this.onMessage.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		ev.addListener('serverStats', this.onStats);
 	}
 
+	@bindThis
 	private onStats(stats: any) {
 		this.send('stats', stats);
 	}
 
+	@bindThis
 	public onMessage(type: string, body: any) {
 		switch (type) {
 			case 'requestLog':
@@ -37,6 +41,7 @@ class ServerStatsChannel extends Channel {
 		}
 	}
 
+	@bindThis
 	public dispose() {
 		ev.removeListener('serverStats', this.onStats);
 	}
@@ -51,6 +56,7 @@ export class ServerStatsChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): ServerStatsChannel {
 		return new ServerStatsChannel(
 			id,
diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts
index f9f0d02558..16af32868c 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -1,11 +1,11 @@
 import { Inject, Injectable } from '@nestjs/common';
-import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js';
-import type { NotesRepository } from '@/models/index.js';
+import type { UserListJoiningsRepository, UserListsRepository, NotesRepository } from '@/models/index.js';
 import type { User } from '@/models/entities/User.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import type { Packed } from '@/misc/schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
 import Channel from '../channel.js';
 
 class UserListChannel extends Channel {
@@ -25,10 +25,11 @@ class UserListChannel extends Channel {
 		connection: Channel['connection'],
 	) {
 		super(id, connection);
-		this.updateListUsers = this.updateListUsers.bind(this);
-		this.onNote = this.onNote.bind(this);
+		//this.updateListUsers = this.updateListUsers.bind(this);
+		//this.onNote = this.onNote.bind(this);
 	}
 
+	@bindThis
 	public async init(params: any) {
 		this.listId = params.listId as string;
 
@@ -48,6 +49,7 @@ class UserListChannel extends Channel {
 		this.listUsersClock = setInterval(this.updateListUsers, 5000);
 	}
 
+	@bindThis
 	private async updateListUsers() {
 		const users = await this.userListJoiningsRepository.find({
 			where: {
@@ -59,6 +61,7 @@ class UserListChannel extends Channel {
 		this.listUsers = users.map(x => x.userId);
 	}
 
+	@bindThis
 	private async onNote(note: Packed<'Note'>) {
 		if (!this.listUsers.includes(note.userId)) return;
 
@@ -93,6 +96,7 @@ class UserListChannel extends Channel {
 		this.send('note', note);
 	}
 
+	@bindThis
 	public dispose() {
 		// Unsubscribe events
 		this.subscriber.off(`userListStream:${this.listId}`, this.send);
@@ -118,6 +122,7 @@ export class UserListChannelService {
 	) {
 	}
 
+	@bindThis
 	public create(id: string, connection: Channel['connection']): UserListChannel {
 		return new UserListChannel(
 			this.userListsRepository,
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 0c5066b736..6763953f9d 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -8,6 +8,7 @@ import type { Packed } from '@/misc/schema.js';
 import type { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { NoteReadService } from '@/core/NoteReadService.js';
 import type { NotificationService } from '@/core/NotificationService.js';
+import { bindThis } from '@/decorators.js';
 import type { ChannelsService } from './ChannelsService.js';
 import type * as websocket from 'websocket';
 import type { EventEmitter } from 'events';
@@ -52,10 +53,10 @@ export default class Connection {
 		if (user) this.user = user;
 		if (token) this.token = token;
 
-		this.onWsConnectionMessage = this.onWsConnectionMessage.bind(this);
-		this.onUserEvent = this.onUserEvent.bind(this);
-		this.onNoteStreamMessage = this.onNoteStreamMessage.bind(this);
-		this.onBroadcastMessage = this.onBroadcastMessage.bind(this);
+		//this.onWsConnectionMessage = this.onWsConnectionMessage.bind(this);
+		//this.onUserEvent = this.onUserEvent.bind(this);
+		//this.onNoteStreamMessage = this.onNoteStreamMessage.bind(this);
+		//this.onBroadcastMessage = this.onBroadcastMessage.bind(this);
 
 		this.wsConnection.on('message', this.onWsConnectionMessage);
 
@@ -74,6 +75,7 @@ export default class Connection {
 		}
 	}
 
+	@bindThis
 	private onUserEvent(data: StreamMessages['user']['payload']) { // { type, body }と展開するとそれぞれ型が分離してしまう
 		switch (data.type) {
 			case 'follow':
@@ -119,6 +121,7 @@ export default class Connection {
 	/**
 	 * クライアントからメッセージ受信時
 	 */
+	@bindThis
 	private async onWsConnectionMessage(data: websocket.Message) {
 		if (data.type !== 'utf8') return;
 		if (data.utf8Data == null) return;
@@ -153,10 +156,12 @@ export default class Connection {
 		}
 	}
 
+	@bindThis
 	private onBroadcastMessage(data: StreamMessages['broadcast']['payload']) {
 		this.sendMessageToWs(data.type, data.body);
 	}
 
+	@bindThis
 	public cacheNote(note: Packed<'Note'>) {
 		const add = (note: Packed<'Note'>) => {
 			const existIndex = this.cachedNotes.findIndex(n => n.id === note.id);
@@ -176,6 +181,7 @@ export default class Connection {
 		if (note.renote) add(note.renote);
 	}
 
+	@bindThis
 	private readNote(body: any) {
 		const id = body.id;
 
@@ -190,6 +196,7 @@ export default class Connection {
 		}
 	}
 
+	@bindThis
 	private onReadNotification(payload: any) {
 		if (!payload.id) return;
 		this.notificationService.readNotification(this.user!.id, [payload.id]);
@@ -198,6 +205,7 @@ export default class Connection {
 	/**
 	 * 投稿購読要求時
 	 */
+	@bindThis
 	private onSubscribeNote(payload: any) {
 		if (!payload.id) return;
 
@@ -215,6 +223,7 @@ export default class Connection {
 	/**
 	 * 投稿購読解除要求時
 	 */
+	@bindThis
 	private onUnsubscribeNote(payload: any) {
 		if (!payload.id) return;
 
@@ -225,6 +234,7 @@ export default class Connection {
 		}
 	}
 
+	@bindThis
 	private async onNoteStreamMessage(data: StreamMessages['note']['payload']) {
 		this.sendMessageToWs('noteUpdated', {
 			id: data.body.id,
@@ -236,6 +246,7 @@ export default class Connection {
 	/**
 	 * チャンネル接続要求時
 	 */
+	@bindThis
 	private onChannelConnectRequested(payload: any) {
 		const { channel, id, params, pong } = payload;
 		this.connectChannel(id, params, channel, pong);
@@ -244,6 +255,7 @@ export default class Connection {
 	/**
 	 * チャンネル切断要求時
 	 */
+	@bindThis
 	private onChannelDisconnectRequested(payload: any) {
 		const { id } = payload;
 		this.disconnectChannel(id);
@@ -252,6 +264,7 @@ export default class Connection {
 	/**
 	 * クライアントにメッセージ送信
 	 */
+	@bindThis
 	public sendMessageToWs(type: string, payload: any) {
 		this.wsConnection.send(JSON.stringify({
 			type: type,
@@ -262,6 +275,7 @@ export default class Connection {
 	/**
 	 * チャンネルに接続
 	 */
+	@bindThis
 	public connectChannel(id: string, params: any, channel: string, pong = false) {
 		const channelService = this.channelsService.getChannelService(channel);
 
@@ -289,6 +303,7 @@ export default class Connection {
 	 * チャンネルから切断
 	 * @param id チャンネルコネクションID
 	 */
+	@bindThis
 	public disconnectChannel(id: string) {
 		const channel = this.channels.find(c => c.id === id);
 
@@ -302,6 +317,7 @@ export default class Connection {
 	 * チャンネルへメッセージ送信要求時
 	 * @param data メッセージ
 	 */
+	@bindThis
 	private onChannelMessageRequested(data: any) {
 		const channel = this.channels.find(c => c.id === data.id);
 		if (channel != null && channel.onMessage != null) {
@@ -309,12 +325,14 @@ 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) {
@@ -325,6 +343,7 @@ export default class Connection {
 		}
 	}
 
+	@bindThis
 	private async updateFollowing() {
 		const followings = await this.followingsRepository.find({
 			where: {
@@ -336,6 +355,7 @@ export default class Connection {
 		this.following = new Set<string>(followings.map(x => x.followeeId));
 	}
 
+	@bindThis
 	private async updateMuting() {
 		const mutings = await this.mutingsRepository.find({
 			where: {
@@ -347,6 +367,7 @@ export default class Connection {
 		this.muting = new Set<string>(mutings.map(x => x.muteeId));
 	}
 
+	@bindThis
 	private async updateBlocking() { // ここでいうBlockingは被Blockingの意
 		const blockings = await this.blockingsRepository.find({
 			where: {
@@ -358,6 +379,7 @@ export default class Connection {
 		this.blocking = new Set<string>(blockings.map(x => x.blockerId));
 	}
 
+	@bindThis
 	private async updateFollowingChannels() {
 		const followings = await this.channelFollowingsRepository.find({
 			where: {
@@ -369,6 +391,7 @@ export default class Connection {
 		this.followingChannels = new Set<string>(followings.map(x => x.followeeId));
 	}
 
+	@bindThis
 	private async updateUserProfile() {
 		this.userProfile = await this.userProfilesRepository.findOneBy({
 			userId: this.user!.id,
@@ -378,6 +401,7 @@ export default class Connection {
 	/**
 	 * ストリームが切れたとき
 	 */
+	@bindThis
 	public dispose() {
 		for (const c of this.channels.filter(c => c.dispose)) {
 			if (c.dispose) c.dispose();