diff --git a/html/src/app.js b/html/src/app.js index 53a069ee..704f95d9 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -3864,10 +3864,12 @@ speechSynthesis.getVoices(); // #region | API: PlayerModeration API.cachedPlayerModerations = new Map(); + API.cachedPlayerModerationsUserIds = new Set(); API.isPlayerModerationsLoading = false; API.$on('LOGIN', function () { this.cachedPlayerModerations.clear(); + this.cachedPlayerModerationsUserIds.clear(); this.isPlayerModerationsLoading = false; this.refreshPlayerModerations(); }); @@ -3917,6 +3919,7 @@ speechSynthesis.getVoices(); }); } } + this.cachedPlayerModerationsUserIds.delete(moderated); }); API.applyPlayerModeration = function (json) { @@ -3941,10 +3944,14 @@ speechSynthesis.getVoices(); Object.assign(ref, json); ref.$isExpired = false; } + if (json.targetUserId) { + this.cachedPlayerModerationsUserIds.add(json.targetUserId); + } return ref; }; API.expirePlayerModerations = function () { + this.cachedPlayerModerationsUserIds.clear(); for (var ref of this.cachedPlayerModerations.values()) { ref.$isExpired = true; } @@ -11162,12 +11169,20 @@ speechSynthesis.getVoices(); } catch (err) { console.error(err); } - if (userId) { - this.gameLogApiLoggingEnabled = true; - if (!API.cachedUsers.has(userId)) { - API.getUser({ userId }); - } + if (!userId) { + break; } + this.gameLogApiLoggingEnabled = true; + if ( + API.cachedUsers.has(userId) || + API.cachedPlayerModerationsUserIds.has(userId) + ) { + break; + } + if (this.debugGameLog || this.debugWebRequests) { + console.log('Fetching user from gameLog:', userId); + } + API.getUser({ userId }); break; case 'avatar-change': var ref = this.lastLocation.playerList.get(gameLog.displayName); @@ -11328,7 +11343,7 @@ speechSynthesis.getVoices(); return; } if (this.debugGameLog) { - console.log('Fetching userId for', displayName); + console.log('Searching for userId for:', displayName); } var params = { n: 5, diff --git a/html/src/mixins/tabs/playerList.pug b/html/src/mixins/tabs/playerList.pug index 64652be3..c0ca6e8c 100644 --- a/html/src/mixins/tabs/playerList.pug +++ b/html/src/mixins/tabs/playerList.pug @@ -22,7 +22,6 @@ mixin playerListTab() el-tag.x-tag-platform-ios(v-if="currentInstanceWorld.isIOS" type="info" effect="plain" size="mini" style="margin-right:5px") iOS span.x-grey(v-if="currentInstanceWorld.bundleSizes['ios']" style="margin-left:5px;border-left:inherit;padding-left:5px") {{ currentInstanceWorld.bundleSizes['ios'].fileSize }} el-tag(v-if="currentInstanceWorld.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }} - el-tag(type="info" effect="plain" size="mini" v-text="currentInstanceWorld.fileSize" style="margin-right:5px") el-tag(v-if="currentInstanceWorld.inCache" type="info" effect="plain" size="mini" style="margin-right:5px") span(v-text="currentInstanceWorld.cacheSize") | {{ $t('dialog.world.tags.cache') }}