From a4526ec21c352c41fc19501e594bfb3ff2fa85aa Mon Sep 17 00:00:00 2001 From: Natsumi Date: Mon, 26 May 2025 18:38:11 +1000 Subject: [PATCH] Fix invite stuff, again --- .../InviteDialog/EditAndSendInviteDialog.vue | 14 +++++++------- .../dialogs/InviteDialog/SendInviteDialog.vue | 2 +- .../dialogs/EditAndSendInviteResponseDialog.vue | 2 +- .../dialogs/SendInviteRequestResponseDialog.vue | 13 ++++++------- .../dialogs/SendInviteResponseDialog.vue | 2 +- src/views/Profile/Profile.vue | 5 +---- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/components/dialogs/InviteDialog/EditAndSendInviteDialog.vue b/src/components/dialogs/InviteDialog/EditAndSendInviteDialog.vue index c00e92d7..0cde0e8c 100644 --- a/src/components/dialogs/InviteDialog/EditAndSendInviteDialog.vue +++ b/src/components/dialogs/InviteDialog/EditAndSendInviteDialog.vue @@ -71,10 +71,11 @@ async function saveEditAndSendInvite() { const D = props.editAndSendInviteDialog; + const I = props.sendInviteDialog; D.visible = false; - const messageType = D.messageType; - const slot = D.inviteMessage.slot; - if (D.inviteMessage.message !== D.newMessage) { + const messageType = I.messageSlot.messageType; + const slot = I.messageSlot.slot; + if (I.messageSlot.message !== D.newMessage) { const params = { message: D.newMessage }; @@ -85,7 +86,7 @@ }) .then((args) => { API.$emit(`INVITE:${messageType.toUpperCase()}`, args); - if (args.json[slot].message === D.inviteMessage.message) { + if (args.json[slot].message === I.messageSlot.message) { $message({ message: "VRChat API didn't update message, try again", type: 'error' @@ -97,7 +98,6 @@ return args; }); } - const I = props.sendInviteDialog; const J = props.inviteDialog; if (J?.visible) { const inviteLoop = () => { @@ -147,7 +147,7 @@ } }; inviteLoop(); - } else if (I.messageType === 'invite') { + } else if (messageType === 'invite') { I.params.messageSlot = slot; if (props.uploadImage) { notificationRequest @@ -176,7 +176,7 @@ return args; }); } - } else if (I.messageType === 'requestInvite') { + } else if (messageType === 'request') { I.params.requestSlot = slot; if (props.uploadImage) { notificationRequest diff --git a/src/components/dialogs/InviteDialog/SendInviteDialog.vue b/src/components/dialogs/InviteDialog/SendInviteDialog.vue index 8a43ec55..4c0ed1ab 100644 --- a/src/components/dialogs/InviteDialog/SendInviteDialog.vue +++ b/src/components/dialogs/InviteDialog/SendInviteDialog.vue @@ -141,7 +141,7 @@ function showEditAndSendInviteDialog(row) { props.sendInviteDialog.messageSlot = row; editAndSendInviteDialog.value = { - newMessage: inviteMessage.message, + newMessage: row.message, visible: true }; } diff --git a/src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue b/src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue index 7918c127..956f3408 100644 --- a/src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue +++ b/src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue @@ -77,7 +77,7 @@ }) .then((args) => { API.$emit(`INVITE:${messageType.toUpperCase()}`, args); - if (args.json[slot].message === D.inviteMessage.message) { + if (args.json[slot].message === I.messageSlot.message) { $message({ message: "VRChat API didn't update message, try again", type: 'error' diff --git a/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue b/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue index dfac20fc..cf193198 100644 --- a/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue +++ b/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue @@ -71,7 +71,11 @@ const API = inject('API'); const inviteImageUpload = inject('inviteImageUpload'); - defineProps({ + const props = defineProps({ + sendInviteResponseDialog: { + type: Object, + default: () => ({}) + }, sendInviteRequestResponseDialogVisible: { type: Boolean, default: false @@ -96,15 +100,10 @@ visible: false }); - const sendInviteResponseDialog = ref({ - messageSlot: {}, - invite: {} - }); - function showEditAndSendInviteResponseDialog(row) { props.sendInviteResponseDialog.messageSlot = row; editAndSendInviteResponseDialog.value = { - newMessage: messageSlot.message, + newMessage: row.message, visible: true }; } diff --git a/src/views/Notifications/dialogs/SendInviteResponseDialog.vue b/src/views/Notifications/dialogs/SendInviteResponseDialog.vue index d97f6ba0..93c53728 100644 --- a/src/views/Notifications/dialogs/SendInviteResponseDialog.vue +++ b/src/views/Notifications/dialogs/SendInviteResponseDialog.vue @@ -112,7 +112,7 @@ function showEditAndSendInviteResponseDialog(row) { props.sendInviteResponseDialog.messageSlot = row; editAndSendInviteResponseDialog.value = { - newMessage: messageSlot.message, + newMessage: row.message, visible: true }; } diff --git a/src/views/Profile/Profile.vue b/src/views/Profile/Profile.vue index 83be0f49..1f26ee8b 100644 --- a/src/views/Profile/Profile.vue +++ b/src/views/Profile/Profile.vue @@ -698,10 +698,7 @@ }); } function showEditInviteMessageDialog(messageType, inviteMessage) { - emit('showEditInviteMessageDialog', { - messageType, - inviteMessage - }); + emit('showEditInviteMessageDialog', messageType, inviteMessage); } function refreshInviteMessageTable(messageType) { inviteMessagesRequest.refreshInviteMessageTableData(messageType);