From ec4bdbbec41e57d75a2a7cb40e067c5d597e0938 Mon Sep 17 00:00:00 2001
From: adb <info@adb.sh>
Date: Fri, 21 May 2021 02:00:38 +0200
Subject: [PATCH] fix membership and unsupported event info

---
 src/components/event.vue        | 15 ++++++++++-----
 src/components/eventContent.vue |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/event.vue b/src/components/event.vue
index aa45258..3f9d8a2 100644
--- a/src/components/event.vue
+++ b/src/components/event.vue
@@ -5,9 +5,9 @@
       <event-content :content="event.content"/>
       <div class="time">{{getTime(event.origin_server_ts)}}</div>
     </div>
-    <div v-else class="info">
+    <div v-else :class="type==='send'?'info send':'info receive'">
       <span v-if="event.type==='m.room.member'">{{membershipEvents[event.content.membership](event)}}</span>
-      <span v-else>unsupported event</span>
+      <span v-else>unsupported event: {{event.type}}</span>
       <span class="time"> {{getTime(event.origin_server_ts)}}</span>
     </div>
   </div>
@@ -49,10 +49,12 @@ export default {
     return{
       replyEvent: undefined,
       membershipEvents:{
-        invite(event){ return `invited ${calcUserName(event.target.userId)}` },
+        invite(event){ return `invited ${event.target?calcUserName(event.target.userId):event.content.displayname||event.state_key}` },
         join(event){
-          if (event.content.displayname !== null) return `changed username to ${event.content.displayname}`
-          return 'joined the room'
+          if (!event.unsigned.prev_content) return 'joined the room';
+          if (event.unsigned.prev_content.displayName !== event.content.displayname)
+            return `changed displayname from ${event.unsigned.prev_content.displayname} to ${event.content.displayname}`;
+          return 'updated their account';
         },
         leave(){ return 'left the room' },
         ban(event){return `banned ${calcUserName(event.target.userId)}` }
@@ -79,6 +81,9 @@ export default {
       font-size: 0.7rem;
     }
   }
+  .info.send{
+    text-align: right;
+  }
   .message{
     position: relative;
     width: max-content;
diff --git a/src/components/eventContent.vue b/src/components/eventContent.vue
index cebebda..0330528 100644
--- a/src/components/eventContent.vue
+++ b/src/components/eventContent.vue
@@ -36,7 +36,8 @@
     </video><br>
     {{content.body}}
   </div>
-  <div v-else class="italic">unsupported message type {{content.msgtype}}</div>
+  <div v-else-if="content.msgtype" class="italic">unsupported message type: {{content.msgtype}}</div>
+  <div v-else class="italic">deleted message</div>
 </template>
 
 <script>