github/VRCX
1
1
Fork 0
mirror of https://github.com/vrcx-team/VRCX.git synced 2026-04-06 00:32:02 +02:00
Code Issues 51 Packages Projects Releases Wiki Activity

replace ElMessage with Sonner

Browse Source
This commit is contained in:
pa
2026-01-07 19:16:31 +09:00
committed by Natsumi
parent f819a3f500
commit 7e4de15ef2
85 changed files with 574 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
package-lock.json generated
View File

@@ -8,7 +8,8 @@
"license": "MIT",
"dependencies": {
"hazardous": "^0.3.0",
"node-api-dotnet": "^0.9.18"
"node-api-dotnet": "^0.9.18",
"vue-sonner": "^2.0.9"
},
"devDependencies": {
"@electron/rebuild": "^4.0.2",
@@ -19082,6 +19083,28 @@
"node": ">=16.19.0"
}
},
"node_modules/vue-sonner": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/vue-sonner/-/vue-sonner-2.0.9.tgz",
"integrity": "sha512-i6BokNlNDL93fpzNxN/LZSn6D6MzlO+i3qXt6iVZne3x1k7R46d5HlFB4P8tYydhgqOrRbIZEsnRd3kG7qGXyw==",
"license": "MIT",
"peerDependencies": {
"@nuxt/kit": "^4.0.3",
"@nuxt/schema": "^4.0.3",
"nuxt": "^4.0.3"
},
"peerDependenciesMeta": {
"@nuxt/kit": {
"optional": true
},
"@nuxt/schema": {
"optional": true
},
"nuxt": {
"optional": true
}
}
},
"node_modules/walker": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",

9
package.json
View File

@@ -50,10 +50,10 @@
"@vitejs/plugin-vue": "^6.0.3",
"@vitejs/plugin-vue-jsx": "^5.1.3",
"@vueuse/core": "^14.1.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"animate.css": "^4.1.1",
"babel-runtime": "^6.26.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"concurrently": "^9.2.1",
"cross-env": "^10.1.0",
"dayjs": "^1.11.19",
@@ -75,8 +75,8 @@
"prettier": "^3.7.4",
"reka-ui": "^2.7.0",
"remixicon": "^4.8.0",
"tailwindcss": "^4.1.18",
"tailwind-merge": "^3.4.0",
"tailwindcss": "^4.1.18",
"tw-animate-css": "^1.4.0",
"vite": "^7.3.0",
"vue": "^3.5.26",
@@ -172,6 +172,7 @@
},
"dependencies": {
"hazardous": "^0.3.0",
"node-api-dotnet": "^0.9.18"
"node-api-dotnet": "^0.9.18",
"vue-sonner": "^2.0.9"
}
}

2
src/App.vue
View File

@@ -12,6 +12,7 @@
ondragover="event.preventDefault()"
ondrop="event.preventDefault()">
<RouterView></RouterView>
<Toaster position="top-center"></Toaster>
<VRCXUpdateDialog></VRCXUpdateDialog>
</div>
@@ -23,6 +24,7 @@
import { computed, onBeforeMount, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
import { Toaster } from './components/ui/sonner';
import { TooltipProvider } from './components/ui/tooltip';
import { createGlobalStores } from './stores';
import { initNoty } from './plugin/noty';

12
src/api/instance.js
View File

@@ -1,4 +1,4 @@
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { i18n } from '../plugin/i18n';
import { request } from '../service/request';
@@ -140,16 +140,10 @@ const instanceReq = {
})
.catch((err) => {
if (err?.error?.message) {
ElMessage({
message: err.error.message,
type: 'error'
});
toast.error(err.error.message);
throw err;
}
ElMessage({
message: i18n.global.t('message.instance.not_allowed'),
type: 'error'
});
toast.error(i18n.global.t('message.instance.not_allowed'));
throw err;
});
}

1
src/app.css
View File

@@ -12,6 +12,7 @@
@import 'animate.css/animate.min.css';
@import 'noty/lib/noty.css';
@import 'remixicon/fonts/remixicon.css';
@import 'vue-sonner/style.css';
@import './styles/flags.css';
@import './styles/animated-emoji.css';

21
src/components/FullscreenImagePreview.vue
View File

@@ -38,8 +38,8 @@
<script setup>
import { CopyDocument, Download, RefreshLeft, RefreshRight, ZoomIn, ZoomOut } from '@element-plus/icons-vue';
import { nextTick, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import Noty from 'noty';
@@ -92,10 +92,7 @@
if (!url) {
return;
}
const msg = ElMessage({
message: 'Downloading image...',
type: 'info'
});
const msg = toast.info('Downloading image...');
try {
const response = await webApiService.execute({
url,
@@ -109,10 +106,7 @@
'image/png': await (await fetch(response.data)).blob()
})
]);
ElMessage({
message: 'Image copied to clipboard',
type: 'success'
});
toast.success('Image copied to clipboard');
} catch (error) {
console.error('Error downloading image:', error);
new Noty({
@@ -120,7 +114,7 @@
text: escapeTag(`Failed to download image. ${url}`)
}).show();
} finally {
msg.close();
toast.dismiss(msg);
}
}
@@ -128,10 +122,7 @@
if (!url) {
return;
}
const msg = ElMessage({
message: 'Downloading image...',
type: 'info'
});
const msg = toast.info('Downloading image...');
try {
const response = await webApiService.execute({
url,
@@ -163,7 +154,7 @@
text: escapeTag(`Failed to download image. ${url}`)
}).show();
} finally {
msg.close();
toast.dismiss(msg);
}
}
</script>

5
src/components/InstanceInfo.vue
View File

@@ -63,9 +63,10 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus';
import { reactive, watch } from 'vue';
import { CaretBottom } from '@element-plus/icons-vue';
import { ElMessageBox } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useGroupStore, useInstanceStore, useLocationStore, useUserStore } from '../stores';
@@ -132,7 +133,7 @@
if (action !== 'confirm') return;
const args = await miscRequest.closeInstance({ location, hardClose: false });
if (args.json) {
ElMessage({ message: t('message.instance.closed'), type: 'success' });
toast.success(t('message.instance.closed'));
instanceStore.applyInstance(args.json);
}
})

4
src/components/InviteYourself.vue
View File

@@ -16,9 +16,9 @@
<script setup>
import { Loading, Message } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { computed } from 'vue';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { checkCanInviteSelf, parseLocation } from '../shared/utils';
@@ -52,7 +52,7 @@
shortName: props.shortname
})
.then((args) => {
ElMessage({ message: 'Self invite sent', type: 'success' });
toast.success('Self invite sent');
return args;
});
}

83
src/components/dialogs/AvatarDialog/AvatarDialog.vue
View File

@@ -567,8 +567,9 @@
Warning
} from '@element-plus/icons-vue';
import { computed, defineAsyncComponent, nextTick, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -787,10 +788,7 @@
avatarId: D.id
})
.then((args) => {
ElMessage({
message: 'Fallback avatar changed',
type: 'success'
});
toast.success('Fallback avatar changed');
return args;
});
break;
@@ -803,10 +801,7 @@
.then((args) => {
// 'AVATAR-MODERATION';
applyAvatarModeration(args.json);
ElMessage({
message: 'Avatar blocked',
type: 'success'
});
toast.success('Avatar blocked');
return args;
});
break;
@@ -835,10 +830,7 @@
})
.then((args) => {
applyAvatar(args.json);
ElMessage({
message: 'Avatar updated to public',
type: 'success'
});
toast.success('Avatar updated to public');
return args;
});
break;
@@ -850,10 +842,7 @@
})
.then((args) => {
applyAvatar(args.json);
ElMessage({
message: 'Avatar updated to private',
type: 'success'
});
toast.success('Avatar updated to private');
return args;
});
break;
@@ -876,10 +865,7 @@
sortUserDialogAvatars(array);
}
ElMessage({
message: 'Avatar deleted',
type: 'success'
});
toast.success('Avatar deleted');
D.visible = false;
return args;
});
@@ -890,10 +876,7 @@
avatarId: D.id
})
.then((args) => {
ElMessage({
message: 'Imposter deleted',
type: 'success'
});
toast.success('Imposter deleted');
showAvatarDialog(D.id);
return args;
});
@@ -904,10 +887,7 @@
avatarId: D.id
})
.then((args) => {
ElMessage({
message: 'Imposter queued for creation',
type: 'success'
});
toast.success('Imposter queued for creation');
return args;
});
break;
@@ -926,10 +906,7 @@
avatarId: D.id
})
.then((args) => {
ElMessage({
message: 'Imposter deleted and queued for creation',
type: 'success'
});
toast.success('Imposter deleted and queued for creation');
return args;
});
});
@@ -968,10 +945,7 @@
})
.then((args) => {
applyAvatar(args.json);
ElMessage({
message: t('prompt.change_avatar_description.message.success'),
type: 'success'
});
toast.success(t('prompt.change_avatar_description.message.success'));
return args;
});
}
@@ -996,10 +970,7 @@
})
.then((args) => {
applyAvatar(args.json);
ElMessage({
message: t('prompt.rename_avatar.message.success'),
type: 'success'
});
toast.success(t('prompt.rename_avatar.message.success'));
return args;
});
}
@@ -1130,10 +1101,7 @@
avatarRequest
.uploadAvatarGalleryImage(base64Body, avatarDialog.value.id)
.then(async (args) => {
ElMessage({
message: t('message.avatar_gallery.uploaded'),
type: 'success'
});
toast.success(t('message.avatar_gallery.uploaded'));
console.log(args);
avatarDialog.value.galleryImages = await getAvatarGallery(avatarDialog.value.id);
return args;
@@ -1163,24 +1131,15 @@
});
const index = fileIds.indexOf(fileId);
if (index === -1) {
ElMessage({
message: t('message.avatar_gallery.not_found'),
type: 'error'
});
toast.error(t('message.avatar_gallery.not_found'));
return;
}
if (direction === -1 && index === 0) {
ElMessage({
message: t('message.avatar_gallery.already_first'),
type: 'warning'
});
toast.warning(t('message.avatar_gallery.already_first'));
return;
}
if (direction === 1 && index === fileIds.length - 1) {
ElMessage({
message: t('message.avatar_gallery.already_last'),
type: 'warning'
});
toast.warning(t('message.avatar_gallery.already_last'));
return;
}
if (direction === -1) {
@@ -1189,10 +1148,7 @@
moveArrayItem(fileIds, index, index + 1);
}
avatarRequest.setAvatarGalleryOrder(fileIds).then(async (args) => {
ElMessage({
message: t('message.avatar_gallery.reordered'),
type: 'success'
});
toast.success(t('message.avatar_gallery.reordered'));
avatarDialog.value.galleryImages = await getAvatarGallery(avatarDialog.value.id);
return args;
});
@@ -1201,10 +1157,7 @@
function deleteAvatarGalleryImage(imageUrl) {
const fileId = extractFileId(imageUrl);
miscRequest.deleteFile(fileId).then((args) => {
ElMessage({
message: t('message.avatar_gallery.deleted'),
type: 'success'
});
toast.success(t('message.avatar_gallery.deleted'));
getAvatarGallery(avatarDialog.value.id);
return args;
});

12
src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue
View File

@@ -42,10 +42,10 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { Upload } from '@element-plus/icons-vue';
import { ref } from 'vue';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { avatarRequest, imageRequest } from '../../../api';
@@ -286,10 +286,7 @@
function avatarImageSet(args) {
changeAvatarImageDialogLoading.value = false;
if (args.json.imageUrl === args.params.imageUrl) {
ElMessage({
message: t('message.avatar.image_changed'),
type: 'success'
});
toast.success(t('message.avatar.image_changed'));
emit('update:previousImageUrl', args.json.imageUrl);
} else {
$throw(0, 'avatar image change failed', args.params.imageUrl);
@@ -308,10 +305,7 @@
const ref = applyAvatar(avatarArgs.json);
changeAvatarImageDialogLoading.value = false;
emit('update:previousImageUrl', ref.imageUrl);
ElMessage({
message: t('message.avatar.image_changed'),
type: 'success'
});
toast.success(t('message.avatar.image_changed'));
// closeDialog();
}

6
src/components/dialogs/AvatarDialog/SetAvatarStylesDialog.vue
View File

@@ -60,7 +60,7 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { watch } from 'vue';
@@ -150,11 +150,11 @@
.saveAvatar(params)
.then((args) => {
applyAvatar(args.json);
ElMessage({ message: t('dialog.set_avatar_styles.save_success'), type: 'success' });
toast.success(t('dialog.set_avatar_styles.save_success'));
closeSetAvatarStylesDialog();
})
.catch((error) => {
ElMessage({ message: t('dialog.set_avatar_styles.save_failed'), type: 'error' });
toast.error(t('dialog.set_avatar_styles.save_failed'));
console.error('Error saving avatar styles:', error);
});
}

7
src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
View File

@@ -96,8 +96,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { Loading } from '@element-plus/icons-vue';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { watch } from 'vue';
@@ -254,10 +254,7 @@
}
} catch (err) {
console.error(err);
ElMessage({
message: 'Error saving avatar tags',
type: 'error'
});
toast.error('Error saving avatar tags');
} finally {
D.loading = false;
D.visible = false;

17
src/components/dialogs/GroupDialog/GallerySelectDialog.vue
View File

@@ -54,8 +54,8 @@
<script setup>
import { Close, Refresh, Upload } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useGalleryStore, useUserStore } from '../../../stores';
@@ -98,18 +98,12 @@
}
if (files[0].size >= 100000000) {
// 100MB
ElMessage({
message: t('message.file.too_large'),
type: 'error'
});
toast.error(t('message.file.too_large'));
clearFile();
return;
}
if (!files[0].type.match(/image.*/)) {
ElMessage({
message: t('message.file.not_image'),
type: 'error'
});
toast.error(t('message.file.not_image'));
clearFile();
return;
}
@@ -118,10 +112,7 @@
const base64Body = btoa(r.result.toString());
vrcPlusImageRequest.uploadGalleryImage(base64Body).then((args) => {
handleGalleryImageAdd(args);
ElMessage({
message: t('message.gallery.uploaded'),
type: 'success'
});
toast.success(t('message.gallery.uploaded'));
if (Object.keys(galleryTable.value).length !== 0) {
galleryTable.value.unshift(args.json);
}

13
src/components/dialogs/GroupDialog/GroupDialog.vue
View File

@@ -1155,8 +1155,9 @@
Warning
} from '@element-plus/icons-vue';
import { computed, nextTick, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -1545,15 +1546,9 @@
getGroupDialogGroup(id);
}
if (args.json.membershipStatus === 'member') {
ElMessage({
message: 'Group joined',
type: 'success'
});
toast.success('Group joined');
} else if (args.json.membershipStatus === 'requested') {
ElMessage({
message: 'Group join request sent',
type: 'success'
});
toast.success('Group join request sent');
}
return args;
});

125
src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
View File

@@ -864,8 +864,8 @@
<script setup>
import { ArrowDown, Delete, Loading, Refresh, Warning } from '@element-plus/icons-vue';
import { reactive, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { debounce, formatDateFilter, hasGroupPermission, userImage, userImageFull } from '../../../shared/utils';
@@ -1080,18 +1080,12 @@
});
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to delete group invites: ${err}`,
type: 'error'
});
toast.error(`Failed to delete group invites: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({
message: `Deleted ${memberCount} group invites`,
type: 'success'
});
toast.success(`Deleted ${memberCount} group invites`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1132,10 +1126,7 @@
}
groupBansModerationTable.data = fetchedBans;
} catch {
ElMessage({
message: 'Failed to get group bans',
type: 'error'
});
toast.error('Failed to get group bans');
} finally {
isGroupMembersLoading.value = false;
}
@@ -1163,13 +1154,10 @@
await groupRequest.banGroupMember({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to ban group member: ${err}`,
type: 'error'
});
toast.error(`Failed to ban group member: ${err}`);
}
}
ElMessage({ message: `Banned ${memberCount} group members`, type: 'success' });
toast.success(`Banned ${memberCount} group members`);
progressCurrent.value = 0;
progressTotal.value = 0;
getAllGroupBans(D.id);
@@ -1192,16 +1180,13 @@
await groupRequest.unbanGroupMember({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to unban group member: ${err}`,
type: 'error'
});
toast.error(`Failed to unban group member: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({ message: `Unbanned ${memberCount} group members`, type: 'success' });
toast.success(`Unbanned ${memberCount} group members`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1226,15 +1211,12 @@
await groupRequest.kickGroupMember({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to kick group member: ${err}`,
type: 'error'
});
toast.error(`Failed to kick group member: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({ message: `Kicked ${memberCount} group members`, type: 'success' });
toast.success(`Kicked ${memberCount} group members`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1262,15 +1244,12 @@
handleGroupMemberProps(args);
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to set group member note for ${err}`,
type: 'error'
});
toast.error(`Failed to set group member note for ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({ message: `Saved notes for ${memberCount} group members`, type: 'success' });
toast.success(`Saved notes for ${memberCount} group members`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1310,19 +1289,13 @@
handleGroupMemberRoleChange(args);
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to remove group member roles: ${err}`,
type: 'error'
});
toast.error(`Failed to remove group member roles: ${err}`);
allSuccess = false;
}
}
}
if (allSuccess) {
ElMessage({
message: `Roles removed`,
type: 'success'
});
toast.success(`Roles removed`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1358,19 +1331,13 @@
handleGroupMemberRoleChange(args);
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to add group member roles: ${err}`,
type: 'error'
});
toast.error(`Failed to add group member roles: ${err}`);
allSuccess = false;
}
}
}
if (allSuccess) {
ElMessage({
message: `Added group member roles`,
type: 'success'
});
toast.success(`Added group member roles`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1462,10 +1429,7 @@
}
}
} catch {
ElMessage({
message: 'Failed to get group logs',
type: 'error'
});
toast.error('Failed to get group logs');
} finally {
isGroupMembersLoading.value = false;
}
@@ -1492,18 +1456,12 @@
await groupRequest.deleteBlockedGroupRequest({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to delete blocked group requests: ${err}`,
type: 'error'
});
toast.error(`Failed to delete blocked group requests: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({
message: `Deleted ${memberCount} blocked group requests`,
type: 'success'
});
toast.success(`Deleted ${memberCount} blocked group requests`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1528,18 +1486,12 @@
await groupRequest.blockGroupInviteRequest({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to block group join requests: ${err}`,
type: 'error'
});
toast.error(`Failed to block group join requests: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({
message: `Blocked ${memberCount} group join requests`,
type: 'success'
});
toast.success(`Blocked ${memberCount} group join requests`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1565,18 +1517,12 @@
await groupRequest.rejectGroupInviteRequest({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to reject group join requests: ${err}`,
type: 'error'
});
toast.error(`Failed to reject group join requests: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({
message: `Rejected ${memberCount} group join requests`,
type: 'success'
});
toast.success(`Rejected ${memberCount} group join requests`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1601,18 +1547,12 @@
await groupRequest.acceptGroupInviteRequest({ groupId: D.id, userId: user.userId });
} catch (err) {
console.error(err);
ElMessage({
message: `Failed to accept group join requests: ${err}`,
type: 'error'
});
toast.error(`Failed to accept group join requests: ${err}`);
allSuccess = false;
}
}
if (allSuccess) {
ElMessage({
message: `Accepted ${memberCount} group join requests`,
type: 'success'
});
toast.success(`Accepted ${memberCount} group join requests`);
}
progressCurrent.value = 0;
progressTotal.value = 0;
@@ -1657,10 +1597,7 @@
}
}
} catch {
ElMessage({
message: 'Failed to get group join requests',
type: 'error'
});
toast.error('Failed to get group join requests');
} finally {
isGroupMembersLoading.value = false;
}
@@ -1690,10 +1627,7 @@
}
}
} catch {
ElMessage({
message: 'Failed to get group join requests',
type: 'error'
});
toast.error('Failed to get group join requests');
} finally {
isGroupMembersLoading.value = false;
}
@@ -1727,10 +1661,7 @@
}
}
} catch {
ElMessage({
message: 'Failed to get group invites',
type: 'error'
});
toast.error('Failed to get group invites');
} finally {
isGroupMembersLoading.value = false;
}

22
src/components/dialogs/GroupDialog/GroupPostEditDialog.vue
View File

@@ -99,7 +99,7 @@
<script setup>
import { computed, ref } from 'vue';
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { groupRequest, vrcPlusIconRequest } from '../../../api';
@@ -160,10 +160,7 @@
return;
}
if (!D.title || !D.text) {
ElMessage({
message: 'Title and text are required',
type: 'warning'
});
toast.warning('Title and text are required');
return;
}
const params = {
@@ -180,20 +177,14 @@
}
groupRequest.editGroupPost(params).then((args) => {
handleGroupPost(args);
ElMessage({
message: 'Group post edited',
type: 'success'
});
toast.success('Group post edited');
});
D.visible = false;
}
function createGroupPost() {
const D = groupPostEditDialog.value;
if (!D.title || !D.text) {
ElMessage({
message: 'Title and text are required',
type: 'warning'
});
toast.warning('Title and text are required');
return;
}
const params = {
@@ -210,10 +201,7 @@
}
groupRequest.createGroupPost(params).then((args) => {
handleGroupPost(args);
ElMessage({
message: 'Group post created',
type: 'success'
});
toast.success('Group post created');
});
D.visible = false;
}

34
src/components/dialogs/InviteDialog/EditAndSendInviteDialog.vue
View File

@@ -32,8 +32,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { instanceRequest, inviteMessagesRequest, notificationRequest } from '../../../api';
@@ -84,13 +84,10 @@
})
.then((args) => {
if (args.json[slot].message === I.messageSlot.message) {
ElMessage({
message: "VRChat API didn't update message, try again",
type: 'error'
});
toast.error("VRChat API didn't update message, try again");
throw new Error("VRChat API didn't update message, try again");
} else {
ElMessage('Invite message updated');
toast('Invite message updated');
}
return args;
});
@@ -137,10 +134,7 @@
} else {
J.loading = false;
J.visible = false;
ElMessage({
message: 'Invite sent',
type: 'success'
});
toast.success('Invite sent');
}
};
inviteLoop();
@@ -153,10 +147,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Invite photo message sent',
type: 'success'
});
toast.success('Invite photo message sent');
return args;
});
} else {
@@ -166,10 +157,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Invite message sent',
type: 'success'
});
toast.success('Invite message sent');
return args;
});
}
@@ -183,10 +171,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Request invite photo message sent',
type: 'success'
});
toast.success('Request invite photo message sent');
return args;
});
} else {
@@ -196,10 +181,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Request invite message sent',
type: 'success'
});
toast.success('Request invite message sent');
return args;
});
}

8
src/components/dialogs/InviteDialog/InviteDialog.vue
View File

@@ -168,9 +168,10 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { ref } from 'vue';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useFriendStore, useGalleryStore, useInviteStore, useUserStore } from '../../../stores';
@@ -280,10 +281,7 @@
} else {
D.loading = false;
D.visible = false;
ElMessage({
message: 'Invite sent',
type: 'success'
});
toast.success('Invite sent');
}
};
inviteLoop();

27
src/components/dialogs/InviteDialog/SendInviteConfirmDialog.vue
View File

@@ -22,8 +22,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { instanceRequest, notificationRequest } from '../../../api';
@@ -104,10 +104,7 @@
} else {
J.loading = false;
J.visible = false;
ElMessage({
message: 'Invite message sent',
type: 'success'
});
toast.success('Invite message sent');
}
};
inviteLoop();
@@ -121,10 +118,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Invite photo message sent',
type: 'success'
});
toast.success('Invite photo message sent');
return args;
});
} else {
@@ -134,10 +128,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Invite message sent',
type: 'success'
});
toast.success('Invite message sent');
return args;
});
}
@@ -151,10 +142,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Request invite photo message sent',
type: 'success'
});
toast.success('Request invite photo message sent');
return args;
});
} else {
@@ -164,10 +152,7 @@
throw err;
})
.then((args) => {
ElMessage({
message: 'Request invite message sent',
type: 'success'
});
toast.success('Request invite message sent');
return args;
});
}

8
src/components/dialogs/InviteGroupDialog.vue
View File

@@ -166,8 +166,9 @@
<script setup>
import { computed, nextTick, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { hasGroupPermission, userImage, userStatusClass } from '../../shared/utils';
@@ -244,10 +245,7 @@
}
// not allowed to invite
inviteGroupDialog.value.groupId = '';
ElMessage({
type: 'error',
message: 'You are not allowed to invite to this group'
});
toast.error('You are not allowed to invite to this group');
return args;
})
.finally(() => {

18
src/components/dialogs/LaunchDialog.vue
View File

@@ -120,8 +120,9 @@
<script setup>
import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue';
import { CopyDocument, Warning } from '@element-plus/icons-vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useFriendStore, useGameStore, useInviteStore, useLaunchStore, useLocationStore } from '../../stores';
@@ -273,10 +274,7 @@
shortName
})
.then((args) => {
ElMessage({
message: 'Self invite sent',
type: 'success'
});
toast.success('Self invite sent');
return args;
});
}
@@ -334,15 +332,9 @@
async function copyInstanceMessage(input) {
try {
await navigator.clipboard.writeText(input);
ElMessage({
message: 'Instance copied to clipboard',
type: 'success'
});
toast.success('Instance copied to clipboard');
} catch (error) {
ElMessage({
message: 'Instance copied failed',
type: 'error'
});
toast.error('Instance copied failed');
console.error(error.message);
}
}

7
src/components/dialogs/NewInstanceDialog.vue
View File

@@ -479,8 +479,8 @@
<script setup>
import { nextTick, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -735,10 +735,7 @@
worldId: L.worldId
})
.then((args) => {
ElMessage({
message: 'Self invite sent',
type: 'success'
});
toast.success('Self invite sent');
return args;
});
}

7
src/components/dialogs/UserDialog/BioDialog.vue
View File

@@ -48,7 +48,7 @@
<script setup>
import { Delete } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { getFaviconUrl } from '../../../shared/utils';
@@ -78,10 +78,7 @@
})
.then((args) => {
D.visible = false;
ElMessage({
message: 'Bio updated',
type: 'success'
});
toast.success('Bio updated');
return args;
});
}

7
src/components/dialogs/UserDialog/PronounsDialog.vue
View File

@@ -25,7 +25,7 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { userRequest } from '../../../api';
@@ -53,10 +53,7 @@
})
.then((args) => {
D.visible = false;
ElMessage({
message: 'Pronouns updated',
type: 'success'
});
toast.success('Pronouns updated');
return args;
});
}

7
src/components/dialogs/UserDialog/SocialStatusDialog.vue
View File

@@ -63,8 +63,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useUserStore } from '../../../stores';
@@ -108,10 +108,7 @@
})
.then((args) => {
D.visible = false;
ElMessage({
message: 'Status updated',
type: 'success'
});
toast.success('Status updated');
return args;
});
}

49
src/components/dialogs/UserDialog/UserDialog.vue
View File

@@ -293,9 +293,7 @@
style="display: flex; justify-content: space-between; align-items: center">
<div>
{{ t('dialog.user.info.join_count') }}
<TooltipWrapper
side="top"
:content="t('dialog.user.info.accuracy_notice')">
<TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
<el-icon style="margin-left: 3px"><Warning /></el-icon>
</TooltipWrapper>
</div>
@@ -333,9 +331,7 @@
<div class="detail">
<span class="name">
{{ t('dialog.user.info.play_time') }}
<TooltipWrapper
side="top"
:content="t('dialog.user.info.accuracy_notice')">
<TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
<el-icon style="margin-left: 3px"><Warning /></el-icon>
</TooltipWrapper>
</span>
@@ -875,9 +871,7 @@
{{ t('dialog.group.tags.unsubscribed') }}</span
>
</el-button> -->
<TooltipWrapper
side="right"
:content="t('dialog.user.groups.leave_group_tooltip')">
<TooltipWrapper side="right" :content="t('dialog.user.groups.leave_group_tooltip')">
<el-button
v-if="shiftHeld"
size="small"
@@ -1366,8 +1360,9 @@
Warning
} from '@element-plus/icons-vue';
import { computed, defineAsyncComponent, nextTick, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -1756,10 +1751,7 @@
function handleBadgeUpdate(args) {
if (args.json) {
ElMessage({
message: t('message.badge.updated'),
type: 'success'
});
toast.success(t('message.badge.updated'));
}
}
@@ -1778,10 +1770,7 @@
D.isHideAvatar = false;
}
} else {
ElMessage({
message: t('message.avatar.change_moderation_failed'),
type: 'error'
});
toast.error(t('message.avatar.change_moderation_failed'));
}
});
}
@@ -1845,7 +1834,7 @@
D.id
)
.then((args) => {
ElMessage('Request invite sent');
toast('Request invite sent');
return args;
});
} else if (command === 'Invite Message') {
@@ -1892,7 +1881,7 @@
D.id
)
.then((_args) => {
ElMessage('Invite sent');
toast('Invite sent');
return _args;
});
});
@@ -1904,10 +1893,7 @@
if (fallbackAvatar) {
showAvatarDialog(fallbackAvatar);
} else {
ElMessage({
message: 'No fallback avatar set',
type: 'error'
});
toast.error('No fallback avatar set');
}
} else if (command === 'Previous Instances') {
showPreviousInstancesUserDialog(D.ref);
@@ -2021,10 +2007,7 @@
} else if (ref.type === 'muteChat') {
D.isMuteChat = true;
}
ElMessage({
message: t('message.user.moderated'),
type: 'success'
});
toast.success(t('message.user.moderated'));
}
async function performUserDialogCommand(command, userId) {
@@ -2481,10 +2464,7 @@
homeLocation: ''
})
.then((args) => {
ElMessage({
message: 'Home world has been reset',
type: 'success'
});
toast.success('Home world has been reset');
return args;
});
}
@@ -2554,10 +2534,7 @@
);
} catch (err) {
console.error(err);
ElMessage({
message: 'Failed to save in-game group order',
type: 'error'
});
toast.error('Failed to save in-game group order');
}
}

12
src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue
View File

@@ -42,10 +42,10 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { Upload } from '@element-plus/icons-vue';
import { ref } from 'vue';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { imageRequest, worldRequest } from '../../../api';
@@ -281,10 +281,7 @@
function worldImageSet(args) {
changeWorldImageDialogLoading.value = false;
if (args.json.imageUrl === args.params.imageUrl) {
ElMessage({
message: t('message.world.image_changed'),
type: 'success'
});
toast.success(t('message.world.image_changed'));
emit('update:previousImageUrl', args.json.imageUrl);
} else {
$throw(0, 'World image change failed', args.params.imageUrl);
@@ -303,10 +300,7 @@
const ref = applyWorld(worldArgs.json);
changeWorldImageDialogLoading.value = false;
emit('update:previousImageUrl', ref.imageUrl);
ElMessage({
message: t('message.world.image_changed'),
type: 'success'
});
toast.success(t('message.world.image_changed'));
// closeDialog();
}

7
src/components/dialogs/WorldDialog/SetWorldTagsDialog.vue
View File

@@ -90,7 +90,7 @@
<script setup>
import { computed, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useWorldStore } from '../../../stores';
@@ -306,10 +306,7 @@
tags
})
.then((args) => {
ElMessage({
message: 'Tags updated',
type: 'success'
});
toast.success('Tags updated');
emit('update:isSetWorldTagsDialogVisible', false);
if (props.isWorldDialogVisible) {
showWorldDialog(args.json.id);

7
src/components/dialogs/WorldDialog/WorldAllowedDomainsDialog.vue
View File

@@ -29,7 +29,7 @@
<script setup>
import { computed, ref, watch } from 'vue';
import { Delete } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { worldRequest } from '../../../api';
@@ -76,10 +76,7 @@
urlList: urlList.value
})
.then((args) => {
ElMessage({
message: 'Allowed Video Player Domains updated',
type: 'success'
});
toast.success('Allowed Video Player Domains updated');
return args;
});
D.visible = false;

93
src/components/dialogs/WorldDialog/WorldDialog.vue
View File

@@ -748,8 +748,9 @@
Warning
} from '@element-plus/icons-vue';
import { computed, defineAsyncComponent, nextTick, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -983,10 +984,7 @@
homeLocation: D.id
})
.then((args) => {
ElMessage({
message: 'Home world updated',
type: 'success'
});
toast.success('Home world updated');
return args;
});
break;
@@ -996,10 +994,7 @@
homeLocation: ''
})
.then((args) => {
ElMessage({
message: 'Home world has been reset',
type: 'success'
});
toast.success('Home world has been reset');
return args;
});
break;
@@ -1009,10 +1004,7 @@
worldId: D.id
})
.then((args) => {
ElMessage({
message: 'World has been published',
type: 'success'
});
toast.success('World has been published');
return args;
});
break;
@@ -1022,10 +1014,7 @@
worldId: D.id
})
.then((args) => {
ElMessage({
message: 'World has been unpublished',
type: 'success'
});
toast.success('World has been unpublished');
return args;
});
break;
@@ -1038,10 +1027,7 @@
if (args.params.worldId === worldDialog.value.id && worldDialog.value.visible) {
worldDialog.value.hasPersistData = false;
}
ElMessage({
message: 'Persistent data has been deleted',
type: 'success'
});
toast.success('Persistent data has been deleted');
return args;
});
break;
@@ -1063,10 +1049,7 @@
const array = Array.from(map.values());
userDialog.value.worlds = array;
}
ElMessage({
message: 'World has been deleted',
type: 'success'
});
toast.success('World has been deleted');
D.visible = false;
return args;
});
@@ -1141,10 +1124,7 @@
name: value
})
.then((args) => {
ElMessage({
message: t('prompt.rename_world.message.success'),
type: 'success'
});
toast.success(t('prompt.rename_world.message.success'));
return args;
});
}
@@ -1171,10 +1151,7 @@
description: value
})
.then((args) => {
ElMessage({
message: t('prompt.change_world_description.message.success'),
type: 'success'
});
toast.success(t('prompt.change_world_description.message.success'));
return args;
});
}
@@ -1199,10 +1176,7 @@
capacity: Number(value)
})
.then((args) => {
ElMessage({
message: t('prompt.change_world_capacity.message.success'),
type: 'success'
});
toast.success(t('prompt.change_world_capacity.message.success'));
return args;
});
}
@@ -1231,10 +1205,7 @@
recommendedCapacity: Number(value)
})
.then((args) => {
ElMessage({
message: t('prompt.change_world_recommended_capacity.message.success'),
type: 'success'
});
toast.success(t('prompt.change_world_recommended_capacity.message.success'));
return args;
});
}
@@ -1265,10 +1236,7 @@
processedValue = id2;
}
} catch {
ElMessage({
message: t('prompt.change_world_preview.message.error'),
type: 'error'
});
toast.error(t('prompt.change_world_preview.message.error'));
return;
}
}
@@ -1279,10 +1247,7 @@
previewYoutubeId: processedValue
})
.then((args) => {
ElMessage({
message: t('prompt.change_world_preview.message.success'),
type: 'success'
});
toast.success(t('prompt.change_world_preview.message.success'));
return args;
});
}
@@ -1318,51 +1283,33 @@
navigator.clipboard
.writeText(worldDialog.value.id)
.then(() => {
ElMessage({
message: 'World ID copied to clipboard',
type: 'success'
});
toast.success('World ID copied to clipboard');
})
.catch((err) => {
console.error('copy failed:', err);
ElMessage({
message: 'Copy failed',
type: 'error'
});
toast.error('Copy failed');
});
}
function copyWorldUrl() {
navigator.clipboard
.writeText(`https://vrchat.com/home/world/${worldDialog.value.id}`)
.then(() => {
ElMessage({
message: 'World URL copied to clipboard',
type: 'success'
});
toast.success('World URL copied to clipboard');
})
.catch((err) => {
console.error('copy failed:', err);
ElMessage({
message: 'Copy failed',
type: 'error'
});
toast.error('Copy failed');
});
}
function copyWorldName() {
navigator.clipboard
.writeText(worldDialog.value.ref.name)
.then(() => {
ElMessage({
message: 'World name copied to clipboard',
type: 'success'
});
toast.success('World name copied to clipboard');
})
.catch((err) => {
console.error('copy failed:', err);
ElMessage({
message: 'Copy failed',
type: 'error'
});
toast.error('Copy failed');
});
}
function showWorldAllowedDomainsDialog() {

6
src/components/ui/data-table/DataTableLayout.vue
View File

@@ -66,7 +66,7 @@
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem v-for="size in pageSizes" :key="size" :value="String(size)">
<SelectItem v-for="size in pageSizes" :key="String(size)" :value="String(size)">
{{ size }}
</SelectItem>
</SelectContent>
@@ -81,7 +81,9 @@
class="flex-none">
<PaginationContent v-slot="{ items }">
<PaginationPrevious />
<template v-for="item in items" :key="item.key">
<template
v-for="(item, index) in items"
:key="item.type === 'page' ? `page-${item.value}` : `ellipsis-${index}`">
<PaginationItem
v-if="item.type === 'page'"
:value="item.value"

62
src/components/ui/sonner/Sonner.vue Normal file
View File

@@ -0,0 +1,62 @@
<script setup>
import { CircleCheckIcon, InfoIcon, Loader2Icon, OctagonXIcon, TriangleAlertIcon, XIcon } from 'lucide-vue-next';
import { Toaster as Sonner } from 'vue-sonner';
import { cn } from '@/lib/utils';
const props = defineProps({
id: { type: String, required: false },
invert: { type: Boolean, required: false },
theme: { type: String, required: false },
position: { type: String, required: false },
closeButtonPosition: { type: String, required: false },
hotkey: { type: Array, required: false },
richColors: { type: Boolean, required: false },
expand: { type: Boolean, required: false },
duration: { type: Number, required: false },
gap: { type: Number, required: false },
visibleToasts: { type: Number, required: false },
closeButton: { type: Boolean, required: false },
toastOptions: { type: Object, required: false },
class: { type: String, required: false },
style: { type: Object, required: false },
offset: { type: [Object, String, Number], required: false },
mobileOffset: { type: [Object, String, Number], required: false },
dir: { type: String, required: false },
swipeDirections: { type: Array, required: false },
icons: { type: Object, required: false },
containerAriaLabel: { type: String, required: false }
});
</script>
<template>
<Sonner
:class="cn('toaster group', props.class)"
:style="{
'--normal-bg': 'var(--popover)',
'--normal-text': 'var(--popover-foreground)',
'--normal-border': 'var(--border)',
'--border-radius': 'var(--radius)'
}"
v-bind="props">
<template #success-icon>
<CircleCheckIcon class="size-4" />
</template>
<template #info-icon>
<InfoIcon class="size-4" />
</template>
<template #warning-icon>
<TriangleAlertIcon class="size-4" />
</template>
<template #error-icon>
<OctagonXIcon class="size-4" />
</template>
<template #loading-icon>
<div>
<Loader2Icon class="size-4 animate-spin" />
</div>
</template>
<template #close-icon>
<XIcon class="size-4" />
</template>
</Sonner>
</template>

1
src/components/ui/sonner/index.js Normal file
View File

@@ -0,0 +1 @@
export { default as Toaster } from './Sonner.vue';

8
src/service/request.js
View File

@@ -1,4 +1,5 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { toast } from 'vue-sonner';
import Noty from 'noty';
@@ -198,10 +199,7 @@ export function request(endpoint, options) {
status === 404 &&
endpoint?.startsWith('avatars/')
) {
ElMessage({
message: t('message.api_handler.avatar_private_or_deleted'),
type: 'error'
});
toast.error(t('message.api_handler.avatar_private_or_deleted'));
avatarStore.avatarDialog.visible = false;
$throw(404, data.error?.message || '', endpoint);
}

8
src/shared/utils/base/ui.js
View File

@@ -1,5 +1,5 @@
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { THEME_CONFIG } from '../../constants';
import { i18n } from '../../../plugin/i18n';
@@ -327,11 +327,7 @@ async function getThemeMode(configRepository) {
function redirectToToolsTab() {
router.push({ name: 'tools' });
ElMessage({
message: i18n.global.t('view.tools.redirect_message'),
type: 'primary',
duration: 3000
});
toast(i18n.global.t('view.tools.redirect_message'), { duration: 3000 });
}
export {

13
src/shared/utils/common.js
View File

@@ -1,5 +1,6 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import Noty from 'noty';
@@ -159,17 +160,11 @@ function copyToClipboard(text, message = 'Copied successfully!') {
navigator.clipboard
.writeText(text)
.then(() => {
ElMessage({
message: message,
type: 'success'
});
toast.success(message);
})
.catch((err) => {
console.error('Copy failed:', err);
ElMessage({
message: 'Copy failed!',
type: 'error'
});
toast.error('Copy failed!');
});
}

13
src/shared/utils/imageUpload.js
View File

@@ -1,5 +1,4 @@
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
function resolveMessage(message) {
if (typeof message === 'function') {
return message();
@@ -47,10 +46,7 @@ export function handleImageUploadInput(event, options = {}) {
const file = files[0];
if (file.size >= maxSize) {
if (tooLargeMessage) {
ElMessage({
message: resolveMessage(tooLargeMessage),
type: 'error'
});
toast.error(resolveMessage(tooLargeMessage));
}
clearInput();
return { file: null, clearInput };
@@ -66,10 +62,7 @@ export function handleImageUploadInput(event, options = {}) {
if (acceptRegex && !acceptRegex.test(file.type)) {
if (invalidTypeMessage) {
ElMessage({
message: resolveMessage(invalidTypeMessage),
type: 'error'
});
toast.error(resolveMessage(invalidTypeMessage));
}
clearInput();
return { file: null, clearInput };

8
src/stores/auth.js
View File

@@ -1,6 +1,7 @@
import { reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
@@ -477,10 +478,7 @@ export const useAuthStore = defineStore('Auth', () => {
});
})
.catch((_) => {
ElMessage({
message: 'Incorrect primary password',
type: 'error'
});
toast.error('Incorrect primary password');
reject(_);
});
} else {

41
src/stores/avatar.js
View File

@@ -1,6 +1,7 @@
import { nextTick, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import {
checkVRChatCache,
@@ -468,10 +469,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
} catch (err) {
const msg = `Avatar search failed for ${search} with ${avatarProviderStore.avatarRemoteDatabaseProvider}\n${err}`;
console.error(msg);
ElMessage({
message: msg,
type: 'error'
});
toast.error(msg);
}
} else if (type === 'authorId') {
const length =
@@ -546,10 +544,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
} catch (err) {
const msg = `Avatar lookup failed for ${authorId} with ${url}\n${err}`;
console.error(msg);
ElMessage({
message: msg,
type: 'error'
});
toast.error(msg);
}
return avatars;
}
@@ -568,10 +563,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
async function selectAvatarWithoutConfirmation(id) {
if (userStore.currentUser.currentAvatar === id) {
ElMessage({
message: 'Avatar already selected',
type: 'info'
});
toast.info('Avatar already selected');
return;
}
return avatarRequest
@@ -579,10 +571,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
avatarId: id
})
.then(() => {
ElMessage({
message: 'Avatar changed',
type: 'success'
});
toast.success('Avatar changed');
});
}
@@ -614,10 +603,7 @@ export const useAvatarStore = defineStore('Avatar', () => {
) {
const fileId = extractFileId(currentAvatarImageUrl);
if (!fileId) {
ElMessage({
message: 'Sorry, the author is unknown',
type: 'error'
});
toast.error('Sorry, the author is unknown');
} else if (refUserId === userStore.currentUser.id) {
showAvatarDialog(userStore.currentUser.currentAvatar);
} else {
@@ -637,16 +623,11 @@ export const useAvatarStore = defineStore('Avatar', () => {
}
if (!avatarId) {
if (avatarInfo.ownerId === refUserId) {
ElMessage({
message:
"It's personal (own) avatar or not found in avatar database",
type: 'warning'
});
toast.warning(
"It's personal (own) avatar or not found in avatar database"
);
} else {
ElMessage({
message: 'Avatar not found in avatar database',
type: 'warning'
});
toast.warning('Avatar not found in avatar database');
userStore.showUserDialog(avatarInfo.ownerId);
}
}

11
src/stores/charts.js
View File

@@ -1,6 +1,7 @@
import { computed, reactive, ref, watch } from 'vue';
import { ElMessage, ElNotification } from 'element-plus';
import { ElNotification } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useFriendStore } from './friend';
@@ -38,12 +39,8 @@ export const useChartsStore = defineStore('Charts', () => {
const friendCount = computed(() => friendStore.friends.size || 0);
function showInfoMessage(message, type) {
ElMessage({
message,
type,
duration: 4000,
grouping: true
});
const toastFn = toast[type] ?? toast;
toastFn(message, { duration: 4000 });
}
watch(

38
src/stores/favorite.js
View File

@@ -1,6 +1,6 @@
import { computed, reactive, ref, shallowReactive, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -1071,12 +1071,11 @@ export const useFavoriteStore = defineStore('Favorite', () => {
*/
function renameLocalAvatarFavoriteGroup(newName, group) {
if (localAvatarFavoriteGroups.value.includes(newName)) {
ElMessage({
message: t('prompt.local_favorite_group_rename.message.error', {
toast.error(
t('prompt.local_favorite_group_rename.message.error', {
name: newName
}),
type: 'error'
});
})
);
return;
}
localAvatarFavorites[newName] = localAvatarFavorites[group];
@@ -1092,12 +1091,11 @@ export const useFavoriteStore = defineStore('Favorite', () => {
*/
function newLocalAvatarFavoriteGroup(group) {
if (localAvatarFavoriteGroups.value.includes(group)) {
ElMessage({
message: t('prompt.new_local_favorite_group.message.error', {
toast.error(
t('prompt.new_local_favorite_group.message.error', {
name: group
}),
type: 'error'
});
})
);
return;
}
if (!localAvatarFavorites[group]) {
@@ -1355,12 +1353,11 @@ export const useFavoriteStore = defineStore('Favorite', () => {
*/
function renameLocalWorldFavoriteGroup(newName, group) {
if (localWorldFavoriteGroups.value.includes(newName)) {
ElMessage({
message: t('prompt.local_favorite_group_rename.message.error', {
toast.error(
t('prompt.local_favorite_group_rename.message.error', {
name: newName
}),
type: 'error'
});
})
);
return;
}
localWorldFavorites[newName] = localWorldFavorites[group];
@@ -1474,12 +1471,11 @@ export const useFavoriteStore = defineStore('Favorite', () => {
*/
function newLocalWorldFavoriteGroup(group) {
if (localWorldFavoriteGroups.value.includes(group)) {
ElMessage({
message: t('prompt.new_local_favorite_group.message.error', {
toast.error(
t('prompt.new_local_favorite_group.message.error', {
name: group
}),
type: 'error'
});
})
);
return;
}
if (!localWorldFavorites[group]) {

8
src/stores/friend.js
View File

@@ -1,6 +1,7 @@
import { computed, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -1606,10 +1607,7 @@ export const useFriendStore = defineStore('Friend', () => {
}
} catch (err) {
if (!AppDebug.dontLogMeOut) {
ElMessage({
message: t('message.friend.load_failed'),
type: 'error'
});
toast.error(t('message.friend.load_failed'));
authStore.handleLogoutEvent();
throw err;
}

8
src/stores/game.js
View File

@@ -1,6 +1,7 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import { reactive, ref } from 'vue';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import {
deleteVRChatCache as _deleteVRChatCache,
@@ -123,10 +124,7 @@ export const useGameStore = defineStore('Game', () => {
}
AppApi.FocusWindow();
const message = 'VRChat crashed, attempting to rejoin last instance';
ElMessage({
message,
type: 'info'
});
toast(message);
const entry = {
created_at: new Date().toJSON(),
type: 'Event',

11
src/stores/gameLog.js
View File

@@ -1,6 +1,7 @@
import { reactive, ref, shallowReactive, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import dayjs from 'dayjs';
@@ -1400,11 +1401,9 @@ export const useGameLogStore = defineStore('GameLog', () => {
async function disableGameLogDialog() {
if (gameStore.isGameRunning) {
ElMessage({
message:
'VRChat needs to be closed before this option can be changed',
type: 'error'
});
toast.error(
'VRChat needs to be closed before this option can be changed'
);
return;
}
if (!advancedSettingsStore.gameLogDisabled) {

18
src/stores/group.js
View File

@@ -1,6 +1,7 @@
import { nextTick, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import {
groupRequest,
@@ -150,10 +151,7 @@ export const useGroupStore = defineStore('Group', () => {
.catch((err) => {
D.loading = false;
D.visible = false;
ElMessage({
message: 'Failed to load group',
type: 'error'
});
toast.error('Failed to load group');
throw err;
})
.then((args) => {
@@ -596,10 +594,7 @@ export const useGroupStore = defineStore('Group', () => {
})
.then((args) => {
handleGroupMemberProps(args);
ElMessage({
message: 'Group visibility updated',
type: 'success'
});
toast.success('Group visibility updated');
return args;
});
}
@@ -611,10 +606,7 @@ export const useGroupStore = defineStore('Group', () => {
})
.then((args) => {
handleGroupMemberProps(args);
ElMessage({
message: 'Group subscription updated',
type: 'success'
});
toast.success('Group subscription updated');
return args;
});
}

55
src/stores/instance.js
View File

@@ -1,6 +1,6 @@
import { computed, reactive, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { reactive, ref, watch } from 'vue';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -16,8 +16,7 @@ import {
hasGroupPermission,
isRealInstance,
parseLocation,
replaceBioSymbols,
replaceReactiveObject
replaceBioSymbols
} from '../shared/utils';
import { instanceRequest, userRequest, worldRequest } from '../api';
import { database } from '../service/database';
@@ -72,6 +71,7 @@ export const useInstanceStore = defineStore('Instance', () => {
lastUpdated: ''
});
/** @type {import('vue').Ref<any>} */
const currentInstanceLocation = ref({});
const queuedInstances = reactive(new Map());
@@ -877,11 +877,8 @@ export const useInstanceStore = defineStore('Instance', () => {
function removeAllQueuedInstances() {
queuedInstances.forEach((ref) => {
ElMessage({
message: `Removed instance ${ref.$worldName} from queue`,
type: 'info'
});
ref.$msgBox?.close();
toast.info(`Removed instance ${ref.$worldName} from queue`);
toast.dismiss(ref.$msgBox);
});
queuedInstances.clear();
}
@@ -893,7 +890,7 @@ export const useInstanceStore = defineStore('Instance', () => {
function removeQueuedInstance(instanceId) {
const ref = queuedInstances.get(instanceId);
if (typeof ref !== 'undefined') {
ref.$msgBox.close();
toast.dismiss(ref.$msgBox);
queuedInstances.delete(instanceId);
}
}
@@ -905,13 +902,12 @@ export const useInstanceStore = defineStore('Instance', () => {
function applyQueuedInstance(instanceId) {
queuedInstances.forEach((ref) => {
if (ref.location !== instanceId) {
ElMessage({
message: t('message.instance.removed_form_queue', {
toast.info(
t('message.instance.removed_form_queue', {
worldName: ref.$worldName
}),
type: 'info'
});
ref.$msgBox?.close();
})
);
toast.dismiss(ref.$msgBox);
queuedInstances.delete(ref.location);
}
});
@@ -953,7 +949,7 @@ export const useInstanceStore = defineStore('Instance', () => {
function instanceQueueReady(instanceId) {
const ref = queuedInstances.get(instanceId);
if (typeof ref !== 'undefined') {
ref.$msgBox.close();
toast.dismiss(ref.$msgBox);
queuedInstances.delete(instanceId);
}
const L = parseLocation(instanceId);
@@ -961,10 +957,7 @@ export const useInstanceStore = defineStore('Instance', () => {
const groupName = group?.name ?? '';
const worldName = ref?.$worldName ?? '';
const location = displayLocation(instanceId, worldName, groupName);
ElMessage({
message: `Instance ready to join ${location}`,
type: 'success'
});
toast.success(`Instance ready to join ${location}`);
const noty = {
created_at: new Date().toJSON(),
type: 'group.queueReady',
@@ -1021,14 +1014,16 @@ export const useInstanceStore = defineStore('Instance', () => {
ref.$worldName,
ref.$groupName
);
ref.$msgBox?.close();
ref.$msgBox = ElMessage({
message: `You are in position ${ref.position} of ${ref.queueSize} in the queue for ${location} `,
type: 'info',
duration: 0,
showClose: true,
customClass: 'vrc-instance-queue-message'
});
toast.dismiss(ref.$msgBox ?? undefined);
ref.$msgBox = toast.info(
`You are in position ${ref.position} of ${ref.queueSize} in the queue for ${location} `,
{
duration: Infinity,
position: 'bottom-right',
closeButton: true,
class: 'vrc-instance-queue-message'
}
);
queuedInstances.set(instanceId, ref);
// workerTimers.setTimeout(this.instanceQueueTimeout, 3600000);
}
@@ -1196,7 +1191,7 @@ export const useInstanceStore = defineStore('Instance', () => {
// $app.methods.instanceQueueClear = function () {
// // remove all instances from queue
// queuedInstances.forEach((ref) => {
// ref.$msgBox.close();
// toast.dismiss(ref.$msgBox);
// queuedInstances.delete(ref.location);
// });
// };

12
src/stores/invite.js
View File

@@ -1,6 +1,6 @@
import { computed, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { instanceRequest, inviteMessagesRequest } from '../api';
import { parseLocation } from '../shared/utils';
@@ -111,10 +111,7 @@ export const useInviteStore = defineStore('Invite', () => {
instanceStore.createNewInstance(worldId).then((args) => {
const location = args?.json?.location;
if (!location) {
ElMessage({
message: 'Failed to create instance',
type: 'error'
});
toast.error('Failed to create instance');
return;
}
// self invite
@@ -134,10 +131,7 @@ export const useInviteStore = defineStore('Invite', () => {
worldId: L.worldId
})
.then((args) => {
ElMessage({
message: 'Self invite sent',
type: 'success'
});
toast.success('Self invite sent');
return args;
});
});

46
src/stores/launch.js
View File

@@ -1,6 +1,6 @@
import { nextTick, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { instanceRequest } from '../api';
import { parseLocation } from '../shared/utils';
@@ -103,11 +103,9 @@ export const useLaunchStore = defineStore('Launch', () => {
}
console.log('Attach Game', launchUrl, result);
if (!result) {
ElMessage({
message:
'Failed open instance in VRChat, falling back to self invite',
type: 'warning'
});
toast.warning(
'Failed open instance in VRChat, falling back to self invite'
);
// self invite fallback
try {
const L = parseLocation(location);
@@ -116,10 +114,7 @@ export const useLaunchStore = defineStore('Launch', () => {
worldId: L.worldId,
shortName
});
ElMessage({
message: 'Self invite sent',
type: 'success'
});
toast.success('Self invite sent');
} catch (e) {
console.error(e);
}
@@ -157,38 +152,25 @@ export const useLaunchStore = defineStore('Launch', () => {
args.join(' ')
);
if (!result) {
ElMessage({
message:
'Failed to launch VRChat, invalid custom path set',
type: 'error'
});
toast.error(
'Failed to launch VRChat, invalid custom path set'
);
} else {
ElMessage({
message: 'VRChat launched',
type: 'success'
});
toast.success('VRChat launched');
}
} else {
const result = await AppApi.StartGame(args.join(' '));
if (!result) {
ElMessage({
message:
'Failed to find VRChat, set a custom path in launch options',
type: 'error'
});
toast.error(
'Failed to find VRChat, set a custom path in launch options'
);
} else {
ElMessage({
message: 'VRChat launched',
type: 'success'
});
toast.success('VRChat launched');
}
}
} catch (e) {
console.error(e);
ElMessage({
message: `Failed to launch VRChat: ${e.message}`,
type: 'error'
});
toast.error(`Failed to launch VRChat: ${e.message}`);
}
console.log('Launch Game', args.join(' '), desktopMode);
}

8
src/stores/photon.js
View File

@@ -1,6 +1,7 @@
import { computed, reactive, ref } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -433,10 +434,7 @@ export const usePhotonStore = defineStore('Photon', () => {
userStore.lookupUser(ref);
}
} else {
ElMessage({
message: 'No user info available',
type: 'error'
});
toast.error('No user info available');
}
}
}

8
src/stores/search.js
View File

@@ -1,6 +1,7 @@
import { computed, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
@@ -367,10 +368,7 @@ export const useSearchStore = defineStore('Search', () => {
if (action === 'confirm' && value) {
const input = value.trim();
if (!directAccessParse(input)) {
ElMessage({
message: t('prompt.direct_access_omni.message.error'),
type: 'error'
});
toast.error(t('prompt.direct_access_omni.message.error'));
}
}
} catch (error) {

77
src/stores/settings/advanced.js
View File

@@ -1,10 +1,12 @@
import { reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { AppDebug } from '../../service/appConfig';
import { database } from '../../service/database';
import { languageCodes } from '../../localization';
import { useGameStore } from '../game';
import { useVRCXUpdaterStore } from '../vrcxUpdater';
import { useVrcxStore } from '../vrcx';
@@ -12,7 +14,6 @@ import { watchState } from '../../service/watchState';
import configRepository from '../../service/config';
import webApiService from '../../service/webapi';
import { languageCodes } from '../../localization';
export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
const gameStore = useGameStore();
@@ -162,10 +163,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
configRepository.getString('VRCX_SentryEnabled', '')
]);
if (
!bioLanguageConfig ||
!languageCodes.includes(bioLanguageConfig)
) {
if (!bioLanguageConfig || !languageCodes.includes(bioLanguageConfig)) {
bioLanguage.value = 'en';
} else {
bioLanguage.value = bioLanguageConfig;
@@ -628,10 +626,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
async function translateText(text, targetLang, overrides) {
if (!translationApi.value) {
ElMessage({
message: 'Translation API disabled',
type: 'warning'
});
toast.warning('Translation API disabled');
return null;
}
@@ -641,10 +636,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
if (provider === 'google') {
const keyToUse = overrides?.key ?? translationApiKey.value;
if (!keyToUse) {
ElMessage({
message: 'No Translation API key configured',
type: 'warning'
});
toast.warning('No Translation API key configured');
return null;
}
try {
@@ -672,10 +664,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
}
return data.data.translations[0].translatedText;
} catch (err) {
ElMessage({
message: `Translation failed: ${err.message}`,
type: 'error'
});
toast.error(`Translation failed: ${err.message}`);
return null;
}
}
@@ -692,10 +681,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
`You are a translation assistant. Translate the user message into ${targetLang}. Only return the translated text.`;
if (!endpoint || !model) {
ElMessage({
message: 'Translation endpoint/model missing',
type: 'warning'
});
toast.warning('Translation endpoint/model missing');
return null;
}
@@ -742,10 +728,7 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
const translated = data?.choices?.[0]?.message?.content;
return typeof translated === 'string' ? translated.trim() : null;
} catch (err) {
ElMessage({
message: `Translation failed: ${err.message}`,
type: 'error'
});
toast.error(`Translation failed: ${err.message}`);
return null;
}
}
@@ -769,25 +752,18 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
)
.then(async ({ action }) => {
if (action === 'confirm') {
const msgBox = ElMessage({
message: 'Batch print cropping in progress...',
type: 'warning',
duration: 0
});
const msgBox = toast.warning(
'Batch print cropping in progress...',
{ duration: Infinity, position: 'bottom-right' }
);
try {
await AppApi.CropAllPrints(ugcFolderPath.value);
ElMessage({
message: 'Batch print cropping complete',
type: 'success'
});
toast.success('Batch print cropping complete');
} catch (err) {
console.error(err);
ElMessage({
message: `Batch print cropping failed: ${err}`,
type: 'error'
});
toast.error(`Batch print cropping failed: ${err}`);
} finally {
msgBox.close();
toast.dismiss(msgBox);
}
}
})
@@ -836,25 +812,18 @@ export const useAdvancedSettingsStore = defineStore('AdvancedSettings', () => {
)
.then(async ({ action }) => {
if (action === 'confirm') {
const msgBox = ElMessage({
message: 'Batch metadata removal in progress...',
type: 'warning',
duration: 0
});
const msgBox = toast.warning(
'Batch metadata removal in progress...',
{ duration: Infinity, position: 'bottom-right' }
);
try {
await AppApi.DeleteAllScreenshotMetadata();
ElMessage({
message: 'Batch metadata removal complete',
type: 'success'
});
toast.success('Batch metadata removal complete');
} catch (err) {
console.error(err);
ElMessage({
message: `Batch metadata removal failed: ${err}`,
type: 'error'
});
toast.error(`Batch metadata removal failed: ${err}`);
} finally {
msgBox.close();
toast.dismiss(msgBox);
}
}
})

7
src/stores/ui.js
View File

@@ -1,6 +1,6 @@
import { ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useMagicKeys } from '@vueuse/core';
import { useRouter } from 'vue-router';
@@ -54,10 +54,7 @@ export const useUiStore = defineStore('Ui', () => {
if (isPressed) {
refreshCustomCss();
updateLocalizedStrings();
ElMessage({
message: 'Custom CSS and localization strings refreshed',
type: 'success'
});
toast.success('Custom CSS and localization strings refreshed');
}
});

12
src/stores/user.js
View File

@@ -1,6 +1,6 @@
import { computed, reactive, ref, shallowReactive, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import Noty from 'noty';
@@ -842,10 +842,7 @@ export const useUserStore = defineStore('User', () => {
.catch((err) => {
D.loading = false;
D.visible = false;
ElMessage({
message: 'Failed to load user',
type: 'error'
});
toast.error('Failed to load user');
throw err;
})
.then((args) => {
@@ -1218,10 +1215,7 @@ export const useUserStore = defineStore('User', () => {
return;
}
}
ElMessage({
message: 'Own avatar not found',
type: 'error'
});
toast.error('Own avatar not found');
}
}
});

52
src/stores/vrcx.js
View File

@@ -1,6 +1,7 @@
import { reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
@@ -160,12 +161,10 @@ export const useVrcxStore = defineStore('Vrcx', () => {
let msgBox;
if (state.databaseVersion < databaseVersion) {
if (state.databaseVersion) {
msgBox = ElMessage({
message:
'DO NOT CLOSE VRCX, database upgrade in progress...',
type: 'warning',
duration: 0
});
msgBox = toast.warning(
'DO NOT CLOSE VRCX, database upgrade in progress...',
{ duration: Infinity, position: 'bottom-right' }
);
}
console.log(
`Updating database from ${state.databaseVersion} to ${databaseVersion}...`
@@ -188,24 +187,19 @@ export const useVrcxStore = defineStore('Vrcx', () => {
databaseVersion
);
console.log('Database update complete.');
msgBox?.close();
toast.dismiss(msgBox);
if (state.databaseVersion) {
// only display when database exists
ElMessage({
message: 'Database upgrade complete',
type: 'success'
});
toast.success('Database upgrade complete');
}
state.databaseVersion = databaseVersion;
} catch (err) {
console.error(err);
msgBox?.close();
ElMessage({
message:
'Database upgrade failed, check console for details',
type: 'error',
duration: 120000
});
toast.dismiss(msgBox);
toast.error(
'Database upgrade failed, check console for details',
{ duration: 120000 }
);
AppApi.ShowDevTools();
}
}
@@ -365,12 +359,10 @@ export const useVrcxStore = defineStore('Vrcx', () => {
} catch (e) {
console.error('Failed to add screenshot metadata', e);
if (e.message?.includes('UnauthorizedAccessException')) {
ElMessage({
message:
'Failed to add screenshot metadata, access denied. Make sure VRCX has permission to access the screenshot folder.',
type: 'error',
duration: 10000
});
toast.error(
'Failed to add screenshot metadata, access denied. Make sure VRCX has permission to access the screenshot folder.',
{ duration: 10000 }
);
}
return;
}
@@ -547,10 +539,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
}
}
ElMessage({
message: t('message.crash.vrcx_reload'),
type: 'success'
});
toast.success(t('message.crash.vrcx_reload'));
return;
}
eventLaunchCommand(command);
@@ -603,10 +592,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
const regexAvatarId =
/avtr_[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}/g;
if (!avatarId.match(regexAvatarId) || avatarId.length !== 41) {
ElMessage({
message: 'Invalid Avatar ID',
type: 'error'
});
toast.error('Invalid Avatar ID');
break;
}
if (advancedSettingsStore.showConfirmationOnSwitchAvatar) {

34
src/stores/vrcxUpdater.js
View File

@@ -1,6 +1,6 @@
import { computed, ref } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { AppDebug } from '../service/appConfig';
@@ -211,12 +211,11 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
checkingForVRCXUpdate.value = false;
}
if (response.status !== 200) {
ElMessage({
message: t('message.vrcx_updater.failed', {
toast.error(
t('message.vrcx_updater.failed', {
message: `${response.status} ${response.data}`
}),
type: 'error'
});
})
);
return;
}
pendingVRCXUpdate.value = false;
@@ -290,12 +289,11 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
checkingForVRCXUpdate.value = false;
}
if (response.status !== 200) {
ElMessage({
message: t('message.vrcx_updater.failed', {
toast.error(
t('message.vrcx_updater.failed', {
message: `${response.status} ${response.data}`
}),
type: 'error'
});
})
);
return;
}
if (AppDebug.debugWebRequests) {
@@ -303,12 +301,11 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
}
const releases = [];
if (typeof json !== 'object' || json.message) {
ElMessage({
message: t('message.vrcx_updater.failed', {
toast.error(
t('message.vrcx_updater.failed', {
message: json.message
}),
type: 'error'
});
})
);
return;
}
for (const release of json) {
@@ -347,10 +344,7 @@ export const useVRCXUpdaterStore = defineStore('VRCXUpdater', () => {
pendingVRCXInstall.value = releaseName;
} catch (err) {
console.error(err);
ElMessage({
message: `${t('message.vrcx_updater.failed_install')} ${err}`,
type: 'error'
});
toast.error(`${t('message.vrcx_updater.failed_install')} ${err}`);
} finally {
updateInProgress.value = false;
updateProgress.value = 0;

7
src/stores/world.js
View File

@@ -1,6 +1,6 @@
import { reactive, shallowReactive, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { defineStore } from 'pinia';
import { toast } from 'vue-sonner';
import {
checkVRChatCache,
@@ -132,10 +132,7 @@ export const useWorldStore = defineStore('World', () => {
.catch((err) => {
D.loading = false;
D.visible = false;
ElMessage({
message: 'Failed to load world',
type: 'error'
});
toast.error('Failed to load world');
throw err;
})
.then((args) => {

16
src/views/Charts/components/MutualFriends.vue
View File

@@ -104,10 +104,11 @@
<script setup>
import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { Setting } from '@element-plus/icons-vue';
import { onBeforeRouteLeave } from 'vue-router';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAppearanceSettingsStore, useChartsStore, useFriendStore, useUserStore } from '../../../stores';
@@ -173,7 +174,7 @@
const progressPercent = computed(() =>
totalFriends.value ? Math.min(100, Math.round((fetchState.processedFriends / totalFriends.value) * 100)) : 0
);
const progressStatus = computed(() => (isFetching.value ? 'warning' : undefined));
const progressStatus = computed(() => (isFetching.value ? 'warning' : ''));
const forceDefaults = computed(() =>
computeForceOptions(graphPayload.value?.nodes ?? [], graphPayload.value?.links ?? [])
);
@@ -293,13 +294,8 @@
if (!message) {
return;
}
ElMessage({
// @ts-ignore
message,
type,
duration: 4000,
grouping: true
});
const toastFn = toast[type] ?? toast;
toastFn(message, { duration: 4000 });
}
function createChartInstance() {
@@ -613,7 +609,7 @@
const hasInvalid = [repulsion, minEdge, maxEdge, gravity].some((entry) => entry.invalid);
if (hasInvalid) {
ElMessage.error(t('view.charts.mutual_friend.force_dialog.invalid_input'));
toast.error(t('view.charts.mutual_friend.force_dialog.invalid_input'));
return;
}

23
src/views/Favorites/FavoritesAvatar.vue
View File

@@ -497,9 +497,10 @@
<script setup>
import { computed, h, nextTick, onBeforeMount, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox, ElNotification, ElProgress } from 'element-plus';
import { Loading, MoreFilled, Plus, Refresh } from '@element-plus/icons-vue';
import { ElMessageBox, ElNotification, ElProgress } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAppearanceSettingsStore, useAvatarStore, useFavoriteStore, useUserStore } from '../../stores';
@@ -1191,16 +1192,10 @@
navigator.clipboard
.writeText(result.invalidIds.join('\n'))
.then(() => {
ElMessage({
message: t('view.favorite.avatars.copied_ids'),
type: 'success'
});
toast.success(t('view.favorite.avatars.copied_ids'));
})
.catch(() => {
ElMessage({
message: 'Failed to copy',
type: 'error'
});
toast.error('Failed to copy');
});
return;
}
@@ -1285,10 +1280,7 @@
favoriteGroupId: args.json.id
}
});
ElMessage({
message: t('prompt.change_favorite_group_name.message.success'),
type: 'success'
});
toast.success(t('prompt.change_favorite_group_name.message.success'));
refreshFavorites();
});
})
@@ -1308,10 +1300,7 @@
favoriteGroupId: args.json.id
}
});
ElMessage({
message: 'Group visibility changed',
type: 'success'
});
toast.success('Group visibility changed');
if (menuKey) {
handleGroupMenuVisible(menuKey, false);
}

13
src/views/Favorites/FavoritesFriend.vue
View File

@@ -281,9 +281,10 @@
<script setup>
import { computed, onBeforeMount, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { MoreFilled, Refresh } from '@element-plus/icons-vue';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAppearanceSettingsStore, useFavoriteStore, useUserStore } from '../../stores';
@@ -678,10 +679,7 @@
favoriteGroupId: args.json.id
}
});
ElMessage({
message: t('prompt.change_favorite_group_name.message.success'),
type: 'success'
});
toast.success(t('prompt.change_favorite_group_name.message.success'));
refreshFavorites();
});
})
@@ -701,10 +699,7 @@
favoriteGroupId: args.json.id
}
});
ElMessage({
message: 'Group visibility changed',
type: 'success'
});
toast.success('Group visibility changed');
if (menuKey) {
handleGroupMenuVisible(menuKey, false);
}

13
src/views/Favorites/FavoritesWorld.vue
View File

@@ -407,8 +407,9 @@
<script setup>
import { computed, nextTick, onBeforeMount, onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { Loading, MoreFilled, Plus, Refresh } from '@element-plus/icons-vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAppearanceSettingsStore, useFavoriteStore, useWorldStore } from '../../stores';
@@ -979,10 +980,7 @@
favoriteGroupId: args.json.id
}
});
ElMessage({
message: 'Group visibility changed',
type: 'success'
});
toast.success('Group visibility changed');
if (menuKey) {
handleGroupMenuVisible(menuKey, false);
}
@@ -1121,10 +1119,7 @@
favoriteGroupId: args.json.id
}
});
ElMessage({
message: t('prompt.change_favorite_group_name.message.success'),
type: 'success'
});
toast.success(t('prompt.change_favorite_group_name.message.success'));
refreshFavorites();
});
})

9
src/views/Favorites/components/FavoritesMoveDropdown.vue
View File

@@ -24,8 +24,8 @@
<script setup>
import { Back } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { computed } from 'vue';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { favoriteRequest } from '../../../api';
@@ -89,10 +89,7 @@
tags: groupAPI.name
})
.then((args) => {
ElMessage({
message: 'Avatar added to favorites',
type: 'success'
});
toast.success('Avatar added to favorites');
return args;
});
}
@@ -105,7 +102,7 @@
tags: groupAPI.name
})
.then((args) => {
ElMessage({ message: 'World added to favorites', type: 'success' });
toast.success('World added to favorites');
return args;
});
}

13
src/views/Favorites/dialogs/AvatarExportDialog.vue
View File

@@ -84,8 +84,8 @@
<script setup>
import { computed, ref, watch } from 'vue';
import { ArrowDown } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAvatarStore, useFavoriteStore } from '../../../stores';
@@ -153,18 +153,11 @@
navigator.clipboard
.writeText(avatarExportContent.value)
.then(() => {
ElMessage({
message: 'Copied successfully!',
type: 'success',
duration: 2000
});
toast.success('Copied successfully!', { duration: 2000 });
})
.catch((err) => {
console.error('Copy failed:', err);
ElMessage({
message: 'Copy failed!',
type: 'error'
});
toast.error('Copy failed!');
});
}
function updateAvatarExportDialog() {

7
src/views/Favorites/dialogs/AvatarImportDialog.vue
View File

@@ -178,8 +178,8 @@
<script setup>
import { ArrowDown, Close, Loading } from '@element-plus/icons-vue';
import { computed, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAvatarStore, useFavoriteStore, useGalleryStore, useUserStore } from '../../../stores';
@@ -324,10 +324,7 @@
})
.then((args) => {
if (message) {
ElMessage({
message: 'Avatar added to favorites',
type: 'success'
});
toast.success('Avatar added to favorites');
}
return args;
});

13
src/views/Favorites/dialogs/FriendExportDialog.vue
View File

@@ -48,8 +48,8 @@
<script setup>
import { computed, ref, watch } from 'vue';
import { ArrowDown } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useFavoriteStore } from '../../../stores';
@@ -100,18 +100,11 @@
navigator.clipboard
.writeText(friendExportContent.value)
.then(() => {
ElMessage({
message: 'Copied successfully!',
type: 'success',
duration: 2000
});
toast.success('Copied successfully!', { duration: 2000 });
})
.catch((err) => {
console.error('Copy failed:', err);
ElMessage({
message: 'Copy failed!',
type: 'error'
});
toast.error('Copy failed!');
});
}

7
src/views/Favorites/dialogs/FriendImportDialog.vue
View File

@@ -125,8 +125,8 @@
<script setup>
import { ArrowDown, Close, Loading } from '@element-plus/icons-vue';
import { computed, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { removeFromArray, userImage, userImageFull } from '../../../shared/utils';
@@ -242,10 +242,7 @@
})
.then((args) => {
if (message) {
ElMessage({
message: 'Friend added to favorites',
type: 'success'
});
toast.success('Friend added to favorites');
}
return args;
});

13
src/views/Favorites/dialogs/WorldExportDialog.vue
View File

@@ -82,8 +82,8 @@
<script setup>
import { computed, ref, watch } from 'vue';
import { ArrowDown } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useFavoriteStore, useWorldStore } from '../../../stores';
@@ -153,18 +153,11 @@
navigator.clipboard
.writeText(worldExportContent.value)
.then(() => {
ElMessage({
message: 'Copied successfully!',
type: 'success',
duration: 2000
});
toast.success('Copied successfully!', { duration: 2000 });
})
.catch((err) => {
console.error('Copy failed:', err);
ElMessage({
message: 'Copy failed!',
type: 'error'
});
toast.error('Copy failed!');
});
}

7
src/views/Favorites/dialogs/WorldImportDialog.vue
View File

@@ -174,8 +174,8 @@
<script setup>
import { ArrowDown, Close, Loading } from '@element-plus/icons-vue';
import { computed, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useFavoriteStore, useGalleryStore, useUserStore, useWorldStore } from '../../../stores';
@@ -355,10 +355,7 @@
})
.then((args) => {
if (message) {
ElMessage({
message: 'World added to favorites',
type: 'success'
});
toast.success('World added to favorites');
}
return args;
});

7
src/views/FriendList/FriendList.vue
View File

@@ -265,8 +265,9 @@
<script setup>
import { computed, nextTick, reactive, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
@@ -449,7 +450,7 @@
friendsListLoadingTotal.value = total;
friendsListLoadingCurrent.value = 0;
if (!total) {
ElMessage.success(t('view.friend_list.load_complete'));
toast.success(t('view.friend_list.load_complete'));
return;
}
friendsListLoading.value = true;
@@ -472,7 +473,7 @@
friendsListLoadingCurrent.value = 0;
friendsListLoadingTotal.value = 0;
if (!cancelled) {
ElMessage.success(t('view.friend_list.load_complete'));
toast.success(t('view.friend_list.load_complete'));
}
}

5
src/views/Notifications/Notification.vue
View File

@@ -78,9 +78,10 @@
useVueTable
} from '@tanstack/vue-table';
import { computed, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { Refresh } from '@element-plus/icons-vue';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import Noty from 'noty';
@@ -376,7 +377,7 @@
row.senderUserId
)
.then((_args) => {
ElMessage('Invite sent');
toast('Invite sent');
notificationRequest.hideNotification({
notificationId: row.id
});

19
src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue
View File

@@ -34,8 +34,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { inviteMessagesRequest, notificationRequest } from '../../../api';
@@ -79,13 +79,10 @@
})
.then((args) => {
if (args.json[slot].message === I.messageSlot.message) {
ElMessage({
message: "VRChat API didn't update message, try again",
type: 'error'
});
toast.error("VRChat API didn't update message, try again");
throw new Error("VRChat API didn't update message, try again");
} else {
ElMessage('Invite message updated');
toast('Invite message updated');
}
return args;
});
@@ -104,10 +101,7 @@
notificationRequest.hideNotification({
notificationId: I.invite.id
});
ElMessage({
message: 'Invite response message sent',
type: 'success'
});
toast.success('Invite response message sent');
return args;
})
.finally(() => {
@@ -123,10 +117,7 @@
notificationRequest.hideNotification({
notificationId: I.invite.id
});
ElMessage({
message: 'Invite response message sent',
type: 'success'
});
toast.success('Invite response message sent');
return args;
})
.finally(() => {

12
src/views/Notifications/dialogs/SendInviteResponseConfirmDialog.vue
View File

@@ -20,8 +20,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { notificationRequest } from '../../../api';
@@ -65,10 +65,7 @@
notificationRequest.hideNotification({
notificationId: D.invite.id
});
ElMessage({
message: 'Invite response photo message sent',
type: 'success'
});
toast.success('Invite response photo message sent');
return args;
})
.finally(() => {
@@ -84,10 +81,7 @@
notificationRequest.hideNotification({
notificationId: D.invite.id
});
ElMessage({
message: 'Invite response message sent',
type: 'success'
});
toast.success('Invite response message sent');
return args;
})
.finally(() => {

28
src/views/PlayerList/PlayerList.vue
View File

@@ -283,10 +283,12 @@
})
);
const playerListDisplayData = computed(() => currentInstanceUsersData.value ?? []);
const playerListTable = useVueTable({
data: currentInstanceUsersData.value,
data: playerListDisplayData,
columns: playerListColumns.value,
getRowId: (row) => `${row?.ref?.id ?? ''}:${row?.displayName ?? ''}`,
getRowId: (row) => `${row?.ref?.id ?? ''}:${row?.displayName ?? ''}:${row?.photonId ?? ''}`,
getCoreRowModel: getCoreRowModel(),
getPaginationRowModel: getPaginationRowModel(),
getSortedRowModel: getSortedRowModel(),
@@ -310,6 +312,28 @@
}
});
watch(
playerListColumns,
(next) => {
playerListTable.setOptions((prev) => ({
...prev,
columns: next
}));
},
{ immediate: true }
);
watch(
playerListDisplayData,
(next) => {
playerListTable.setOptions((prev) => ({
...prev,
data: next
}));
},
{ immediate: true }
);
const playerListTotalItems = computed(() => playerListTable.getRowModel().rows.length);
const handlePlayerListRowClick = (row) => {

32
src/views/Settings/components/Tabs/AdvancedTab.vue
View File

@@ -390,8 +390,8 @@
User
} from '@element-plus/icons-vue';
import { computed, reactive, ref } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import {
@@ -503,15 +503,9 @@
function openVrcxAppDataFolder() {
AppApi.OpenVrcxAppDataFolder().then((result) => {
if (result) {
ElMessage({
message: 'Folder opened',
type: 'success'
});
toast.success('Folder opened');
} else {
ElMessage({
message: "Folder dosn't exist",
type: 'error'
});
toast.error("Folder dosn't exist");
}
});
}
@@ -519,15 +513,9 @@
function openVrcAppDataFolder() {
AppApi.OpenVrcAppDataFolder().then((result) => {
if (result) {
ElMessage({
message: 'Folder opened',
type: 'success'
});
toast.success('Folder opened');
} else {
ElMessage({
message: "Folder dosn't exist",
type: 'error'
});
toast.error("Folder dosn't exist");
}
});
}
@@ -535,15 +523,9 @@
function openCrashVrcCrashDumps() {
AppApi.OpenCrashVrcCrashDumps().then((result) => {
if (result) {
ElMessage({
message: 'Folder opened',
type: 'success'
});
toast.success('Folder opened');
} else {
ElMessage({
message: "Folder dosn't exist",
type: 'error'
});
toast.error("Folder dosn't exist");
}
});
}

7
src/views/Settings/components/Tabs/AppearanceTab.vue
View File

@@ -386,8 +386,8 @@
<script setup>
import { ArrowDown, ArrowRight, Notebook } from '@element-plus/icons-vue';
import { computed, onBeforeUnmount, ref } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useAppearanceSettingsStore, useFavoriteStore, useVrStore } from '../../../../stores';
@@ -474,10 +474,7 @@
const rawLength = Array.isArray(values) ? values.length : 0;
setTablePageSizes(values);
if (rawLength && rawLength !== tablePageSizes.value.length) {
ElMessage({
message: t('view.settings.appearance.appearance.table_page_sizes_error'),
type: 'error'
});
toast.error(t('view.settings.appearance.appearance.table_page_sizes_error'));
}
}
});

12
src/views/Settings/dialogs/LaunchOptionsDialog.vue
View File

@@ -55,8 +55,8 @@
<script setup>
import { computed, ref } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { Badge } from '../../../components/ui/badge';
@@ -104,17 +104,11 @@
D.vrcLaunchPathOverride.endsWith('.exe') &&
!D.vrcLaunchPathOverride.endsWith('launch.exe')
) {
ElMessage({
message: 'Invalid path, you must enter VRChat folder or launch.exe',
type: 'error'
});
toast.error('Invalid path, you must enter VRChat folder or launch.exe');
return;
}
configRepository.setString('vrcLaunchPathOverride', D.vrcLaunchPathOverride);
ElMessage({
message: 'Updated launch options',
type: 'success'
});
toast.success('Updated launch options');
closeDialog();
}

33
src/views/Settings/dialogs/RegistryBackupDialog.vue
View File

@@ -77,9 +77,10 @@
<script setup>
import { Delete, Download, Upload } from '@element-plus/icons-vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ref, watch } from 'vue';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { downloadAndSaveJson, formatDateFilter, removeFromArray } from '../../../shared/utils';
@@ -134,17 +135,11 @@
const data = JSON.stringify(row.data);
AppApi.SetVRChatRegistry(data)
.then(() => {
ElMessage({
message: 'VRC registry settings restored',
type: 'success'
});
toast.success('VRC registry settings restored');
})
.catch((e) => {
console.error(e);
ElMessage({
message: `Failed to restore VRC registry settings, check console for full error: ${e}`,
type: 'error'
});
toast.error(`Failed to restore VRC registry settings, check console for full error: ${e}`);
});
})
.catch(() => {});
@@ -172,10 +167,7 @@
return;
}
AppApi.DeleteVRChatRegistryFolder().then(() => {
ElMessage({
message: 'VRC registry settings deleted',
type: 'success'
});
toast.success('VRC registry settings deleted');
});
})
.catch(() => {});
@@ -256,23 +248,14 @@
}
AppApi.SetVRChatRegistry(json)
.then(() => {
ElMessage({
message: 'VRC registry settings restored',
type: 'success'
});
toast.success('VRC registry settings restored');
})
.catch((e) => {
console.error(e);
ElMessage({
message: `Failed to restore VRC registry settings, check console for full error: ${e}`,
type: 'error'
});
toast.error(`Failed to restore VRC registry settings, check console for full error: ${e}`);
});
} catch {
ElMessage({
message: 'Invalid JSON',
type: 'error'
});
toast.error('Invalid JSON');
}
}

32
src/views/Settings/dialogs/TranslationApiDialog.vue
View File

@@ -104,8 +104,8 @@
<script setup>
import { reactive, watch } from 'vue';
import { ArrowDown } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { getLanguageName, languageCodes } from '../../../localization';
@@ -173,10 +173,7 @@
async function saveTranslationApiConfig() {
if (form.translationApiType === 'openai') {
if (!form.translationApiEndpoint || !form.translationApiModel) {
ElMessage({
message: t('dialog.translation_api.msg_fill_endpoint_model'),
type: 'warning'
});
toast.warning(t('dialog.translation_api.msg_fill_endpoint_model'));
return;
}
}
@@ -189,10 +186,7 @@
setTranslationApiKey(form.translationApiKey)
]);
ElMessage({
message: t('dialog.translation_api.msg_settings_saved'),
type: 'success'
});
toast.success(t('dialog.translation_api.msg_settings_saved'));
closeDialog();
}
@@ -201,10 +195,7 @@
return;
}
if (!form.translationApiEndpoint || !form.translationApiModel) {
ElMessage({
message: t('dialog.translation_api.msg_fill_endpoint_model'),
type: 'warning'
});
toast.warning(t('dialog.translation_api.msg_fill_endpoint_model'));
return;
}
@@ -218,23 +209,14 @@
key: form.translationApiKey
});
if (data) {
ElMessage({
message: t('dialog.translation_api.msg_test_success'),
type: 'success'
});
toast.success(t('dialog.translation_api.msg_test_success'));
} else {
console.error('[TranslationAPI] Test returned empty result');
ElMessage({
message: t('dialog.translation_api.msg_test_failed'),
type: 'error'
});
toast.error(t('dialog.translation_api.msg_test_failed'));
}
} catch (err) {
console.error('[TranslationAPI] Test failed', err);
ElMessage({
message: t('dialog.translation_api.msg_test_failed'),
type: 'error'
});
toast.error(t('dialog.translation_api.msg_test_failed'));
}
}

18
src/views/Settings/dialogs/VRChatConfigDialog.vue
View File

@@ -183,8 +183,9 @@
<script setup>
import { ArrowDown, Delete, FolderDelete, FolderOpened, Refresh } from '@element-plus/icons-vue';
import { computed, ref, watch } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { VRChatCameraResolutions, VRChatScreenshotResolutions } from '../../../shared/constants';
@@ -279,15 +280,9 @@
async function deleteAllVRChatCache() {
try {
await AssetBundleManager.DeleteAllCache();
ElMessage({
message: 'All VRChat cache deleted',
type: 'success'
});
toast.success('All VRChat cache deleted');
} catch (error) {
ElMessage({
message: `Error deleting VRChat cache: ${error.message}`,
type: 'error'
});
toast.error(`Error deleting VRChat cache: ${error.message}`);
}
getVRChatCacheSize();
}
@@ -379,10 +374,7 @@
const parsedConfig = JSON.parse(config);
VRChatConfigFile.value = { ...VRChatConfigFile.value, ...parsedConfig };
} catch {
ElMessage({
message: 'Invalid JSON in config.json',
type: 'error'
});
toast.error('Invalid JSON in config.json');
throw new Error('Invalid JSON in config.json');
}
}

17
src/views/Settings/dialogs/YouTubeApiDialog.vue
View File

@@ -30,8 +30,8 @@
</template>
<script setup>
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { openExternalLink } from '../../../shared/utils';
@@ -57,26 +57,17 @@
async function testYouTubeApiKey() {
const previousKey = youTubeApiKey.value;
if (!youTubeApiKey.value) {
ElMessage({
message: 'YouTube API key removed',
type: 'success'
});
toast.success('YouTube API key removed');
closeDialog();
return;
}
const data = await lookupYouTubeVideo('dQw4w9WgXcQ');
if (!data) {
setYouTubeApiKey(previousKey);
ElMessage({
message: 'Invalid YouTube API key',
type: 'error'
});
toast.error('Invalid YouTube API key');
} else {
setYouTubeApiKey(youTubeApiKey.value);
ElMessage({
message: 'YouTube API key valid!',
type: 'success'
});
toast.success('YouTube API key valid!');
closeDialog();
}
}

53
src/views/Tools/Gallery.vue
View File

@@ -527,8 +527,9 @@
<script setup>
import { ArrowLeft, Close, Delete, Link, Picture, Plus, Present, Refresh, Upload } from '@element-plus/icons-vue';
import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessageBox } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
@@ -636,10 +637,7 @@
.uploadGalleryImage(base64Body)
.then((args) => {
handleGalleryImageAdd(args);
ElMessage({
message: t('message.gallery.uploaded'),
type: 'success'
});
toast.success(t('message.gallery.uploaded'));
return args;
})
.catch((error) => {
@@ -667,10 +665,7 @@
function setProfilePicOverride(fileId) {
if (!isLocalUserVrcPlusSupporter.value) {
ElMessage({
message: 'VRCPlus required',
type: 'error'
});
toast.error('VRCPlus required');
return;
}
let profilePicOverride = '';
@@ -685,10 +680,7 @@
profilePicOverride
})
.then((args) => {
ElMessage({
message: 'Profile picture changed',
type: 'success'
});
toast.success('Profile picture changed');
return args;
});
}
@@ -739,10 +731,7 @@
if (Object.keys(VRCPlusIconsTable.value).length !== 0) {
VRCPlusIconsTable.value.unshift(args.json);
}
ElMessage({
message: t('message.icon.uploaded'),
type: 'success'
});
toast.success(t('message.icon.uploaded'));
return args;
})
.catch((error) => {
@@ -770,10 +759,7 @@
function setVRCPlusIcon(fileId) {
if (!isLocalUserVrcPlusSupporter.value) {
ElMessage({
message: 'VRCPlus required',
type: 'error'
});
toast.error('VRCPlus required');
return;
}
let userIcon = '';
@@ -788,10 +774,7 @@
userIcon
})
.then((args) => {
ElMessage({
message: 'Icon changed',
type: 'success'
});
toast.success('Icon changed');
return args;
});
}
@@ -878,10 +861,7 @@
if (Object.keys(emojiTable.value).length !== 0) {
emojiTable.value.unshift(args.json);
}
ElMessage({
message: t('message.emoji.uploaded'),
type: 'success'
});
toast.success(t('message.emoji.uploaded'));
return args;
})
.catch((error) => {
@@ -946,10 +926,7 @@
.uploadSticker(base64Body, params)
.then((args) => {
handleStickerAdd(args);
ElMessage({
message: t('message.sticker.uploaded'),
type: 'success'
});
toast.success(t('message.sticker.uploaded'));
return args;
})
.catch((error) => {
@@ -1020,10 +997,7 @@
vrcPlusImageRequest
.uploadPrint(base64Body, cropWhiteBorder, params)
.then((args) => {
ElMessage({
message: t('message.print.uploaded'),
type: 'success'
});
toast.success(t('message.print.uploaded'));
if (Object.keys(printTable.value).length !== 0) {
printTable.value.unshift(args.json);
}
@@ -1102,10 +1076,7 @@
code: value.trim()
})
.then((args) => {
ElMessage({
message: t('prompt.redeem.success'),
type: 'success'
});
toast.success(t('prompt.redeem.success'));
getInventory();
return args;
})

22
src/views/Tools/Tools.vue
View File

@@ -208,8 +208,8 @@
<script setup>
import { computed, defineAsyncComponent, ref } from 'vue';
import { ArrowRight } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
@@ -281,15 +281,9 @@
function openVrcPhotosFolder() {
AppApi.OpenVrcPhotosFolder().then((result) => {
if (result) {
ElMessage({
message: 'Folder opened',
type: 'success'
});
toast.success('Folder opened');
} else {
ElMessage({
message: "Folder dosn't exist",
type: 'error'
});
toast.error("Folder dosn't exist");
}
});
}
@@ -297,15 +291,9 @@
function openVrcScreenshotsFolder() {
AppApi.OpenVrcScreenshotsFolder().then((result) => {
if (result) {
ElMessage({
message: 'Folder opened',
type: 'success'
});
toast.success('Folder opened');
} else {
ElMessage({
message: "Folder dosn't exist",
type: 'error'
});
toast.error("Folder dosn't exist");
}
});
}

7
src/views/Tools/components/GroupCalendarEventCard.vue
View File

@@ -67,8 +67,8 @@
<script setup>
import { Calendar, Download, Star, StarFilled } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { computed } from 'vue';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useGalleryStore, useGroupStore } from '../../../stores';
@@ -148,10 +148,7 @@
}
return response.data;
} catch (error) {
ElMessage({
message: `Failed to download .ics file, ${error.message}`,
type: 'error'
});
toast.error(`Failed to download .ics file, ${error.message}`);
console.error('Failed to download .ics file:', error);
}
}

9
src/views/Tools/dialogs/EditInviteMessageDialog.vue
View File

@@ -28,7 +28,7 @@
<script setup>
import { ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { inviteMessagesRequest } from '../../../api';
@@ -69,13 +69,10 @@
})
.then((args) => {
if (args.json[slot].message === props.inviteMessage.message) {
ElMessage({
message: "VRChat API didn't update message, try again",
type: 'error'
});
toast.error("VRChat API didn't update message, try again");
throw new Error("VRChat API didn't update message, try again");
} else {
ElMessage({ message: 'Invite message updated', type: 'success' });
toast.success('Invite message updated');
emit('updateInviteMessages', messageType);
}
return args;

7
src/views/Tools/dialogs/EditInviteMessagesDialog.vue
View File

@@ -119,8 +119,8 @@
<script setup>
import { ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useInviteStore } from '../../../stores';
@@ -173,10 +173,7 @@
cooldownEnd.setHours(cooldownEnd.getHours() + 1);
const now = new Date();
if (now < cooldownEnd) {
ElMessage({
message: 'This invite message is on cooldown and cannot be edited yet.',
type: 'warning'
});
toast.warning('This invite message is on cooldown and cannot be edited yet.');
return;
}
}

37
src/views/Tools/dialogs/ScreenshotMetadataDialog.vue
View File

@@ -158,8 +158,8 @@
<script setup>
import { CopyDocument, Delete, Folder, FolderOpened, Picture, Upload } from '@element-plus/icons-vue';
import { reactive, ref, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { storeToRefs } from 'pinia';
import { toast } from 'vue-sonner';
import { useI18n } from 'vue-i18n';
import { useGalleryStore, useUserStore, useVrcxStore } from '../../../stores';
@@ -275,10 +275,7 @@
return;
}
AppApi.CopyImageToClipboard(path).then(() => {
ElMessage({
message: 'Image copied to clipboard',
type: 'success'
});
toast.success('Image copied to clipboard');
});
}
function openImageFolder(path) {
@@ -286,10 +283,7 @@
return;
}
AppApi.OpenFolderAndSelectItem(path).then(() => {
ElMessage({
message: 'Opened image folder',
type: 'success'
});
toast.success('Opened image folder');
});
}
function deleteMetadata(path) {
@@ -298,16 +292,10 @@
}
AppApi.DeleteScreenshotMetadata(path).then((result) => {
if (!result) {
ElMessage({
message: t('message.screenshot_metadata.delete_failed'),
type: 'error'
});
toast.error(t('message.screenshot_metadata.delete_failed'));
return;
}
ElMessage({
message: t('message.screenshot_metadata.deleted'),
type: 'success'
});
toast.success(t('message.screenshot_metadata.deleted'));
const D = screenshotMetadataDialog;
getAndDisplayScreenshot(D.metadata.filePath, true);
});
@@ -315,10 +303,7 @@
function uploadScreenshotToGallery() {
const D = screenshotMetadataDialog;
if (D.metadata.fileSizeBytes > 10000000) {
ElMessage({
message: t('message.file.too_large'),
type: 'error'
});
toast.error(t('message.file.too_large'));
return;
}
D.isUploading = true;
@@ -328,10 +313,7 @@
.uploadGalleryImage(base64Body)
.then((args) => {
handleGalleryImageAdd(args);
ElMessage({
message: t('message.gallery.uploaded'),
type: 'success'
});
toast.success(t('message.gallery.uploaded'));
return args;
})
.finally(() => {
@@ -339,10 +321,7 @@
});
})
.catch((err) => {
ElMessage({
message: t('message.gallery.failed'),
type: 'error'
});
toast.error(t('message.gallery.failed'));
console.error(err);
D.isUploading = false;
});