diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue index 21b3565f..15ef8aa6 100644 --- a/src/components/dialogs/GroupDialog/GroupDialog.vue +++ b/src/components/dialogs/GroupDialog/GroupDialog.vue @@ -611,11 +611,23 @@ {{ formatDateFilter(groupDialog.ref.createdAt, 'long') }} - +
- {{ t('dialog.group.info.last_visited') }} - {{formatDateFilter(groupDialog.lastVisit,'long') }} + + {{ t('dialog.group.info.last_visited') }} + + + + + {{ formatDateFilter(groupDialog.lastVisit, 'long') }}
@@ -1176,8 +1188,7 @@ + :current-user="currentUser" /> @@ -1215,7 +1226,7 @@ } from '../../../stores'; import InviteGroupDialog from '../InviteGroupDialog.vue'; import GroupPostEditDialog from './GroupPostEditDialog.vue'; - import PreviousInstancesGroupDialog from "../PreviousInstancesDialog/PreviousInstancesGroupDialog.vue"; + import PreviousInstancesGroupDialog from '../PreviousInstancesDialog/PreviousInstancesGroupDialog.vue'; const { t } = useI18n(); diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue index 61fa321a..ec57b342 100644 --- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue +++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue @@ -1,161 +1,158 @@ diff --git a/src/localization/en/en.json b/src/localization/en/en.json index 3bfeeb1f..f8a12a9a 100644 --- a/src/localization/en/en.json +++ b/src/localization/en/en.json @@ -829,7 +829,7 @@ "instance_hard_closed": "hard closed", "close_instance": "Close Instance", "instance_age_gated": "age gated", - "open_previous_instance": "Open Previous Instance" + "open_previous_instance": "Open Previous Instances" }, "groups": { "header": "Groups", diff --git a/src/service/database/gameLog.js b/src/service/database/gameLog.js index d5a00fe1..9243077e 100644 --- a/src/service/database/gameLog.js +++ b/src/service/database/gameLog.js @@ -324,11 +324,11 @@ const gameLog = { return ref; }, - async getPreviousInstancesByGroupName(groupName) { - var data = new Map(); + async getPreviousInstancesByGroupId(groupId) { + const data = new Map(); await sqliteService.execute( (dbRow) => { - var time = 0; + let time = 0; if (dbRow[2]) { time = dbRow[2]; } @@ -345,21 +345,17 @@ const gameLog = { }; data.set(row.location, row); }, - `SELECT created_at, location, time, world_name, group_name FROM gamelog_location WHERE group_name = @groupName ORDER BY id DESC`, + `SELECT created_at, location, time, world_name, group_name FROM gamelog_location WHERE location LIKE '%${groupId}%' ORDER BY id DESC`, { - '@groupName': groupName + '@groupId': groupId } ); return data; }, async getLastSeen(input, inCurrentWorld) { - if (inCurrentWorld) { - var count = 2; - } else { - var count = 1; - } - var ref = { + const count = inCurrentWorld ? 2 : 1; + let ref = { created_at: '', userId: '' };