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

Fix invite stuff, again

Browse Source
This commit is contained in:
Natsumi
2025-05-26 18:38:11 +10:00
parent 5812b37c17
commit a4526ec21c
6 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,10 +71,11 @@
async function saveEditAndSendInvite() { async function saveEditAndSendInvite() {
const D = props.editAndSendInviteDialog; const D = props.editAndSendInviteDialog;
const I = props.sendInviteDialog;
D.visible = false; D.visible = false;
const messageType = D.messageType; const messageType = I.messageSlot.messageType;
const slot = D.inviteMessage.slot; const slot = I.messageSlot.slot;
if (D.inviteMessage.message !== D.newMessage) { if (I.messageSlot.message !== D.newMessage) {
const params = { const params = {
message: D.newMessage message: D.newMessage
}; };
@@ -85,7 +86,7 @@
}) })
.then((args) => { .then((args) => {
API.$emit(`INVITE:${messageType.toUpperCase()}`, 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({
message: "VRChat API didn't update message, try again", message: "VRChat API didn't update message, try again",
type: 'error' type: 'error'
@@ -97,7 +98,6 @@
return args; return args;
}); });
} }
const I = props.sendInviteDialog;
const J = props.inviteDialog; const J = props.inviteDialog;
if (J?.visible) { if (J?.visible) {
const inviteLoop = () => { const inviteLoop = () => {
@@ -147,7 +147,7 @@
} }
}; };
inviteLoop(); inviteLoop();
} else if (I.messageType === 'invite') { } else if (messageType === 'invite') {
I.params.messageSlot = slot; I.params.messageSlot = slot;
if (props.uploadImage) { if (props.uploadImage) {
notificationRequest notificationRequest
@@ -176,7 +176,7 @@
return args; return args;
}); });
} }
} else if (I.messageType === 'requestInvite') { } else if (messageType === 'request') {
I.params.requestSlot = slot; I.params.requestSlot = slot;
if (props.uploadImage) { if (props.uploadImage) {
notificationRequest notificationRequest

2
src/components/dialogs/InviteDialog/SendInviteDialog.vue
View File

@@ -141,7 +141,7 @@
function showEditAndSendInviteDialog(row) { function showEditAndSendInviteDialog(row) {
props.sendInviteDialog.messageSlot = row; props.sendInviteDialog.messageSlot = row;
editAndSendInviteDialog.value = { editAndSendInviteDialog.value = {
newMessage: inviteMessage.message, newMessage: row.message,
visible: true visible: true
}; };
} }

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

@@ -77,7 +77,7 @@
}) })
.then((args) => { .then((args) => {
API.$emit(`INVITE:${messageType.toUpperCase()}`, 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({
message: "VRChat API didn't update message, try again", message: "VRChat API didn't update message, try again",
type: 'error' type: 'error'

13
src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
View File

@@ -71,7 +71,11 @@
const API = inject('API'); const API = inject('API');
const inviteImageUpload = inject('inviteImageUpload'); const inviteImageUpload = inject('inviteImageUpload');
defineProps({ const props = defineProps({
sendInviteResponseDialog: {
type: Object,
default: () => ({})
},
sendInviteRequestResponseDialogVisible: { sendInviteRequestResponseDialogVisible: {
type: Boolean, type: Boolean,
default: false default: false
@@ -96,15 +100,10 @@
visible: false visible: false
}); });
const sendInviteResponseDialog = ref({
messageSlot: {},
invite: {}
});
function showEditAndSendInviteResponseDialog(row) { function showEditAndSendInviteResponseDialog(row) {
props.sendInviteResponseDialog.messageSlot = row; props.sendInviteResponseDialog.messageSlot = row;
editAndSendInviteResponseDialog.value = { editAndSendInviteResponseDialog.value = {
newMessage: messageSlot.message, newMessage: row.message,
visible: true visible: true
}; };
} }

2
src/views/Notifications/dialogs/SendInviteResponseDialog.vue
View File

@@ -112,7 +112,7 @@
function showEditAndSendInviteResponseDialog(row) { function showEditAndSendInviteResponseDialog(row) {
props.sendInviteResponseDialog.messageSlot = row; props.sendInviteResponseDialog.messageSlot = row;
editAndSendInviteResponseDialog.value = { editAndSendInviteResponseDialog.value = {
newMessage: messageSlot.message, newMessage: row.message,
visible: true visible: true
}; };
} }

5
src/views/Profile/Profile.vue
View File

@@ -698,10 +698,7 @@
}); });
} }
function showEditInviteMessageDialog(messageType, inviteMessage) { function showEditInviteMessageDialog(messageType, inviteMessage) {
emit('showEditInviteMessageDialog', { emit('showEditInviteMessageDialog', messageType, inviteMessage);
messageType,
inviteMessage
});
} }
function refreshInviteMessageTable(messageType) { function refreshInviteMessageTable(messageType) {
inviteMessagesRequest.refreshInviteMessageTableData(messageType); inviteMessagesRequest.refreshInviteMessageTableData(messageType);