Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

syuilo · syuilo · commit 046c263f131c · 2021-04-20T11:36:08.000+09:00
diff --git a/package.json b/package.json
@@ -181,7 +181,7 @@
 		"markdown-it": "12.0.5",
 		"markdown-it-anchor": "7.1.0",
 		"matter-js": "0.17.1",
-		"mfm-js": "0.16.0",
+		"mfm-js": "0.16.2",
 		"mocha": "8.3.2",
 		"moji": "0.5.1",
 		"ms": "2.1.3",
diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts
@@ -147,7 +147,7 @@ export class UserRepository extends Repository<User> {
 	}
 
 	public getOnlineStatus(user: User): string {
-		if (user.hideOnlineStatus == null) return 'unknown';
+		if (user.hideOnlineStatus) return 'unknown';
 		if (user.lastActiveDate == null) return 'unknown';
 		const elapsed = Date.now() - user.lastActiveDate.getTime();
 		return (

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ export class UserRepository extends Repository<User> {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public getOnlineStatus(user: User): string {`
`150`		`- if (user.hideOnlineStatus == null) return 'unknown';`
	`150`	`+ if (user.hideOnlineStatus) return 'unknown';`
`151`	`151`	`if (user.lastActiveDate == null) return 'unknown';`
`152`	`152`	`const elapsed = Date.now() - user.lastActiveDate.getTime();`
`153`	`153`	`return (`