mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 14:56:06 +02:00
Fix errors
This commit is contained in:
@@ -5,101 +5,7 @@
|
|||||||
:title="t('dialog.boop_dialog.header')"
|
:title="t('dialog.boop_dialog.header')"
|
||||||
width="450px"
|
width="450px"
|
||||||
@close="closeDialog">
|
@close="closeDialog">
|
||||||
<el-select
|
<span>{{ displayName }}</span>
|
||||||
v-if="sendBoopDialog.visible"
|
|
||||||
v-model="sendBoopDialog.userId"
|
|
||||||
:placeholder="t('dialog.new_instance.instance_creator_placeholder')"
|
|
||||||
filterable
|
|
||||||
style="width: 100%">
|
|
||||||
<el-option-group v-if="vipFriends.length" :label="t('side_panel.favorite')">
|
|
||||||
<el-option
|
|
||||||
v-for="friend in vipFriends"
|
|
||||||
:key="friend.id"
|
|
||||||
:label="friend.name"
|
|
||||||
:value="friend.id"
|
|
||||||
style="height: auto"
|
|
||||||
class="x-friend-item">
|
|
||||||
<template v-if="friend.ref">
|
|
||||||
<div class="avatar" :class="userStatusClass(friend.ref)">
|
|
||||||
<img :src="userImage(friend.ref)" loading="lazy" />
|
|
||||||
</div>
|
|
||||||
<div class="detail">
|
|
||||||
<span
|
|
||||||
class="name"
|
|
||||||
:style="{ color: friend.ref.$userColour }"
|
|
||||||
v-text="friend.ref.displayName"></span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<span v-else v-text="friend.id"></span>
|
|
||||||
</el-option>
|
|
||||||
</el-option-group>
|
|
||||||
<el-option-group v-if="onlineFriends.length" :label="t('side_panel.online')">
|
|
||||||
<el-option
|
|
||||||
v-for="friend in onlineFriends"
|
|
||||||
:key="friend.id"
|
|
||||||
:label="friend.name"
|
|
||||||
:value="friend.id"
|
|
||||||
style="height: auto"
|
|
||||||
class="x-friend-item">
|
|
||||||
<template v-if="friend.ref">
|
|
||||||
<div class="avatar" :class="userStatusClass(friend.ref)">
|
|
||||||
<img :src="userImage(friend.ref)" loading="lazy" />
|
|
||||||
</div>
|
|
||||||
<div class="detail">
|
|
||||||
<span
|
|
||||||
class="name"
|
|
||||||
:style="{ color: friend.ref.$userColour }"
|
|
||||||
v-text="friend.ref.displayName"></span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<span v-else v-text="friend.id"></span>
|
|
||||||
</el-option>
|
|
||||||
</el-option-group>
|
|
||||||
<el-option-group v-if="activeFriends.length" :label="t('side_panel.active')">
|
|
||||||
<el-option
|
|
||||||
v-for="friend in activeFriends"
|
|
||||||
:key="friend.id"
|
|
||||||
:label="friend.name"
|
|
||||||
:value="friend.id"
|
|
||||||
style="height: auto"
|
|
||||||
class="x-friend-item">
|
|
||||||
<template v-if="friend.ref">
|
|
||||||
<div class="avatar">
|
|
||||||
<img :src="userImage(friend.ref)" loading="lazy" />
|
|
||||||
</div>
|
|
||||||
<div class="detail">
|
|
||||||
<span
|
|
||||||
class="name"
|
|
||||||
:style="{ color: friend.ref.$userColour }"
|
|
||||||
v-text="friend.ref.displayName"></span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<span v-else v-text="friend.id"></span>
|
|
||||||
</el-option>
|
|
||||||
</el-option-group>
|
|
||||||
<el-option-group v-if="offlineFriends.length" :label="t('side_panel.offline')">
|
|
||||||
<el-option
|
|
||||||
v-for="friend in offlineFriends"
|
|
||||||
:key="friend.id"
|
|
||||||
:label="friend.name"
|
|
||||||
:value="friend.id"
|
|
||||||
style="height: auto"
|
|
||||||
class="x-friend-item">
|
|
||||||
<template v-if="friend.ref">
|
|
||||||
<div class="avatar">
|
|
||||||
<img :src="userImage(friend.ref)" loading="lazy" />
|
|
||||||
</div>
|
|
||||||
<div class="detail">
|
|
||||||
<span
|
|
||||||
class="name"
|
|
||||||
:style="{ color: friend.ref.$userColour }"
|
|
||||||
v-text="friend.ref.displayName"></span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<span v-else v-text="friend.id"></span>
|
|
||||||
</el-option>
|
|
||||||
</el-option-group>
|
|
||||||
</el-select>
|
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<br />
|
||||||
@@ -108,7 +14,7 @@
|
|||||||
v-if="sendBoopDialog.visible"
|
v-if="sendBoopDialog.visible"
|
||||||
v-model="fileId"
|
v-model="fileId"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="t('dialog.boop_dialog.select_emoji')"
|
:placeholder="t('dialog.boop_dialog.select_default_emoji')"
|
||||||
size="small"
|
size="small"
|
||||||
style="width: 100%">
|
style="width: 100%">
|
||||||
<el-option-group :label="t('dialog.boop_dialog.default_emojis')">
|
<el-option-group :label="t('dialog.boop_dialog.default_emojis')">
|
||||||
@@ -178,12 +84,10 @@
|
|||||||
import { storeToRefs } from 'pinia';
|
import { storeToRefs } from 'pinia';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
import { userImage, userStatusClass } from '../../shared/utils';
|
import { notificationRequest, userRequest } from '../../api';
|
||||||
import { miscRequest } from '../../api';
|
import { miscRequest } from '../../api';
|
||||||
import { notificationRequest } from '../../api';
|
|
||||||
import { photonEmojis } from '../../shared/constants/photon.js';
|
import { photonEmojis } from '../../shared/constants/photon.js';
|
||||||
import { redirectToToolsTab } from '../../shared/utils/base/ui';
|
import { redirectToToolsTab } from '../../shared/utils/base/ui';
|
||||||
import { useFriendStore } from '../../stores';
|
|
||||||
import { useGalleryStore } from '../../stores';
|
import { useGalleryStore } from '../../stores';
|
||||||
import { useNotificationStore } from '../../stores';
|
import { useNotificationStore } from '../../stores';
|
||||||
import { useUserStore } from '../../stores/user.js';
|
import { useUserStore } from '../../stores/user.js';
|
||||||
@@ -196,15 +100,21 @@
|
|||||||
const { notificationTable } = storeToRefs(useNotificationStore());
|
const { notificationTable } = storeToRefs(useNotificationStore());
|
||||||
const { showGalleryDialog, refreshEmojiTable } = useGalleryStore();
|
const { showGalleryDialog, refreshEmojiTable } = useGalleryStore();
|
||||||
const { emojiTable } = storeToRefs(useGalleryStore());
|
const { emojiTable } = storeToRefs(useGalleryStore());
|
||||||
const { vipFriends, onlineFriends, activeFriends, offlineFriends } = useFriendStore();
|
|
||||||
const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
|
const { isLocalUserVrcPlusSupporter } = storeToRefs(useUserStore());
|
||||||
|
|
||||||
const fileId = ref('');
|
const fileId = ref('');
|
||||||
|
const displayName = ref('');
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => sendBoopDialog.value.visible,
|
() => sendBoopDialog.value.visible,
|
||||||
(visible) => {
|
(visible) => {
|
||||||
if (visible && emojiTable.value.length === 0) {
|
if (visible) {
|
||||||
|
displayName.value = '';
|
||||||
|
userRequest.getCachedUser({ userId: sendBoopDialog.value.userId }).then((user) => {
|
||||||
|
displayName.value = user.ref.displayName;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (visible && isLocalUserVrcPlusSupporter && emojiTable.value.length === 0) {
|
||||||
refreshEmojiTable();
|
refreshEmojiTable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1686,7 +1686,7 @@
|
|||||||
"boop_dialog": {
|
"boop_dialog": {
|
||||||
"header": "Boop",
|
"header": "Boop",
|
||||||
"emoji_manager": "Emoji Manager",
|
"emoji_manager": "Emoji Manager",
|
||||||
"select_emoji": "Select Emoji",
|
"select_default_emoji": "Select Default Emoji",
|
||||||
"my_emojis": "My Emojis",
|
"my_emojis": "My Emojis",
|
||||||
"default_emojis": "Default Emojis",
|
"default_emojis": "Default Emojis",
|
||||||
"cancel": "Cancel",
|
"cancel": "Cancel",
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ export const useVrcStatusStore = defineStore('VrcStatus', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
lastTimeFetched.value = Date.now();
|
lastTimeFetched.value = Date.now();
|
||||||
const data = JSON.parse(response.data);
|
|
||||||
if (response.status !== 200) {
|
if (response.status !== 200) {
|
||||||
console.error('Failed to fetch VRChat status', response);
|
console.error('Failed to fetch VRChat status', response);
|
||||||
lastStatus.value = 'Failed to fetch VRC status';
|
lastStatus.value = 'Failed to fetch VRC status';
|
||||||
@@ -83,6 +82,7 @@ export const useVrcStatusStore = defineStore('VrcStatus', () => {
|
|||||||
updateAlert();
|
updateAlert();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const data = JSON.parse(response.data);
|
||||||
lastStatusTime.value = new Date(data.page.updated_at);
|
lastStatusTime.value = new Date(data.page.updated_at);
|
||||||
if (data.status.description === 'All Systems Operational') {
|
if (data.status.description === 'All Systems Operational') {
|
||||||
lastStatus.value = '';
|
lastStatus.value = '';
|
||||||
|
|||||||
@@ -296,7 +296,10 @@
|
|||||||
|
|
||||||
const sliceWorldFavorites = computed(() => {
|
const sliceWorldFavorites = computed(() => {
|
||||||
return (group) => {
|
return (group) => {
|
||||||
return groupedByGroupKeyFavoriteWorlds.value[group].slice(0, sliceWorldFavoritesLoadMoreNumber.value);
|
if (groupedByGroupKeyFavoriteWorlds.value[group]) {
|
||||||
|
return groupedByGroupKeyFavoriteWorlds.value[group].slice(0, sliceWorldFavoritesLoadMoreNumber.value);
|
||||||
|
}
|
||||||
|
return [];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user