Merge branch '521-room-failing-to-purge' into 'dev'

Fix purge room

See merge request keanuapp/keanuapp-weblite!241
This commit is contained in:
N Pex 2023-10-10 08:48:50 +00:00
commit 3c37708b4e
2 changed files with 9 additions and 4 deletions

View file

@ -1,5 +1,6 @@
<template>
<v-dialog
persistent
v-model="showDialog"
v-show="room" class="ma-0 pa-0"
:width="$vuetify.breakpoint.smAndUp ? '688px' : '95%'"
@ -119,9 +120,13 @@ export default {
this.showDialog = newVal;
},
},
showDialog() {
if (!this.showDialog) {
showDialog(val, oldVal) {
if (!val && oldVal) {
this.undo();
this.$emit("close");
} else if (val && !oldVal) {
// Showing, reset
this.status = null;
}
},
},

View file

@ -840,11 +840,11 @@ export default {
return kickFirstMember(allMembers);
})
.then(() => {
return this.matrixClient.sendStateEvent(
return withRetry(() => this.matrixClient.sendStateEvent(
roomId,
STATE_EVENT_ROOM_DELETED,
{ status: "deleted" }
);
));
})
.then(() => {
statusCallback(null);