diff --git a/framework/core/js/src/common/helpers/userOnline.js b/framework/core/js/src/common/helpers/userOnline.js index 8a7052c89..fcbef1673 100644 --- a/framework/core/js/src/common/helpers/userOnline.js +++ b/framework/core/js/src/common/helpers/userOnline.js @@ -7,7 +7,7 @@ import icon from './icon'; * @return {Object} */ export default function userOnline(user) { - if (user.lastSeenTime() && user.isOnline()) { + if (user.lastSeenAt() && user.isOnline()) { return {icon('fas fa-circle')}; } } diff --git a/framework/core/js/src/common/models/User.js b/framework/core/js/src/common/models/User.js index f49512ffc..284f75413 100644 --- a/framework/core/js/src/common/models/User.js +++ b/framework/core/js/src/common/models/User.js @@ -20,7 +20,7 @@ Object.assign(User.prototype, { groups: Model.hasMany('groups'), joinTime: Model.attribute('joinTime', Model.transformDate), - lastSeenTime: Model.attribute('lastSeenTime', Model.transformDate), + lastSeenAt: Model.attribute('lastSeenAt', Model.transformDate), readTime: Model.attribute('readTime', Model.transformDate), unreadNotificationsCount: Model.attribute('unreadNotificationsCount'), newNotificationsCount: Model.attribute('newNotificationsCount'), @@ -54,7 +54,7 @@ Object.assign(User.prototype, { * @public */ isOnline() { - return this.lastSeenTime() > moment().subtract(5, 'minutes').toDate(); + return this.lastSeenAt() > moment().subtract(5, 'minutes').toDate(); }, /** diff --git a/framework/core/js/src/forum/components/SettingsPage.js b/framework/core/js/src/forum/components/SettingsPage.js index 9ea3993a7..e58e1204c 100644 --- a/framework/core/js/src/forum/components/SettingsPage.js +++ b/framework/core/js/src/forum/components/SettingsPage.js @@ -134,7 +134,7 @@ export default class SettingsPage extends UserPage { children: app.translator.trans('core.forum.settings.privacy_disclose_online_label'), state: this.user.preferences().discloseOnline, onchange: (value, component) => { - this.user.pushAttributes({lastSeenTime: null}); + this.user.pushAttributes({lastSeenAt: null}); this.preferenceSaver('discloseOnline')(value, component); } }) diff --git a/framework/core/js/src/forum/components/UserCard.js b/framework/core/js/src/forum/components/UserCard.js index 68c743a00..fa042005c 100644 --- a/framework/core/js/src/forum/components/UserCard.js +++ b/framework/core/js/src/forum/components/UserCard.js @@ -79,16 +79,16 @@ export default class UserCard extends Component { infoItems() { const items = new ItemList(); const user = this.props.user; - const lastSeenTime = user.lastSeenTime(); + const lastSeenAt = user.lastSeenAt(); - if (lastSeenTime) { + if (lastSeenAt) { const online = user.isOnline(); items.add('lastSeen', ( {online ? [icon('fas fa-circle'), ' ', app.translator.trans('core.forum.user.online_text')] - : [icon('far fa-clock'), ' ', humanTime(lastSeenTime)]} + : [icon('far fa-clock'), ' ', humanTime(lastSeenAt)]} )); } diff --git a/framework/core/src/Api/Serializer/UserSerializer.php b/framework/core/src/Api/Serializer/UserSerializer.php index 94103106e..9ac6fcb70 100644 --- a/framework/core/src/Api/Serializer/UserSerializer.php +++ b/framework/core/src/Api/Serializer/UserSerializer.php @@ -50,7 +50,7 @@ class UserSerializer extends BasicUserSerializer if ($user->getPreference('discloseOnline')) { $attributes += [ - 'lastSeenTime' => $this->formatDate($user->last_seen_at) + 'lastSeenAt' => $this->formatDate($user->last_seen_at) ]; }