Make channels unencrypted

Also, show info about older messages being deleted in rooms with message retention set.
This commit is contained in:
N-Pex 2024-06-05 15:44:34 +02:00
parent 057561ff4a
commit 54982298fa
4 changed files with 51 additions and 8 deletions

View file

@ -54,6 +54,9 @@
<component :is="roomWelcomeHeader" v-on:close="closeRoomWelcomeHeader"></component>
<!-- If we have a retention timer, it means we have active message retention. Show header. -->
<WelcomeHeaderChannelUser v-if="retentionTimer && !roomWelcomeHeader" />
<div v-for="(event, index) in filteredEvents" :key="event.getId()" :eventId="event.getId()">
<!-- DAY Marker, shown for every new day in the timeline -->
<div v-if="showDayMarkerBeforeEvent(event) && !!componentForEvent(event, isForExport = false)" class="day-marker"><div class="line"></div><div class="text">{{ dayForEvent(event) }}</div><div class="line"></div></div>
@ -346,6 +349,7 @@ import RoomInfoBottomSheet from "./RoomInfoBottomSheet";
import WelcomeHeaderRoom from "./welcome_headers/WelcomeHeaderRoom";
import WelcomeHeaderDirectChat from "./welcome_headers/WelcomeHeaderDirectChat";
import WelcomeHeaderChannel from "./welcome_headers/WelcomeHeaderChannel";
import WelcomeHeaderChannelUser from "./welcome_headers/WelcomeHeaderChannelUser";
import NoHistoryRoomWelcomeHeader from "./NoHistoryRoomWelcomeHeader.vue";
import MessageOperationsBottomSheet from "./MessageOperationsBottomSheet";
import StickerPickerBottomSheet from "./StickerPickerBottomSheet";
@ -413,6 +417,7 @@ export default {
FileDropLayout,
UserProfileDialog,
PurgeRoomDialog,
WelcomeHeaderChannelUser
},
data() {

View file

@ -145,18 +145,18 @@ export default {
preset: "public_chat",
initial_state:
[
{
type: "m.room.encryption",
state_key: "",
content: {
algorithm: "m.megolm.v1.aes-sha2",
},
},
// {
// type: "m.room.encryption",
// state_key: "",
// content: {
// algorithm: "m.megolm.v1.aes-sha2",
// },
// },
{
type: "m.room.history_visibility",
state_key: "",
content: {
history_visibility: "joined"
history_visibility: "shared"
}
},
{

View file

@ -0,0 +1,37 @@
<template>
<div class="created-room-welcome-header">
<div class="mt-2" v-if="roomMessageRetention() > 0">
<i18n path="room_welcome.info_retention_user" tag="span">
<template v-slot:time>
<b>{{ messageRetentionDisplay }}</b>
</template>
</i18n>
</div>
</div>
</template>
<script>
import roomInfoMixin from "../roomInfoMixin";
export default {
name: "WelcomeHeaderChannelUser",
mixins: [roomInfoMixin],
components: {
},
computed: {
},
data() {
return {
}
},
methods: {
onMessageRetention(ignoredretention) {
this.updateMessageRetention();
},
}
};
</script>
<style lang="scss">
@import "@/assets/css/chat.scss";
</style>