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

Small Fixes

Browse Source
This commit is contained in:
Natsumi
2022-08-16 23:07:22 +12:00
parent e4961ddcba
commit bce22b0588
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+19 -2
View File
@@ -1300,7 +1300,7 @@ speechSynthesis.getVoices();
travelingToWorld: '', travelingToWorld: '',
// VRCX // VRCX
$online_for: Date.now(), $online_for: Date.now(),
$offline_for: Date.now(), $offline_for: '',
$travelingToTime: Date.now(), $travelingToTime: Date.now(),
$homeLocation: {}, $homeLocation: {},
$isVRCPlus: false, $isVRCPlus: false,
@@ -6788,8 +6788,10 @@ speechSynthesis.getVoices();
(newState === 'offline' || newState === 'active') && (newState === 'offline' || newState === 'active') &&
ctx.state === 'online' ctx.state === 'online'
) { ) {
if (ctx.ref !== 'undefined') {
ctx.ref.$online_for = ''; ctx.ref.$online_for = '';
ctx.ref.$offline_for = Date.now(); ctx.ref.$offline_for = Date.now();
}
var ts = Date.now(); var ts = Date.now();
var time = ts - $location_at; var time = ts - $location_at;
var worldName = await this.getWorldName(location); var worldName = await this.getWorldName(location);
@@ -6805,9 +6807,11 @@ speechSynthesis.getVoices();
this.addFeed(feed); this.addFeed(feed);
database.addOnlineOfflineToDatabase(feed); database.addOnlineOfflineToDatabase(feed);
} else if (newState === 'online') { } else if (newState === 'online') {
if (ctx.ref !== 'undefined') {
ctx.ref.$location_at = Date.now(); ctx.ref.$location_at = Date.now();
ctx.ref.$online_for = Date.now(); ctx.ref.$online_for = Date.now();
ctx.ref.$offline_for = ''; ctx.ref.$offline_for = '';
}
var worldName = await this.getWorldName(newRef.location); var worldName = await this.getWorldName(newRef.location);
var feed = { var feed = {
created_at: new Date().toJSON(), created_at: new Date().toJSON(),
@@ -10932,9 +10936,11 @@ speechSynthesis.getVoices();
} }
var ref = API.cachedUsers.get(id); var ref = API.cachedUsers.get(id);
if (typeof ref === 'undefined') { if (typeof ref === 'undefined') {
try {
API.getUser({ API.getUser({
userId: id userId: id
}); });
} catch {}
return; return;
} }
API.getFriendStatus({ API.getFriendStatus({
@@ -13236,8 +13242,8 @@ speechSynthesis.getVoices();
instanceId: L.instanceId instanceId: L.instanceId
}); });
} }
D.$location = L;
} }
D.$location = L;
if (L.userId) { if (L.userId) {
var ref = API.cachedUsers.get(L.userId); var ref = API.cachedUsers.get(L.userId);
if (typeof ref === 'undefined') { if (typeof ref === 'undefined') {
@@ -19705,6 +19711,17 @@ speechSynthesis.getVoices();
API.currentUser.location = this.lastLocation.location; API.currentUser.location = this.lastLocation.location;
API.currentUser.travelingToLocation = this.lastLocationDestination; API.currentUser.travelingToLocation = this.lastLocationDestination;
API.currentUser.$travelingToTime = this.lastLocationDestinationTime; API.currentUser.$travelingToTime = this.lastLocationDestinationTime;
var ref = API.cachedUsers.get(API.currentUser.id);
if (typeof ref !== 'undefined') {
var currentLocation = this.lastLocation.location;
if (this.lastLocation.location === 'traveling') {
currentLocation = this.lastLocationDestination;
}
ref.$location = API.parseLocation(currentLocation);
ref.location = this.lastLocation.location;
ref.travelingToLocation = this.lastLocationDestination;
ref.$travelingToTime = this.lastLocationDestinationTime;
}
}; };
$app.data.avatarHistory = new Set(); $app.data.avatarHistory = new Set();
html/src/index.pug
+4 -4
View File
@@ -1532,13 +1532,13 @@ html
div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #e4e7ed14") div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #e4e7ed14")
div(style="flex:none") div(style="flex:none")
location(:location="userDialog.ref.location" :traveling="userDialog.ref.travelingToLocation") location(:location="userDialog.ref.location" :traveling="userDialog.ref.travelingToLocation")
template(v-if="isRealInstance(userDialog.ref.$location.tag)") template(v-if="isRealInstance(userDialog.$location.tag)")
el-tooltip(placement="top" content="Launch/Invite" :disabled="hideTooltips") el-tooltip(placement="top" content="Launch/Invite" :disabled="hideTooltips")
launch(:location="userDialog.ref.$location.tag" style="margin-left:5px") launch(:location="userDialog.$location.tag" style="margin-left:5px")
el-tooltip(placement="top" content="Invite yourself" :disabled="hideTooltips") el-tooltip(placement="top" content="Invite yourself" :disabled="hideTooltips")
invite-yourself(:location="userDialog.ref.$location.tag" style="margin-left:5px") invite-yourself(:location="userDialog.$location.tag" style="margin-left:5px")
el-tooltip(placement="top" content="Refresh player count" :disabled="hideTooltips") el-tooltip(placement="top" content="Refresh player count" :disabled="hideTooltips")
el-button(v-if="userDialog.ref.$location.tag !== lastLocation.location" @click="refreshInstancePlayerCount(userDialog.ref.$location.tag)" size="mini" icon="el-icon-refresh" style="margin-left:5px" circle) el-button(v-if="userDialog.$location.tag !== lastLocation.location" @click="refreshInstancePlayerCount(userDialog.$location.tag)" size="mini" icon="el-icon-refresh" style="margin-left:5px" circle)
span(v-if="userDialog.instance.occupants" style="margin-left:5px") {{ userDialog.instance.occupants }} #[template(v-if="userDialog.instance.friendCount > 0") ({{ userDialog.instance.friendCount }})] span(v-if="userDialog.instance.occupants" style="margin-left:5px") {{ userDialog.instance.occupants }} #[template(v-if="userDialog.instance.friendCount > 0") ({{ userDialog.instance.friendCount }})]
.x-friend-list(style="flex:1;margin-top:10px;max-height:150px") .x-friend-list(style="flex:1;margin-top:10px;max-height:150px")
.x-friend-item(v-if="userDialog.$location.userId" @click="showUserDialog(userDialog.$location.userId)" class="x-friend-item-border") .x-friend-item(v-if="userDialog.$location.userId" @click="showUserDialog(userDialog.$location.userId)" class="x-friend-item-border")