MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 06:56:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Natsumi
2022-02-02 20:55:37 +13:00
parent 1ed6bf57b4
commit ae06b9b708
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+23 -5
View File
@@ -8006,10 +8006,11 @@ speechSynthesis.getVoices();
database.addGamelogPortalSpawnToDatabase(entry); database.addGamelogPortalSpawnToDatabase(entry);
break; break;
case 'video-play': case 'video-play':
if (this.lastVideoUrl === gameLog.videoUrl) { var videoUrl = encodeURI(gameLog.videoUrl);
if (this.lastVideoUrl === videoUrl) {
return; return;
} }
this.lastVideoUrl = gameLog.videoUrl; this.lastVideoUrl = videoUrl;
this.addGameLogVideo(gameLog, location, userId); this.addGameLogVideo(gameLog, location, userId);
return; return;
case 'video-sync': case 'video-sync':
@@ -9793,9 +9794,17 @@ speechSynthesis.getVoices();
}; };
$app.methods.search = function () { $app.methods.search = function () {
switch (this.$refs.searchTab.currentName) {
case '0':
this.searchUser(); this.searchUser();
break;
case '1':
this.searchWorld({}); this.searchWorld({});
break;
case '2':
this.searchAvatar(); this.searchAvatar();
break;
}
}; };
$app.methods.searchUser = async function () { $app.methods.searchUser = async function () {
@@ -10428,6 +10437,7 @@ speechSynthesis.getVoices();
database.setFriendLogCurrent(friendLogCurrent); database.setFriendLogCurrent(friendLogCurrent);
this.notifyMenu('friendLog'); this.notifyMenu('friendLog');
this.deleteFriendRequest(id); this.deleteFriendRequest(id);
this.updateSharedFeed(true);
} }
}; };
@@ -10461,6 +10471,7 @@ speechSynthesis.getVoices();
this.friendLog.delete(id); this.friendLog.delete(id);
database.deleteFriendLogCurrent(id); database.deleteFriendLogCurrent(id);
this.notifyMenu('friendLog'); this.notifyMenu('friendLog');
this.updateSharedFeed(true);
}; };
$app.methods.updateFriendships = function (ref) { $app.methods.updateFriendships = function (ref) {
@@ -10513,6 +10524,7 @@ speechSynthesis.getVoices();
database.setFriendLogCurrent(friendLogCurrent); database.setFriendLogCurrent(friendLogCurrent);
ctx.displayName = ref.displayName; ctx.displayName = ref.displayName;
this.notifyMenu('friendLog'); this.notifyMenu('friendLog');
this.updateSharedFeed(true);
} }
if ( if (
ref.$trustLevel && ref.$trustLevel &&
@@ -10538,6 +10550,7 @@ speechSynthesis.getVoices();
this.friendLog.set(ref.id, friendLogCurrent); this.friendLog.set(ref.id, friendLogCurrent);
database.setFriendLogCurrent(friendLogCurrent); database.setFriendLogCurrent(friendLogCurrent);
this.notifyMenu('friendLog'); this.notifyMenu('friendLog');
this.updateSharedFeed(true);
} }
ctx.trustLevel = ref.$trustLevel; ctx.trustLevel = ref.$trustLevel;
}; };
@@ -12690,8 +12703,11 @@ speechSynthesis.getVoices();
break; break;
} }
} }
if (addUser && API.cachedUsers.has(friend.userId)) { if (addUser) {
users.push(API.cachedUsers.get(friend.userId)); var ref = API.cachedUsers.get(friend.userId);
if (typeof ref !== 'undefined') {
users.push(ref);
}
} }
} }
friendCount = users.length - 1; friendCount = users.length - 1;
@@ -13678,7 +13694,9 @@ speechSynthesis.getVoices();
L.user = ref; L.user = ref;
} }
} }
if (instance.friendCount === 0) {
instance.friendCount = instance.users.length; instance.friendCount = instance.users.length;
}
instance.users.sort(compareByLocationAt); instance.users.sort(compareByLocationAt);
rooms.push(instance); rooms.push(instance);
} }
@@ -14133,7 +14151,7 @@ speechSynthesis.getVoices();
if (!avatarId) { if (!avatarId) {
avatarId = await this.checkAvatarCacheRemote( avatarId = await this.checkAvatarCacheRemote(
fileId, fileId,
ownerUserId avatarInfo.ownerId
); );
} }
if (!avatarId) { if (!avatarId) {
html/src/index.pug
+10 -9
View File
@@ -105,6 +105,7 @@ html
div(v-for="id in photonLobbyBots" :key="id" placement="top") div(v-for="id in photonLobbyBots" :key="id" placement="top")
span.x-link(v-text="getDisplayNameFromPhotonId(id)" @click="showUserFromPhotonId(id)" style="margin-right:5px") span.x-link(v-text="getDisplayNameFromPhotonId(id)" @click="showUserFromPhotonId(id)" style="margin-right:5px")
span(v-text="photonLobbyBots.length" style="color:red") span(v-text="photonLobbyBots.length" style="color:red")
|  #[timer(v-if="lastLocation.date" :epoch="lastLocation.date")]
//- el-tag(type="info" effect="plain" size="mini" v-text="worldDialog.fileSize" style="margin-right:5px") //- el-tag(type="info" effect="plain" size="mini" v-text="worldDialog.fileSize" style="margin-right:5px")
div(style="margin-top:5px") div(style="margin-top:5px")
span(v-show="currentInstanceWorld.name !== currentInstanceWorld.description" v-text="currentInstanceWorld.description" style="font-size:12px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2") span(v-show="currentInstanceWorld.name !== currentInstanceWorld.description" v-text="currentInstanceWorld.description" style="font-size:12px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2")
@@ -259,12 +260,12 @@ html
template(v-else-if="scope.row.type === 'Avatar'") template(v-else-if="scope.row.type === 'Avatar'")
el-popover(placement="right" width="500px" trigger="click") el-popover(placement="right" width="500px" trigger="click")
img.x-link(slot="reference" v-lazy="scope.row.previousCurrentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px") img.x-link(slot="reference" v-lazy="scope.row.previousCurrentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px")
img.x-link(v-lazy="scope.row.previousCurrentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, scope.row.previousCurrentAvatarImageUrl)") img.x-link(v-lazy="scope.row.previousCurrentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, '', scope.row.previousCurrentAvatarImageUrl)")
span(style="position:relative;top:-50px;margin:0 5px") span(style="position:relative;top:-50px;margin:0 5px")
i.el-icon-right i.el-icon-right
el-popover(placement="right" width="500px" trigger="click") el-popover(placement="right" width="500px" trigger="click")
img.x-link(slot="reference" v-lazy="scope.row.currentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px") img.x-link(slot="reference" v-lazy="scope.row.currentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px")
img.x-link(v-lazy="scope.row.currentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, scope.row.currentAvatarImageUrl)") img.x-link(v-lazy="scope.row.currentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, '', scope.row.currentAvatarImageUrl)")
template(v-else-if="scope.row.type === 'Status'") template(v-else-if="scope.row.type === 'Status'")
el-tooltip(placement="top") el-tooltip(placement="top")
template(#content) template(#content)
@@ -546,7 +547,7 @@ html
el-button(type="text" icon="el-icon-close" size="mini" @click.stop="deleteFavorite(favorite.id)" style="margin-left:5px") el-button(type="text" icon="el-icon-close" size="mini" @click.stop="deleteFavorite(favorite.id)" style="margin-left:5px")
//- friendLog //- friendLog
.x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'friendLog'") .x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'friendLog'" v-if="$refs.menu && $refs.menu.activeIndex === 'friendLog'")
data-tables(v-bind="friendLogTable") data-tables(v-bind="friendLogTable")
template(#tool) template(#tool)
div(style="margin:0 0 10px;display:flex;align-items:center") div(style="margin:0 0 10px;display:flex;align-items:center")
@@ -572,7 +573,7 @@ html
el-button(type="text" icon="el-icon-close" size="mini" @click="deleteFriendLog(scope.row)") el-button(type="text" icon="el-icon-close" size="mini" @click="deleteFriendLog(scope.row)")
//- moderation //- moderation
.x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'moderation'") .x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'moderation'" v-if="$refs.menu && $refs.menu.activeIndex === 'moderation'")
data-tables(v-bind="playerModerationTable" v-loading="API.isPlayerModerationsLoading") data-tables(v-bind="playerModerationTable" v-loading="API.isPlayerModerationsLoading")
template(#tool) template(#tool)
div(style="margin:0 0 10px;display:flex;align-items:center") div(style="margin:0 0 10px;display:flex;align-items:center")
@@ -599,7 +600,7 @@ html
el-button(v-if="scope.row.sourceUserId === API.currentUser.id" type="text" icon="el-icon-close" size="mini" @click="deletePlayerModeration(scope.row)") el-button(v-if="scope.row.sourceUserId === API.currentUser.id" type="text" icon="el-icon-close" size="mini" @click="deletePlayerModeration(scope.row)")
//- notification //- notification
.x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'notification'" v-loading="API.isNotificationsLoading") .x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'notification'" v-if="$refs.menu && $refs.menu.activeIndex === 'notification'" v-loading="API.isNotificationsLoading")
data-tables(v-bind="notificationTable") data-tables(v-bind="notificationTable")
template(#tool) template(#tool)
div(style="margin:0 0 10px;display:flex;align-items:center") div(style="margin:0 0 10px;display:flex;align-items:center")
@@ -858,7 +859,7 @@ html
span(v-if="scope.row.$timeSpent") {{ scope.row.$timeSpent | timeToText }} span(v-if="scope.row.$timeSpent") {{ scope.row.$timeSpent | timeToText }}
el-table-column(label="Last Seen" width="170" prop="$lastSeen" sortable :sort-method="(a, b) => sortAlphabetically(a, b, '$lastSeen')") el-table-column(label="Last Seen" width="170" prop="$lastSeen" sortable :sort-method="(a, b) => sortAlphabetically(a, b, '$lastSeen')")
template(v-once #default="scope") template(v-once #default="scope")
span {{ scope.row.$timeSpent | formatDate('long') }} span {{ scope.row.$lastSeen | formatDate('long') }}
el-table-column(label="Last Login" width="170" prop="last_login" sortable :sort-method="(a, b) => sortAlphabetically(a, b, 'last_login')") el-table-column(label="Last Login" width="170" prop="last_login" sortable :sort-method="(a, b) => sortAlphabetically(a, b, 'last_login')")
template(v-once #default="scope") template(v-once #default="scope")
span {{ scope.row.last_login | formatDate('long') }} span {{ scope.row.last_login | formatDate('long') }}
@@ -1016,8 +1017,8 @@ html
span.name Enable span.name Enable
el-switch(v-model="openVR" @change="saveOpenVROption") el-switch(v-model="openVR" @change="saveOpenVROption")
div.options-container-item div.options-container-item
span.name Always start with SteamVR span.name Start overlay with
el-switch(v-model="openVRAlways" @change="saveOpenVROption" :disabled="!openVR") el-switch(v-model="openVRAlways" @change="saveOpenVROption" inactive-text="VRChat" active-text="SteamVR" :disabled="!openVR")
div.options-container-item div.options-container-item
span.name Hide Private Worlds span.name Hide Private Worlds
el-switch(v-model="hidePrivateFromFeed" @change="saveOpenVROption") el-switch(v-model="hidePrivateFromFeed" @change="saveOpenVROption")
@@ -1695,7 +1696,7 @@ html
.detail .detail
span.name Favorites span.name Favorites
span.extra {{ worldDialog.ref.favorites | commaNumber }} span.extra {{ worldDialog.ref.favorites | commaNumber }}
| #[template(v-if="worldDialog.ref.favorites > 0") ({{ Math.round(((worldDialog.ref.favorites - worldDialog.ref.visits) / worldDialog.ref.visits * 100 + 100) * 100) / 100 }}%)] | #[template(v-if="worldDialog.ref.favorites > 0 && worldDialog.ref.visits > 0") ({{ Math.round(((worldDialog.ref.favorites - worldDialog.ref.visits) / worldDialog.ref.visits * 100 + 100) * 100) / 100 }}%)]
.x-friend-item(style="cursor:default") .x-friend-item(style="cursor:default")
.detail .detail
span.name Visits span.name Visits