From defc622767b52b85d925511c03d82eba9a1087e4 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Tue, 23 Aug 2022 09:05:51 +0000 Subject: [PATCH 1/5] Update dependency opn to v5 --- package.json | 2 +- yarn.lock | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index a8cbaa3f3..dfc9c4b1a 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "mini-css-extract-plugin": "2.6.1", "mocha": "10.0.0", "nightwatch": "2.3.3", - "opn": "4.0.2", + "opn": "5.5.0", "ora": "0.4.1", "postcss": "8.4.16", "postcss-loader": "7.0.1", diff --git a/yarn.lock b/yarn.lock index 15b139a71..d8215d9de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5188,6 +5188,11 @@ is-weakref@^1.0.1: dependencies: call-bind "^1.0.2" +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw== + is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -6551,13 +6556,12 @@ open@^8.4.0: is-docker "^2.1.1" is-wsl "^2.2.0" -opn@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" - integrity sha1-erwi5kTf9jsKltWrfyeQwPAavJU= +opn@5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" + integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" + is-wsl "^1.1.0" optimist@^0.6.1: version "0.6.1" @@ -6835,16 +6839,6 @@ pify@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - pirates@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" From 666015c9fa2aaafbb602c449a1a2f7529f9bfb1b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 23 Aug 2022 22:10:21 +0300 Subject: [PATCH 2/5] fix mobile side drawer causing issues --- src/components/navigation/navigation.js | 9 +++++++++ src/components/navigation/navigation_entry.js | 10 +--------- src/components/navigation/navigation_pins.js | 11 +---------- src/components/side_drawer/side_drawer.js | 11 +++++++++-- src/components/side_drawer/side_drawer.vue | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js index 57db2253f..b4bcb05fb 100644 --- a/src/components/navigation/navigation.js +++ b/src/components/navigation/navigation.js @@ -1,3 +1,12 @@ +export const USERNAME_ROUTES = new Set([ + 'bookmarks', + 'dms', + 'interactions', + 'notifications', + 'chat', + 'chats' +]) + export const TIMELINES = { home: { route: 'friends', diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js index a19ee1b44..d8866c12b 100644 --- a/src/components/navigation/navigation_entry.js +++ b/src/components/navigation/navigation_entry.js @@ -1,18 +1,10 @@ import { mapState } from 'vuex' +import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js' import { library } from '@fortawesome/fontawesome-svg-core' import { faThumbtack } from '@fortawesome/free-solid-svg-icons' library.add(faThumbtack) -const USERNAME_ROUTES = new Set([ - 'bookmarks', - 'dms', - 'interactions', - 'notifications', - 'chat', - 'chats' -]) - const NavigationEntry = { props: ['item', 'showPin'], methods: { diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js index f0295c70d..57b8d589c 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 } from 'src/components/navigation/navigation.js' +import { TIMELINES, ROOT_ITEMS, USERNAME_ROUTES } from 'src/components/navigation/navigation.js' import { getListEntries, filterNavigation } from 'src/components/navigation/filter.js' import { library } from '@fortawesome/fontawesome-svg-core' @@ -27,15 +27,6 @@ library.add( faList ) -const USERNAME_ROUTES = new Set([ - 'bookmarks', - 'dms', - 'interactions', - 'notifications', - 'chat', - 'chats' -]) - const NavPanel = { props: ['limit'], methods: { diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index cbfd6b7d0..d5dabb724 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -2,6 +2,7 @@ import { mapState, mapGetters } from 'vuex' import UserCard from '../user_card/user_card.vue' import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils' import GestureService from '../../services/gesture_service/gesture_service' +import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js' import { library } from '@fortawesome/fontawesome-svg-core' import { faSignInAlt, @@ -82,10 +83,16 @@ const SideDrawer = { return this.$store.state.instance.federating }, timelinesRoute () { + let name if (this.$store.state.interface.lastTimeline) { - return this.$store.state.interface.lastTimeline + name = this.$store.state.interface.lastTimeline + } + name = this.currentUser ? 'friends' : 'public-timeline' + if (USERNAME_ROUTES.has(name)) { + return { name, params: { username: this.currentUser.screen_name }} + } else { + return { name } } - return this.currentUser ? 'friends' : 'public-timeline' }, ...mapState({ pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 5223fdfa1..cbeafdd2a 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -47,7 +47,7 @@ v-if="currentUser || !privateMode" @click="toggleDrawer" > - + Date: Tue, 23 Aug 2022 22:15:46 +0300 Subject: [PATCH 3/5] aria --- src/components/nav_panel/nav_panel.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index 112608181..b4ca60228 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -26,6 +26,7 @@