diff --git a/src/api/favorite.js b/src/api/favorite.js index 7f61ab47..2fe371ce 100644 --- a/src/api/favorite.js +++ b/src/api/favorite.js @@ -18,7 +18,7 @@ const favoriteReq = { }, /** - * @type {import('../types/favorite').getFavorites} + * @type {import('../types/api/favorite').GetFavorites} */ getFavorites(params) { return request('favorites', { @@ -34,7 +34,7 @@ const favoriteReq = { }, /** - * @type {import('../types/favorite').addFavorite} + * @type {import('../types/api/favorite').AddFavorite} */ addFavorite(params) { return request('favorites', { @@ -130,7 +130,7 @@ const favoriteReq = { }, /** - * @type {import('../types/favorite').getFavoriteWorlds} + * @type {import('../types/api/favorite').GetFavoriteWorlds} */ getFavoriteWorlds(params) { return request('worlds/favorites', { @@ -146,7 +146,7 @@ const favoriteReq = { }, /** - * @type {import('../types/favorite').getFavoriteAvatars} + * @type {import('../types/api/favorite').GetFavoriteAvatars} */ getFavoriteAvatars(params) { return request('avatars/favorites', { diff --git a/src/api/group.js b/src/api/group.js index 601d2800..a794c0f8 100644 --- a/src/api/group.js +++ b/src/api/group.js @@ -56,7 +56,7 @@ const groupReq = { }); }, /** - * @type {import('../types/group').getGroup} + * @type {import('../types/api/group').GetGroup} */ getGroup(params) { return request(`groups/${params.groupId}`, { @@ -302,7 +302,7 @@ const groupReq = { * groupId: string, * userId: string * }} params - * @return { Promise<{json: any, params}> } + * @return { Promise<{json: any, params, ref?: any}> } */ getGroupMember(params) { return request(`groups/${params.groupId}/members/${params.userId}`, { @@ -557,7 +557,7 @@ const groupReq = { }); }, /** - * @param {{ groupId: string, eventTypes: array }} params + * @param {{ groupId: string, n: number, offset: number, eventTypes?: array }} params * @return { Promise<{json: any, params}> } */ getGroupLogs(params) { diff --git a/src/api/notification.js b/src/api/notification.js index 9e83be3b..1f2f411a 100644 --- a/src/api/notification.js +++ b/src/api/notification.js @@ -84,11 +84,15 @@ const notificationReq = { /** * @param {{ - * receiverUserId: string, - * type: string, - * message: string, - * seen: boolean, - * details: JsonString + * receiverUserId?: string, + * type?: string, + * message?: string, + * seen?: boolean, + * details?: JsonString, + * instanceId?: string, + * worldId?: string, + * worldName?: string, + * messageSlot?: string, * }} params * @param receiverUserId * @return { Promise<{json: any, params}> } diff --git a/src/api/user.js b/src/api/user.js index 1c0d2314..2a40bf60 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -77,8 +77,8 @@ const userReq = { }, /** - * @param {string[]} params User tags to add - * @returns {Promise<{json: any, params: string[]}>} + * @param {{tags: string[]}} params User tags to add + * @returns {Promise<{json: any, params: {tags: string[]}}>} */ addUserTags(params) { const userStore = useUserStore(); @@ -96,8 +96,8 @@ const userReq = { }, /** - * @param {string[]} params User tags to remove - * @returns {Promise<{json: any, params: string[]}>} + * @param {{tags: string[]}} params User tags to remove + * @returns {Promise<{json: any, params: {tags: string[]}}>} */ removeUserTags(params) { const userStore = useUserStore(); diff --git a/src/components/dialogs/AvatarDialog/AvatarDialog.vue b/src/components/dialogs/AvatarDialog/AvatarDialog.vue index 094c0401..27348b48 100644 --- a/src/components/dialogs/AvatarDialog/AvatarDialog.vue +++ b/src/components/dialogs/AvatarDialog/AvatarDialog.vue @@ -403,21 +403,21 @@ icon="el-icon-back" circle class="x-link" - style="margin-left: 0px" + style="margin-left: 0" @click.stop="reorderAvatarGalleryImage(imageUrl, -1)"> diff --git a/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue b/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue index 0138abae..dc5fa464 100644 --- a/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue +++ b/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue @@ -24,12 +24,9 @@
-
+
-
- -
+
diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue index 197dc8aa..cbda6706 100644 --- a/src/components/dialogs/GroupDialog/GroupDialog.vue +++ b/src/components/dialogs/GroupDialog/GroupDialog.vue @@ -1253,7 +1253,13 @@ auditLogTypes: [] }); - let loadMoreGroupMembersParams = {}; + let loadMoreGroupMembersParams = ref({ + n: 100, + offset: 0, + groupId: '', + sort: '', + roleId: '' + }); watch( () => groupDialog.value.loading, @@ -1632,16 +1638,17 @@ const D = groupDialog.value; D.members = []; isGroupMembersDone.value = false; - loadMoreGroupMembersParams = { + loadMoreGroupMembersParams.value = { n: 100, offset: 0, - groupId: D.id + groupId: D.id, + ...loadMoreGroupMembersParams.value }; if (D.memberSortOrder.value) { - loadMoreGroupMembersParams.sort = D.memberSortOrder.value; + loadMoreGroupMembersParams.value.sort = D.memberSortOrder.value; } if (D.memberFilter.id !== null) { - loadMoreGroupMembersParams.roleId = D.memberFilter.id; + loadMoreGroupMembersParams.value.roleId = D.memberFilter.id; } if (D.inGroup) { await groupRequest @@ -1669,7 +1676,7 @@ return; } const D = groupDialog.value; - const params = loadMoreGroupMembersParams; + const params = loadMoreGroupMembersParams.value; D.memberSearch = ''; isGroupMembersLoading.value = true; await groupRequest @@ -1802,7 +1809,7 @@ async function setGroupMemberFilter(filter) { const D = groupDialog.value; - if (D.memberFilter.value === filter) { + if (D.memberFilter === filter) { return; } D.memberFilter = filter; diff --git a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue index beb824dc..fa1f06ab 100644 --- a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue +++ b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue @@ -80,10 +80,10 @@ v-text="t(item.name)"> + >{{ t(item.name) }}
@@ -101,7 +101,7 @@ }} -