Message deleted text

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;

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": "མདོ་འཛིན་པ།",

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",

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",

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",

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",

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",

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",

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",

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",

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": {

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": ""

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": {

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": "登录",

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="

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;
     },

src/components/messages/MessageIncoming.vue

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

src/components/messages/MessageIncomingText.vue

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

src/components/messages/MessageOutgoing.vue

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

src/components/messages/MessageOutgoingText.vue

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