From 3f68e8434667ee8de734faf04dd14a72ea7155cb Mon Sep 17 00:00:00 2001
From: 10G Meow <10gmeow@gmail.com>
Date: Wed, 30 Nov 2022 08:16:23 +0000
Subject: [PATCH] Message deleted text

---
 src/assets/css/chat.scss                        |  5 +++++
 src/assets/translations/bo.json                 |  4 +++-
 src/assets/translations/de.json                 |  4 +++-
 src/assets/translations/en.json                 |  4 +++-
 src/assets/translations/es.json                 |  4 +++-
 src/assets/translations/fi.json                 |  4 +++-
 src/assets/translations/fr.json                 |  4 +++-
 src/assets/translations/it.json                 |  4 +++-
 src/assets/translations/nb_NO.json              |  4 +++-
 src/assets/translations/pt_BR.json              |  4 +++-
 src/assets/translations/ro.json                 |  4 +++-
 src/assets/translations/si.json                 |  4 +++-
 src/assets/translations/ug.json                 |  4 +++-
 src/assets/translations/zh_Hans.json            |  4 +++-
 src/components/Chat.vue                         |  2 +-
 src/components/chatMixin.js                     |  5 ++++-
 src/components/messages/MessageIncoming.vue     |  8 ++++----
 src/components/messages/MessageIncomingText.vue | 12 ++++++++----
 src/components/messages/MessageOutgoing.vue     |  8 ++++----
 src/components/messages/MessageOutgoingText.vue | 12 ++++++++----
 20 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss
index 01bdca9..2066534 100644
--- a/src/assets/css/chat.scss
+++ b/src/assets/css/chat.scss
@@ -488,6 +488,11 @@ $admin-fg: white;
   white-space: pre-wrap;
   text-align: left;
 
+  .deleted-text {
+    cursor: not-allowed;
+    font-size: 14px;
+  }
+
   .edit-marker {
     font-size: 0.8rem;
     color: #888888;
diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json
index 3d3fdd0..540327d 100644
--- a/src/assets/translations/bo.json
+++ b/src/assets/translations/bo.json
@@ -181,7 +181,9 @@
         "user_changed_guest_access_closed": "{user} མགྲོན་པོ་ཁ་བརྡ་ཁང་དུ་འཛུལ་བཅུག་མ་སོང་།",
         "reply_image": "",
         "reply_audio_message": "",
-        "reply_video": ""
+        "reply_video": "",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "power_level": {
         "moderator": "མདོ་འཛིན་པ།",
diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json
index 5ce8d56..e1bad16 100644
--- a/src/assets/translations/de.json
+++ b/src/assets/translations/de.json
@@ -59,7 +59,9 @@
         "user_left": "{user} hat das Gespräch verlassen",
         "user_joined": "{Benutzer} ist dem Gespräch beigetreten",
         "download_progress": "{percentage} % heruntergeladen",
-        "user_changed_room_name": "{user} hat den Raumnamen in {name} geändert"
+        "user_changed_room_name": "{user} hat den Raumnamen in {name} geändert",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "room": {
         "leave": "Verlassen",
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index c8cfb26..e2193bd 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -68,7 +68,9 @@
     "reply_image": "Image",
     "reply_audio_message": "Audio message",
     "reply_video": "Video",
-    "time_ago": "Today | Yesterday | {count} days ago"
+    "time_ago": "Today | Yesterday | {count} days ago",
+    "outgoing_message_deleted_text": "You deleted this message.",
+    "incoming_message_deleted_text": "This message was deleted."
   },
   "room": {
     "invitations": "You have no invitations | You have 1 invitation | You have {count} invitations",
diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json
index 2c031e5..68c1f30 100644
--- a/src/assets/translations/es.json
+++ b/src/assets/translations/es.json
@@ -192,7 +192,9 @@
         "reply_audio_message": "Mensaje de audio",
         "reply_video": "Vídeo",
         "user_changed_guest_access_closed": "{user} no has permitido que los invitados se unan a la sala",
-        "user_changed_guest_access_open": "{user} has permitido que los invitados se unieran a la sala"
+        "user_changed_guest_access_open": "{user} has permitido que los invitados se unieran a la sala",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "menu": {
         "login": "Iniciar sesión",
diff --git a/src/assets/translations/fi.json b/src/assets/translations/fi.json
index 29befa3..0401285 100644
--- a/src/assets/translations/fi.json
+++ b/src/assets/translations/fi.json
@@ -106,7 +106,9 @@
         "user_joined": "{user} liittyi keskusteluun",
         "file_prefix": "Tiedosto: ",
         "edited": "(muokattu)",
-        "users_are_typing": "{count} jäsentä kirjoitavat"
+        "users_are_typing": "{count} jäsentä kirjoitavat",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "room": {
         "leave": "Poistu",
diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json
index 63b356e..b61bec8 100644
--- a/src/assets/translations/fr.json
+++ b/src/assets/translations/fr.json
@@ -59,7 +59,9 @@
         "room_joinrule_public": "public",
         "unread_messages": "Messages non lus",
         "users_are_typing": "{count} membres écrivent",
-        "room_powerlevel_change": "{user} a changé le statut de {changes}"
+        "room_powerlevel_change": "{user} a changé le statut de {changes}",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "room": {
         "members": "aucun membre | 1 membre | {count} membres",
diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json
index bdcef3a..10fe765 100644
--- a/src/assets/translations/it.json
+++ b/src/assets/translations/it.json
@@ -40,7 +40,9 @@
         "room_history_world_readable": "leggibile da chiunque",
         "room_history_shared": "leggibile da tutti i membri nella stanza",
         "user_is_typing": "{user} sta scrivendo",
-        "users_are_typing": "{count} membri stanno scrivendo"
+        "users_are_typing": "{count} membri stanno scrivendo",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "room": {
         "purge_removing_members": "Rimozione di membri",
diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json
index d747b7e..7dc85b6 100644
--- a/src/assets/translations/nb_NO.json
+++ b/src/assets/translations/nb_NO.json
@@ -36,7 +36,9 @@
         "you": "Deg",
         "reply_image": "",
         "reply_audio_message": "",
-        "reply_video": ""
+        "reply_video": "",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "device_list": {
         "title": "Enheter",
diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json
index cda286f..ee9f623 100644
--- a/src/assets/translations/pt_BR.json
+++ b/src/assets/translations/pt_BR.json
@@ -81,7 +81,9 @@
         "reply_image": "Imagem",
         "reply_audio_message": "Mensagem de áudio",
         "reply_video": "Vídeo",
-        "time_ago": "Hoje | Ontem | {count} dias atrás"
+        "time_ago": "Hoje | Ontem | {count} dias atrás",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "room": {
         "members": "sem membros | 1 membro | {count} membros",
diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json
index 16d8bff..742c7b2 100644
--- a/src/assets/translations/ro.json
+++ b/src/assets/translations/ro.json
@@ -236,7 +236,9 @@
         "you": "Tu",
         "reply_image": "Imagine",
         "reply_audio_message": "Mesaj audio",
-        "reply_video": "Videoclip"
+        "reply_video": "Videoclip",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "language_display_name": "Engleză",
     "fallbacks": {
diff --git a/src/assets/translations/si.json b/src/assets/translations/si.json
index 33e42f9..8540ce2 100644
--- a/src/assets/translations/si.json
+++ b/src/assets/translations/si.json
@@ -25,7 +25,9 @@
         "reply_image": "",
         "reply_audio_message": "",
         "reply_video": "",
-        "you": "ඔබ"
+        "you": "ඔබ",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "login": {
         "invalid_message": ""
diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json
index df724cb..0ed74f4 100644
--- a/src/assets/translations/ug.json
+++ b/src/assets/translations/ug.json
@@ -67,7 +67,9 @@
         "user_changed_room_history": "قوللانغۇچى» مۇنازىرەخانىنىڭ تارىخىنى قۇردى»",
         "reply_image": "",
         "reply_audio_message": "",
-        "reply_video": ""
+        "reply_video": "",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "language_display_name": "ئىنگىلزچە",
     "new_room": {
diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json
index f096cb5..c2eeaa0 100644
--- a/src/assets/translations/zh_Hans.json
+++ b/src/assets/translations/zh_Hans.json
@@ -117,7 +117,9 @@
         "user_changed_guest_access_closed": "{user} 不允许客人加入聊天室",
         "reply_image": "",
         "reply_audio_message": "",
-        "reply_video": ""
+        "reply_video": "",
+        "outgoing_message_deleted_text": "",
+        "incoming_message_deleted_text": ""
     },
     "menu": {
         "login": "登录",
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index bdf2759..76c4a3b 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -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="
diff --git a/src/components/chatMixin.js b/src/components/chatMixin.js
index c8d5356..970fe16 100644
--- a/src/components/chatMixin.js
+++ b/src/components/chatMixin.js
@@ -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;
     },
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index a345132..9c31eb3 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -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>
diff --git a/src/components/messages/MessageIncomingText.vue b/src/components/messages/MessageIncomingText.vue
index b34a3f6..2a38e8d 100644
--- a/src/components/messages/MessageIncomingText.vue
+++ b/src/components/messages/MessageIncomingText.vue
@@ -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>
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index 11b4000..d2495eb 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -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>
diff --git a/src/components/messages/MessageOutgoingText.vue b/src/components/messages/MessageOutgoingText.vue
index dd6b3c2..c775988 100644
--- a/src/components/messages/MessageOutgoingText.vue
+++ b/src/components/messages/MessageOutgoingText.vue
@@ -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>