natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
syuilo 2021-04-20 11:36:08 +09:00
parent 4d9e3b9012 1043020f27
commit 046c263f13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -181,7 +181,7 @@
"markdown-it": "12.0.5", "markdown-it": "12.0.5",
"markdown-it-anchor": "7.1.0", "markdown-it-anchor": "7.1.0",
"matter-js": "0.17.1", "matter-js": "0.17.1",
"mfm-js": "0.16.0", "mfm-js": "0.16.2",
"mocha": "8.3.2", "mocha": "8.3.2",
"moji": "0.5.1", "moji": "0.5.1",
"ms": "2.1.3", "ms": "2.1.3",

2
src/models/repositories/user.ts
View File

@ -147,7 +147,7 @@ export class UserRepository extends Repository<User> {
} }
public getOnlineStatus(user: User): string { public getOnlineStatus(user: User): string {
if (user.hideOnlineStatus == null) return 'unknown'; if (user.hideOnlineStatus) return 'unknown';
if (user.lastActiveDate == null) return 'unknown'; if (user.lastActiveDate == null) return 'unknown';
const elapsed = Date.now() - user.lastActiveDate.getTime(); const elapsed = Date.now() - user.lastActiveDate.getTime();
return ( return (