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

Lint

Browse Source
This commit is contained in:
Natsumi
2024-05-29 11:16:24 +12:00
parent 79890e4313
commit 90555c0043
2 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+36 -46
View File
@@ -5489,7 +5489,6 @@ speechSynthesis.getVoices();
nextClearVRCXCacheCheck: 0, nextClearVRCXCacheCheck: 0,
nextDiscordUpdate: 0, nextDiscordUpdate: 0,
nextAutoStateChange: 0, nextAutoStateChange: 0,
autoAcceptInviteRequests: 'Off',
isDiscordActive: false, isDiscordActive: false,
isGameRunning: false, isGameRunning: false,
isGameNoVR: true, isGameNoVR: true,
@@ -14790,57 +14789,45 @@ speechSynthesis.getVoices();
API.$on('PIPELINE:NOTIFICATION', function (args) { API.$on('PIPELINE:NOTIFICATION', function (args) {
var ref = args.json; var ref = args.json;
if (ref.type !== 'requestInvite' || $app.autoAcceptInviteRequests === 'Off') if (
ref.type !== 'requestInvite' ||
$app.autoAcceptInviteRequests === 'Off'
)
return; return;
var currentLocation = $app.lastLocation.location; var currentLocation = $app.lastLocation.location;
if ($app.lastLocation.location === 'traveling') { if ($app.lastLocation.location === 'traveling') {
currentLocation = $app.lastLocationDestination; currentLocation = $app.lastLocationDestination;
} }
if (!currentLocation) if (!currentLocation) return;
return;
var L = this.parseLocation(currentLocation); var L = this.parseLocation(currentLocation);
switch ($app.autoAcceptInviteRequests) { if (
case 'All Favorites': $app.autoAcceptInviteRequests === 'All Favorites' &&
if (!$app.favoriteFriends.some(x => x.id === ref.senderUserId)) !$app.favoriteFriends.some((x) => x.id === ref.senderUserId)
break; )
this.getCachedWorld({ return;
worldId: L.worldId
}).then((args) => { if (
this.sendInvite( $app.autoAcceptInviteRequests === 'Selected Favorites' &&
{ !$app.localFavoriteFriends.has(ref.senderUserId)
instanceId: L.tag, )
worldId: L.tag, return;
worldName: args.ref.name,
rsvp: true this.getCachedWorld({
}, worldId: L.worldId
ref.senderUserId }).then((args1) => {
).then((_args) => { this.sendInvite(
$app.$message('Auto Invite sent to ' + ref.senderUsername); {
return _args; instanceId: L.tag,
}); worldId: L.tag,
}); worldName: args1.ref.name,
break; rsvp: true
case 'Selected Favorites': },
if (!$app.localFavoriteFriends.has(ref.senderUserId)) ref.senderUserId
break; ).then((_args) => {
this.getCachedWorld({ $app.$message(`Auto invite sent to ${ref.senderUsername}`);
worldId: L.worldId return _args;
}).then((args) => { });
this.sendInvite( });
{
instanceId: L.tag,
worldId: L.tag,
worldName: args.ref.name,
rsvp: true
},
ref.senderUserId
).then((_args) => {
$app.$message('Auto Invite sent to ' + ref.senderUsername);
return _args;
});
});
break;
}
}); });
$app.data.unseenNotifications = []; $app.data.unseenNotifications = [];
@@ -15579,6 +15566,9 @@ speechSynthesis.getVoices();
VRCXStorage.Set('VRCX_CloseToTray', $app.data.isCloseToTray.toString()); VRCXStorage.Set('VRCX_CloseToTray', $app.data.isCloseToTray.toString());
await configRepository.remove('VRCX_CloseToTray'); await configRepository.remove('VRCX_CloseToTray');
} }
if (!(await VRCXStorage.Get('VRCX_DatabaseLocation'))) {
await VRCXStorage.Set('VRCX_DatabaseLocation', '');
}
$app.data.disableWorldDatabase = $app.data.disableWorldDatabase =
(await VRCXStorage.Get('VRCX_DisableWorldDatabase')) === 'true'; (await VRCXStorage.Get('VRCX_DisableWorldDatabase')) === 'true';
$app.methods.saveVRCXWindowOption = async function () { $app.methods.saveVRCXWindowOption = async function () {
html/src/localization/en/en.json
+2 -2
View File
@@ -232,8 +232,8 @@
"auto_state_change_join_me_or_ask_me": "Join Me / Ask Me", "auto_state_change_join_me_or_ask_me": "Join Me / Ask Me",
"auto_state_change_join_me_or_busy": "Join Me / Busy", "auto_state_change_join_me_or_busy": "Join Me / Busy",
"auto_state_change_ask_me_or_busy": "Ask Me / Busy", "auto_state_change_ask_me_or_busy": "Ask Me / Busy",
"auto_invite_request_accept": "Auto Invite Request Accept", "auto_invite_request_accept": "Auto Accept Invite Requests",
"auto_invite_request_accept_tooltip": "Automatically accept Invite Requests from Favorite friends", "auto_invite_request_accept_tooltip": "Automatically accept invite requests from favorite friends",
"auto_invite_request_accept_off": "Off", "auto_invite_request_accept_off": "Off",
"auto_invite_request_accept_favs": "All Favorites", "auto_invite_request_accept_favs": "All Favorites",
"auto_invite_request_accept_selected_favs": "Selected Favorites" "auto_invite_request_accept_selected_favs": "Selected Favorites"