Merge remote-tracking branch 'origin/main'

This commit is contained in:
Sami Mazouz 2022-11-16 11:22:47 +01:00
commit 18bdd48835
No known key found for this signature in database
5 changed files with 5 additions and 4 deletions

View File

@ -1,5 +1,6 @@
# Changelog
## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0)
### Fixed
- (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647))

View File

@ -1,6 +1,6 @@
import type Mithril from 'mithril';
import User from '../models/User';
/**
* The `useronline` helper displays a green circle if the user is online
* The `useronline` helper displays a green circle if the user is online.
*/
export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3,7 +3,7 @@ import User from '../models/User';
import icon from './icon';
/**
* The `useronline` helper displays a green circle if the user is online
* The `useronline` helper displays a green circle if the user is online.
*/
export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null {
if (user.lastSeenAt() && user.isOnline()) {