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

Small fixes

Browse Source
This commit is contained in:
Natsumi
2022-05-31 11:19:56 +12:00
parent 29c0daf436
commit 2a5672561e
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
html/src/app.js
View File

@@ -9010,6 +9010,7 @@ speechSynthesis.getVoices();
var text = 'User joined as Quest in desktop mode'; var text = 'User joined as Quest in desktop mode';
} else if ( } else if (
data.user.last_platform === 'android' && data.user.last_platform === 'android' &&
platforms.length > 0 &&
!platforms.includes('android') !platforms.includes('android')
) { ) {
var text = 'User joined as Quest in PC only world'; var text = 'User joined as Quest in PC only world';
@@ -9957,7 +9958,7 @@ speechSynthesis.getVoices();
bigIcon = 'vr_dancing'; bigIcon = 'vr_dancing';
} else if ( } else if (
L.worldId === 'wrld_52bdcdab-11cd-4325-9655-0fb120846945' || L.worldId === 'wrld_52bdcdab-11cd-4325-9655-0fb120846945' ||
L.worldId === 'wrld_db612673-d536-488e-a776-24e7877c161b' L.worldId === 'wrld_2d40da63-8f1f-4011-8a9e-414eb8530acd'
) { ) {
appId = '939473404808007731'; appId = '939473404808007731';
bigIcon = 'zuwa_zuwa_dance'; bigIcon = 'zuwa_zuwa_dance';
@@ -11942,7 +11943,7 @@ speechSynthesis.getVoices();
'wrld_42377cf1-c54f-45ed-8996-5875b0573a83', 'wrld_42377cf1-c54f-45ed-8996-5875b0573a83',
'wrld_dd6d2888-dbdc-47c2-bc98-3d631b2acd7c', 'wrld_dd6d2888-dbdc-47c2-bc98-3d631b2acd7c',
'wrld_52bdcdab-11cd-4325-9655-0fb120846945', 'wrld_52bdcdab-11cd-4325-9655-0fb120846945',
'wrld_db612673-d536-488e-a776-24e7877c161b', 'wrld_2d40da63-8f1f-4011-8a9e-414eb8530acd',
'wrld_99211ba0-1878-493f-b64e-d3552c10b7cb', 'wrld_99211ba0-1878-493f-b64e-d3552c10b7cb',
'wrld_1b68f7a8-8aea-4900-b7a2-3fc4139ac817' 'wrld_1b68f7a8-8aea-4900-b7a2-3fc4139ac817'
]; ];
@@ -12483,13 +12484,10 @@ speechSynthesis.getVoices();
}; };
$app.methods.promptChangeWorldYouTubePreview = function (world) { $app.methods.promptChangeWorldYouTubePreview = function (world) {
this.$prompt( this.$prompt('Enter world YouTube preview', 'Change YouTube Preview', {
'Enter world YouTube preview', distinguishCancelAndClose: true,
'Change YouTube Preview', confirmButtonText: 'OK',
{ cancelButtonText: 'Cancel',
distinguishCancelAndClose: true,
confirmButtonText: 'OK',
cancelButtonText: 'Cancel',
inputValue: world.ref.previewYoutubeId, inputValue: world.ref.previewYoutubeId,
inputErrorMessage: 'Valid YouTube URL is required', inputErrorMessage: 'Valid YouTube URL is required',
callback: (action, instance) => { callback: (action, instance) => {
@@ -12513,15 +12511,13 @@ speechSynthesis.getVoices();
message: 'Invalid YouTube URL', message: 'Invalid YouTube URL',
type: 'error' type: 'error'
}); });
return; return;
}
} }
if ( }
instance.inputValue !== world.ref.previewYoutubeId if (instance.inputValue !== world.ref.previewYoutubeId) {
) { API.saveWorld({
API.saveWorld({ id: world.id,
id: world.id, previewYoutubeId: instance.inputValue
previewYoutubeId: instance.inputValue
}).then((args) => { }).then((args) => {
this.$message({ this.$message({
message: 'World YouTube preview changed', message: 'World YouTube preview changed',
@@ -12529,11 +12525,10 @@ speechSynthesis.getVoices();
}); });
return args; return args;
}); });
}
} }
} }
} }
); });
}; };
$app.methods.promptMaxTableSizeDialog = function () { $app.methods.promptMaxTableSizeDialog = function () {
@@ -19296,6 +19291,23 @@ speechSynthesis.getVoices();
return `#${decColor.toString(16).substr(1)}`; return `#${decColor.toString(16).substr(1)}`;
}; };
$app.methods.isFriendOnline = function (friend) {
if (
typeof friend === 'undefined' ||
typeof friend.ref === 'undefined'
) {
return false;
}
if (friend.state === 'online') {
return true;
}
if (friend.state !== 'online' && friend.ref.location !== 'private') {
// wat
return true;
}
return false;
};
$app = new Vue($app); $app = new Vue($app);
window.$app = $app; window.$app = $app;
})(); })();

2
html/src/index.pug
View File

@@ -1475,7 +1475,7 @@ html
el-dropdown-item(icon="el-icon-delete" command="Unfriend" divided) Unfriend el-dropdown-item(icon="el-icon-delete" command="Unfriend" divided) Unfriend
el-tabs(ref="userDialogTabs" @tab-click="userDialogTabClick") el-tabs(ref="userDialogTabs" @tab-click="userDialogTabClick")
el-tab-pane(label="Info") el-tab-pane(label="Info")
template(v-if="!userDialog.isFriend || (userDialog.friend.state === 'online' || (userDialog.friend.state !== 'online' && userDialog.ref.location !== 'private'))") template(v-if="!userDialog.isFriend || isFriendOnline(userDialog.friend)")
div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #eee") div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #eee")
div(style="flex:none") div(style="flex:none")
location(:location="userDialog.ref.location") location(:location="userDialog.ref.location")