diff --git a/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue b/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue index 2cd82cc2..586199f3 100644 --- a/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue +++ b/src/components/dialogs/NewInstanceDialog/NewInstanceDialog.vue @@ -565,9 +565,7 @@ getLaunchURL, hasGroupPermission, isRealInstance, - parseLocation, - userImage, - userStatusClass + parseLocation } from '../../../shared/utils'; import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '../../ui/select'; import { @@ -584,6 +582,9 @@ import { useNewInstanceBuilder } from './useNewInstanceBuilder'; import InviteDialog from '../InviteDialog/InviteDialog.vue'; + import { useUserDisplay } from '../../../composables/useUserDisplay'; + + const { userImage, userStatusClass } = useUserDisplay(); const props = defineProps({ newInstanceDialogLocationTag: { diff --git a/src/views/FriendList/FriendList.vue b/src/views/FriendList/FriendList.vue index 03d79e48..b44765f7 100644 --- a/src/views/FriendList/FriendList.vue +++ b/src/views/FriendList/FriendList.vue @@ -147,6 +147,7 @@ import { useVrcxVueTable } from '../../lib/table/useVrcxVueTable'; import { showUserDialog } from '../../coordinators/userCoordinator'; import { confirmDeleteFriend, handleFriendDelete } from '../../coordinators/friendRelationshipCoordinator'; + import { useUserDisplay } from '../../composables/useUserDisplay'; const { t } = useI18n(); @@ -157,6 +158,7 @@ const { getAllUserStats, getAllUserMutualCount } = useFriendStore(); const appearanceSettingsStore = useAppearanceSettingsStore(); const { randomUserColours } = storeToRefs(appearanceSettingsStore); + const { userImage } = useUserDisplay(); const { stringComparer, friendsListSearch } = storeToRefs(useSearchStore()); @@ -189,7 +191,8 @@ randomUserColours, selectedFriends, onToggleFriendSelection: toggleFriendSelection, - onConfirmDeleteFriend: confirmDeleteFriend + onConfirmDeleteFriend: confirmDeleteFriend, + userImage }) ); diff --git a/src/views/FriendList/columns.jsx b/src/views/FriendList/columns.jsx index 2b652a09..af93a957 100644 --- a/src/views/FriendList/columns.jsx +++ b/src/views/FriendList/columns.jsx @@ -16,8 +16,7 @@ import { openExternalLink, sortStatus, statusClass, - timeToText, - userImage + timeToText } from '../../shared/utils'; const { t } = i18n.global; @@ -101,7 +100,8 @@ export const createColumns = ({ randomUserColours, selectedFriends, onToggleFriendSelection, - onConfirmDeleteFriend + onConfirmDeleteFriend, + userImage }) => { const cols = []; diff --git a/src/views/PlayerList/PlayerList.vue b/src/views/PlayerList/PlayerList.vue index 91bd3c40..94fbb20b 100644 --- a/src/views/PlayerList/PlayerList.vue +++ b/src/views/PlayerList/PlayerList.vue @@ -206,8 +206,10 @@ import { showWorldDialog } from '../../coordinators/worldCoordinator'; import PhotonEventTable from './components/PhotonEventTable.vue'; + import { useUserDisplay } from '../../composables/useUserDisplay'; const { randomUserColours } = storeToRefs(useAppearanceSettingsStore()); + const { userImage } = useUserDisplay(); const photonStore = usePhotonStore(); const { photonLoggingEnabled, chatboxUserBlacklist } = storeToRefs(photonStore); const { saveChatboxUserBlacklist } = photonStore; @@ -299,7 +301,8 @@ chatboxUserBlacklist, onBlockChatbox: addChatboxUserBlacklist, onUnblockChatbox: deleteChatboxUserBlacklist, - sortAlphabetically + sortAlphabetically, + userImage }) ); diff --git a/src/views/PlayerList/columns.jsx b/src/views/PlayerList/columns.jsx index daf5739d..2401f9a2 100644 --- a/src/views/PlayerList/columns.jsx +++ b/src/views/PlayerList/columns.jsx @@ -14,8 +14,7 @@ import { getFaviconUrl, languageClass, openExternalLink, - statusClass, - userImage + statusClass } from '../../shared/utils'; import { i18n } from '../../plugins'; @@ -65,7 +64,8 @@ export const createColumns = ({ chatboxUserBlacklist, onBlockChatbox, onUnblockChatbox, - sortAlphabetically + sortAlphabetically, + userImage }) => { const cols = [ {