From 6c8dc8743ad2ced880b39d513fb287946886cd06 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sat, 22 May 2021 14:53:30 +0900
Subject: [PATCH] refs #2258 Apply filter to account timeline

---
 .../Contents/SideBar/AccountProfile/Timeline.vue     | 12 +++++++++---
 .../SideBar/AccountProfile/Timeline/Media.vue        |  3 ++-
 .../SideBar/AccountProfile/Timeline/Posts.vue        |  4 +++-
 .../AccountProfile/Timeline/PostsAndReplies.vue      |  3 ++-
 .../Contents/SideBar/AccountProfile/Timeline.ts      | 12 ++++++++++--
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
index deaf02d8..e5ca2835 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
@@ -1,14 +1,17 @@
 <template>
   <div class="tabs" id="sidebar_tabs">
     <el-tabs v-model="activeName" @tab-click="handleClick" stretch>
-      <el-tab-pane label="Posts" name="posts"><Posts :account="account" :buffer="buffer" /></el-tab-pane>
-      <el-tab-pane label="Posts and replies" name="posts_and_replies"><PostsAndReplies :account="account" :buffer="buffer" /></el-tab-pane>
-      <el-tab-pane label="Media" name="media"><Media :account="account" :buffer="buffer" /></el-tab-pane>
+      <el-tab-pane label="Posts" name="posts"><Posts :account="account" :buffer="buffer" :filters="filters" /></el-tab-pane>
+      <el-tab-pane label="Posts and replies" name="posts_and_replies"
+        ><PostsAndReplies :account="account" :buffer="buffer" :filters="filters"
+      /></el-tab-pane>
+      <el-tab-pane label="Media" name="media"><Media :account="account" :buffer="buffer" :filters="filters" /></el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import Posts from './Timeline/Posts'
 import PostsAndReplies from './Timeline/PostsAndReplies'
 import Media from './Timeline/Media'
@@ -28,6 +31,9 @@ export default {
       buffer: 200
     }
   },
+  computed: {
+    ...mapGetters('TimelineSpace/Contents/SideBar/AccountProfile/Timeline', ['filters'])
+  },
   mounted() {
     const timeline = document.getElementById('sidebar_tabs')
     if (timeline !== undefined && timeline !== null) {
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Media.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Media.vue
index 44bf430b..a6bebccf 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Media.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Media.vue
@@ -8,6 +8,7 @@
             :key="item.id"
             :focused="item.uri + item.id === focusedId"
             :overlaid="modalOpened"
+            :filters="filters"
             v-on:update="updateToot"
             v-on:delete="deleteToot"
             @focusNext="focusNext"
@@ -30,7 +31,7 @@ import { Event } from '~/src/renderer/components/event'
 
 export default {
   name: 'media',
-  props: ['account', 'buffer'],
+  props: ['account', 'buffer', 'filters'],
   components: { Toot },
   data() {
     return {
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Posts.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Posts.vue
index e2bb55f4..0f7e9f98 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Posts.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/Posts.vue
@@ -7,6 +7,7 @@
         :focused="message.uri + message.id === focusedId"
         :pinned="true"
         :overlaid="modalOpened"
+        :filters="filters"
         v-on:update="updatePinnedToot"
         v-on:delete="deleteToot"
         @focusNext="focusNext"
@@ -24,6 +25,7 @@
             :key="item.id"
             :focused="item.uri + item.id === focusedId"
             :overlaid="modalOpened"
+            :filters="filters"
             v-on:update="updateToot"
             v-on:delete="deleteToot"
             @focusNext="focusNext"
@@ -46,7 +48,7 @@ import { Event } from '~/src/renderer/components/event'
 
 export default {
   name: 'posts',
-  props: ['account', 'buffer'],
+  props: ['account', 'buffer', 'filters'],
   components: { Toot },
   data() {
     return {
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/PostsAndReplies.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/PostsAndReplies.vue
index 39b7efff..87c5cc71 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/PostsAndReplies.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline/PostsAndReplies.vue
@@ -8,6 +8,7 @@
             :key="item.id"
             :focused="item.uri + item.id === focusedId"
             :overlaid="modalOpened"
+            :filters="filters"
             v-on:update="updateToot"
             v-on:delete="deleteToot"
             @focusNext="focusNext"
@@ -30,7 +31,7 @@ import { Event } from '~/src/renderer/components/event'
 
 export default {
   name: 'posts-and-replies',
-  props: ['account', 'buffer'],
+  props: ['account', 'buffer', 'filters'],
   components: { Toot },
   data() {
     return {
diff --git a/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.ts b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.ts
index f0407f05..4141230c 100644
--- a/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.ts
+++ b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.ts
@@ -1,9 +1,10 @@
-import { Module } from 'vuex'
+import { GetterTree, Module } from 'vuex'
 import { RootState } from '@/store'
 
 import Posts, { PostsState } from './Timeline/Posts'
 import PostsAndReplies, { PostsAndRepliesState } from './Timeline/PostsAndReplies'
 import Media, { MediaState } from './Timeline/Media'
+import { FilterContext } from 'megalodon'
 
 export type TimelineState = {}
 
@@ -17,6 +18,12 @@ export type TimelineModuleState = TimelineModule & TimelineState
 
 const state = (): TimelineState => ({})
 
+const getters: GetterTree<TimelineState, RootState> = {
+  filters: (_state, _getters, rootState) => {
+    return rootState.TimelineSpace.filters.filter(f => f.context.includes(FilterContext.Account) && !f.irreversible)
+  }
+}
+
 const Timeline: Module<TimelineState, RootState> = {
   namespaced: true,
   modules: {
@@ -24,7 +31,8 @@ const Timeline: Module<TimelineState, RootState> = {
     PostsAndReplies,
     Media
   },
-  state: state
+  state: state,
+  getters: getters
 }
 
 export default Timeline