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

Profile picture as user image

Browse Source
This commit is contained in:
Natsumi
2021-05-30 22:23:09 +12:00
parent 4360ef8fe2
commit c743b2aacb
2 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
html/src/app.js
View File

@@ -4421,7 +4421,9 @@ speechSynthesis.getVoices();
console.error(err);
return false;
}).then((args) => {
if ((this.displayVRCPlusIconsAsAvatar) && (args.json.userIcon)) {
if ((this.displayProfilePicOverrideAsAvatar) && (args.json.profilePicOverride)) {
return args.json.profilePicOverride;
} else if ((this.displayVRCPlusIconsAsAvatar) && (args.json.userIcon)) {
return args.json.userIcon;
}
return args.json.currentAvatarThumbnailImageUrl;
@@ -7174,6 +7176,7 @@ speechSynthesis.getVoices();
$app.data.desktopToast = configRepository.getString('VRCX_desktopToast');
$app.data.minimalFeed = configRepository.getBool('VRCX_minimalFeed');
$app.data.displayVRCPlusIconsAsAvatar = configRepository.getBool('displayVRCPlusIconsAsAvatar');
$app.data.displayProfilePicOverrideAsAvatar = configRepository.getBool('VRCX_displayProfilePicOverrideAsAvatar');
$app.data.notificationTTS = configRepository.getString('VRCX_notificationTTS');
$app.data.notificationTTSVoice = configRepository.getString('VRCX_notificationTTSVoice');
$app.data.notificationTimeout = configRepository.getString('VRCX_notificationTimeout');
@@ -7194,6 +7197,7 @@ speechSynthesis.getVoices();
configRepository.setString('VRCX_desktopToast', this.desktopToast);
configRepository.setBool('VRCX_minimalFeed', this.minimalFeed);
configRepository.setBool('displayVRCPlusIconsAsAvatar', this.displayVRCPlusIconsAsAvatar);
configRepository.setBool('VRCX_displayProfilePicOverrideAsAvatar', this.displayProfilePicOverrideAsAvatar);
configRepository.setString('VRCX_worldAutoCacheInvite', this.worldAutoCacheInvite);
configRepository.setString('VRCX_worldAutoCacheGPS', this.worldAutoCacheGPS);
configRepository.setBool('VRCX_worldAutoCacheInviteFilter', this.worldAutoCacheInviteFilter);
@@ -7221,6 +7225,7 @@ speechSynthesis.getVoices();
$app.watch.desktopToast = saveOpenVROption;
$app.watch.minimalFeed = saveOpenVROption;
$app.watch.displayVRCPlusIconsAsAvatar = saveOpenVROption;
$app.watch.displayProfilePicOverrideAsAvatar = saveOpenVROption;
$app.watch.worldAutoCacheInvite = saveOpenVROption;
$app.watch.worldAutoCacheGPS = saveOpenVROption;
$app.watch.worldAutoCacheInviteFilter = saveOpenVROption;
@@ -7251,10 +7256,6 @@ speechSynthesis.getVoices();
$app.watch.isAutoLogin = saveVRCXWindowOption;
// setting defaults
if (configRepository.getBool('displayVRCPlusIconsAsAvatar') === null) {
$app.data.displayVRCPlusIconsAsAvatar = true;
configRepository.setBool('displayVRCPlusIconsAsAvatar', $app.data.displayVRCPlusIconsAsAvatar);
}
if (!configRepository.getString('VRCX_notificationPosition')) {
$app.data.notificationPosition = 'topCenter';
configRepository.setString('VRCX_notificationPosition', $app.data.notificationPosition);
@@ -7527,7 +7528,6 @@ speechSynthesis.getVoices();
overlayNotifications: this.overlayNotifications,
hideDevicesFromFeed: this.hideDevicesFromFeed,
minimalFeed: this.minimalFeed,
displayVRCPlusIconsAsAvatar: this.displayVRCPlusIconsAsAvatar,
notificationPosition: this.notificationPosition,
notificationTimeout: this.notificationTimeout,
notificationTheme