From 24c6884b9afe1d902b4aeb4d7983cf22d391ca3b Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 14:38:28 +0200
Subject: [PATCH 1/8] [feature] changed usertag in chat messages to user-slug

---
 webapp/components/Chat/Chat.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..d27824fa8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,6 +164,12 @@ export default {
     },
 
     async sendMessage(message) {
+      //check for usersTag and change userid to username
+      message.usersTag.forEach(userTag =>{
+        let needle = `<usertag>${userTag.id}</usertag>`
+        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle,replacement)
+      })
       try {
         await this.$apollo.mutate({
           mutation: createMessageMutation(),

From 08b78aad7c55d66cab3ec23d98b32eb710dc58d0 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 14:45:44 +0200
Subject: [PATCH 2/8] fixed linting

---
 webapp/components/Chat/Chat.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d27824fa8..6ed548ab0 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,11 +164,11 @@ export default {
     },
 
     async sendMessage(message) {
-      //check for usersTag and change userid to username
-      message.usersTag.forEach(userTag =>{
-        let needle = `<usertag>${userTag.id}</usertag>`
-        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
-        message.content = message.content.replaceAll(needle,replacement)
+      // check for usersTag and change userid to username
+      message.usersTag.forEach((userTag) => {
+        const needle = `<usertag>${userTag.id}</usertag>`
+        const replacement = `<usertag>@${userTag.name.replaceAll(' ', '-').toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle, replacement)
       })
       try {
         await this.$apollo.mutate({

From db594650f9308e8c3bdd5e396c087598ae932d82 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 18:53:56 +0200
Subject: [PATCH 3/8] feat(webapp): mark messages as seen

---
 webapp/components/Chat/Chat.vue | 71 +++++++++++++++++++--------------
 webapp/graphql/Messages.js      |  8 ++++
 2 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..8c4aaff69 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation } from '~/graphql/Messages'
+import { messageQuery, createMessageMutation, markMessagesAsSeen } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters } from 'vuex'
 
@@ -83,30 +83,30 @@ export default {
           title: 'Just a dummy item',
         },
         /* {
-          name: 'inviteUser',
-          title: 'Invite User',
-        },
-        {
-          name: 'removeUser',
-          title: 'Remove User',
-        },
-        {
-          name: 'deleteRoom',
-          title: 'Delete Room',
-        },
-        */
+            name: 'inviteUser',
+            title: 'Invite User',
+            },
+            {
+            name: 'removeUser',
+            title: 'Remove User',
+            },
+            {
+            name: 'deleteRoom',
+            title: 'Delete Room',
+            },
+          */
       ],
       messageActions: [
         /*
-        {
-          name: 'addMessageToFavorite',
-          title: 'Add To Favorite',
-        },
-        {
-          name: 'shareMessage',
-          title: 'Share Message',
-        },
-        */
+            {
+            name: 'addMessageToFavorite',
+            title: 'Add To Favorite',
+            },
+            {
+            name: 'shareMessage',
+            title: 'Share Message',
+            },
+          */
       ],
       templatesText: [
         {
@@ -134,14 +134,14 @@ export default {
       },
       roomActions: [
         /*
-        {
-          name: 'archiveRoom',
-          title: 'Archive Room',
-        },
-        { name: 'inviteUser', title: 'Invite User' },
-        { name: 'removeUser', title: 'Remove User' },
-        { name: 'deleteRoom', title: 'Delete Room' },
-        */
+            {
+            name: 'archiveRoom',
+            title: 'Archive Room',
+            },
+            { name: 'inviteUser', title: 'Invite User' },
+            { name: 'removeUser', title: 'Remove User' },
+            { name: 'deleteRoom', title: 'Delete Room' },
+          */
       ],
       rooms: [],
       messages: [],
@@ -208,8 +208,19 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
+        const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
+        if (newMsgIds.length) {
+          this.$apollo.mutate({
+            mutation: markMessagesAsSeen(),
+            variables: {
+              messageIds: newMsgIds,
+            },
+          })
+        }
+
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
+          m.seen = true
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..134b00de0 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -27,3 +27,11 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const markMessagesAsSeen = () => {
+  return gql`
+    mutation ($messageIds: [String!]) {
+      MarkMessagesAsSeen(messageIds: $messageIds)
+    }
+  `
+}

From 4a9199229b2c71098bd25bc5d329c855d5a94d16 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:05:51 +0200
Subject: [PATCH 4/8] redurce changeset

---
 webapp/components/Chat/Chat.vue | 45 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dc3619ac6..386e4743e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -84,31 +84,32 @@ export default {
           name: 'dummyItem',
           title: 'Just a dummy item',
         },
-        /* {
-            name: 'inviteUser',
-            title: 'Invite User',
-            },
-            {
-            name: 'removeUser',
-            title: 'Remove User',
-            },
-            {
-            name: 'deleteRoom',
-            title: 'Delete Room',
-            },
-          */
+        /*
+          {
+          name: 'inviteUser',
+          title: 'Invite User',
+          },
+          {
+          name: 'removeUser',
+          title: 'Remove User',
+          },
+          {
+          name: 'deleteRoom',
+          title: 'Delete Room',
+          },
+        */
       ],
       messageActions: [
         /*
-            {
-            name: 'addMessageToFavorite',
-            title: 'Add To Favorite',
-            },
-            {
-            name: 'shareMessage',
-            title: 'Share Message',
-            },
-          */
+          {
+          name: 'addMessageToFavorite',
+          title: 'Add To Favorite',
+          },
+          {
+          name: 'shareMessage',
+          title: 'Share Message',
+          },
+        */
       ],
       templatesText: [
         {

From 19e441b44939a132dc5c2bf12fe667a5cfb58b62 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:06:37 +0200
Subject: [PATCH 5/8] more changeset reduction

---
 webapp/components/Chat/Chat.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 386e4743e..1b5dd45ea 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -85,30 +85,30 @@ export default {
           title: 'Just a dummy item',
         },
         /*
-          {
+        {
           name: 'inviteUser',
           title: 'Invite User',
-          },
-          {
+        },
+        {
           name: 'removeUser',
           title: 'Remove User',
-          },
-          {
+        },
+        {
           name: 'deleteRoom',
           title: 'Delete Room',
-          },
+        },
         */
       ],
       messageActions: [
         /*
-          {
+        {
           name: 'addMessageToFavorite',
           title: 'Add To Favorite',
-          },
-          {
+        },
+        {
           name: 'shareMessage',
           title: 'Share Message',
-          },
+        },
         */
       ],
       templatesText: [

From b8f0e1ef59b2c6f38bce96d607edb3ae174e38b3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:23:34 +0200
Subject: [PATCH 6/8] "fix" room avatar query

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 0ddc65533..76823d364 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,7 +19,7 @@ type Room {
 
   roomId: String! @cypher(statement: "RETURN this.id")
   roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
-  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+  avatar: String @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
 
   lastMessageAt: String
 

From edeb22e70cc36f01661bf6570cf7e75afb8492d8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 15:58:46 +0200
Subject: [PATCH 7/8] room avatar is working (returns other users avatar image
 if present)

---
 backend/src/schema/types/type/Room.gql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 76823d364..9950407b7 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,7 +19,12 @@ type Room {
 
   roomId: String! @cypher(statement: "RETURN this.id")
   roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
-  avatar: String @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+  avatar: String @cypher(statement: """
+    MATCH (this)<-[:CHATS_IN]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+    OPTIONAL MATCH (:User)-[:AVATAR_IMAGE]->(image:Image)
+    RETURN image.url
+  """)
 
   lastMessageAt: String
 

From b1102f6e3e5e10480b39aca57fdb04d572807e80 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 16:07:12 +0200
Subject: [PATCH 8/8] only mark other users messages as seen

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 1b5dd45ea..761973ef1 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -267,7 +267,7 @@ export default {
 
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
-          m.seen = true
+          if (m.senderId !== this.currentUser.id) m.seen = true
           m.date = new Date(m.date).toDateString()
           msgs[m.indexId] = m
         })