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

Fixes

Browse Source
This commit is contained in:
Natsumi
2021-06-16 13:57:13 +12:00
parent e5815e9a5f
commit c2bc249e23
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
html/src/app.js
View File

@@ -4172,6 +4172,9 @@ speechSynthesis.getVoices();
break; break;
} }
} }
if (ctx.data === API.currentUser.displayName) {
isFriend = true;
}
if (isFriend) { if (isFriend) {
friendList.push(ctx.data); friendList.push(ctx.data);
} }
@@ -8364,10 +8367,13 @@ speechSynthesis.getVoices();
} }
} }
} else if (L.isOffline === false) { } else if (L.isOffline === false) {
for (var { ref } of this.friends.values()) { for (var friend of this.friends.values()) {
if ((typeof ref !== 'undefined') && if ((typeof friend.ref !== 'undefined') &&
(ref.location === L.tag)) { (friend.ref.location === L.tag)) {
users.push(ref); if ((friend.state !== 'online') && (friend.ref.location === 'private')) {
continue;
}
users.push(friend.ref);
} }
} }
} }
@@ -9809,7 +9815,6 @@ speechSynthesis.getVoices();
if (D.accessType === 'invite+') { if (D.accessType === 'invite+') {
tags.push('~canRequestInvite'); tags.push('~canRequestInvite');
} }
} }
if (D.region !== 'USA') { if (D.region !== 'USA') {
if (D.region === 'Europe') { if (D.region === 'Europe') {
@@ -12510,6 +12515,11 @@ speechSynthesis.getVoices();
$app.methods.parseLocationUrl = function (location) { $app.methods.parseLocationUrl = function (location) {
var url = new URL(location); var url = new URL(location);
var urlPath = url.pathname;
if ('/world/' === urlPath.substring(5, 12)) {
var worldId = urlPath.substring(12);
return worldId;
}
var urlParams = new URLSearchParams(url.search); var urlParams = new URLSearchParams(url.search);
var worldId = urlParams.get('worldId'); var worldId = urlParams.get('worldId');
var instanceId = urlParams.get('instanceId'); var instanceId = urlParams.get('instanceId');

24
html/src/index.pug
View File

@@ -85,17 +85,19 @@ html
template(v-once #default="scope") template(v-once #default="scope")
div(style="position:relative;font-size:14px") div(style="position:relative;font-size:14px")
template(v-if="scope.row.type === 'GPS'") template(v-if="scope.row.type === 'GPS'")
location(:location="scope.row.location[1]") template(v-if="scope.row.location[1]")
el-tag(type="info" effect="plain" size="mini" style="margin-left:5px") {{ scope.row.time | timeToText }} location(:location="scope.row.location[1]")
br el-tag(type="info" effect="plain" size="mini" style="margin-left:5px") {{ scope.row.time | timeToText }}
span br
i.el-icon-right span
location(:location="scope.row.location[0]") i.el-icon-right
location(v-if="scope.row.location[0]" :location="scope.row.location[0]")
template(v-else-if="scope.row.type === 'Offline'") template(v-else-if="scope.row.type === 'Offline'")
location(:location="scope.row.location") template(v-if="scope.row.location")
el-tag(type="info" effect="plain" size="mini" style="margin-left:5px") {{ scope.row.time | timeToText }} location(:location="scope.row.location")
el-tag(type="info" effect="plain" size="mini" style="margin-left:5px") {{ scope.row.time | timeToText }}
template(v-else-if="scope.row.type === 'Online'") template(v-else-if="scope.row.type === 'Online'")
location(:location="scope.row.location") location(v-if="scope.row.location" :location="scope.row.location")
template(v-else-if="scope.row.type === 'Avatar'") template(v-else-if="scope.row.type === 'Avatar'")
template(v-if="scope.row.avatar[0] === Object(scope.row.avatar[0])") template(v-if="scope.row.avatar[0] === Object(scope.row.avatar[0])")
//- high resolution (v2) 2020.07.12~ //- high resolution (v2) 2020.07.12~
@@ -152,9 +154,9 @@ html
el-table-column(label="Detail") el-table-column(label="Detail")
template(v-once #default="scope") template(v-once #default="scope")
template(v-if="scope.row.type === 'GPS'") template(v-if="scope.row.type === 'GPS'")
location(:location="scope.row.location[0]") location(v-if="scope.row.location[0]" :location="scope.row.location[0]")
template(v-else-if="scope.row.type === 'Offline' || scope.row.type === 'Online'") template(v-else-if="scope.row.type === 'Offline' || scope.row.type === 'Online'")
location(:location="scope.row.location") location(v-if="scope.row.location" :location="scope.row.location")
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)

3
html/src/vr.js
View File

@@ -382,6 +382,7 @@ speechSynthesis.getVoices();
instanceId: '', instanceId: '',
instanceName: '', instanceName: '',
accessType: '', accessType: '',
region: '',
userId: null, userId: null,
hiddenId: null, hiddenId: null,
privateId: null, privateId: null,
@@ -417,6 +418,8 @@ speechSynthesis.getVoices();
ctx.friendsId = value; ctx.friendsId = value;
} else if (key === 'canRequestInvite') { } else if (key === 'canRequestInvite') {
ctx.canRequestInvite = true; ctx.canRequestInvite = true;
} else if (key === 'region') {
ctx.region = value;
} }
} else { } else {
ctx.instanceName = s; ctx.instanceName = s;