github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-24 19:51:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename user.lastSeenTime

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:33:48 +09:30
parent 2ee10bb49f
commit d9d8162684
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/common/helpers/userOnline.js
View File

@ -7,7 +7,7 @@ import icon from './icon';
* @return {Object} * @return {Object}
*/ */
export default function userOnline(user) { export default function userOnline(user) {
if (user.lastSeenTime() && user.isOnline()) { if (user.lastSeenAt() && user.isOnline()) {
return <span className="UserOnline">{icon('fas fa-circle')}</span>; return <span className="UserOnline">{icon('fas fa-circle')}</span>;
} }
} }

4
js/src/common/models/User.js
View File

@ -20,7 +20,7 @@ Object.assign(User.prototype, {
groups: Model.hasMany('groups'), groups: Model.hasMany('groups'),
joinTime: Model.attribute('joinTime', Model.transformDate), joinTime: Model.attribute('joinTime', Model.transformDate),
lastSeenTime: Model.attribute('lastSeenTime', Model.transformDate), lastSeenAt: Model.attribute('lastSeenAt', Model.transformDate),
readTime: Model.attribute('readTime', Model.transformDate), readTime: Model.attribute('readTime', Model.transformDate),
unreadNotificationsCount: Model.attribute('unreadNotificationsCount'), unreadNotificationsCount: Model.attribute('unreadNotificationsCount'),
newNotificationsCount: Model.attribute('newNotificationsCount'), newNotificationsCount: Model.attribute('newNotificationsCount'),
@ -54,7 +54,7 @@ Object.assign(User.prototype, {
* @public * @public
*/ */
isOnline() { isOnline() {
return this.lastSeenTime() > moment().subtract(5, 'minutes').toDate(); return this.lastSeenAt() > moment().subtract(5, 'minutes').toDate();
}, },
/** /**

2
js/src/forum/components/SettingsPage.js
View File

@ -134,7 +134,7 @@ export default class SettingsPage extends UserPage {
children: app.translator.trans('core.forum.settings.privacy_disclose_online_label'), children: app.translator.trans('core.forum.settings.privacy_disclose_online_label'),
state: this.user.preferences().discloseOnline, state: this.user.preferences().discloseOnline,
onchange: (value, component) => { onchange: (value, component) => {
this.user.pushAttributes({lastSeenTime: null}); this.user.pushAttributes({lastSeenAt: null});
this.preferenceSaver('discloseOnline')(value, component); this.preferenceSaver('discloseOnline')(value, component);
} }
}) })

6
js/src/forum/components/UserCard.js
View File

@ -79,16 +79,16 @@ export default class UserCard extends Component {
infoItems() { infoItems() {
const items = new ItemList(); const items = new ItemList();
const user = this.props.user; const user = this.props.user;
const lastSeenTime = user.lastSeenTime(); const lastSeenAt = user.lastSeenAt();
if (lastSeenTime) { if (lastSeenAt) {
const online = user.isOnline(); const online = user.isOnline();
items.add('lastSeen', ( items.add('lastSeen', (
<span className={'UserCard-lastSeen' + (online ? ' online' : '')}> <span className={'UserCard-lastSeen' + (online ? ' online' : '')}>
{online {online
? [icon('fas fa-circle'), ' ', app.translator.trans('core.forum.user.online_text')] ? [icon('fas fa-circle'), ' ', app.translator.trans('core.forum.user.online_text')]
: [icon('far fa-clock'), ' ', humanTime(lastSeenTime)]} : [icon('far fa-clock'), ' ', humanTime(lastSeenAt)]}
</span> </span>
)); ));
} }

2
src/Api/Serializer/UserSerializer.php
View File

@ -50,7 +50,7 @@ class UserSerializer extends BasicUserSerializer
if ($user->getPreference('discloseOnline')) { if ($user->getPreference('discloseOnline')) {
$attributes += [ $attributes += [
'lastSeenTime' => $this->formatDate($user->last_seen_at) 'lastSeenAt' => $this->formatDate($user->last_seen_at)
]; ];
} }