From 596674fbdba740feb0ae1ab2a071fdf4901afd81 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Fri, 12 Aug 2022 22:45:05 +0900
Subject: [PATCH] refs #3300 Enable shortcut to reload timeline

---
 src/renderer/components/TimelineSpace/Contents/Bookmarks.vue | 5 ++++-
 .../components/TimelineSpace/Contents/DirectMessages.vue     | 5 ++++-
 .../components/TimelineSpace/Contents/Favourites.vue         | 5 ++++-
 .../components/TimelineSpace/Contents/Hashtag/Tag.vue        | 5 ++++-
 src/renderer/components/TimelineSpace/Contents/Home.vue      | 5 ++++-
 .../components/TimelineSpace/Contents/Lists/Show.vue         | 5 ++++-
 src/renderer/components/TimelineSpace/Contents/Local.vue     | 5 ++++-
 src/renderer/components/TimelineSpace/Contents/Mentions.vue  | 5 ++++-
 .../components/TimelineSpace/Contents/Notifications.vue      | 5 ++++-
 src/renderer/components/TimelineSpace/Contents/Public.vue    | 5 ++++-
 10 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue
index f851b0d0..6e09eff2 100644
--- a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue
@@ -53,7 +53,7 @@ export default defineComponent({
     const focusedId = ref<string | null>(null)
     const heading = ref<boolean>(true)
     const scroller = ref<any>()
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const bookmarks = computed(() => store.state.TimelineSpace.Contents.Bookmarks.bookmarks)
     const lazyLoading = computed(() => store.state.TimelineSpace.Contents.Bookmarks.lazyLoading)
@@ -97,6 +97,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const onScroll = (event: Event) => {
       if (
diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
index 7b0eb219..4c25cf8e 100644
--- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
+++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -143,6 +143,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const initialize = async () => {
       await store.dispatch(`${space}/${ACTION_TYPES.FETCH_TIMELINE}`).catch(_ => {
diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
index 767d92d8..01fa938c 100644
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@@ -51,7 +51,7 @@ export default defineComponent({
     const heading = ref<boolean>(false)
     const focusedId = ref<string | null>(null)
     const scroller = ref<any>()
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const openSideBar = computed(() => store.state.TimelineSpace.Contents.SideBar.openSideBar)
     const startReload = computed(() => store.state.TimelineSpace.HeaderMenu.reload)
@@ -105,6 +105,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const onScroll = (event: Event) => {
       if (
diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
index c108da20..25cf7305 100644
--- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const { tag } = toRefs(props)
     const focusedId = ref<string | null>(null)
@@ -134,6 +134,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     onBeforeUnmount(() => {
       store.dispatch(`${space}/${ACTION_TYPES.STOP_STREAMING}`)
diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue
index f8e45c55..38f66ca4 100644
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@@ -63,7 +63,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -175,6 +175,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const onScroll = (event: Event) => {
       if (moment().diff(resizeTime.value) < 500) {
diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
index 6f6b9e00..32ee62fb 100644
--- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
@@ -51,7 +51,7 @@ export default defineComponent({
     const space = 'TimelineSpace/Contents/Lists/Show'
     const store = useStore()
     const i18n = useI18next()
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const { list_id } = toRefs(props)
     const focusedId = ref<string | null>(null)
@@ -129,6 +129,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     onBeforeUnmount(() => {
       store.dispatch(`${space}/${ACTION_TYPES.STOP_STREAMING}`)
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index d5129f35..6be06541 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -154,6 +154,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const initialize = async () => {
       await store.dispatch(`${space}/${ACTION_TYPES.FETCH_LOCAL_TIMELINE}`).catch(_ => {
diff --git a/src/renderer/components/TimelineSpace/Contents/Mentions.vue b/src/renderer/components/TimelineSpace/Contents/Mentions.vue
index 08cbe391..3e96f818 100644
--- a/src/renderer/components/TimelineSpace/Contents/Mentions.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Mentions.vue
@@ -62,7 +62,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -156,6 +156,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const onScroll = (event: Event) => {
       if (moment().diff(resizeTime.value) < 500) {
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index ba1f2210..c593e901 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -61,7 +61,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -161,6 +161,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const onScroll = (event: Event) => {
       if (moment().diff(resizeTime.value) < 500) {
diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index 9be67218..8adc28f9 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -55,7 +55,7 @@ export default defineComponent({
     const route = useRoute()
     const i18n = useI18next()
     const { reloadable } = useReloadable(store, route, i18n)
-    const { j, k } = useMagicKeys()
+    const { j, k, r } = useMagicKeys()
 
     const focusedId = ref<string | null>(null)
     const scrollPosition = ref<ScrollPosition | null>(null)
@@ -155,6 +155,9 @@ export default defineComponent({
     whenever(and(k, shortcutEnabled), () => {
       focusPrev()
     })
+    whenever(and(r, shortcutEnabled), () => {
+      reload()
+    })
 
     const initialize = async () => {
       await store.dispatch(`${space}/${ACTION_TYPES.FETCH_PUBLIC_TIMELINE}`).catch(_ => {