From 8c283f949ca27c052e869d64e8311a8bca1ac255 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sat, 11 May 2019 23:01:59 +0900
Subject: [PATCH 1/3] refs #772 Add follow requests menu in side menu

---
 .../store/TimelineSpace/SideMenu.spec.ts      |  6 +-
 src/config/locales/en/translation.json        |  1 +
 src/renderer/components/TimelineSpace.vue     | 95 +++++++++---------
 .../components/TimelineSpace/SideMenu.vue     | 98 +++++++++++--------
 src/renderer/store/TimelineSpace/SideMenu.ts  | 36 ++++---
 5 files changed, 126 insertions(+), 110 deletions(-)

diff --git a/spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts b/spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts
index 65905392..300c388a 100644
--- a/spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts
@@ -26,6 +26,7 @@ const state = (): SideMenuState => {
     unreadLocalTimeline: false,
     unreadDirectMessagesTimeline: false,
     unreadPublicTimeline: false,
+    unreadFollowRequests: false,
     lists: [],
     tags: [],
     collapse: false
@@ -62,10 +63,7 @@ describe('SideMenu', () => {
         get: (_path: string, _params: object) => {
           return new Promise<Response<List[]>>(resolve => {
             const res: Response<List[]> = {
-              data: [
-                list1,
-                list2
-              ],
+              data: [list1, list2],
               status: 200,
               statusText: 'OK',
               headers: {}
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index ebcf2f16..d427bb46 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -49,6 +49,7 @@
     "notification": "Notification",
     "mention": "Mention",
     "direct": "Direct messages",
+    "follow_requests": "Follow Requests",
     "favourite": "Favourite",
     "local": "Local timeline",
     "public": "Public timeline",
diff --git a/src/renderer/components/TimelineSpace.vue b/src/renderer/components/TimelineSpace.vue
index 3c870594..dc4ebac6 100644
--- a/src/renderer/components/TimelineSpace.vue
+++ b/src/renderer/components/TimelineSpace.vue
@@ -1,23 +1,23 @@
 <template>
-<div
-  id="timeline_space"
-  v-loading="loading"
-  :element-loading-text="$t('message.loading')"
-  element-loading-spinner="el-icon-loading"
-  element-loading-background="rgba(0, 0, 0, 0.8)"
-  v-shortkey="shortcutEnabled ? {help: ['shift', '?']} : {}"
-  @shortkey="handleKey"
+  <div
+    id="timeline_space"
+    v-loading="loading"
+    :element-loading-text="$t('message.loading')"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    v-shortkey="shortcutEnabled ? { help: ['shift', '?'] } : {}"
+    @shortkey="handleKey"
   >
-  <side-menu></side-menu>
-  <div :class="collapse ? 'page-narrow':'page'">
-    <header class="header" style="-webkit-app-region: drag;">
-      <header-menu></header-menu>
-    </header>
-    <contents></contents>
+    <side-menu></side-menu>
+    <div :class="collapse ? 'page-narrow' : 'page'">
+      <header class="header" style="-webkit-app-region: drag;">
+        <header-menu></header-menu>
+      </header>
+      <contents></contents>
+    </div>
+    <modals></modals>
+    <receive-drop v-show="droppableVisible"></receive-drop>
   </div>
-  <modals></modals>
-  <receive-drop v-show="droppableVisible"></receive-drop>
-</div>
 </template>
 
 <script>
@@ -32,7 +32,7 @@ import ReceiveDrop from './TimelineSpace/ReceiveDrop'
 export default {
   name: 'timeline-space',
   components: { SideMenu, HeaderMenu, Modals, Contents, ReceiveDrop },
-  data () {
+  data() {
     return {
       dropTarget: null,
       droppableVisible: false
@@ -43,23 +43,20 @@ export default {
       loading: state => state.TimelineSpace.loading,
       collapse: state => state.TimelineSpace.SideMenu.collapse
     }),
-    ...mapGetters('TimelineSpace/Modals', [
-      'modalOpened'
-    ]),
-    shortcutEnabled: function () {
+    ...mapGetters('TimelineSpace/Modals', ['modalOpened']),
+    shortcutEnabled: function() {
       return !this.modalOpened
     }
   },
-  async created () {
+  async created() {
     this.$store.dispatch('TimelineSpace/Contents/SideBar/close')
     this.$store.commit('TimelineSpace/changeLoading', true)
-    await this.initialize()
-      .finally(() => {
-        this.$store.commit('TimelineSpace/changeLoading', false)
-        this.$store.commit('GlobalHeader/updateChanging', false)
-      })
+    await this.initialize().finally(() => {
+      this.$store.commit('TimelineSpace/changeLoading', false)
+      this.$store.commit('GlobalHeader/updateChanging', false)
+    })
   },
-  mounted () {
+  mounted() {
     window.addEventListener('dragenter', this.onDragEnter)
     window.addEventListener('dragleave', this.onDragLeave)
     window.addEventListener('dragover', this.onDragOver)
@@ -68,7 +65,7 @@ export default {
       this.$store.commit('TimelineSpace/Modals/Jump/changeModal', true)
     })
   },
-  beforeDestroy () {
+  beforeDestroy() {
     window.removeEventListener('dragenter', this.onDragEnter)
     window.removeEventListener('dragleave', this.onDragLeave)
     window.removeEventListener('dragover', this.onDragOver)
@@ -77,14 +74,14 @@ export default {
     this.$store.dispatch('TimelineSpace/unbindStreamings')
   },
   methods: {
-    async clear () {
+    async clear() {
       await this.$store.dispatch('TimelineSpace/clearAccount')
       this.$store.dispatch('TimelineSpace/clearContentsTimelines')
       await this.$store.dispatch('TimelineSpace/removeShortcutEvents')
       await this.$store.dispatch('TimelineSpace/clearUnread')
       return 'clear'
     },
-    async initialize () {
+    async initialize() {
       await this.clear()
 
       this.$store.dispatch('TimelineSpace/watchShortcutEvents')
@@ -95,16 +92,16 @@ export default {
         })
       })
       this.$store.dispatch('TimelineSpace/SideMenu/fetchLists', account)
+      this.$store.dispatch('TimelineSpace/SideMenu/fetchFollowRequests', account)
       await this.$store.dispatch('TimelineSpace/loadUnreadNotification', this.$route.params.id)
 
       // Load timelines
-      await this.$store.dispatch('TimelineSpace/fetchContentsTimelines', account)
-        .catch(_ => {
-          this.$message({
-            message: this.$t('message.timeline_fetch_error'),
-            type: 'error'
-          })
+      await this.$store.dispatch('TimelineSpace/fetchContentsTimelines', account).catch(_ => {
+        this.$message({
+          message: this.$t('message.timeline_fetch_error'),
+          type: 'error'
         })
+      })
 
       await this.$store.dispatch('TimelineSpace/detectPleroma')
       // Bind streamings
@@ -115,7 +112,7 @@ export default {
       this.$store.dispatch('TimelineSpace/fetchEmojis', account)
       this.$store.dispatch('TimelineSpace/fetchInstance', account)
     },
-    handleDrop (e) {
+    handleDrop(e) {
       e.preventDefault()
       e.stopPropagation()
       this.droppableVisible = false
@@ -132,28 +129,27 @@ export default {
       }
       this.$store.dispatch('TimelineSpace/Modals/NewToot/openModal')
       this.$store.dispatch('TimelineSpace/Modals/NewToot/incrementMediaId')
-      this.$store.dispatch('TimelineSpace/Modals/NewToot/uploadImage', file)
-        .catch(() => {
-          this.$message({
-            message: this.$t('message.attach_error'),
-            type: 'error'
-          })
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/uploadImage', file).catch(() => {
+        this.$message({
+          message: this.$t('message.attach_error'),
+          type: 'error'
         })
+      })
       return false
     },
-    onDragEnter (e) {
+    onDragEnter(e) {
       this.dropTarget = e.target
       this.droppableVisible = true
     },
-    onDragLeave (e) {
+    onDragLeave(e) {
       if (e.target === this.dropTarget) {
         this.droppableVisible = false
       }
     },
-    onDragOver (e) {
+    onDragOver(e) {
       e.preventDefault()
     },
-    handleKey (event) {
+    handleKey(event) {
       switch (event.srcKey) {
         case 'help':
           this.$store.commit('TimelineSpace/Modals/Shortcut/changeModal', true)
@@ -205,5 +201,4 @@ export default {
     width: calc(100% - 65px - 64px);
   }
 }
-
 </style>
diff --git a/src/renderer/components/TimelineSpace/SideMenu.vue b/src/renderer/components/TimelineSpace/SideMenu.vue
index a94f2a13..0353cc4f 100644
--- a/src/renderer/components/TimelineSpace/SideMenu.vue
+++ b/src/renderer/components/TimelineSpace/SideMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="side_menu">
-    <div :class="collapse ? 'profile-wrapper narrow-menu':'profile-wrapper'" style="-webkit-app-region: drag;">
+    <div :class="collapse ? 'profile-wrapper narrow-menu' : 'profile-wrapper'" style="-webkit-app-region: drag;">
       <div :class="collapse ? 'profile-narrow' : 'profile-wide'">
         <div class="account">
           <div class="avatar" v-if="collapse">
@@ -15,9 +15,9 @@
               <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="show">{{ $t("side_menu.show_profile") }}</el-dropdown-item>
-              <el-dropdown-item command="edit">{{ $t("side_menu.edit_profile") }}</el-dropdown-item>
-              <el-dropdown-item command="settings">{{ $t("side_menu.settings") }}</el-dropdown-item>
+              <el-dropdown-item command="show">{{ $t('side_menu.show_profile') }}</el-dropdown-item>
+              <el-dropdown-item command="edit">{{ $t('side_menu.edit_profile') }}</el-dropdown-item>
+              <el-dropdown-item command="settings">{{ $t('side_menu.settings') }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -38,68 +38,80 @@
       :collapse="collapse"
       active-text-color="#ffffff"
       :router="true"
-      :class="collapse ? 'el-menu-vertical timeline-menu narrow-menu':'el-menu-vertical timeline-menu'"
-      role="menu">
+      :class="collapse ? 'el-menu-vertical timeline-menu narrow-menu' : 'el-menu-vertical timeline-menu'"
+      role="menu"
+    >
       <el-menu-item :index="`/${id()}/home`" role="menuitem" :title="$t('side_menu.home')">
         <icon name="home"></icon>
-        <span>{{ $t("side_menu.home") }}</span>
-        <el-badge is-dot :hidden="!unreadHomeTimeline">
-        </el-badge>
+        <span>{{ $t('side_menu.home') }}</span>
+        <el-badge is-dot :hidden="!unreadHomeTimeline"> </el-badge>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/notifications`" role="menuitem" :title="$t('side_menu.notification')">
         <icon name="bell"></icon>
-        <span>{{ $t("side_menu.notification") }}</span>
-        <el-badge is-dot :hidden="!unreadNotifications">
-        </el-badge>
+        <span>{{ $t('side_menu.notification') }}</span>
+        <el-badge is-dot :hidden="!unreadNotifications"> </el-badge>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/mentions`" role="menuitem" :title="$t('side_menu.mention')">
         <icon name="at"></icon>
-        <span>{{ $t("side_menu.mention") }}</span>
-        <el-badge is-dot :hidden="!unreadMentions">
-        </el-badge>
+        <span>{{ $t('side_menu.mention') }}</span>
+        <el-badge is-dot :hidden="!unreadMentions"> </el-badge>
       </el-menu-item>
-      <el-menu-item :index="`/${id()}/direct-messages`" role="menuitem">
+      <el-menu-item :index="`/${id()}/direct-messages`" role="menuitem" :title="$t('side_menu.direct')">
         <icon name="envelope"></icon>
-        <span>{{ $t("side_menu.direct") }}</span>
-        <el-badge is-dot :hidden="!unreadDirectMessagesTimeline">
-        </el-badge>
+        <span>{{ $t('side_menu.direct') }}</span>
+        <el-badge is-dot :hidden="!unreadDirectMessagesTimeline"> </el-badge>
+      </el-menu-item>
+      <el-menu-item v-if="unreadFollowRequests" :index="`/${id()}/mentions`" role="menuitem" :title="$t('side_menu.follow_requests')">
+        <icon name="users"></icon>
+        <span>{{ $t('side_menu.follow_requests') }}</span>
+        <el-badge is-dot></el-badge>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/favourites`" role="menuitem" :title="$t('side_menu.favourite')">
         <icon name="star"></icon>
-        <span>{{ $t("side_menu.favourite") }}</span>
+        <span>{{ $t('side_menu.favourite') }}</span>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/local`" role="menuitem" :title="$t('side_menu.local')">
         <icon name="users"></icon>
-        <span>{{ $t("side_menu.local") }}</span>
-        <el-badge is-dot :hidden="!unreadLocalTimeline">
-        </el-badge>
+        <span>{{ $t('side_menu.local') }}</span>
+        <el-badge is-dot :hidden="!unreadLocalTimeline"> </el-badge>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/public`" role="menuitem" :title="$t('side_menu.public')">
         <icon name="globe"></icon>
-        <span>{{ $t("side_menu.public") }}</span>
-        <el-badge is-dot :hidden="!unreadPublicTimeline">
-        </el-badge>
+        <span>{{ $t('side_menu.public') }}</span>
+        <el-badge is-dot :hidden="!unreadPublicTimeline"> </el-badge>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/search`" role="menuitem" :title="$t('side_menu.search')">
         <icon name="search"></icon>
-        <span>{{ $t("side_menu.search") }}</span>
+        <span>{{ $t('side_menu.search') }}</span>
       </el-menu-item>
       <el-menu-item :index="`/${id()}/hashtag`" role="menuitem" :title="$t('side_menu.hashtag')">
         <icon name="hashtag"></icon>
-        <span>{{ $t("side_menu.hashtag") }}</span>
+        <span>{{ $t('side_menu.hashtag') }}</span>
       </el-menu-item>
       <template v-for="tag in tags">
-        <el-menu-item :index="`/${id()}/hashtag/${tag.tagName}`" :class="collapse ? '' : 'sub-menu'" :key="tag.tagName" role="menuitem" :title="tag.tagName">
+        <el-menu-item
+          :index="`/${id()}/hashtag/${tag.tagName}`"
+          :class="collapse ? '' : 'sub-menu'"
+          :key="tag.tagName"
+          role="menuitem"
+          :title="tag.tagName"
+        >
           <icon name="hashtag" scale="0.8"></icon>
           <span>{{ tag.tagName }}</span>
         </el-menu-item>
       </template>
       <el-menu-item :index="`/${id()}/lists`" role="menuitem" :title="$t('side_menu.lists')">
         <icon name="list-ul"></icon>
-        <span>{{ $t("side_menu.lists") }}</span>
+        <span>{{ $t('side_menu.lists') }}</span>
       </el-menu-item>
       <template v-for="list in lists">
-        <el-menu-item :index="`/${id()}/lists/${list.id}`" :class="collapse ? '' : 'sub-menu'" :key="list.id" role="menuitem" :title="list.title">
+        <el-menu-item
+          :index="`/${id()}/lists/${list.id}`"
+          :class="collapse ? '' : 'sub-menu'"
+          :key="list.id"
+          role="menuitem"
+          :title="list.title"
+        >
           <icon name="list-ul" scale="0.8"></icon>
           <span>{{ list.title }}</span>
         </el-menu-item>
@@ -128,6 +140,7 @@ export default {
       unreadLocalTimeline: state => state.unreadLocalTimeline,
       unreadDirectMessagesTimeline: state => state.unreadDirectMessagesTimeline,
       unreadPublicTimeline: state => state.unreadPublicTimeline,
+      unreadFollowRequests: state => state.unreadFollowRequests,
       lists: state => state.lists,
       tags: state => state.tags,
       collapse: state => state.collapse
@@ -138,25 +151,24 @@ export default {
       hideGlobalHeader: state => state.GlobalHeader.hide
     })
   },
-  created () {
+  created() {
     this.$store.dispatch('TimelineSpace/SideMenu/readCollapse')
     this.$store.dispatch('TimelineSpace/SideMenu/listTags')
   },
   methods: {
-    activeRoute () {
+    activeRoute() {
       return this.$route.path
     },
-    id () {
+    id() {
       return this.$route.params.id
     },
-    handleProfile (command) {
+    handleProfile(command) {
       switch (command) {
         case 'show':
-          this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/fetchAccount', this.account.accountId)
-            .then((account) => {
-              this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
-              this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
-            })
+          this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/fetchAccount', this.account.accountId).then(account => {
+            this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
+            this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
+          })
 
           this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
           break
@@ -169,13 +181,13 @@ export default {
           break
       }
     },
-    doCollapse () {
+    doCollapse() {
       this.$store.dispatch('TimelineSpace/SideMenu/changeCollapse', true)
     },
-    releaseCollapse () {
+    releaseCollapse() {
       this.$store.dispatch('TimelineSpace/SideMenu/changeCollapse', false)
     },
-    async changeGlobalHeader (value) {
+    async changeGlobalHeader(value) {
       await this.$store.dispatch('GlobalHeader/switchHide', value)
     }
   }
diff --git a/src/renderer/store/TimelineSpace/SideMenu.ts b/src/renderer/store/TimelineSpace/SideMenu.ts
index 08ef1abd..a86eef55 100644
--- a/src/renderer/store/TimelineSpace/SideMenu.ts
+++ b/src/renderer/store/TimelineSpace/SideMenu.ts
@@ -1,4 +1,4 @@
-import Mastodon, { List, Response } from 'megalodon'
+import Mastodon, { List, Response, Account } from 'megalodon'
 import { ipcRenderer } from 'electron'
 import { Module, MutationTree, ActionTree } from 'vuex'
 import LocalTag from '~/src/types/localTag'
@@ -6,14 +6,15 @@ import LocalAccount from '~/src/types/localAccount'
 import { RootState } from '@/store'
 
 export interface SideMenuState {
-  unreadHomeTimeline: boolean,
-  unreadNotifications: boolean,
-  unreadMentions: boolean,
-  unreadLocalTimeline: boolean,
-  unreadDirectMessagesTimeline: boolean,
-  unreadPublicTimeline: boolean,
-  lists: Array<List>,
-  tags: Array<LocalTag>,
+  unreadHomeTimeline: boolean
+  unreadNotifications: boolean
+  unreadMentions: boolean
+  unreadLocalTimeline: boolean
+  unreadDirectMessagesTimeline: boolean
+  unreadPublicTimeline: boolean
+  unreadFollowRequests: boolean
+  lists: Array<List>
+  tags: Array<LocalTag>
   collapse: boolean
 }
 
@@ -24,6 +25,7 @@ const state = (): SideMenuState => ({
   unreadLocalTimeline: false,
   unreadDirectMessagesTimeline: false,
   unreadPublicTimeline: false,
+  unreadFollowRequests: false,
   lists: [],
   tags: [],
   collapse: false
@@ -36,6 +38,7 @@ export const MUTATION_TYPES = {
   CHANGE_UNREAD_LOCAL_TIMELINE: 'changeUnreadLocalTimeline',
   CHANGE_UNREAD_DIRECT_MESSAGES_TIMELINE: 'changeUnreadDirectMessagesTimeline',
   CHANGE_UNREAD_PUBLIC_TIMELINE: 'changeUnreadPublicTimeline',
+  CHANGE_UNREAD_FOLLOW_REQUESTS: 'changeUnreadFollowRequests',
   UPDATE_LISTS: 'updateLists',
   CHANGE_COLLAPSE: 'changeCollapse',
   UPDATE_TAGS: 'updateTags'
@@ -60,6 +63,9 @@ const mutations: MutationTree<SideMenuState> = {
   [MUTATION_TYPES.CHANGE_UNREAD_PUBLIC_TIMELINE]: (state, value: boolean) => {
     state.unreadPublicTimeline = value
   },
+  [MUTATION_TYPES.CHANGE_UNREAD_FOLLOW_REQUESTS]: (state, value: boolean) => {
+    state.unreadFollowRequests = value
+  },
   [MUTATION_TYPES.UPDATE_LISTS]: (state, lists: Array<List>) => {
     state.lists = lists
   },
@@ -74,14 +80,18 @@ const mutations: MutationTree<SideMenuState> = {
 const actions: ActionTree<SideMenuState, RootState> = {
   fetchLists: async ({ commit, rootState }, account: LocalAccount | null = null): Promise<Array<List>> => {
     if (account === null) account = rootState.TimelineSpace.account
-    const client = new Mastodon(
-      account!.accessToken!,
-      account!.baseURL + '/api/v1'
-    )
+    const client = new Mastodon(account!.accessToken!, account!.baseURL + '/api/v1')
     const res: Response<Array<List>> = await client.get<Array<List>>('/lists')
     commit(MUTATION_TYPES.UPDATE_LISTS, res.data)
     return res.data
   },
+  fetchFollowRequests: async ({ commit, rootState }, account: LocalAccount | null = null): Promise<Array<Account>> => {
+    if (account === null) account = rootState.TimelineSpace.account
+    const client = new Mastodon(account!.accessToken!, account!.baseURL + '/api/v1')
+    const res: Response<Array<Account>> = await client.get<Array<Account>>('/follow_requests')
+    commit(MUTATION_TYPES.CHANGE_UNREAD_FOLLOW_REQUESTS, res.data.length > 0)
+    return res.data
+  },
   clearUnread: ({ commit }) => {
     commit(MUTATION_TYPES.CHANGE_UNREAD_HOME_TIMELINE, false)
     commit(MUTATION_TYPES.CHANGE_UNREAD_NOTIFICATIONS, false)

From 1ee9013faf95d215c7e4aadb8666a7262b2ab592 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sun, 12 May 2019 14:34:34 +0900
Subject: [PATCH 2/3] refs #772 Accept/Reject follow requests

---
 src/config/locales/en/translation.json        |  8 ++
 .../TimelineSpace/Contents/FollowRequests.vue | 53 ++++++++++
 .../components/TimelineSpace/HeaderMenu.vue   |  5 +-
 .../components/TimelineSpace/SideMenu.vue     |  7 +-
 src/renderer/components/molecules/User.vue    | 96 ++++++++++++-------
 src/renderer/router/index.ts                  |  7 +-
 src/renderer/store/TimelineSpace/Contents.ts  | 23 +++--
 .../TimelineSpace/Contents/FollowRequests.ts  | 53 ++++++++++
 8 files changed, 207 insertions(+), 45 deletions(-)
 create mode 100644 src/renderer/components/TimelineSpace/Contents/FollowRequests.vue
 create mode 100644 src/renderer/store/TimelineSpace/Contents/FollowRequests.ts

diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index d427bb46..ab62ce84 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -62,6 +62,8 @@
     "notification": "Notification",
     "mention": "Mention",
     "favourite": "Favourite",
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages",
     "local": "Local timeline",
     "public": "Public timeline",
     "hashtag": "Hashtag",
@@ -299,6 +301,10 @@
       "followers": "Followers"
     }
   },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
   "hashtag": {
     "tag_name": "Tag name",
     "delete_tag": "Delete tag",
@@ -338,6 +344,8 @@
     "timeline_fetch_error": "Failed to fetch timeline",
     "notification_fetch_error": "Failed to fetch notification",
     "favourite_fetch_error": "Failed to fetch favorite",
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request",
     "start_streaming_error": "Failed to start streaming",
     "attach_error": "Could not attach the file",
     "authorize_duplicate_error": "Can not login the same account of the same domain",
diff --git a/src/renderer/components/TimelineSpace/Contents/FollowRequests.vue b/src/renderer/components/TimelineSpace/Contents/FollowRequests.vue
new file mode 100644
index 00000000..48d1b81f
--- /dev/null
+++ b/src/renderer/components/TimelineSpace/Contents/FollowRequests.vue
@@ -0,0 +1,53 @@
+<template>
+  <div id="follow-requests">
+    <template v-for="account in requests">
+      <user :user="account" :request="true" @acceptRequest="accept" @rejectRequest="reject"></user>
+    </template>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import User from '@/components/molecules/User'
+
+export default {
+  name: 'folllow-requests',
+  components: { User },
+  computed: {
+    ...mapState('TimelineSpace/Contents/FollowRequests', {
+      requests: state => state.requests
+    })
+  },
+  async mounted() {
+    await this.initialize()
+  },
+  methods: {
+    async initialize() {
+      await this.$store.dispatch('TimelineSpace/Contents/FollowRequests/fetchRequests').catch(_ => {
+        this.$message({
+          message: this.$t('message.timeline_fetch_error'),
+          type: 'error'
+        })
+      })
+    },
+    accept(account) {
+      this.$store.dispatch('TimelineSpace/Contents/FollowRequests/acceptRequest', account).catch(_ => {
+        this.$message({
+          message: this.$t('message.follow_request_accept_error'),
+          type: 'error'
+        })
+      })
+    },
+    reject(account) {
+      this.$store.dispatch('TimelineSpace/Contents/FollowRequests/rejectRequest', account).catch(_ => {
+        this.$message({
+          message: this.$t('message.follow_request_reject_error'),
+          type: 'error'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scorped></style>
diff --git a/src/renderer/components/TimelineSpace/HeaderMenu.vue b/src/renderer/components/TimelineSpace/HeaderMenu.vue
index de5bdfe2..17a38191 100644
--- a/src/renderer/components/TimelineSpace/HeaderMenu.vue
+++ b/src/renderer/components/TimelineSpace/HeaderMenu.vue
@@ -115,6 +115,9 @@ export default {
         case 'mentions':
           this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', this.$t('header_menu.mention'))
           break
+        case 'follow-requests':
+          this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', this.$t('header_menu.follow_requests'))
+          break
         case 'local':
           this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', this.$t('header_menu.local'))
           break
@@ -134,7 +137,7 @@ export default {
           this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', this.$t('header_menu.lists'))
           break
         case 'direct-messages':
-          this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', 'Direct Messages')
+          this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', this.$t('header_menu.direct_messages'))
           break
         case 'edit-list':
           this.$store.commit('TimelineSpace/HeaderMenu/updateTitle', this.$t('header_menu.members'))
diff --git a/src/renderer/components/TimelineSpace/SideMenu.vue b/src/renderer/components/TimelineSpace/SideMenu.vue
index 0353cc4f..566958a7 100644
--- a/src/renderer/components/TimelineSpace/SideMenu.vue
+++ b/src/renderer/components/TimelineSpace/SideMenu.vue
@@ -61,7 +61,12 @@
         <span>{{ $t('side_menu.direct') }}</span>
         <el-badge is-dot :hidden="!unreadDirectMessagesTimeline"> </el-badge>
       </el-menu-item>
-      <el-menu-item v-if="unreadFollowRequests" :index="`/${id()}/mentions`" role="menuitem" :title="$t('side_menu.follow_requests')">
+      <el-menu-item
+        v-if="unreadFollowRequests"
+        :index="`/${id()}/follow-requests`"
+        role="menuitem"
+        :title="$t('side_menu.follow_requests')"
+      >
         <icon name="users"></icon>
         <span>{{ $t('side_menu.follow_requests') }}</span>
         <el-badge is-dot></el-badge>
diff --git a/src/renderer/components/molecules/User.vue b/src/renderer/components/molecules/User.vue
index 09e6733d..293323e4 100644
--- a/src/renderer/components/molecules/User.vue
+++ b/src/renderer/components/molecules/User.vue
@@ -1,34 +1,51 @@
 <template>
-<div class="user" @click="openUser(user)" aria-label="user">
-  <div class="icon" role="presentation">
-    <FailoverImg :src="user.avatar" :alt="`Avatar of ${user.username}`" />
-  </div>
-  <div class="name">
-    <div class="username">
-      <bdi v-html="username(user)"></bdi>
+  <div class="user" @click="openUser(user)" aria-label="user">
+    <div class="icon" role="presentation">
+      <FailoverImg :src="user.avatar" :alt="`Avatar of ${user.username}`" />
     </div>
-    <div class="acct">
-      @{{ user.acct }}
+    <div class="name">
+      <div class="username">
+        <bdi v-html="username(user)"></bdi>
+      </div>
+      <div class="acct">@{{ user.acct }}</div>
+    </div>
+    <div class="tool" v-if="remove">
+      <el-button type="text" @click.stop.prevent="removeAccount(user)">
+        <icon name="times"></icon>
+      </el-button>
+    </div>
+    <div class="tool" v-if="relationship">
+      <el-button
+        v-if="relationship.following"
+        class="unfollow"
+        type="text"
+        @click.stop.prevent="unfollowAccount(user)"
+        :title="$t('side_bar.account_profile.unfollow')"
+      >
+        <icon name="user-times"></icon>
+      </el-button>
+      <el-button v-else-if="relationship.requested" class="requested" type="text" :title="$t('side_bar.account_profile.follow_requested')">
+        <icon name="hourglass"></icon>
+      </el-button>
+      <el-button
+        v-else-if="!relationship.following"
+        class="follow"
+        type="text"
+        @click.stop.prevent="followAccount(user)"
+        :title="$t('side_bar.account_profile.follow')"
+      >
+        <icon name="user-plus"></icon>
+      </el-button>
+    </div>
+    <div class="tool" v-else-if="request">
+      <el-button class="accept" type="text" @click.stop.prevent="acceptRequest(user)" :title="$t('follow_requests.accept')">
+        <icon name="check"></icon>
+      </el-button>
+      <el-button class="reject" type="text" @click.stop.prevent="rejectRequest(user)" :tilte="$t('follow_requests.reject')">
+        <icon name="times"></icon>
+      </el-button>
     </div>
   </div>
-  <div class="tool" v-if="remove">
-    <el-button type="text" @click.stop.prevent="removeAccount(user)">
-      <icon name="times"></icon>
-    </el-button>
-  </div>
-  <div class="tool" v-if="relationship">
-    <el-button v-if="relationship.following" class="unfollow" type="text" @click.stop.prevent="unfollowAccount(user)" :title="$t('side_bar.account_profile.unfollow')">
-      <icon name="user-times"></icon>
-    </el-button>
-    <el-button v-else-if="relationship.requested" class="requested" type="text" :title="$t('side_bar.account_profile.follow_requested')">
-      <icon name="hourglass"></icon>
-    </el-button>
-    <el-button v-else-if="!relationship.following" class="follow" type="text" @click.stop.prevent="followAccount(user)" :title="$t('side_bar.account_profile.follow')">
-      <icon name="user-plus"></icon>
-    </el-button>
-  </div>
-  </div>
-</div>
 </template>
 
 <script>
@@ -52,29 +69,39 @@ export default {
     relationship: {
       type: Object,
       default: null
+    },
+    request: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {
-    username (account) {
+    username(account) {
       if (account.display_name !== '') {
         return emojify(account.display_name, account.emojis)
       } else {
         return account.username
       }
     },
-    openUser (account) {
+    openUser(account) {
       this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
       this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
       this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
     },
-    removeAccount (account) {
+    removeAccount(account) {
       this.$emit('removeAccount', account)
     },
-    unfollowAccount (account) {
+    unfollowAccount(account) {
       this.$emit('unfollowAccount', account)
     },
-    followAccount (account) {
+    followAccount(account) {
       this.$emit('followAccount', account)
+    },
+    acceptRequest(account) {
+      this.$emit('acceptRequest', account)
+    },
+    rejectRequest(account) {
+      this.$emit('rejectRequest', account)
     }
   }
 }
@@ -151,6 +178,11 @@ export default {
       padding-top: 8px;
       padding-bottom: 8px;
     }
+
+    .accept,
+    .reject {
+      margin-right: 24px;
+    }
   }
 }
 </style>
diff --git a/src/renderer/router/index.ts b/src/renderer/router/index.ts
index 66206601..0365f5fd 100644
--- a/src/renderer/router/index.ts
+++ b/src/renderer/router/index.ts
@@ -14,7 +14,7 @@ const router = new Router({
       path: '/authorize',
       name: 'authorize',
       component: require('@/components/Authorize').default,
-      props: (route) => ({ url: route.query.url })
+      props: route => ({ url: route.query.url })
     },
     {
       path: '/preferences/',
@@ -87,6 +87,11 @@ const router = new Router({
               name: 'mentions',
               component: require('@/components/TimelineSpace/Contents/Mentions').default
             },
+            {
+              path: 'follow-requests',
+              name: 'follow-requests',
+              component: require('@/components/TimelineSpace/Contents/FollowRequests').default
+            },
             {
               path: 'favourites',
               name: 'favourites',
diff --git a/src/renderer/store/TimelineSpace/Contents.ts b/src/renderer/store/TimelineSpace/Contents.ts
index 3c11a8a8..3e580d22 100644
--- a/src/renderer/store/TimelineSpace/Contents.ts
+++ b/src/renderer/store/TimelineSpace/Contents.ts
@@ -8,6 +8,7 @@ import Search, { SearchModuleState } from './Contents/Search'
 import Lists from './Contents/Lists'
 import Hashtag, { HashtagModuleState } from './Contents/Hashtag'
 import DirectMessages, { DirectMessagesState } from './Contents/DirectMessages'
+import FollowRequests, { FollowRequestsState } from './Contents/FollowRequests'
 import Mentions, { MentionsState } from './Contents/Mentions'
 import { Module } from 'vuex'
 import { RootState } from '@/store'
@@ -15,16 +16,17 @@ import { RootState } from '@/store'
 export interface ContentsState {}
 
 export interface ContentsModuleState extends ContentsState {
-  SideBar: SideBarModuleState,
-  Home: HomeState,
-  Notifications: NotificationsState,
-  Mentions: MentionsState,
-  DirectMessages: DirectMessagesState,
-  Favourites: FavouritesState,
-  Local: LocalState,
-  Public: PublicState,
-  Search: SearchModuleState,
+  SideBar: SideBarModuleState
+  Home: HomeState
+  Notifications: NotificationsState
+  Mentions: MentionsState
+  DirectMessages: DirectMessagesState
+  Favourites: FavouritesState
+  Local: LocalState
+  Public: PublicState
+  Search: SearchModuleState
   Hashtag: HashtagModuleState
+  FollowRequests: FollowRequestsState
 }
 
 const state = (): ContentsState => ({})
@@ -43,7 +45,8 @@ const Contents: Module<ContentsState, RootState> = {
     Public,
     Search,
     Lists,
-    Hashtag
+    Hashtag,
+    FollowRequests
   }
 }
 
diff --git a/src/renderer/store/TimelineSpace/Contents/FollowRequests.ts b/src/renderer/store/TimelineSpace/Contents/FollowRequests.ts
new file mode 100644
index 00000000..14d24964
--- /dev/null
+++ b/src/renderer/store/TimelineSpace/Contents/FollowRequests.ts
@@ -0,0 +1,53 @@
+import Mastodon, { Account, Response } from 'megalodon'
+import { Module, MutationTree, ActionTree } from 'vuex'
+import { RootState } from '@/store'
+
+export interface FollowRequestsState {
+  requests: Array<Account>
+}
+
+const state = (): FollowRequestsState => ({
+  requests: []
+})
+
+export const MUTATION_TYPES = {
+  UPDATE_REQUESTS: 'updateRequests'
+}
+
+const mutations: MutationTree<FollowRequestsState> = {
+  [MUTATION_TYPES.UPDATE_REQUESTS]: (state, accounts: Array<Account>) => {
+    state.requests = accounts
+  }
+}
+
+const actions: ActionTree<FollowRequestsState, RootState> = {
+  fetchRequests: async ({ commit, rootState }): Promise<Array<Account>> => {
+    const client = new Mastodon(rootState.TimelineSpace.account.accessToken!, rootState.TimelineSpace.account.baseURL + '/api/v1')
+    const res: Response<Array<Account>> = await client.get<Array<Account>>('/follow_requests')
+    commit(MUTATION_TYPES.UPDATE_REQUESTS, res.data)
+    return res.data
+  },
+  acceptRequest: async ({ dispatch, rootState }, user: Account) => {
+    const client = new Mastodon(rootState.TimelineSpace.account.accessToken!, rootState.TimelineSpace.account.baseURL + '/api/v1')
+    const res: Response<{}> = await client.post<{}>(`/follow_requests/${user.id}/authorize`)
+    dispatch('fetchRequests')
+    dispatch('TimelineSpace/SideMenu/fetchFollowRequests', rootState.TimelineSpace.account, { root: true })
+    return res.data
+  },
+  rejectRequest: async ({ dispatch, rootState }, user: Account) => {
+    const client = new Mastodon(rootState.TimelineSpace.account.accessToken!, rootState.TimelineSpace.account.baseURL + '/api/v1')
+    const res: Response<{}> = await client.post<{}>(`/follow_requests/${user.id}/reject`)
+    dispatch('fetchRequests')
+    dispatch('TimelineSpace/SideMenu/fetchFollowRequests', rootState.TimelineSpace.account, { root: true })
+    return res.data
+  }
+}
+
+const FollowRequests: Module<FollowRequestsState, RootState> = {
+  namespaced: true,
+  state: state,
+  mutations: mutations,
+  actions: actions
+}
+
+export default FollowRequests

From ee2abcdc0f141024bdc2a234e49c71284717938f Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sun, 12 May 2019 14:43:09 +0900
Subject: [PATCH 3/3] refs #772 Prepare all translations for follow requests

---
 src/config/locales/de/translation.missing.json | 15 +++++++++++++--
 src/config/locales/fr/translation.missing.json | 17 +++++++++++++++++
 src/config/locales/it/translation.missing.json | 18 +++++++++++++++++-
 src/config/locales/ja/translation.json         |  9 +++++++++
 src/config/locales/ko/translation.missing.json | 15 +++++++++++++++
 src/config/locales/pl/translation.missing.json | 15 +++++++++++++--
 6 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/src/config/locales/de/translation.missing.json b/src/config/locales/de/translation.missing.json
index f3d9beec..4ed9f22a 100644
--- a/src/config/locales/de/translation.missing.json
+++ b/src/config/locales/de/translation.missing.json
@@ -1,10 +1,13 @@
 {
   "side_menu": {
-    "direct": "Direct messages"
+    "direct": "Direct messages",
+    "follow_requests": "Follow Requests"
   },
   "header_menu": {
     "settings": "Settings",
-    "switch_streaming": "Use websocket for streaming. If the timeline does not update with streaming, please try it."
+    "switch_streaming": "Use websocket for streaming. If the timeline does not update with streaming, please try it.",
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
   },
   "settings": {
     "timeline": {
@@ -38,5 +41,13 @@
         "hideAllAttachments": "Hide all medias"
       }
     }
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
   }
 }
diff --git a/src/config/locales/fr/translation.missing.json b/src/config/locales/fr/translation.missing.json
index e69de29b..c11a9d1a 100644
--- a/src/config/locales/fr/translation.missing.json
+++ b/src/config/locales/fr/translation.missing.json
@@ -0,0 +1,17 @@
+{
+  "side_menu": {
+    "follow_requests": "Follow Requests"
+  },
+  "header_menu": {
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
+  }
+}
diff --git a/src/config/locales/it/translation.missing.json b/src/config/locales/it/translation.missing.json
index 8b137891..c11a9d1a 100644
--- a/src/config/locales/it/translation.missing.json
+++ b/src/config/locales/it/translation.missing.json
@@ -1 +1,17 @@
-
+{
+  "side_menu": {
+    "follow_requests": "Follow Requests"
+  },
+  "header_menu": {
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
+  }
+}
diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json
index 8f1bb994..9f876de9 100644
--- a/src/config/locales/ja/translation.json
+++ b/src/config/locales/ja/translation.json
@@ -48,6 +48,7 @@
     "home": "ホーム",
     "notification": "通知",
     "direct": "ダイレクトメッセージ",
+    "follow_requests": "フォローリクエスト",
     "favourite": "お気に入り",
     "local": "ローカル",
     "public": "連合",
@@ -59,6 +60,8 @@
     "home": "ホーム",
     "notification": "通知",
     "favourite": "お気に入り",
+    "follow_requests": "フォローリクエスト",
+    "direct_messages": "ダイレクトメッセージ",
     "local": "ローカルタイムライン",
     "public": "連合タイムライン",
     "hashtag": "ハッシュタグ",
@@ -289,6 +292,10 @@
       "followers": "フォロワー"
     }
   },
+  "follow_requests": {
+    "accept": "承認",
+    "reject": "却下"
+  },
   "hashtag": {
     "tag_name": "タグ名",
     "delete_tag": "タグを削除",
@@ -328,6 +335,8 @@
     "timeline_fetch_error": "タイムラインの読み込みに失敗しました",
     "notification_fetch_error": "通知の読み込みに失敗しました",
     "favourite_fetch_error": "お気に入りの読み込みに失敗しました",
+    "follow_request_accept_error": "フォローリクエストの承認に失敗しました",
+    "follow_reuqest_reject_error": "フォローリクエストの却下に失敗しました",
     "start_streaming_error": "ストリーミングを開始できませんでした",
     "attach_error": "ファイルを添付できませんでした",
     "authorize_duplicate_error": "同一ドメイン同一アカウントではログインできません",
diff --git a/src/config/locales/ko/translation.missing.json b/src/config/locales/ko/translation.missing.json
index da9deab6..6833f0cf 100644
--- a/src/config/locales/ko/translation.missing.json
+++ b/src/config/locales/ko/translation.missing.json
@@ -9,5 +9,20 @@
         "hideAllAttachments": "Hide all medias"
       }
     }
+  },
+  "side_menu": {
+    "follow_requests": "Follow Requests"
+  },
+  "header_menu": {
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
   }
 }
diff --git a/src/config/locales/pl/translation.missing.json b/src/config/locales/pl/translation.missing.json
index f3d9beec..4ed9f22a 100644
--- a/src/config/locales/pl/translation.missing.json
+++ b/src/config/locales/pl/translation.missing.json
@@ -1,10 +1,13 @@
 {
   "side_menu": {
-    "direct": "Direct messages"
+    "direct": "Direct messages",
+    "follow_requests": "Follow Requests"
   },
   "header_menu": {
     "settings": "Settings",
-    "switch_streaming": "Use websocket for streaming. If the timeline does not update with streaming, please try it."
+    "switch_streaming": "Use websocket for streaming. If the timeline does not update with streaming, please try it.",
+    "follow_requests": "Follow Requests",
+    "direct_messages": "Direct Messages"
   },
   "settings": {
     "timeline": {
@@ -38,5 +41,13 @@
         "hideAllAttachments": "Hide all medias"
       }
     }
+  },
+  "follow_requests": {
+    "accept": "Accept",
+    "reject": "Reject"
+  },
+  "message": {
+    "follow_request_accept_error": "Failed to accept the request",
+    "follow_reuqest_reject_error": "failed to reject the request"
   }
 }