mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-19 14:53:50 +02:00
Remove content settings from new instance dialog
This commit is contained in:
15
src/app.js
15
src/app.js
@@ -9921,13 +9921,6 @@ console.log(`isLinux: ${LINUX}`);
|
|||||||
'instanceDialogQueueEnabled',
|
'instanceDialogQueueEnabled',
|
||||||
true
|
true
|
||||||
),
|
),
|
||||||
contentSettings: this.instanceContentSettings || [],
|
|
||||||
selectedContentSettings: JSON.parse(
|
|
||||||
await configRepository.getString(
|
|
||||||
'instanceDialogSelectedContentSettings',
|
|
||||||
JSON.stringify(this.instanceContentSettings || [])
|
|
||||||
)
|
|
||||||
),
|
|
||||||
roleIds: [],
|
roleIds: [],
|
||||||
groupRef: {}
|
groupRef: {}
|
||||||
};
|
};
|
||||||
@@ -9961,18 +9954,12 @@ console.log(`isLinux: ${LINUX}`);
|
|||||||
} else if (D.region === 'Japan') {
|
} else if (D.region === 'Japan') {
|
||||||
region = 'jp';
|
region = 'jp';
|
||||||
}
|
}
|
||||||
var contentSettings = {};
|
|
||||||
for (var setting of D.contentSettings) {
|
|
||||||
contentSettings[setting] =
|
|
||||||
D.selectedContentSettings.includes(setting);
|
|
||||||
}
|
|
||||||
var params = {
|
var params = {
|
||||||
type,
|
type,
|
||||||
canRequestInvite,
|
canRequestInvite,
|
||||||
worldId: D.worldId,
|
worldId: D.worldId,
|
||||||
ownerId: API.currentUser.id,
|
ownerId: API.currentUser.id,
|
||||||
region,
|
region
|
||||||
contentSettings
|
|
||||||
};
|
};
|
||||||
if (type === 'group') {
|
if (type === 'group') {
|
||||||
params.groupAccessType = D.groupAccessType;
|
params.groupAccessType = D.groupAccessType;
|
||||||
|
|||||||
@@ -70,41 +70,6 @@
|
|||||||
<el-radio-button label="Japan">{{ $t('dialog.new_instance.region_jp') }}</el-radio-button>
|
<el-radio-button label="Japan">{{ $t('dialog.new_instance.region_jp') }}</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</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
|
<el-form-item
|
||||||
v-if="newInstanceDialog.accessType === 'group'"
|
v-if="newInstanceDialog.accessType === 'group'"
|
||||||
:label="$t('dialog.new_instance.queueEnabled')">
|
:label="$t('dialog.new_instance.queueEnabled')">
|
||||||
@@ -528,10 +493,6 @@
|
|||||||
type: Array,
|
type: Array,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
instanceContentSettings: {
|
|
||||||
type: Array,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
createNewInstance: {
|
createNewInstance: {
|
||||||
type: Function,
|
type: Function,
|
||||||
required: true
|
required: true
|
||||||
@@ -579,9 +540,7 @@
|
|||||||
lastSelectedGroupId: '',
|
lastSelectedGroupId: '',
|
||||||
selectedGroupRoles: [],
|
selectedGroupRoles: [],
|
||||||
roleIds: [],
|
roleIds: [],
|
||||||
groupRef: {},
|
groupRef: {}
|
||||||
contentSettings: this.instanceContentSettings,
|
|
||||||
selectedContentSettings: []
|
|
||||||
},
|
},
|
||||||
inviteDialog: {
|
inviteDialog: {
|
||||||
visible: false,
|
visible: false,
|
||||||
@@ -690,23 +649,10 @@
|
|||||||
configRepository
|
configRepository
|
||||||
.getBool('instanceDialogAgeGate', false)
|
.getBool('instanceDialogAgeGate', false)
|
||||||
.then((value) => (this.newInstanceDialog.ageGate = value));
|
.then((value) => (this.newInstanceDialog.ageGate = value));
|
||||||
|
|
||||||
configRepository
|
|
||||||
.getString('instanceDialogSelectedContentSettings', JSON.stringify(this.instanceContentSettings))
|
|
||||||
.then((value) => (this.newInstanceDialog.selectedContentSettings = JSON.parse(value)));
|
|
||||||
},
|
},
|
||||||
saveNewInstanceDialog() {
|
saveNewInstanceDialog() {
|
||||||
const {
|
const { accessType, region, instanceName, userId, groupId, groupAccessType, queueEnabled, ageGate } =
|
||||||
accessType,
|
this.newInstanceDialog;
|
||||||
region,
|
|
||||||
instanceName,
|
|
||||||
userId,
|
|
||||||
groupId,
|
|
||||||
groupAccessType,
|
|
||||||
queueEnabled,
|
|
||||||
ageGate,
|
|
||||||
selectedContentSettings
|
|
||||||
} = this.newInstanceDialog;
|
|
||||||
|
|
||||||
configRepository.setString('instanceDialogAccessType', accessType);
|
configRepository.setString('instanceDialogAccessType', accessType);
|
||||||
configRepository.setString('instanceRegion', region);
|
configRepository.setString('instanceRegion', region);
|
||||||
@@ -716,10 +662,6 @@
|
|||||||
configRepository.setString('instanceDialogGroupAccessType', groupAccessType);
|
configRepository.setString('instanceDialogGroupAccessType', groupAccessType);
|
||||||
configRepository.setBool('instanceDialogQueueEnabled', queueEnabled);
|
configRepository.setBool('instanceDialogQueueEnabled', queueEnabled);
|
||||||
configRepository.setBool('instanceDialogAgeGate', ageGate);
|
configRepository.setBool('instanceDialogAgeGate', ageGate);
|
||||||
configRepository.setString(
|
|
||||||
'instanceDialogSelectedContentSettings',
|
|
||||||
JSON.stringify(selectedContentSettings)
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
newInstanceTabClick(tab) {
|
newInstanceTabClick(tab) {
|
||||||
if (tab === '1') {
|
if (tab === '1') {
|
||||||
|
|||||||
@@ -753,7 +753,6 @@
|
|||||||
<NewInstanceDialog
|
<NewInstanceDialog
|
||||||
:new-instance-dialog-location-tag="newInstanceDialogLocationTag"
|
:new-instance-dialog-location-tag="newInstanceDialogLocationTag"
|
||||||
:create-new-instance="createNewInstance"
|
:create-new-instance="createNewInstance"
|
||||||
:instance-content-settings="instanceContentSettings"
|
|
||||||
:offline-friends="offlineFriends"
|
:offline-friends="offlineFriends"
|
||||||
:active-friends="activeFriends"
|
:active-friends="activeFriends"
|
||||||
:online-friends="onlineFriends"
|
:online-friends="onlineFriends"
|
||||||
@@ -825,7 +824,6 @@
|
|||||||
isAgeGatedInstancesVisible: Boolean,
|
isAgeGatedInstancesVisible: Boolean,
|
||||||
|
|
||||||
createNewInstance: Function,
|
createNewInstance: Function,
|
||||||
instanceContentSettings: Array,
|
|
||||||
offlineFriends: Array,
|
offlineFriends: Array,
|
||||||
activeFriends: Array,
|
activeFriends: Array,
|
||||||
onlineFriends: Array,
|
onlineFriends: Array,
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ mixin dialogs
|
|||||||
:updateInstanceInfo='updateInstanceInfo'
|
:updateInstanceInfo='updateInstanceInfo'
|
||||||
:isAgeGatedInstancesVisible='isAgeGatedInstancesVisible'
|
:isAgeGatedInstancesVisible='isAgeGatedInstancesVisible'
|
||||||
:createNewInstance='createNewInstance'
|
:createNewInstance='createNewInstance'
|
||||||
:instanceContentSettings='instanceContentSettings'
|
|
||||||
:offlineFriends='offlineFriends'
|
:offlineFriends='offlineFriends'
|
||||||
:activeFriends='activeFriends'
|
:activeFriends='activeFriends'
|
||||||
:onlineFriends='onlineFriends'
|
:onlineFriends='onlineFriends'
|
||||||
|
|||||||
Reference in New Issue
Block a user