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

Small fixes

Browse Source
This commit is contained in:
Natsumi
2023-06-07 18:21:41 +12:00
parent 09c4087ed4
commit 3780d61054
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+15 -12
View File
@@ -380,7 +380,11 @@ speechSynthesis.getVoices();
// merge requests // merge requests
var req = this.pendingGetRequests.get(init.url); var req = this.pendingGetRequests.get(init.url);
if (typeof req !== 'undefined') { if (typeof req !== 'undefined') {
return req; if (req.time >= Date.now() - 10000) {
// 10s
return req.req;
}
this.pendingGetRequests.delete(init.url);
} }
} else if (init.uploadImage || init.uploadFilePUT) { } else if (init.uploadImage || init.uploadFilePUT) {
// nothing // nothing
@@ -513,7 +517,7 @@ speechSynthesis.getVoices();
req.finally(() => { req.finally(() => {
this.pendingGetRequests.delete(init.url); this.pendingGetRequests.delete(init.url);
}); });
this.pendingGetRequests.set(init.url, req); this.pendingGetRequests.set(init.url, { req, time: Date.now() });
} }
return req; return req;
}; };
@@ -24872,7 +24876,7 @@ speechSynthesis.getVoices();
this.updateSharedFeed(true); this.updateSharedFeed(true);
}; };
$app.methods.instanceQueueUpdate = function ( $app.methods.instanceQueueUpdate = async function (
instanceId, instanceId,
position, position,
queueSize queueSize
@@ -24900,18 +24904,17 @@ speechSynthesis.getVoices();
}); });
} }
if (!ref.$groupName) { if (!ref.$groupName) {
this.getGroupName(instanceId).then((name) => { ref.$groupName = await this.getGroupName(instanceId);
ref.$groupName = name;
ref.$msgBox.message = `You are in position ${ref.position} of ${ref.queueSize} in the queue for ${name} `;
});
} }
if (!ref.$worldName) { if (!ref.$worldName) {
this.getWorldName(instanceId).then((name) => { ref.$worldName = await this.getWorldName(instanceId);
ref.$worldName = name;
});
} }
var displayLocation = this.displayLocation(
ref.$msgBox.message = `You are in position ${ref.position} of ${ref.queueSize} in the queue for ${ref.$groupName} `; instanceId,
ref.$worldName,
ref.$groupName
);
ref.$msgBox.message = `You are in position ${ref.position} of ${ref.queueSize} in the queue for ${displayLocation} `;
API.queuedInstances.set(instanceId, ref); API.queuedInstances.set(instanceId, ref);
}; };
html/src/index.pug
+1 -1
View File
@@ -1265,7 +1265,7 @@ html
el-checkbox(v-model="newInstanceDialog.queueEnabled" @change="buildInstance") el-checkbox(v-model="newInstanceDialog.queueEnabled" @change="buildInstance")
el-form-item(:label="$t('dialog.new_instance.world_id')") el-form-item(:label="$t('dialog.new_instance.world_id')")
el-input(v-model="newInstanceDialog.worldId" size="mini" @click.native="$event.target.tagName === 'INPUT' && $event.target.select()" @change="buildInstance") el-input(v-model="newInstanceDialog.worldId" size="mini" @click.native="$event.target.tagName === 'INPUT' && $event.target.select()" @change="buildInstance")
el-form-item(:label="$t('dialog.new_instance.group_id')" v-if="newInstanceDialog.accessType === 'group'") el-form-item(:label="$t('dialog.new_instance.group_id')")
el-select(v-model="newInstanceDialog.groupId" clearable :placeholder="$t('dialog.new_instance.group_placeholder')" filterable style="width:100%" @change="buildInstance") el-select(v-model="newInstanceDialog.groupId" clearable :placeholder="$t('dialog.new_instance.group_placeholder')" filterable style="width:100%" @change="buildInstance")
el-option-group(:label="$t('dialog.new_instance.group_placeholder')") el-option-group(:label="$t('dialog.new_instance.group_placeholder')")
el-option.x-friend-item(v-if="group" v-for="group in API.currentUserGroups.values()" :key="group.id" :label="group.name" :value="group.id" style="height:auto;width:478px") el-option.x-friend-item(v-if="group" v-for="group in API.currentUserGroups.values()" :key="group.id" :label="group.name" :value="group.id" style="height:auto;width:478px")