From 306e254c15c7cb7a19b680a5666695f429445729 Mon Sep 17 00:00:00 2001 From: Alexander Tumin Date: Fri, 17 Mar 2023 22:24:22 +0300 Subject: Fix user-profile route crash on pinned favorites route --- src/components/navigation/navigation_pins.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/components/navigation/navigation_pins.js') diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js index 9dd795aa..ef78e44c 100644 --- a/src/components/navigation/navigation_pins.js +++ b/src/components/navigation/navigation_pins.js @@ -1,5 +1,5 @@ import { mapState } from 'vuex' -import { TIMELINES, ROOT_ITEMS, USERNAME_ROUTES } from 'src/components/navigation/navigation.js' +import { TIMELINES, ROOT_ITEMS, routeTo } from 'src/components/navigation/navigation.js' import { getListEntries, filterNavigation } from 'src/components/navigation/filter.js' import { library } from '@fortawesome/fontawesome-svg-core' @@ -31,14 +31,7 @@ const NavPanel = { props: ['limit'], methods: { getRouteTo (item) { - if (item.routeObject) { - return item.routeObject - } - const route = { name: (item.anon || this.currentUser) ? item.route : item.anonRoute } - if (USERNAME_ROUTES.has(route.name)) { - route.params = { username: this.currentUser.screen_name } - } - return route + return routeTo(item, this.currentUser) } }, computed: { -- cgit v1.2.3-70-g09d2 From 5c0deb1e6f3a854ddcef99f4bdfa82672524f82c Mon Sep 17 00:00:00 2001 From: tusooa Date: Thu, 6 Apr 2023 18:14:49 -0400 Subject: Fix bug where announcements cannot be pinned --- src/components/navigation/navigation_pins.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/components/navigation/navigation_pins.js') diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js index ef78e44c..86c33d1f 100644 --- a/src/components/navigation/navigation_pins.js +++ b/src/components/navigation/navigation_pins.js @@ -45,6 +45,7 @@ const NavPanel = { privateMode: state => state.instance.private, federating: state => state.instance.federating, pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable, + supportsAnnouncements: state => state.announcements.supportsAnnouncements, pinnedItems: state => new Set(state.serverSideStorage.prefsStorage.collections.pinnedNavItems) }), pinnedList () { @@ -56,6 +57,7 @@ const NavPanel = { ], { hasChats: this.pleromaChatMessagesAvailable, + hasAnnouncements: this.supportsAnnouncements, isFederating: this.federating, isPrivate: this.privateMode, currentUser: this.currentUser @@ -75,6 +77,7 @@ const NavPanel = { ], { hasChats: this.pleromaChatMessagesAvailable, + hasAnnouncements: this.supportsAnnouncements, isFederating: this.federating, isPrivate: this.privateMode, currentUser: this.currentUser -- cgit v1.2.3-70-g09d2