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

Small fixes, fix launchGame not recreating shortName

Browse Source
This commit is contained in:
Natsumi
2023-07-04 16:43:01 +12:00
parent ede0c52af2
commit bd33aae8bc
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
html/src/app.js
View File

@@ -11927,10 +11927,9 @@ speechSynthesis.getVoices();
$app.methods.addGameLogLSMedia = function (gameLog, location) {
// [VRCX] LSMedia 0,4268.981,Natsumi-sama,,
// [VRCX] LSMedia 0,6298.292,Natsumi-sama,The Outfit (2022), 1080p
var data =
/LSMedia ([\d.]+),([\d.]+),(.+?),(.+?),(?=[^,]*$) ([\d.]+p)/g.exec(
gameLog.data
);
var data = /LSMedia ([\d.]+),([\d.]+),(.+?),(.+?),(?=[^,]*$)/g.exec(
gameLog.data
);
if (!data) {
return;
}
@@ -12352,15 +12351,15 @@ speechSynthesis.getVoices();
appId = '939473404808007731';
bigIcon = 'zuwa_zuwa_dance';
} else if (
L.worldId === 'wrld_99211ba0-1878-493f-b64e-d3552c10b7cb' ||
L.worldId === 'wrld_1b68f7a8-8aea-4900-b7a2-3fc4139ac817'
L.worldId === 'wrld_1b68f7a8-8aea-4900-b7a2-3fc4139ac817' ||
L.worldId === 'wrld_db9d878f-6e76-4776-8bf2-15bcdd7fc445' ||
L.worldId === 'wrld_435bbf25-f34f-4b8b-82c6-cd809057eb8e'
) {
appId = '968292722391785512';
bigIcon = 'ls_media';
} else if (
L.worldId === 'wrld_791ebf58-54ce-4d3a-a0a0-39f10e1b20b2' ||
L.worldId === 'wrld_435bbf25-f34f-4b8b-82c6-cd809057eb8e' ||
L.worldId === 'wrld_db9d878f-6e76-4776-8bf2-15bcdd7fc445'
L.worldId === 'wrld_86a09fce-a34e-4deb-81be-53c843f97e98'
) {
appId = '1095440531821170820';
bigIcon = 'movie_and_chill';
@@ -14674,10 +14673,10 @@ speechSynthesis.getVoices();
'wrld_dd6d2888-dbdc-47c2-bc98-3d631b2acd7c',
'wrld_52bdcdab-11cd-4325-9655-0fb120846945',
'wrld_2d40da63-8f1f-4011-8a9e-414eb8530acd',
'wrld_99211ba0-1878-493f-b64e-d3552c10b7cb',
'wrld_1b68f7a8-8aea-4900-b7a2-3fc4139ac817',
'wrld_10e5e467-fc65-42ed-8957-f02cace1398c',
'wrld_791ebf58-54ce-4d3a-a0a0-39f10e1b20b2',
'wrld_86a09fce-a34e-4deb-81be-53c843f97e98',
'wrld_435bbf25-f34f-4b8b-82c6-cd809057eb8e',
'wrld_db9d878f-6e76-4776-8bf2-15bcdd7fc445'
];
@@ -18461,6 +18460,8 @@ speechSynthesis.getVoices();
$app.methods.buildInstance = function () {
var D = this.newInstanceDialog;
D.instanceCreated = false;
D.shortName = '';
D.secureOrShortName = '';
var tags = [];
if (D.instanceName) {
D.instanceName = D.instanceName.replace(/[^A-Za-z0-9-_]/g, '');
@@ -18685,6 +18686,7 @@ speechSynthesis.getVoices();
D.roleIds = [];
D.strict = false;
D.shortName = '';
D.secureOrShortName = '';
this.buildInstance();
this.updateNewInstanceDialog();
D.visible = true;

6
html/src/index.pug
View File

@@ -1046,7 +1046,7 @@ html
el-tooltip(v-if="!user.isSubscribedToAnnouncements" placement="top" :content="$t('dialog.group.members.unsubscribed_announcements')")
i.el-icon-chat-line-square(style="margin-right:5px")
template(v-for="roleId in user.roleIds" :key="roleId")
span(v-text="groupDialog.ref.roles.find(role => role.id === roleId).name")
span(v-for="(role, rIndex) in groupDialog.ref.roles" :key="rIndex" v-if="role.id === roleId" v-text="role.name")
span(v-if="user.roleIds.indexOf(roleId) < user.roleIds.length - 1") ,&nbsp;
.x-friend-item(v-if="!isGroupMembersDone" v-loading="isGroupMembersLoading" style="width:100%;height:45px;text-align:center" @click="loadMoreGroupMembers")
.detail(v-if="!isGroupMembersLoading")
@@ -1303,13 +1303,13 @@ html
el-button(size="small" @click="copyInstanceUrl(newInstanceDialog.location)") {{ $t('dialog.new_instance.copy_url') }}
el-button(size="small" @click="selfInvite(newInstanceDialog.location)") {{ $t('dialog.new_instance.self_invite') }}
el-button(size="small" @click="showInviteDialog(newInstanceDialog.location)" :disabled="(newInstanceDialog.accessType === 'friends' || newInstanceDialog.accessType === 'invite') && newInstanceDialog.userId !== API.currentUser.id") {{ $t('dialog.new_instance.invite') }}
el-button(type="primary" size="small" @click="showLaunchDialog(newInstanceDialog.location, newInstanceDialog.secureOrShortName)") {{ $t('dialog.new_instance.launch') }}
el-button(type="primary" size="small" @click="showLaunchDialog(newInstanceDialog.location, newInstanceDialog.shortName)") {{ $t('dialog.new_instance.launch') }}
template(#footer v-else-if="newInstanceDialog.selectedTab === '1'")
template(v-if="newInstanceDialog.instanceCreated")
el-button(size="small" @click="copyInstanceUrl(newInstanceDialog.location)") {{ $t('dialog.new_instance.copy_url') }}
el-button(size="small" @click="selfInvite(newInstanceDialog.location)") {{ $t('dialog.new_instance.self_invite') }}
el-button(size="small" @click="showInviteDialog(newInstanceDialog.location)" :disabled="(newInstanceDialog.accessType === 'friends' || newInstanceDialog.accessType === 'invite') && newInstanceDialog.userId !== API.currentUser.id") {{ $t('dialog.new_instance.invite') }}
el-button(type="primary" size="small" @click="showLaunchDialog(newInstanceDialog.location, newInstanceDialog.secureOrShortName)") {{ $t('dialog.new_instance.launch') }}
el-button(type="primary" size="small" @click="showLaunchDialog(newInstanceDialog.location, newInstanceDialog.shortName)") {{ $t('dialog.new_instance.launch') }}
template(v-else)
el-button(type="primary" size="small" @click="createGroupInstance()" :disabled="!newInstanceDialog.groupId") {{ $t('dialog.new_instance.create_instance') }}

1
html/src/localization/strings/en.json
View File

@@ -438,6 +438,7 @@
"avatar_cache": "Avatar cache:",
"group_cache": "Group cache:",
"avatar_name_cache": "Avatar Name cache:",
"instance_cache": "Instance cache:",
"clear_cache": "Clear Cache",
"auto_clear_cache": "Auto Clear Cache",
"download_history": "Download History",

2
html/src/mixins/tabs/settings.pug
View File

@@ -512,6 +512,8 @@ mixin settingsTab()
span.name {{ $t('view.settings.advanced.advanced.cache_debug.group_cache') }} #[span(v-text="API.cachedGroups.size")]
div.options-container-item
span.name {{ $t('view.settings.advanced.advanced.cache_debug.avatar_name_cache') }} #[span(v-text="API.cachedAvatarNames.size")]
div.options-container-item
span.name {{ $t('view.settings.advanced.advanced.cache_debug.instance_cache') }} #[span(v-text="API.cachedInstances.size")]
div.options-container-item
el-button(size="small" icon="el-icon-delete-solid" @click="clearVRCXCache") {{ $t('view.settings.advanced.advanced.cache_debug.clear_cache') }}
el-button(size="small" icon="el-icon-time" @click="promptAutoClearVRCXCacheFrequency") {{ $t('view.settings.advanced.advanced.cache_debug.auto_clear_cache') }}