From 140c9a032b74341f0839e8adf1e67b8c151345f0 Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Fri, 26 Aug 2022 13:30:26 +1000
Subject: [PATCH 1/4] feat(i18n): add messaging strings

---
 locales/en-US.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/en-US.js b/locales/en-US.js
index 63e2e44e0d..f2a54b1559 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -104,6 +104,12 @@ export default {
       enter_to: 'enter to',
       save: 'save',
     },
+    group_join: '{name} added {members} to the group.',
+    group_leave: '{name} left the group.',
+    sent_attachment: '{name} sent an attachment.',
+    you_sent_attachment: 'You sent an attachment.',
+    sent_glyph: '{name} sent a glyph.',
+    you_sent_glyph: 'You sent a glyph.',
     group_join_notice: {
       added: 'added',
       to_group: 'to the group.',

From 6ae8967d3f6c002b4845f87fa6d4e7606f5b0aaf Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Fri, 26 Aug 2022 13:31:00 +1000
Subject: [PATCH 2/4] chore(i18n): add comment for i18n-t

---
 components/views/chat/message/notice/Notice.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/views/chat/message/notice/Notice.html b/components/views/chat/message/notice/Notice.html
index fca4298188..fd3cf9a7d4 100644
--- a/components/views/chat/message/notice/Notice.html
+++ b/components/views/chat/message/notice/Notice.html
@@ -1,4 +1,5 @@
 <div class="message-notice">
+  <!-- TODO(i18n): replace with i18n-t https://vue-i18n.intlify.dev/guide/advanced/component.html -->
   <template v-if="message.type === 'member_join'">
     <div class="icon color-green">
       <ArrowRightIcon />

From e2b851e86adfc6d573ea84cb93a9cd55eb168a29 Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Fri, 26 Aug 2022 13:31:30 +1000
Subject: [PATCH 3/4] feat(sidebar): display other message types in message
 preview

---
 .../navigation/sidebar/list/item/Item.vue     | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/components/views/navigation/sidebar/list/item/Item.vue b/components/views/navigation/sidebar/list/item/Item.vue
index 274a6ae101..b305e16de0 100644
--- a/components/views/navigation/sidebar/list/item/Item.vue
+++ b/components/views/navigation/sidebar/list/item/Item.vue
@@ -14,6 +14,7 @@ import {
   ConversationMessage,
 } from '~/libraries/Iridium/chat/types'
 import { User } from '~/libraries/Iridium/friends/types'
+import { conversationMessageIsNotice } from '~/utilities/chat'
 
 export default Vue.extend({
   components: {
@@ -89,25 +90,40 @@ export default Vue.extend({
     },
 
     lastMessageDisplay(): string {
-      const lastMessage = this.messages.at(-1)
-      if (!lastMessage) {
+      const message = this.messages.at(-1)
+      if (!message) {
         return this.$t('messaging.say_hi') as string
       }
-      return lastMessage.body || ''
 
-      // const sender = message.from === iridium.connector?.id ? 'me' : 'user'
+      const name = iridium.users.getUser(message.from)?.name
+      const members = message.members
+        ?.map((did) => iridium.users.getUser(did)?.name)
+        .filter((name) => name)
+        .join(', ')
 
-      // switch (message.type) {
-      //   case MessagingTypesEnum.TEXT:
-      //     return message.payload
-      //   case MessagingTypesEnum.FILE:
-      //   case MessagingTypesEnum.GLYPH:
-      //     return this.$t(`messaging.user_sent.${sender}`, {
-      //       msgType: message.type,
-      //     }) as string
-      //   default:
-      //     return this.$t(`messaging.user_sent_something.${sender}`) as string
-      // }
+      const fromSelf = message.from === iridium.connector?.id
+
+      if (message.attachments.length) {
+        return fromSelf
+          ? (this.$t('messaging.you_sent_attachment') as string)
+          : (this.$t('messaging.sent_attachment', { name }) as string)
+      }
+
+      switch (message.type) {
+        case 'glyph':
+          return fromSelf
+            ? (this.$t('messaging.you_sent_glyph') as string)
+            : (this.$t('messaging.sent_glyph', { name }) as string)
+        case 'member_join':
+          return this.$t('messaging.group_join', {
+            name,
+            members,
+          }) as string
+        case 'member_leave':
+          return this.$t('messaging.group_leave', { name }) as string
+      }
+
+      return message.body || ''
     },
 
     isSelected(): boolean {

From b75ceede73cd2e516cf323cfe66a598d2e1e91f3 Mon Sep 17 00:00:00 2001
From: Jason Woodland <me@jasonwoodland.com>
Date: Fri, 26 Aug 2022 13:32:11 +1000
Subject: [PATCH 4/4] fix(attachment): fix download button alignment

---
 components/views/chat/message/attachments/Item/Item.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/views/chat/message/attachments/Item/Item.less b/components/views/chat/message/attachments/Item/Item.less
index f8048b20d1..74870a2e9f 100644
--- a/components/views/chat/message/attachments/Item/Item.less
+++ b/components/views/chat/message/attachments/Item/Item.less
@@ -22,7 +22,7 @@
     }
 
     .file-info {
-      flex-shrink: 1;
+      flex: 1;
       overflow: hidden;
       cursor: pointer;
     }