From b6d0542adf41a38ad4e03f089df77f50054d7ae5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 20 Apr 2021 00:15:53 +0900 Subject: [PATCH 1/2] fix #7466 --- src/models/repositories/user.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index 0d59ed254..1ebc16a56 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -147,7 +147,7 @@ export class UserRepository extends Repository { } 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 ( From 69265c970a90495c160cfd31987e23af5128064e Mon Sep 17 00:00:00 2001 From: marihachi Date: Tue, 20 Apr 2021 10:29:08 +0900 Subject: [PATCH 2/2] update mfm.js (#7468) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3a4930cc..a54ba0441 100644 --- 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",