From bd688ecd6b5bbc9c7e4b57bc49c31ce79c2b8568 Mon Sep 17 00:00:00 2001
From: entermex <max@infinity.labs.ooo>
Date: Fri, 18 Aug 2023 11:43:28 +0200
Subject: [PATCH 1/2] Fix: proxyApiUrl in chat rooms for the avatars

---
 webapp/components/Chat/Chat.vue | 4 +---
 webapp/plugins/vue-filters.js   | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 37c2b3e06..faffa45e0 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -334,9 +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/')) {
-            m.avatar = this.$filters.proxyApiUrl(m.avatar)
-          }
+          m.avatar = this.$filters.proxyApiUrl(m.avatar)
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)
diff --git a/webapp/plugins/vue-filters.js b/webapp/plugins/vue-filters.js
index 5368385b7..327bf518d 100644
--- a/webapp/plugins/vue-filters.js
+++ b/webapp/plugins/vue-filters.js
@@ -98,6 +98,7 @@ export default ({ app = {} }) => {
     proxyApiUrl: (input) => {
       const url = input && (input.url || input)
       if (!url) return url
+      if (url.startsWith('/api/')) return url
       return url.startsWith('/') ? url.replace('/', '/api/') : url
     },
   })

From be604cc94582038dbf734481ee57f381451a6134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20L=C3=B3pez?= <javier.lopezdelrio@manomano.com>
Date: Sun, 20 Aug 2023 23:48:14 +0200
Subject: [PATCH 2/2] fix:[6687] update the groups link in map

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

diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue
index 2bf1817f7..d83c3f581 100644
--- a/webapp/pages/map.vue
+++ b/webapp/pages/map.vue
@@ -270,7 +270,7 @@ export default {
           },
           group: {
             linkTitle: '&' + e.features[0].properties.slug,
-            link: `/group/${e.features[0].properties.id}/${e.features[0].properties.slug}`,
+            link: `/groups/${e.features[0].properties.id}/${e.features[0].properties.slug}`,
           },
           event: {
             linkTitle: e.features[0].properties.slug,