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

Remove content settings from new instance dialog

Browse Source
This commit is contained in:
Natsumi
2025-06-26 19:22:14 +12:00
parent 97cc2dc81a
commit 134e7a5358
4 changed files with 4 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app.js
View File

@@ -9921,13 +9921,6 @@ console.log(`isLinux: ${LINUX}`);
'instanceDialogQueueEnabled',
true
),
contentSettings: this.instanceContentSettings || [],
selectedContentSettings: JSON.parse(
await configRepository.getString(
'instanceDialogSelectedContentSettings',
JSON.stringify(this.instanceContentSettings || [])
)
),
roleIds: [],
groupRef: {}
};
@@ -9961,18 +9954,12 @@ console.log(`isLinux: ${LINUX}`);
} else if (D.region === 'Japan') {
region = 'jp';
}
var contentSettings = {};
for (var setting of D.contentSettings) {
contentSettings[setting] =
D.selectedContentSettings.includes(setting);
}
var params = {
type,
canRequestInvite,
worldId: D.worldId,
ownerId: API.currentUser.id,
region,
contentSettings
region
};
if (type === 'group') {
params.groupAccessType = D.groupAccessType;

64
src/components/dialogs/NewInstanceDialog.vue
View File

@@ -70,41 +70,6 @@
<el-radio-button label="Japan">{{ $t('dialog.new_instance.region_jp') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('dialog.new_instance.content_settings')">
<el-select
v-model="newInstanceDialog.selectedContentSettings"
multiple
:placeholder="$t('dialog.new_instance.content_placeholder')"
style="width: 100%"
@change="buildInstance">
<el-option-group :label="$t('dialog.new_instance.content_placeholder')">
<el-option
class="x-friend-item"
value="emoji"
:label="$t('dialog.new_instance.content_emoji')"></el-option>
<el-option
class="x-friend-item"
value="stickers"
:label="$t('dialog.new_instance.content_stickers')"></el-option>
<el-option
class="x-friend-item"
value="pedestals"
:label="$t('dialog.new_instance.content_pedestals')"></el-option>
<el-option
class="x-friend-item"
value="prints"
:label="$t('dialog.new_instance.content_prints')"></el-option>
<el-option
class="x-friend-item"
value="drones"
:label="$t('dialog.new_instance.content_drones')"></el-option>
<el-option
class="x-friend-item"
value="props"
:label="$t('dialog.new_instance.content_items')"></el-option>
</el-option-group>
</el-select>
</el-form-item>
<el-form-item
v-if="newInstanceDialog.accessType === 'group'"
:label="$t('dialog.new_instance.queueEnabled')">
@@ -528,10 +493,6 @@
type: Array,
required: true
},
instanceContentSettings: {
type: Array,
required: true
},
createNewInstance: {
type: Function,
required: true
@@ -579,9 +540,7 @@
lastSelectedGroupId: '',
selectedGroupRoles: [],
roleIds: [],
groupRef: {},
contentSettings: this.instanceContentSettings,
selectedContentSettings: []
groupRef: {}
},
inviteDialog: {
visible: false,
@@ -690,23 +649,10 @@
configRepository
.getBool('instanceDialogAgeGate', false)
.then((value) => (this.newInstanceDialog.ageGate = value));
configRepository
.getString('instanceDialogSelectedContentSettings', JSON.stringify(this.instanceContentSettings))
.then((value) => (this.newInstanceDialog.selectedContentSettings = JSON.parse(value)));
},
saveNewInstanceDialog() {
const {
accessType,
region,
instanceName,
userId,
groupId,
groupAccessType,
queueEnabled,
ageGate,
selectedContentSettings
} = this.newInstanceDialog;
const { accessType, region, instanceName, userId, groupId, groupAccessType, queueEnabled, ageGate } =
this.newInstanceDialog;
configRepository.setString('instanceDialogAccessType', accessType);
configRepository.setString('instanceRegion', region);
@@ -716,10 +662,6 @@
configRepository.setString('instanceDialogGroupAccessType', groupAccessType);
configRepository.setBool('instanceDialogQueueEnabled', queueEnabled);
configRepository.setBool('instanceDialogAgeGate', ageGate);
configRepository.setString(
'instanceDialogSelectedContentSettings',
JSON.stringify(selectedContentSettings)
);
},
newInstanceTabClick(tab) {
if (tab === '1') {

2
src/components/dialogs/WorldDialog/WorldDialog.vue
View File

@@ -753,7 +753,6 @@
<NewInstanceDialog
:new-instance-dialog-location-tag="newInstanceDialogLocationTag"
:create-new-instance="createNewInstance"
:instance-content-settings="instanceContentSettings"
:offline-friends="offlineFriends"
:active-friends="activeFriends"
:online-friends="onlineFriends"
@@ -825,7 +824,6 @@
isAgeGatedInstancesVisible: Boolean,
createNewInstance: Function,
instanceContentSettings: Array,
offlineFriends: Array,
activeFriends: Array,
onlineFriends: Array,

1
src/mixins/dialogs/dialogs.pug
View File

@@ -104,7 +104,6 @@ mixin dialogs
:updateInstanceInfo='updateInstanceInfo'
:isAgeGatedInstancesVisible='isAgeGatedInstancesVisible'
:createNewInstance='createNewInstance'
:instanceContentSettings='instanceContentSettings'
:offlineFriends='offlineFriends'
:activeFriends='activeFriends'
:onlineFriends='onlineFriends'