From cdf5f108ccc25d225efbc51790569de031950b13 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 22 Aug 2018 14:32:29 +0900
Subject: [PATCH 1/3] refs #543 Add shortcut to reply, reboot, favourite, open
 detail, and open profile

---
 .../TimelineSpace/Contents/Cards/Toot.vue       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
index dd760f60..d1c008f2 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
@@ -2,7 +2,7 @@
 <div
   class="status"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k'], reply: ['r'], boost: ['b'], fav: ['f'], open: ['o'], profile: ['p']} : {}"
   @shortkey="handleTootControl"
   ref="status"
   @click="$emit('selectToot')"
@@ -392,6 +392,21 @@ export default {
         case 'prev':
           this.$emit('focusPrev')
           break
+        case 'reply':
+          this.openReply(this.message)
+          break
+        case 'boost':
+          this.changeReblog(this.message)
+          break
+        case 'fav':
+          this.changeFavourite(this.message)
+          break
+        case 'open':
+          this.openDetail(this.message)
+          break
+        case 'profile':
+          this.openUser(this.originalMessage(this.message).account)
+          break
       }
     }
   }

From 76a83320d18fd56b35da8256f5bc30c6fe485d88 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 22 Aug 2018 19:17:35 +0900
Subject: [PATCH 2/3] refs #543 Start focus with j key in timeline

---
 .../components/TimelineSpace/Contents/Favourites.vue  | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Hashtag/Tag.vue | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Home.vue        | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Local.vue       | 11 ++++++++++-
 .../components/TimelineSpace/Contents/Public.vue      | 11 ++++++++++-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
index 02dca8a4..122bcb68 100644
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="favourites">
+<div id="favourites" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
   <div class="fav" v-for="message in favourites" v-bind:key="message.id">
@@ -167,6 +167,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.id
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.favourites[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
index a4b868d5..78123323 100644
--- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
@@ -1,5 +1,5 @@
 <template>
-<div name="tag">
+<div name="tag" v-shortkey="{next:['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -205,6 +205,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue
index 1eac656c..a1aea6f3 100644
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="home">
+<div id="home" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -172,6 +172,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index 622fefe9..2b2d59e3 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="local">
+<div id="local" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -171,6 +171,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index 71837a5c..4b1fb1f8 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="public">
+<div id="public" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -194,6 +194,15 @@ export default {
     },
     focusToot (message) {
       this.focusedId = message.uri
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedId) {
+            this.focusedId = this.timeline[0].uri
+          }
+          break
+      }
     }
   }
 }

From 7ea3ffb4f00acb89e948f824f8c0162fefbeb7c8 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 22 Aug 2018 19:20:41 +0900
Subject: [PATCH 3/3] refs #543 Start focus with j key in favourite

---
 .../Contents/Cards/Notification/Favourite.vue         |  2 +-
 .../Contents/Cards/Notification/Follow.vue            |  2 +-
 .../Contents/Cards/Notification/Reblog.vue            |  2 +-
 .../TimelineSpace/Contents/Notifications.vue          | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
index 30b679d7..9777c088 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
@@ -2,7 +2,7 @@
 <div
   class="status"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k']} : {}"
   @shortkey="handleStatusControl"
   ref="status"
   @click="$emit('select')"
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
index 62845009..6fb8f8cc 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
@@ -2,7 +2,7 @@
 <div
   class="follow"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k']} : {}"
   @shortkey="handleStatusControl"
   ref="status"
   @click="$emit('select')"
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
index cec7685b..f3ffca24 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
@@ -2,7 +2,7 @@
 <div
   class="status"
   tabIndex="0"
-  v-shortkey="{next: ['j'], prev: ['k']}"
+  v-shortkey="focused ? {next: ['j'], prev: ['k']} : {}"
   @shortkey="handleStatusControl"
   ref="status"
   @click="$emit('select')"
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index 2883ae5e..cdd516cd 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -1,5 +1,5 @@
 <template>
-<div id="notifications">
+<div id="notifications" v-shortkey="{next: ['j']}" @shortkey="handleKey">
   <div class="unread">{{ unread.length > 0 ? unread.length : '' }}</div>
   <div v-shortkey="{linux: ['ctrl', 'r'], mac: ['meta', 'r']}" @shortkey="reload()">
   </div>
@@ -157,6 +157,15 @@ export default {
     },
     focusNotification (index) {
       this.focusedIndex = index
+    },
+    handleKey (event) {
+      switch (event.srcKey) {
+        case 'next':
+          if (!this.focusedIndex) {
+            this.focusedIndex = 0
+          }
+          break
+      }
     }
   }
 }