MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 14:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and lint

Browse Source
This commit is contained in:
Natsumi
2024-04-06 08:36:54 +13:00
parent 9254fe7971
commit cae4376617
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dotnet/IPC/IPCServer.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace VRCX
{ {
foreach (var client in Clients) foreach (var client in Clients)
{ {
client.Send(ipcPacket); client?.Send(ipcPacket);
} }
} }
html/src/app.js
+26 -5
View File
@@ -2568,7 +2568,7 @@ speechSynthesis.getVoices();
return args; return args;
}) })
.catch((err) => { .catch((err) => {
if (err.includes('Instance is closed.')) { if (err && err.includes('Instance is closed.')) {
$app.$message({ $app.$message({
message: 'Instance is closed.', message: 'Instance is closed.',
type: 'error' type: 'error'
@@ -6377,14 +6377,29 @@ speechSynthesis.getVoices();
if (playNotificationTTS) { if (playNotificationTTS) {
this.playNotyTTS(noty, message); this.playNotyTTS(noty, message);
} }
if (playDesktopToast || playXSNotification || playOvrtHudNotifications || playOvrtWristNotifications || playOverlayNotification) { if (
playDesktopToast ||
playXSNotification ||
playOvrtHudNotifications ||
playOvrtWristNotifications ||
playOverlayNotification
) {
if (this.imageNotifications) { if (this.imageNotifications) {
this.notySaveImage(noty).then((image) => { this.notySaveImage(noty).then((image) => {
if (playXSNotification) { if (playXSNotification) {
this.displayXSNotification(noty, message, image); this.displayXSNotification(noty, message, image);
} }
if (playOvrtHudNotifications || playOvrtWristNotifications) { if (
this.displayOvrtNotification(playOvrtHudNotifications, playOvrtWristNotifications, noty, message, image); playOvrtHudNotifications ||
playOvrtWristNotifications
) {
this.displayOvrtNotification(
playOvrtHudNotifications,
playOvrtWristNotifications,
noty,
message,
image
);
} }
if (playDesktopToast) { if (playDesktopToast) {
this.displayDesktopToast(noty, message, image); this.displayDesktopToast(noty, message, image);
@@ -6398,7 +6413,13 @@ speechSynthesis.getVoices();
this.displayXSNotification(noty, message, ''); this.displayXSNotification(noty, message, '');
} }
if (playOvrtHudNotifications || playOvrtWristNotifications) { if (playOvrtHudNotifications || playOvrtWristNotifications) {
this.displayOvrtNotification(playOvrtHudNotifications, playOvrtWristNotifications, noty, message, ''); this.displayOvrtNotification(
playOvrtHudNotifications,
playOvrtWristNotifications,
noty,
message,
''
);
} }
if (playDesktopToast) { if (playDesktopToast) {
this.displayDesktopToast(noty, message, ''); this.displayDesktopToast(noty, message, '');
html/src/mixins/tabs/notifications.pug
+5 -1
View File
@@ -43,7 +43,11 @@ mixin notificationsTab()
img.x-link(v-lazy="scope.row.imageUrl" style="width:500px" @click="showFullscreenImageDialog(scope.row.imageUrl)") img.x-link(v-lazy="scope.row.imageUrl" style="width:500px" @click="showFullscreenImageDialog(scope.row.imageUrl)")
el-table-column(:label="$t('table.notification.message')" prop="message") el-table-column(:label="$t('table.notification.message')" prop="message")
template(v-once #default="scope") template(v-once #default="scope")
span(v-if="scope.row.title") {{ scope.row.title }}, {{ scope.row.message }} span.x-link(v-if="scope.row.type === 'invite'" @click="showWorldDialog(scope.row.details.worldId)")
location(v-if="scope.row.details" :location="scope.row.details.worldId" :hint="scope.row.details.worldName" :grouphint="scope.row.details.groupName" :link="false")
br
span(v-if="scope.row.message" v-text="scope.row.message")
span(v-else-if="scope.row.title") {{ scope.row.title }}, {{ scope.row.message }}
span(v-else-if="scope.row.message" v-text="scope.row.message") span(v-else-if="scope.row.message" v-text="scope.row.message")
span(v-else-if='scope.row.details && scope.row.details.inviteMessage' v-text="scope.row.details.inviteMessage") span(v-else-if='scope.row.details && scope.row.details.inviteMessage' v-text="scope.row.details.inviteMessage")
span(v-else-if='scope.row.details && scope.row.details.requestMessage' v-text="scope.row.details.requestMessage") span(v-else-if='scope.row.details && scope.row.details.requestMessage' v-text="scope.row.details.requestMessage")