Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6691-add-using-DKIM-by-nodemailer

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)

webapp/components/FilterMenu/FilterMenuSection.vue

@@ -80,10 +80,6 @@ export default {
   @media only screen and (max-width: 630px) {
     flex-direction: column;
 
-    > .title {
-      text-align: center;
-    }
-
     // > .sidebar {
     //   max-width: none;
     // }

webapp/components/FilterMenu/PostTypeFilter.vue

@@ -2,7 +2,7 @@
   <filter-menu-section
     :title="$t('filter-menu.post-type')"
     :divider="false"
-    class="following-filter post-type-filter"
+    class="post-type-filter"
   >
     <template #filter-follower>
       <li class="item all-item">
@@ -65,9 +65,10 @@ export default {
 <style lang="scss">
 .post-type-filter {
   & .filter-list {
-    display: grid;
-    grid-template-columns: repeat(3, 10%);
-    padding-left: 0px;
+    display: flex;
+    flex-basis: 100%;
+    flex-grow: 1;
+    padding-left: $space-base;
   }
 }
 </style>

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,

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
     },
   })