Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
commit
046c263f13
@ -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",
|
||||
|
@ -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 (
|
||||
|
Loading…
Reference in New Issue
Block a user