Fix invite stuff

src/components/dialogs/UserDialog/SendInviteRequestDialog.vue

@@ -36,7 +36,7 @@
                         type="text"
                         icon="el-icon-edit"
                         size="mini"
-                        @click.stop="showEditAndSendInviteDialog('request', scope.row)"></el-button>
+                        @click.stop="showEditAndSendInviteDialog(scope.row)"></el-button>
                 </template>
             </el-table-column>
         </data-tables>
@@ -73,6 +73,7 @@
     const { t } = useI18n();
 
     const API = inject('API');
+    const inviteImageUpload = inject('inviteImageUpload');
 
     const props = defineProps({
         sendInviteRequestDialogVisible: {
@@ -98,33 +99,25 @@
         }
     });
 
-    const emit = defineEmits(['inviteImageUpload', 'update:sendInviteRequestDialogVisible', 'closeInviteDialog']);
+    const emit = defineEmits(['update:sendInviteRequestDialogVisible', 'closeInviteDialog']);
 
     const isSendInviteConfirmDialogVisible = ref(false);
 
     const editAndSendInviteDialog = ref({
         visible: false,
-        messageType: '',
-        newMessage: '',
-        inviteMessage: {}
+        newMessage: ''
     });
 
-    function inviteImageUpload(event) {
-        emit('inviteImageUpload', event);
-    }
-
-    function showSendInviteConfirmDialog(val) {
+    function showSendInviteConfirmDialog(row) {
+        props.sendInviteDialog.messageSlot = row;
         isSendInviteConfirmDialogVisible.value = true;
-        //
-        props.sendInviteDialog.messageSlot = val.slot;
     }
 
-    function showEditAndSendInviteDialog(messageType, inviteMessage) {
+    function showEditAndSendInviteDialog(row) {
+        props.sendInviteDialog.messageSlot = row;
         editAndSendInviteDialog.value = {
-            newMessage: inviteMessage.message,
-            visible: true,
-            messageType,
-            inviteMessage
+            newMessage: row.message,
+            visible: true
         };
     }
 

src/components/dialogs/UserDialog/UserDialog.vue

@@ -553,7 +553,7 @@
                                 <template v-if="isRealInstance(userDialog.$location.tag)">
                                     <launch
                                         :location="userDialog.$location.tag"
-                                        @show-launch-dialog="showLaunchDialog"></launch>
+                                        @show-launch-dialog="showLaunchDialog" />
                                     <el-tooltip
                                         placement="top"
                                         :content="t('dialog.user.info.self_invite_tooltip')"
@@ -1755,13 +1755,14 @@
             :send-invite-dialog-visible.sync="sendInviteDialogVisible"
             :invite-message-table="inviteMessageTable"
             :send-invite-dialog="sendInviteDialog"
-            :upload-image="uploadImage" />
+            :upload-image="uploadImage"
+            @closeInviteDialog="closeInviteDialog" />
         <SendInviteRequestDialog
             :send-invite-request-dialog-visible.sync="sendInviteRequestDialogVisible"
             :invite-request-message-table="inviteRequestMessageTable"
             :send-invite-dialog="sendInviteDialog"
             :upload-image="uploadImage"
-            @inviteImageUpload="inviteImageUpload" />
+            @closeInviteDialog="closeInviteDialog" />
         <PreviousInstancesUserDialog
             :previous-instances-user-dialog.sync="previousInstancesUserDialog"
             :shift-held="shiftHeld" />
@@ -1848,6 +1849,7 @@
 
     const API = inject('API');
     const showFullscreenImageDialog = inject('showFullscreenImageDialog');
+    const clearInviteImageUpload = inject('clearInviteImageUpload');
 
     const userImage = inject('userImage');
     const showLaunchDialog = inject('showLaunchDialog');
@@ -2032,7 +2034,6 @@
         'saveUserMemo',
         'setGroupVisibility',
         'leaveGroupPrompt',
-        'clearInviteImageUpload',
         'refreshGalleryTable',
         'refreshVRCPlusIconsTable',
         'refreshStickerTable',
@@ -2075,7 +2076,11 @@
     const favoriteWorldsRef = ref(null);
 
     const sendInviteDialogVisible = ref(false);
-    const sendInviteDialog = ref({ message: '', messageSlot: 0, userId: '', messageType: '', params: {} });
+    const sendInviteDialog = ref({
+        messageSlot: {},
+        userId: '',
+        params: {}
+    });
     const sendInviteRequestDialogVisible = ref(false);
 
     const previousInstancesUserDialog = ref({
@@ -2308,7 +2313,7 @@
         sendInviteDialog.value = {
             params,
             userId,
-            messageType: 'invite'
+            messageSlot: {}
         };
         inviteMessagesRequest.refreshInviteMessageTableData('message');
         clearInviteImageUpload();
@@ -2319,7 +2324,7 @@
         sendInviteDialog.value = {
             params,
             userId,
-            messageType: 'requestInvite'
+            messageSlot: {}
         };
         inviteMessagesRequest.refreshInviteMessageTableData('request');
         clearInviteImageUpload();
@@ -3244,11 +3249,8 @@
     function saveUserMemo(userId, memo) {
         emit('saveUserMemo', userId, memo);
     }
-    function clearInviteImageUpload() {
-        emit('clearInviteImageUpload');
-    }
-    function inviteImageUpload(event) {
-        emit('inviteImageUpload', event);
+    function closeInviteDialog() {
+        clearInviteImageUpload();
     }
     function refreshGalleryTable() {
         emit('refreshGalleryTable');