diff --git a/html/src/app.js b/html/src/app.js index b118e365..dfa69f3c 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -7870,14 +7870,9 @@ speechSynthesis.getVoices(); offset: 0, sort: 'updated', order: 'descending', - // user: 'friends', - userId: D.id, - releaseStatus: 'public' + releaseStatus: 'all', + user: 'me', }; - if (params.userId === API.currentUser.id) { - params.user = 'me'; - params.releaseStatus = 'all'; - } var map = new Map(); for (var ref of API.cachedAvatars.values()) { if (ref.authorId === D.id) { @@ -7897,10 +7892,8 @@ speechSynthesis.getVoices(); } }, done: () => { - if (D.id === params.userId) { - var array = Array.from(map.values()); - this.setUserDialogAvatars(array); - } + var array = Array.from(map.values()); + this.setUserDialogAvatars(array); D.isAvatarsLoading = false; } }); @@ -8044,7 +8037,7 @@ speechSynthesis.getVoices(); return _args; }); }); - } else if (command === 'Show Avatar Details') { + } else if (command === 'Show Avatar Author') { var { currentAvatarImageUrl } = D.ref; for (var ref of API.cachedAvatars.values()) { if (ref.imageUrl === currentAvatarImageUrl) { @@ -8060,42 +8053,14 @@ speechSynthesis.getVoices(); var args = API.getAvatarImages({fileId: fileId}); var ownerId = args.json.ownerId; } - D.loading = true; - var params = { - n: 50, - offset: 0, - sort: 'updated', - order: 'descending', - // user: 'friends', - userId: ownerId, - releaseStatus: 'public' - }; - if (params.userId === API.currentUser.id) { - params.user = 'me'; - params.releaseStatus = 'all'; - } - API.bulk({ - fn: 'getAvatars', - N: -1, - params, - done: () => { - D.loading = false; - for (var ref2 of API.cachedAvatars.values()) { - if (ref2.imageUrl === currentAvatarImageUrl) { - this.showAvatarDialog(ref2.id); - return; - } - } - if (ownerId === D.id) { - this.$message({ - message: 'It\'s personal (own) avatar', + if (ownerId === D.id) { + this.$message({ + message: 'It\'s personal (own) avatar', type: 'warning' }); - return; - } - this.showUserDialog(ownerId); - } - }); + return; + } + this.showUserDialog(ownerId); } else { this.$message({ message: 'Sorry, the author is unknown', diff --git a/html/src/index.pug b/html/src/index.pug index 2037a600..23c67548 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -968,7 +968,7 @@ html el-button(:type="(userDialog.incomingRequest || userDialog.outgoingRequest) ? 'success' : (userDialog.isBlock || userDialog.isMute || userDialog.isHideAvatar) ? 'danger' : 'default'" icon="el-icon-more" circle style="margin-left:5px") el-dropdown-menu(#default="dropdown") template(v-if="userDialog.ref.id === API.currentUser.id") - el-dropdown-item(icon="el-icon-s-custom" command="Show Avatar Details") Show Avatar Details + el-dropdown-item(icon="el-icon-s-custom" command="Show Avatar Author") Show Avatar Author el-dropdown-item(icon="el-icon-s-custom" command="Show Fallback Avatar Details") Show Fallback Avatar Details el-dropdown-item(icon="el-icon-edit" command="Edit Social Status" divided) Social Status el-dropdown-item(icon="el-icon-edit" command="Edit Language") Language @@ -986,7 +986,7 @@ html el-dropdown-item(icon="el-icon-close" command="Decline Friend Request") Decline Friend Request el-dropdown-item(v-else-if="userDialog.outgoingRequest" icon="el-icon-close" command="Cancel Friend Request") Cancel Friend Request el-dropdown-item(v-else icon="el-icon-plus" command="Send Friend Request") Send Friend Request - el-dropdown-item(icon="el-icon-s-custom" command="Show Avatar Details" divided) Show Avatar Details + el-dropdown-item(icon="el-icon-s-custom" command="Show Avatar Author" divided) Show Avatar Author el-dropdown-item(icon="el-icon-s-custom" command="Show Fallback Avatar Details") Show Fallback Avatar Details el-dropdown-item(v-if="userDialog.isBlock" icon="el-icon-circle-check" command="Unblock" divided style="color:#F56C6C") Unblock el-dropdown-item(v-else icon="el-icon-circle-close" command="Block" divided) Block @@ -1030,7 +1030,7 @@ html .x-friend-item(style="width:100%;cursor:default") .detail span.name Avatar Name - .extra(@click="userDialogCommand('Show Avatar Details')" style="cursor:pointer;width:fit-content") + .extra(@click="userDialogCommand('Show Avatar Author')" style="cursor:pointer;width:fit-content") span(v-text="userDialog.$avatarInfo.avatarName" style="display:inline-block;margin-right:5px") span(v-if="userDialog.$avatarInfo.ownerId === userDialog.id" style="display:inline-block;color:#E6A23C" ) (own) span(v-else-if="userDialog.$avatarInfo.avatarName && userDialog.$avatarInfo.ownerId" style="display:inline-block;color:#67C23A") ‎(public) @@ -1081,9 +1081,10 @@ html span.name(v-text="world.name") span.extra(v-if="world.occupants") ({{ world.occupants }}) el-tab-pane(label="Avatars") - el-button(type="default" :loading="userDialog.isAvatarsLoading" @click="refreshUserDialogAvatars()" size="mini" icon="el-icon-refresh" circle) - span(style="margin-left:5px") Total {{ userDialogAvatars.length }} - el-radio-group(v-model="userDialog.avatarSorting" size="mini" style="margin-left:30px" @change="changeUserDialogAvatarSorting") + template(v-if="userDialog.ref.id === API.currentUser.id") + el-button(type="default" :loading="userDialog.isAvatarsLoading" @click="refreshUserDialogAvatars()" size="mini" icon="el-icon-refresh" circle) + span(style="margin-left:5px") Total {{ userDialogAvatars.length }} + el-radio-group(v-model="userDialog.avatarSorting" size="mini" style="margin-left:30px" @change="changeUserDialogAvatarSorting") el-radio(label="name") by name el-radio(label="update") by update el-radio-group(v-model="userDialog.avatarReleaseStatus" size="mini" style="margin-left:60px")