Fix invite stuff

This commit is contained in:
Natsumi
2025-05-26 04:53:17 +10:00
parent 2f019ac038
commit 8b93bf5d57
15 changed files with 136 additions and 147 deletions

View File

@@ -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');