From 987168b863c52d0548050ffbac569782bb9a8cef Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 13 Apr 2019 01:43:22 +0900
Subject: strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
---
 src/server/api/stream/index.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/server/api/stream/index.ts')

diff --git a/src/server/api/stream/index.ts b/src/server/api/stream/index.ts
index abbd91ec81..f73f3229d5 100644
--- a/src/server/api/stream/index.ts
+++ b/src/server/api/stream/index.ts
@@ -28,13 +28,13 @@ export default class Connection {
 	constructor(
 		wsConnection: websocket.connection,
 		subscriber: EventEmitter,
-		user: User,
-		app: App
+		user: User | null | undefined,
+		app: App | null | undefined
 	) {
 		this.wsConnection = wsConnection;
-		this.user = user;
-		this.app = app;
 		this.subscriber = subscriber;
+		if (user) this.user = user;
+		if (app) this.app = app;
 
 		this.wsConnection.on('message', this.onWsConnectionMessage);
 
@@ -52,6 +52,8 @@ export default class Connection {
 	 */
 	@autobind
 	private async onWsConnectionMessage(data: websocket.IMessage) {
+		if (data.utf8Data == null) return;
+
 		const { type, body } = JSON.parse(data.utf8Data);
 
 		switch (type) {
@@ -89,7 +91,7 @@ export default class Connection {
 	@autobind
 	private onReadNotification(payload: any) {
 		if (!payload.id) return;
-		readNotification(this.user.id, [payload.id]);
+		readNotification(this.user!.id, [payload.id]);
 	}
 
 	/**
@@ -109,7 +111,7 @@ export default class Connection {
 			this.subscriber.on(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 		}
 
-		if (payload.read) {
+		if (payload.read && this.user) {
 			readNote(this.user.id, payload.id);
 		}
 	}
@@ -221,7 +223,7 @@ export default class Connection {
 	private async updateFollowing() {
 		const followings = await Followings.find({
 			where: {
-				followerId: this.user.id
+				followerId: this.user!.id
 			},
 			select: ['followeeId']
 		});
@@ -233,7 +235,7 @@ export default class Connection {
 	private async updateMuting() {
 		const mutings = await Mutings.find({
 			where: {
-				muterId: this.user.id
+				muterId: this.user!.id
 			},
 			select: ['muteeId']
 		});
@@ -247,7 +249,7 @@ export default class Connection {
 	@autobind
 	public dispose() {
 		for (const c of this.channels.filter(c => c.dispose)) {
-			c.dispose();
+			if (c.dispose) c.dispose();
 		}
 
 		if (this.followingClock) clearInterval(this.followingClock);
-- 
cgit v1.2.3-freya