From fdf4eb6bdcf5cde5ee116dc93fc8a9f15938ef58 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:25:13 +0200
Subject: [PATCH] get closer to master

---
 webapp/pages/index.vue |  8 +++++---
 webapp/store/posts.js  | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index e2c92e868..db05fc0c5 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -197,9 +197,11 @@ export default {
     },
     finalFilters() {
       let filter = this.postsFilter
-      filter = {
-        ...filter,
-        tags_some: this.hashtag ? { id: this.hashtag } : undefined,
+      if (this.hashtag) {
+        filter = {
+          ...filter,
+          tags_some: this.hashtag ? { id: this.hashtag } : undefined,
+        }
       }
       return filter
     },
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 41b9d99ba..c0a5d8ae3 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -57,13 +57,6 @@ export const mutations = {
     delete filter.language_in
     state.filter = filter
   },
-  RESET_POST_TYPE(state) {
-    const filter = clone(state.filter)
-    delete filter.eventStart_gte
-    delete filter.postType_in
-    state.order = 'createdAt_desc'
-    state.filter = filter
-  },
   TOGGLE_CATEGORY(state, categoryId) {
     const filter = clone(state.filter)
     update(filter, 'categories_some.id_in', (categoryIds) => xor(categoryIds, [categoryId]))
@@ -82,6 +75,13 @@ export const mutations = {
     if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some
     state.filter = filter
   },
+  RESET_POST_TYPE(state) {
+    const filter = clone(state.filter)
+    delete filter.eventStart_gte
+    delete filter.postType_in
+    state.order = 'createdAt_desc'
+    state.filter = filter
+  },
   TOGGLE_POST_TYPE(state, postType) {
     const filter = clone(state.filter)
     if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) {
@@ -124,15 +124,15 @@ export const getters = {
   filteredCategoryIds(state) {
     return get(state.filter, 'categories_some.id_in') || []
   },
+  filteredPostTypes(state) {
+    return get(state.filter, 'postType_in') || []
+  },
   filteredLanguageCodes(state) {
     return get(state.filter, 'language_in') || []
   },
   filteredByUsersFollowed(state) {
     return !!get(state.filter, 'author.followedBy_some.id')
   },
-  filteredPostTypes(state) {
-    return get(state.filter, 'postType_in') || []
-  },
   filteredByPostsInMyGroups(state) {
     return !!get(state.filter, 'postsInMyGroups')
   },