butter/keanu-weblite
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Message deleted text

Browse source
This commit is contained in:
10G Meow 2022-11-30 08:16:23 +00:00 • committed by N Pex
parent 4791f9f16e
commit 3f68e84346
20 changed files with 73 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/Chat.vue
View file

@ -58,7 +58,7 @@
<!-- DAY Marker, shown for every new day in the timeline -->
<div v-if="showDayMarkerBeforeEvent(event)" class="day-marker" :title="dayForEvent(event)" />
<div v-if="!event.isRelation() && !event.isRedacted() && !event.isRedaction()" :ref="event.getId()">
<div v-if="!event.isRelation() && !event.isRedaction()" :ref="event.getId()">
<div
class="message-wrapper"
v-on:touchstart="

5
src/components/chatMixin.js
View file

@ -111,7 +111,7 @@ export default {
dateForEvent(event) {
return util.formatDay(event.getTs());
},
componentForEvent(event, isForExport = false) {
switch (event.getType()) {
case "m.room.member":
@ -240,6 +240,9 @@ export default {
}
}
}
break;
case "m.room.encrypted":
return event.getSender() != this.$matrix.currentUserId ? MessageIncomingText : MessageOutgoingText
}
return this.debugging ? DebugEvent : null;
},

8
src/components/messages/MessageIncoming.vue
View file

@ -15,10 +15,10 @@
</v-avatar>
<!-- SLOT FOR CONTENT -->
<slot></slot>
<div class="op-button" ref="opbutton">
<v-btn id="btn-more" icon @click.stop="showContextMenu($refs.opbutton)"
><v-icon>more_vert</v-icon></v-btn
>
<div class="op-button" ref="opbutton" v-if="!event.isRedacted()">
<v-btn id="btn-more" icon @click.stop="showContextMenu($refs.opbutton)">
<v-icon>more_vert</v-icon>
</v-btn>
</div>
<QuickReactions :event="event" :timelineSet="timelineSet" />
</div>

12
src/components/messages/MessageIncomingText.vue
View file

@ -11,10 +11,14 @@
/>
</div>
<div class="message">
<span v-html="linkify($sanitize(messageText))" />
<span class="edit-marker" v-if="event.replacingEventId()"
>{{ $t('message.edited') }}</span
>
<i v-if="event.isRedacted()" class="deleted-text">
<v-icon :color="this.senderIsAdminOrModerator(this.event)?'white':''" size="small">block</v-icon>
{{ $t('message.incoming_message_deleted_text')}}
</i>
<span v-html="linkify($sanitize(messageText))" v-else/>
<span class="edit-marker" v-if="event.replacingEventId() && !event.isRedacted()">
{{ $t('message.edited') }}
</span>
</div>
<!-- <div>{{ JSON.stringify(event) }}</div> -->
</div>

8
src/components/messages/MessageOutgoing.vue
View file

@ -9,10 +9,10 @@
</div>
<QuickReactions :event="event" :timelineSet="timelineSet" />
<div class="op-button" ref="opbutton">
<v-btn id="btn-show-menu" icon @click.stop="showContextMenu($refs.opbutton)"
><v-icon>more_vert</v-icon></v-btn
>
<div class="op-button" ref="opbutton" v-if="!event.isRedacted()">
<v-btn id="btn-show-menu" icon @click.stop="showContextMenu($refs.opbutton)">
<v-icon>more_vert</v-icon>
</v-btn>
</div>
<!-- SLOT FOR CONTENT -->
<slot></slot>

12
src/components/messages/MessageOutgoingText.vue
View file

@ -12,10 +12,14 @@
</div>
<div class="message">
<span v-html="linkify($sanitize(messageText))" />
<span class="edit-marker" v-if="event.replacingEventId()"
>{{ $t('message.edited') }}</span
>
<i v-if="event.isRedacted()" class="deleted-text">
<v-icon size="small">block</v-icon>
{{ $t('message.outgoing_message_deleted_text')}}
</i>
<span v-html="linkify($sanitize(messageText))" v-else/>
<span class="edit-marker" v-if="event.replacingEventId() && !event.isRedacted()">
{{ $t('message.edited') }}
</span>
</div>
</div>
</message-outgoing>