From 6f43321abad945602529b962e536546ab541cd70 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 7 Aug 2023 15:56:56 +0200
Subject: [PATCH 1/4] try to fix avatars

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index eb0ce4433..4e973c894 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -334,6 +334,7 @@ export default {
         ;[...this.messages, ...Message].forEach((m) => {
           if (m.senderId !== this.currentUser.id) m.seen = true
           m.date = new Date(m.date).toDateString()
+          m.avatar = this.$filters.proxyApiUrl(m.avatar)
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)
@@ -413,7 +414,7 @@ export default {
             }
           : null,
         users: room.users.map((u) => {
-          return { ...u, username: u.name, avatar: u.avatar?.url }
+          return { ...u, username: u.name, avatar: this.$filters.proxyApiUrl(u.avatar?.url) }
         }),
       }
       if (!fixedRoom.avatar) {

From b591820eb6c1ced2556fa5998cd568d7d0ab9e59 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 8 Aug 2023 07:56:02 +0200
Subject: [PATCH 2/4] Fix avatar in Room.

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 4e973c894..7a46de387 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -407,6 +407,7 @@ export default {
       const fixedRoom = {
         ...room,
         index: room.lastMessage ? room.lastMessage.date : room.createdAt,
+        avatar: this.$filters.proxyApiUrl(room.avatar),
         lastMessage: room.lastMessage
           ? {
               ...room.lastMessage,

From 5c1ab880127a5f4c1b457598fafd3ae9fe1a0d12 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 8 Aug 2023 22:21:24 +0200
Subject: [PATCH 3/4] conditional url replacement

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 7a46de387..6535ece4e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -334,7 +334,9 @@ export default {
         ;[...this.messages, ...Message].forEach((m) => {
           if (m.senderId !== this.currentUser.id) m.seen = true
           m.date = new Date(m.date).toDateString()
-          m.avatar = this.$filters.proxyApiUrl(m.avatar)
+          if(!m.avatar.startsWith('/api/')){
+            m.avatar = this.$filters.proxyApiUrl(m.avatar)
+          }
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)

From 7e697d7f9ddce184911680485ceac9d6b510349f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 8 Aug 2023 22:22:11 +0200
Subject: [PATCH 4/4] lint fixes

---
 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 6535ece4e..0671891cb 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -334,7 +334,7 @@ export default {
         ;[...this.messages, ...Message].forEach((m) => {
           if (m.senderId !== this.currentUser.id) m.seen = true
           m.date = new Date(m.date).toDateString()
-          if(!m.avatar.startsWith('/api/')){
+          if (!m.avatar.startsWith('/api/')) {
             m.avatar = this.$filters.proxyApiUrl(m.avatar)
           }
           msgs[m.indexId] = m