Remove global "auto_join_rooms" flag and use optional "/join" segments in invite links

Generated for channels, not for "normal" rooms.
This commit is contained in:
N-Pex 2024-07-30 18:28:42 +02:00
parent ff7851cb53
commit 59f551de75
7 changed files with 14 additions and 34 deletions

View file

@ -1,14 +1,6 @@
<template>
<div v-if="$config.auto_join_rooms && !roomCreatedByYou() && event.getSender() == $matrix.currentUserId" class="created-room-welcome-header" style="white-space: pre-line;">
{{ $t('room_welcome.info_auto_join',{room: room ? room.name : "",you: $matrix.currentUserDisplayName}) }}
<div class="ma-0">
<a href="#" text @click.prevent="viewProfile">
{{ $t("room_welcome.change") }}
</a>
</div>
</div>
<!-- Contact joined the chat -->
<div v-else class="messageJoin">
<div class="messageJoin">
{{ $t('message.user_joined',{user: eventSenderDisplayName(event)}) }}
</div>
</template>
@ -18,19 +10,6 @@ import messageMixin from "./messageMixin";
export default {
mixins: [messageMixin],
methods: {
viewProfile() {
this.$navigation.push({ name: "Profile" }, 1);
},
roomCreatedByYou() {
const createEvent = this.room && this.room.currentState.getStateEvents("m.room.create", "");
if (createEvent) {
const creatorId = createEvent.getContent().creator;
return (creatorId == this.$matrix.currentUserId);
}
return false;
},
}
};
</script>