diff --git a/packages/backend/src/server/api/stream/channels/admin.ts b/packages/backend/src/server/api/stream/channels/admin.ts index a0140d395d..b0f6e8da13 100644 --- a/packages/backend/src/server/api/stream/channels/admin.ts +++ b/packages/backend/src/server/api/stream/channels/admin.ts @@ -18,7 +18,7 @@ class AdminChannel extends Channel { @bindThis public async init(params: JsonObject) { // Subscribe admin stream - this.subscriber.on(`adminStream:${this.user!.id}`, data => { + this.subscriber?.on(`adminStream:${this.user!.id}`, data => { this.send(data); }); } diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts index 0974dbdb25..189bfe8ab8 100644 --- a/packages/backend/src/server/api/stream/channels/antenna.ts +++ b/packages/backend/src/server/api/stream/channels/antenna.ts @@ -33,7 +33,7 @@ class AntennaChannel extends Channel { this.antennaId = params.antennaId; // Subscribe stream - this.subscriber.on(`antennaStream:${this.antennaId}`, this.onEvent); + this.subscriber?.on(`antennaStream:${this.antennaId}`, this.onEvent); } @bindThis @@ -52,7 +52,7 @@ class AntennaChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off(`antennaStream:${this.antennaId}`, this.onEvent); + this.subscriber?.off(`antennaStream:${this.antennaId}`, this.onEvent); } } diff --git a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts index a7f538eeda..83b7e842fc 100644 --- a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts @@ -42,7 +42,7 @@ class BubbleTimelineChannel extends Channel { this.withBots = !!(params.withBots ?? true); // Subscribe events - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -85,7 +85,7 @@ class BubbleTimelineChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts index 9eea423088..e0ab8b00f1 100644 --- a/packages/backend/src/server/api/stream/channels/channel.ts +++ b/packages/backend/src/server/api/stream/channels/channel.ts @@ -36,7 +36,7 @@ class ChannelChannel extends Channel { this.withRenotes = !!(params.withRenotes ?? true); // Subscribe stream - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -56,7 +56,7 @@ class ChannelChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } diff --git a/packages/backend/src/server/api/stream/channels/chat-room.ts b/packages/backend/src/server/api/stream/channels/chat-room.ts index 648e407569..1fafac0070 100644 --- a/packages/backend/src/server/api/stream/channels/chat-room.ts +++ b/packages/backend/src/server/api/stream/channels/chat-room.ts @@ -33,7 +33,7 @@ class ChatRoomChannel extends Channel { if (typeof params.roomId !== 'string') return; this.roomId = params.roomId; - this.subscriber.on(`chatRoomStream:${this.roomId}`, this.onEvent); + this.subscriber?.on(`chatRoomStream:${this.roomId}`, this.onEvent); } @bindThis @@ -54,7 +54,7 @@ class ChatRoomChannel extends Channel { @bindThis public dispose() { - this.subscriber.off(`chatRoomStream:${this.roomId}`, this.onEvent); + this.subscriber?.off(`chatRoomStream:${this.roomId}`, this.onEvent); } } diff --git a/packages/backend/src/server/api/stream/channels/chat-user.ts b/packages/backend/src/server/api/stream/channels/chat-user.ts index b37aef29d1..c708997c99 100644 --- a/packages/backend/src/server/api/stream/channels/chat-user.ts +++ b/packages/backend/src/server/api/stream/channels/chat-user.ts @@ -33,7 +33,7 @@ class ChatUserChannel extends Channel { if (typeof params.otherId !== 'string') return; this.otherId = params.otherId; - this.subscriber.on(`chatUserStream:${this.user!.id}-${this.otherId}`, this.onEvent); + this.subscriber?.on(`chatUserStream:${this.user!.id}-${this.otherId}`, this.onEvent); } @bindThis @@ -54,7 +54,7 @@ class ChatUserChannel extends Channel { @bindThis public dispose() { - this.subscriber.off(`chatUserStream:${this.user!.id}-${this.otherId}`, this.onEvent); + this.subscriber?.off(`chatUserStream:${this.user!.id}-${this.otherId}`, this.onEvent); } } diff --git a/packages/backend/src/server/api/stream/channels/drive.ts b/packages/backend/src/server/api/stream/channels/drive.ts index fa097fdc35..39dc18a56d 100644 --- a/packages/backend/src/server/api/stream/channels/drive.ts +++ b/packages/backend/src/server/api/stream/channels/drive.ts @@ -18,7 +18,7 @@ class DriveChannel extends Channel { @bindThis public async init(params: JsonObject) { // Subscribe drive stream - this.subscriber.on(`driveStream:${this.user!.id}`, data => { + this.subscriber?.on(`driveStream:${this.user!.id}`, data => { this.send(data); }); } 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 9bdd299ddb..dbdeebc5ab 100644 --- a/packages/backend/src/server/api/stream/channels/global-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts @@ -43,7 +43,7 @@ class GlobalTimelineChannel extends Channel { this.withBots = !!(params.withBots ?? true); // Subscribe events - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -86,7 +86,7 @@ class GlobalTimelineChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts index e0331828d2..09fb641392 100644 --- a/packages/backend/src/server/api/stream/channels/hashtag.ts +++ b/packages/backend/src/server/api/stream/channels/hashtag.ts @@ -34,7 +34,7 @@ class HashtagChannel extends Channel { this.q = params.q; // Subscribe stream - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -52,7 +52,7 @@ class HashtagChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } 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 bb28cbf81e..8e6dfa7131 100644 --- a/packages/backend/src/server/api/stream/channels/home-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts @@ -34,7 +34,7 @@ class HomeTimelineChannel extends Channel { this.withRenotes = !!(params.withRenotes ?? true); this.withFiles = !!(params.withFiles ?? false); - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -80,7 +80,7 @@ class HomeTimelineChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } 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 82d96c6e7e..5150e2b550 100644 --- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts @@ -46,7 +46,7 @@ class HybridTimelineChannel extends Channel { this.withBots = !!(params.withBots ?? true); // Subscribe events - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -97,7 +97,7 @@ class HybridTimelineChannel extends Channel { @bindThis public dispose(): void { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } 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 c6c04d356f..b4698fca19 100644 --- a/packages/backend/src/server/api/stream/channels/local-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts @@ -45,7 +45,7 @@ class LocalTimelineChannel extends Channel { this.withBots = !!(params.withBots ?? true); // Subscribe events - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); } @bindThis @@ -89,7 +89,7 @@ class LocalTimelineChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off('notesStream', this.onNote); } } diff --git a/packages/backend/src/server/api/stream/channels/main.ts b/packages/backend/src/server/api/stream/channels/main.ts index 193907504a..f39387d4e1 100644 --- a/packages/backend/src/server/api/stream/channels/main.ts +++ b/packages/backend/src/server/api/stream/channels/main.ts @@ -28,7 +28,7 @@ class MainChannel extends Channel { @bindThis public async init(params: JsonObject) { // Subscribe main stream channel - this.subscriber.on(`mainStream:${this.user!.id}`, async data => { + this.subscriber?.on(`mainStream:${this.user!.id}`, async data => { switch (data.type) { case 'notification': { // Ignore notifications from instances the user has muted diff --git a/packages/backend/src/server/api/stream/channels/reversi-game.ts b/packages/backend/src/server/api/stream/channels/reversi-game.ts index b7fffbe844..702284185b 100644 --- a/packages/backend/src/server/api/stream/channels/reversi-game.ts +++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts @@ -37,7 +37,7 @@ class ReversiGameChannel extends Channel { if (typeof params.gameId !== 'string') return; this.gameId = params.gameId; - this.subscriber.on(`reversiGameStream:${this.gameId}`, this.send); + this.subscriber?.on(`reversiGameStream:${this.gameId}`, this.send); } @bindThis @@ -105,7 +105,7 @@ class ReversiGameChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off(`reversiGameStream:${this.gameId}`, this.send); + this.subscriber?.off(`reversiGameStream:${this.gameId}`, this.send); } } diff --git a/packages/backend/src/server/api/stream/channels/reversi.ts b/packages/backend/src/server/api/stream/channels/reversi.ts index dc73d3a3d8..46f519e407 100644 --- a/packages/backend/src/server/api/stream/channels/reversi.ts +++ b/packages/backend/src/server/api/stream/channels/reversi.ts @@ -25,13 +25,13 @@ class ReversiChannel extends Channel { @bindThis public async init(params: JsonObject) { - this.subscriber.on(`reversiStream:${this.user!.id}`, this.send); + this.subscriber?.on(`reversiStream:${this.user!.id}`, this.send); } @bindThis public dispose() { // Unsubscribe events - this.subscriber.off(`reversiStream:${this.user!.id}`, this.send); + this.subscriber?.off(`reversiStream:${this.user!.id}`, this.send); } } diff --git a/packages/backend/src/server/api/stream/channels/role-timeline.ts b/packages/backend/src/server/api/stream/channels/role-timeline.ts index 2a8d4f7ffd..8278e9c962 100644 --- a/packages/backend/src/server/api/stream/channels/role-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/role-timeline.ts @@ -34,7 +34,7 @@ class RoleTimelineChannel extends Channel { if (typeof params.roleId !== 'string') return; this.roleId = params.roleId; - this.subscriber.on(`roleTimelineStream:${this.roleId}`, this.onEvent); + this.subscriber?.on(`roleTimelineStream:${this.roleId}`, this.onEvent); } @bindThis @@ -80,7 +80,7 @@ class RoleTimelineChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off(`roleTimelineStream:${this.roleId}`, this.onEvent); + this.subscriber?.off(`roleTimelineStream:${this.roleId}`, this.onEvent); } } 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 98bcbd11ba..007b482553 100644 --- a/packages/backend/src/server/api/stream/channels/user-list.ts +++ b/packages/backend/src/server/api/stream/channels/user-list.ts @@ -54,9 +54,9 @@ class UserListChannel extends Channel { if (!listExist) return; // Subscribe stream - this.subscriber.on(`userListStream:${this.listId}`, this.send); + this.subscriber?.on(`userListStream:${this.listId}`, this.send); - this.subscriber.on('notesStream', this.onNote); + this.subscriber?.on('notesStream', this.onNote); this.updateListUsers(); this.listUsersClock = setInterval(this.updateListUsers, 5000); @@ -121,8 +121,8 @@ class UserListChannel extends Channel { @bindThis public dispose() { // Unsubscribe events - this.subscriber.off(`userListStream:${this.listId}`, this.send); - this.subscriber.off('notesStream', this.onNote); + this.subscriber?.off(`userListStream:${this.listId}`, this.send); + this.subscriber?.off('notesStream', this.onNote); clearInterval(this.listUsersClock); }