diff --git a/src/shared/utils/base/ui.js b/src/shared/utils/base/ui.js index d2546c0e..bc79ddf1 100644 --- a/src/shared/utils/base/ui.js +++ b/src/shared/utils/base/ui.js @@ -32,7 +32,7 @@ function changeAppThemeStyle(themeMode) { const themeConfig = THEME_CONFIG[themeMode]; if (!themeConfig) { console.error('Invalid theme mode:', themeMode); - themeMode = 'light'; + themeMode = systemIsDarkMode() ? 'dark' : 'light'; } let filePathPrefix = 'file://vrcx/'; diff --git a/src/stores/instance.js b/src/stores/instance.js index b29feacd..049265b8 100644 --- a/src/stores/instance.js +++ b/src/stores/instance.js @@ -17,7 +17,8 @@ import { getWorldName, hasGroupPermission, isRealInstance, - parseLocation + parseLocation, + replaceBioSymbols } from '../shared/utils'; import { useFriendStore } from './friend'; import { useGroupStore } from './group'; @@ -390,6 +391,9 @@ export const useInstanceStore = defineStore('Instance', () => { ref.$disabledContentSettings.push(setting); } } + if (ref.displayName) { + ref.displayName = replaceBioSymbols(ref.displayName); + } if ( userStore.userDialog.visible && userStore.userDialog.ref.$location.tag === ref.id diff --git a/src/stores/sharedFeed.js b/src/stores/sharedFeed.js index c26b0d14..eab22b2d 100644 --- a/src/stores/sharedFeed.js +++ b/src/stores/sharedFeed.js @@ -216,6 +216,26 @@ export const useSharedFeedStore = defineStore('SharedFeed', () => { return 0; }); wristFeed.splice(16); + // temp fix, tack on instance names in the worst way possible + for (let feedEntry of wristFeed) { + if (feedEntry.location) { + const instanceRef = instanceStore.cachedInstances.get( + feedEntry.location + ); + if (instanceRef?.displayName) { + feedEntry.instanceDisplayName = instanceRef.displayName; + } + } + // invites + if (feedEntry.details?.worldId) { + const instanceRef = instanceStore.cachedInstances.get( + feedEntry.details.worldId + ); + if (instanceRef?.displayName) { + feedEntry.instanceDisplayName = instanceRef.displayName; + } + } + } AppApi.ExecuteVrFeedFunction( 'wristFeedUpdate', JSON.stringify(wristFeed) diff --git a/src/vr/Vr.vue b/src/vr/Vr.vue index 18bcfa0e..38eca356 100644 --- a/src/vr/Vr.vue +++ b/src/vr/Vr.vue @@ -23,6 +23,7 @@ :location="feed.location" :hint="feed.worldName" :grouphint="feed.groupName" + :instancedisplayname="feed.instanceDisplayName" style="margin-left: 5px"> @@ -54,6 +55,7 @@ :location="feed.location" :hint="feed.worldName" :grouphint="feed.groupName" + :instancedisplayname="feed.instanceDisplayName" style="margin-left: 5px"> @@ -86,7 +88,7 @@