From 38e38e5a480d1150e4d61bee2af2348d08024c09 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Mon, 17 May 2021 01:47:54 +0900 Subject: [PATCH] refs #2258 Delete old filter form --- .../Contents/DirectMessages.spec.ts | 4 +- .../TimelineSpace/Contents/Favourites.spec.ts | 4 - .../Contents/Hashtag/Tag.spec.ts | 6 +- .../store/TimelineSpace/Contents/Home.spec.ts | 2 - .../TimelineSpace/Contents/Lists/Show.spec.ts | 6 +- .../TimelineSpace/Contents/Local.spec.ts | 4 +- .../TimelineSpace/Contents/Mentions.spec.ts | 12 +- .../Contents/Notifications.spec.ts | 6 +- .../TimelineSpace/Contents/Public.spec.ts | 4 +- .../Contents/DirectMessages.spec.ts | 18 +-- .../Contents/Hashtag/Tag.spec.ts | 18 +-- .../store/TimelineSpace/Contents/Home.spec.ts | 11 -- .../TimelineSpace/Contents/Lists/Show.spec.ts | 18 +-- .../TimelineSpace/Contents/Local.spec.ts | 18 +-- .../TimelineSpace/Contents/Mentions.spec.ts | 30 ++--- .../Contents/Notifications.spec.ts | 15 +-- .../TimelineSpace/Contents/Public.spec.ts | 18 +-- src/config/locales/en/translation.json | 6 +- .../TimelineSpace/Contents/Bookmarks.vue | 3 +- .../TimelineSpace/Contents/DirectMessages.vue | 4 +- .../TimelineSpace/Contents/Favourites.vue | 4 +- .../TimelineSpace/Contents/Hashtag/Tag.vue | 4 +- .../TimelineSpace/Contents/Home.vue | 2 - .../TimelineSpace/Contents/Lists/Show.vue | 4 +- .../TimelineSpace/Contents/Local.vue | 4 +- .../TimelineSpace/Contents/Mentions.vue | 4 +- .../TimelineSpace/Contents/Notifications.vue | 4 +- .../TimelineSpace/Contents/Public.vue | 4 +- .../components/TimelineSpace/HeaderMenu.vue | 106 ++---------------- .../TimelineSpace/Contents/DirectMessages.ts | 10 +- .../TimelineSpace/Contents/Favourites.ts | 6 - .../TimelineSpace/Contents/Hashtag/Tag.ts | 10 +- .../store/TimelineSpace/Contents/Home.ts | 6 - .../TimelineSpace/Contents/Lists/Show.ts | 10 +- .../store/TimelineSpace/Contents/Local.ts | 10 +- .../store/TimelineSpace/Contents/Mentions.ts | 10 +- .../TimelineSpace/Contents/Notifications.ts | 10 +- .../store/TimelineSpace/Contents/Public.ts | 10 +- 38 files changed, 95 insertions(+), 330 deletions(-) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts index ca0230ac..02c8558f 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts @@ -134,8 +134,7 @@ let state = (): DirectMessagesState => { lazyLoading: false, heading: true, timeline: [], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } @@ -199,7 +198,6 @@ describe('Home', () => { heading: true, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts index f9a3acc4..e78a94e6 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts @@ -132,7 +132,6 @@ let state = (): FavouritesState => { return { favourites: [], lazyLoading: false, - filter: '', maxId: null } } @@ -234,7 +233,6 @@ describe('Favourites', () => { return { favourites: [], lazyLoading: true, - filter: '', maxId: null } } @@ -251,7 +249,6 @@ describe('Favourites', () => { return { favourites: [], lazyLoading: false, - filter: '', maxId: null } } @@ -268,7 +265,6 @@ describe('Favourites', () => { return { favourites: [status1], lazyLoading: false, - filter: '', maxId: '2' } } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts index db48adc8..4a488efe 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts @@ -119,8 +119,7 @@ let state = (): TagState => { lazyLoading: false, heading: true, timeline: [], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } @@ -182,8 +181,7 @@ describe('Home', () => { lazyLoading: false, heading: true, timeline: [status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts index 38c47ca1..6d60a127 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts @@ -119,7 +119,6 @@ let state = (): HomeState => { heading: true, timeline: [], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -184,7 +183,6 @@ describe('Home', () => { heading: true, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts index c415a711..9c75517e 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts @@ -121,8 +121,7 @@ let state = (): ShowState => { lazyLoading: false, heading: true, timeline: [], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } @@ -182,8 +181,7 @@ describe('Lists/Show', () => { lazyLoading: false, heading: true, timeline: [status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts index c8d6e142..7ab103ea 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts @@ -118,8 +118,7 @@ let state = (): LocalState => { lazyLoading: false, heading: true, timeline: [], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } @@ -182,7 +181,6 @@ describe('Home', () => { heading: true, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts index 0bfdb207..a2f63ac6 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts @@ -116,8 +116,7 @@ let state: Function = () => { lazyLoading: false, heading: true, mentions: [], - unreadMentions: [], - filter: '' + unreadMentions: [] } } @@ -178,8 +177,7 @@ describe('Mentions', () => { lazyLoading: true, heading: true, mentions: [], - unreadMentions: [], - filter: '' + unreadMentions: [] } } }) @@ -196,8 +194,7 @@ describe('Mentions', () => { lazyLoading: false, heading: true, mentions: [mention, reblog], - unreadMentions: [], - filter: '' + unreadMentions: [] } } }) @@ -228,8 +225,7 @@ describe('Mentions', () => { lazyLoading: false, heading: true, mentions: [mention, favourite, reblog, follow], - unreadMentions: [], - filter: '' + unreadMentions: [] } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts index 685494e6..f83e0bd1 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts @@ -193,8 +193,7 @@ let state = (): NotificationsState => { lazyLoading: false, heading: true, notifications: [], - unreadNotifications: [], - filter: '' + unreadNotifications: [] } } @@ -255,8 +254,7 @@ describe('Notifications', () => { lazyLoading: false, heading: true, notifications: [notification1], - unreadNotifications: [], - filter: '' + unreadNotifications: [] } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts index 60da94b5..67836cf8 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts @@ -118,8 +118,7 @@ let state = (): PublicState => { lazyLoading: false, heading: true, timeline: [], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } } @@ -182,7 +181,6 @@ describe('Home', () => { heading: true, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts index 71b749ca..f8f483db 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts @@ -137,8 +137,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -153,8 +152,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { lazyLoading: false, heading: true, timeline: [status2, rebloggedStatus], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -172,8 +170,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -189,8 +186,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { lazyLoading: false, heading: true, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { @@ -208,8 +204,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { lazyLoading: false, heading: false, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -225,8 +220,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { lazyLoading: false, heading: false, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts index 10cc0a47..2d3850f4 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts @@ -137,8 +137,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -153,8 +152,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { lazyLoading: false, heading: true, timeline: [status2, rebloggedStatus], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -172,8 +170,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -189,8 +186,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { lazyLoading: false, heading: true, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { @@ -208,8 +204,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { lazyLoading: false, heading: false, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -225,8 +220,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { lazyLoading: false, heading: false, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts index 096dd081..9612f06a 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts @@ -100,7 +100,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -129,7 +128,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -148,7 +146,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [status2, status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -169,7 +166,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: false, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -187,7 +183,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: false, timeline: [], unreadTimeline: [status2, status1], - filter: '', showReblogs: true, showReplies: true } @@ -208,7 +203,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [status1], unreadTimeline: [status2], - filter: '', showReblogs: true, showReplies: true } @@ -227,7 +221,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [status1], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -246,7 +239,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [status1, status2], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -303,7 +295,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [rebloggedStatus, status2], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -324,7 +315,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [status1, status2], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } @@ -376,7 +366,6 @@ describe('TimelineSpace/Contents/Home', () => { heading: true, timeline: [rebloggedStatus, status2], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true } diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts index 36a2fac6..074e9ce4 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts @@ -137,8 +137,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -153,8 +152,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { lazyLoading: false, heading: true, timeline: [status2, rebloggedStatus], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -172,8 +170,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -189,8 +186,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { lazyLoading: false, heading: true, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { @@ -208,8 +204,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { lazyLoading: false, heading: false, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -225,8 +220,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { lazyLoading: false, heading: false, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts index 69484513..18d54fc9 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts @@ -137,8 +137,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -153,8 +152,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [status2, rebloggedStatus], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -171,8 +169,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -188,8 +185,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { @@ -207,8 +203,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: false, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -224,8 +219,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: false, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts index 2b28648e..d8cd0504 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts @@ -174,8 +174,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: true, mentions: [], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) @@ -187,8 +186,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: true, mentions: [notification1], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should update mentions', () => { @@ -204,8 +202,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: true, mentions: [notification2, notification1], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should not be updated mentions', () => { @@ -223,8 +220,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: false, mentions: [notification1], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should update mentions', () => { @@ -240,8 +236,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: false, mentions: [notification1], - unreadMentions: [notification2], - filter: '' + unreadMentions: [notification2] } }) it('should not be updated mentions', () => { @@ -259,8 +254,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: false, mentions: [notification1], - unreadMentions: [notification2], - filter: '' + unreadMentions: [notification2] } }) it('should be merged', () => { @@ -276,8 +270,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: false, mentions: [notification2], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should be inserted', () => { @@ -292,8 +285,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: false, mentions: [notification2, notification1], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should be updated', () => { @@ -313,8 +305,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: true, mentions: [notification2, notification1], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should be deleted', () => { @@ -328,8 +319,7 @@ describe('TimelineSpace/Contents/Mentions', () => { lazyLoading: false, heading: true, mentions: [notification2, notification1], - unreadMentions: [], - filter: '' + unreadMentions: [] } }) it('should be deleted', () => { diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts index 6f7585dd..3bf79ccc 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts @@ -176,8 +176,7 @@ describe('TimelineSpace/Contents/Notifications', () => { lazyLoading: false, heading: true, notifications: [notification2, notification1], - unreadNotifications: [], - filter: '' + unreadNotifications: [] } }) describe('message is not reblogged', () => { @@ -202,8 +201,7 @@ describe('TimelineSpace/Contents/Notifications', () => { lazyLoading: false, heading: true, notifications: [notification1], - unreadNotifications: [], - filter: '' + unreadNotifications: [] } }) it('should update timeline', () => { @@ -219,8 +217,7 @@ describe('TimelineSpace/Contents/Notifications', () => { lazyLoading: false, heading: true, notifications: [notification2, notification1], - unreadNotifications: [], - filter: '' + unreadNotifications: [] } }) it('should not update timeline', () => { @@ -238,8 +235,7 @@ describe('TimelineSpace/Contents/Notifications', () => { lazyLoading: false, heading: false, notifications: [notification1], - unreadNotifications: [], - filter: '' + unreadNotifications: [] } }) it('should update unreadTimeline', () => { @@ -254,8 +250,7 @@ describe('TimelineSpace/Contents/Notifications', () => { lazyLoading: false, heading: false, notifications: [notification1], - unreadNotifications: [notification2], - filter: '' + unreadNotifications: [notification2] } }) it('should not update unreadTimeline', () => { diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts index 71c8d2f4..7aea60c0 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts @@ -137,8 +137,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -153,8 +152,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [status2, rebloggedStatus], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be deleted', () => { @@ -172,8 +170,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -189,8 +186,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: true, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { @@ -208,8 +204,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: false, timeline: [status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should be updated timeline', () => { @@ -225,8 +220,7 @@ describe('TimelineSpace/Contents/Local', () => { lazyLoading: false, heading: false, timeline: [rebloggedStatus, status2, status1], - unreadTimeline: [], - filter: '' + unreadTimeline: [] } }) it('should not be updated timeline', () => { diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json index 0f69a0e8..0a8d3abd 100644 --- a/src/config/locales/en/translation.json +++ b/src/config/locales/en/translation.json @@ -74,10 +74,8 @@ "search": "Search", "lists": "Lists", "members": "Members", - "filter": { - "title": "Filter", - "placeholder": "Filter out by regular expressions", - "show_dms": "Show direct messages", + "option": { + "title": "Option", "show_reblogs": "Show reblogs", "show_replies": "Show replies", "apply": "Apply" diff --git a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue index 8c7ed486..39614790 100644 --- a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue +++ b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue @@ -57,8 +57,7 @@ export default { }), ...mapState('TimelineSpace/Contents/Bookmarks', { bookmarks: state => state.bookmarks, - lazyLoading: state => state.lazyLoading, - filter: state => state.filter + lazyLoading: state => state.lazyLoading }), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), shortcutEnabled: function () { diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue index adffcbec..74d8a322 100644 --- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue +++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue @@ -7,7 +7,6 @@ state.timeline, lazyLoading: state => state.lazyLoading, heading: state => state.heading, - unread: state => state.unreadTimeline, - filter: state => state.filter + unread: state => state.unreadTimeline }), ...mapState({ openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue index 0c31014f..74c7189c 100644 --- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue +++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue @@ -6,7 +6,6 @@ state.TimelineSpace.HeaderMenu.reload, account: state => state.TimelineSpace.account, favourites: state => state.TimelineSpace.Contents.Favourites.favourites, - lazyLoading: state => state.TimelineSpace.Contents.Favourites.lazyLoading, - filter: state => state.TimelineSpace.Contents.Favourites.filter + lazyLoading: state => state.TimelineSpace.Contents.Favourites.lazyLoading }), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), shortcutEnabled: function () { diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue index 33bea72a..9fd9d3c5 100644 --- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue +++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue @@ -7,7 +7,6 @@ state.TimelineSpace.Contents.Hashtag.Tag.timeline, lazyLoading: state => state.TimelineSpace.Contents.Hashtag.Tag.lazyLoading, heading: state => state.TimelineSpace.Contents.Hashtag.Tag.heading, - unread: state => state.TimelineSpace.Contents.Hashtag.Tag.unreadTimeline, - filter: state => state.TimelineSpace.Contents.Hashtag.Tag.filter + unread: state => state.TimelineSpace.Contents.Hashtag.Tag.unreadTimeline }), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), shortcutEnabled: function () { diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue index a5476a93..e2160d35 100644 --- a/src/renderer/components/TimelineSpace/Contents/Home.vue +++ b/src/renderer/components/TimelineSpace/Contents/Home.vue @@ -7,7 +7,6 @@ state.TimelineSpace.Contents.Home.lazyLoading, heading: state => state.TimelineSpace.Contents.Home.heading, unread: state => state.TimelineSpace.Contents.Home.unreadTimeline, - filter: state => state.TimelineSpace.Contents.Home.filter, showReblogs: state => state.TimelineSpace.Contents.Home.showReblogs, showReplies: state => state.TimelineSpace.Contents.Home.showReplies }), diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue index bdbf26bb..175f87cd 100644 --- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue +++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue @@ -7,7 +7,6 @@ state.TimelineSpace.Contents.Lists.Show.timeline, lazyLoading: state => state.TimelineSpace.Contents.Lists.Show.lazyLoading, heading: state => state.TimelineSpace.Contents.Lists.Show.heading, - unread: state => state.TimelineSpace.Contents.Lists.Show.unreadTimeline, - filter: state => state.TimelineSpace.Contents.Lists.Show.filter + unread: state => state.TimelineSpace.Contents.Lists.Show.unreadTimeline }), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), shortcutEnabled: function () { diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue index ffa46de6..733e4e35 100644 --- a/src/renderer/components/TimelineSpace/Contents/Local.vue +++ b/src/renderer/components/TimelineSpace/Contents/Local.vue @@ -7,7 +7,6 @@ state.timeline, lazyLoading: state => state.lazyLoading, heading: state => state.heading, - unread: state => state.unreadTimeline, - filter: state => state.filter + unread: state => state.unreadTimeline }), ...mapState({ openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, diff --git a/src/renderer/components/TimelineSpace/Contents/Mentions.vue b/src/renderer/components/TimelineSpace/Contents/Mentions.vue index cc0e677d..889f431c 100644 --- a/src/renderer/components/TimelineSpace/Contents/Mentions.vue +++ b/src/renderer/components/TimelineSpace/Contents/Mentions.vue @@ -7,7 +7,6 @@ state.lazyLoading, heading: state => state.heading, - unread: state => state.unreadMentions, - filter: state => state.filter + unread: state => state.unreadMentions }), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), ...mapGetters('TimelineSpace/Contents/Mentions', ['mentions']), diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue index 5370c3c9..51ba356d 100644 --- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue +++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue @@ -7,7 +7,6 @@ state.App.theme.background_color, lazyLoading: state => state.TimelineSpace.Contents.Notifications.lazyLoading, heading: state => state.TimelineSpace.Contents.Notifications.heading, - unread: state => state.TimelineSpace.Contents.Notifications.unreadNotifications, - filter: state => state.TimelineSpace.Contents.Notifications.filter + unread: state => state.TimelineSpace.Contents.Notifications.unreadNotifications }), ...mapGetters('TimelineSpace/Contents/Notifications', ['handledNotifications']), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue index 72b6ea77..4dfba92b 100644 --- a/src/renderer/components/TimelineSpace/Contents/Public.vue +++ b/src/renderer/components/TimelineSpace/Contents/Public.vue @@ -7,7 +7,6 @@ state.timeline, lazyLoading: state => state.lazyLoading, heading: state => state.heading, - unread: state => state.unreadTimeline, - filter: state => state.filter + unread: state => state.unreadTimeline }), ...mapState({ openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar, diff --git a/src/renderer/components/TimelineSpace/HeaderMenu.vue b/src/renderer/components/TimelineSpace/HeaderMenu.vue index a2290ed1..490366ba 100644 --- a/src/renderer/components/TimelineSpace/HeaderMenu.vue +++ b/src/renderer/components/TimelineSpace/HeaderMenu.vue @@ -11,34 +11,19 @@ - +
- -
- -
- - + - + - - {{ $t('header_menu.filter.apply') }} - + {{ $t('header_menu.option.apply') }}
- + @@ -56,8 +41,7 @@ export default { name: 'header-menu', data() { return { - filter: '', - filterVisible: false, + TLOptionVisible: false, showReblogs: true, showReplies: true } @@ -70,13 +54,13 @@ export default { }, created() { this.channelName() - this.loadFilter() + this.loadTLOption() this.$store.dispatch('TimelineSpace/HeaderMenu/setupLoading') }, watch: { $route: function () { this.channelName() - this.loadFilter() + this.loadTLOption() } }, methods: { @@ -174,94 +158,28 @@ export default { return false } }, - loadFilter() { + loadTLOption() { switch (this.$route.name) { case 'home': - this.filter = this.$store.state.TimelineSpace.Contents.Home.filter this.showReblogs = this.$store.state.TimelineSpace.Contents.Home.showReblogs this.showReplies = this.$store.state.TimelineSpace.Contents.Home.showReplies break - case 'notifications': - this.filter = this.$store.state.TimelineSpace.Contents.Notifications.filter - break - case 'mentions': - this.filter = this.$store.state.TimelineSpace.Contents.Mentions.filter - break - case 'favourites': - this.filter = this.$store.state.TimelineSpace.Contents.Favourites.filter - break - case 'local': - this.filter = this.$store.state.TimelineSpace.Contents.Local.filter - break - case 'public': - this.filter = this.$store.state.TimelineSpace.Contents.Public.filter - break - case 'tag': - this.filter = this.$store.state.TimelineSpace.Contents.Hashtag.Tag.filter - break - case 'list': - this.filter = this.$store.state.TimelineSpace.Contents.Lists.Show.filter - break - case 'direct-messages': - this.filter = this.$store.state.TimelineSpace.Contents.DirectMessages.filter - break default: console.log('Not implemented') } }, - applyFilter(filter) { + applyTLOption() { switch (this.$route.name) { case 'home': - this.$store.commit('TimelineSpace/Contents/Home/changeFilter', filter) this.$store.commit('TimelineSpace/Contents/Home/showReblogs', this.showReblogs) this.$store.commit('TimelineSpace/Contents/Home/showReplies', this.showReplies) break - case 'notifications': - this.$store.commit('TimelineSpace/Contents/Notifications/changeFilter', filter) - break - case 'mentions': - this.$store.commit('TimelineSpace/Contents/Mentions/changeFilter', filter) - break - case 'favourites': - this.$store.commit('TimelineSpace/Contents/Favourites/changeFilter', filter) - break - case 'local': - this.$store.commit('TimelineSpace/Contents/Local/changeFilter', filter) - break - case 'public': - this.$store.commit('TimelineSpace/Contents/Public/changeFilter', filter) - break - case 'tag': - this.$store.commit('TimelineSpace/Contents/Hashtag/Tag/changeFilter', filter) - break - case 'list': - this.$store.commit('TimelineSpace/Contents/Lists/Show/changeFilter', filter) - break - case 'direct-messages': - this.$store.commit('TimelineSpace/Contents/DirectMessages/changeFilter', filter) - break default: console.log('Not implemented') } - this.filterVisible = false + this.TLOptionVisible = false }, - filterable() { - switch (this.$route.name) { - case 'home': - case 'notifications': - case 'mentions': - case 'favourites': - case 'local': - case 'public': - case 'tag': - case 'list': - case 'direct-messages': - return true - default: - return false - } - }, - extrasFilterable() { + TLOption() { switch (this.$route.name) { case 'home': return true diff --git a/src/renderer/store/TimelineSpace/Contents/DirectMessages.ts b/src/renderer/store/TimelineSpace/Contents/DirectMessages.ts index 881afbe6..8a00c71d 100644 --- a/src/renderer/store/TimelineSpace/Contents/DirectMessages.ts +++ b/src/renderer/store/TimelineSpace/Contents/DirectMessages.ts @@ -7,15 +7,13 @@ export type DirectMessagesState = { heading: boolean timeline: Array unreadTimeline: Array - filter: string } const state = (): DirectMessagesState => ({ lazyLoading: false, heading: true, timeline: [], - unreadTimeline: [], - filter: '' + unreadTimeline: [] }) export const MUTATION_TYPES = { @@ -28,8 +26,7 @@ export const MUTATION_TYPES = { ARCHIVE_TIMELINE: 'archiveTimeline', CLEAR_TIMELINE: 'clearTimeline', UPDATE_TOOT: 'updateToot', - DELETE_TOOT: 'deleteToot', - CHANGE_FILTER: 'changeFilter' + DELETE_TOOT: 'deleteToot' } const mutations: MutationTree = { @@ -91,9 +88,6 @@ const mutations: MutationTree = { return toot.id !== id } }) - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } } diff --git a/src/renderer/store/TimelineSpace/Contents/Favourites.ts b/src/renderer/store/TimelineSpace/Contents/Favourites.ts index a788baea..45925686 100644 --- a/src/renderer/store/TimelineSpace/Contents/Favourites.ts +++ b/src/renderer/store/TimelineSpace/Contents/Favourites.ts @@ -7,14 +7,12 @@ import { LocalAccount } from '~/src/types/localAccount' export type FavouritesState = { favourites: Array lazyLoading: boolean - filter: string maxId: string | null } const state = (): FavouritesState => ({ favourites: [], lazyLoading: false, - filter: '', maxId: null }) @@ -24,7 +22,6 @@ export const MUTATION_TYPES = { UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', CHANGE_LAZY_LOADING: 'changeLazyLoading', - CHANGE_FILTER: 'changeFilter', CHANGE_MAX_ID: 'changeMaxId' } @@ -63,9 +60,6 @@ const mutations: MutationTree = { [MUTATION_TYPES.CHANGE_LAZY_LOADING]: (state, value: boolean) => { state.lazyLoading = value }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter - }, [MUTATION_TYPES.CHANGE_MAX_ID]: (state, id: string | null) => { state.maxId = id } diff --git a/src/renderer/store/TimelineSpace/Contents/Hashtag/Tag.ts b/src/renderer/store/TimelineSpace/Contents/Hashtag/Tag.ts index f05a0ce4..9e06480b 100644 --- a/src/renderer/store/TimelineSpace/Contents/Hashtag/Tag.ts +++ b/src/renderer/store/TimelineSpace/Contents/Hashtag/Tag.ts @@ -11,15 +11,13 @@ export type TagState = { unreadTimeline: Array lazyLoading: boolean heading: boolean - filter: string } const state = (): TagState => ({ timeline: [], unreadTimeline: [], lazyLoading: false, - heading: true, - filter: '' + heading: true }) export const MUTATION_TYPES = { @@ -32,8 +30,7 @@ export const MUTATION_TYPES = { CLEAR_TIMELINE: 'clearTimeline', UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', - CHANGE_LAZY_LOADING: 'changeLazyLoading', - CHANGE_FILTER: 'changeFilter' + CHANGE_LAZY_LOADING: 'changeLazyLoading' } const mutations: MutationTree = { @@ -94,9 +91,6 @@ const mutations: MutationTree = { }, [MUTATION_TYPES.CHANGE_LAZY_LOADING]: (state, value: boolean) => { state.lazyLoading = value - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } } diff --git a/src/renderer/store/TimelineSpace/Contents/Home.ts b/src/renderer/store/TimelineSpace/Contents/Home.ts index e75a03d0..c283cac6 100644 --- a/src/renderer/store/TimelineSpace/Contents/Home.ts +++ b/src/renderer/store/TimelineSpace/Contents/Home.ts @@ -9,7 +9,6 @@ export type HomeState = { showReplies: boolean timeline: Array unreadTimeline: Array - filter: string } const state = (): HomeState => ({ @@ -17,7 +16,6 @@ const state = (): HomeState => ({ heading: true, timeline: [], unreadTimeline: [], - filter: '', showReblogs: true, showReplies: true }) @@ -33,7 +31,6 @@ export const MUTATION_TYPES = { CLEAR_TIMELINE: 'clearTimeline', UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', - CHANGE_FILTER: 'changeFilter', SHOW_REBLOGS: 'showReblogs', SHOW_REPLIES: 'showReplies' } @@ -98,9 +95,6 @@ const mutations: MutationTree = { } }) }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter - }, [MUTATION_TYPES.SHOW_REBLOGS]: (state, visible: boolean) => { state.showReblogs = visible }, diff --git a/src/renderer/store/TimelineSpace/Contents/Lists/Show.ts b/src/renderer/store/TimelineSpace/Contents/Lists/Show.ts index 66d68588..78f4538c 100644 --- a/src/renderer/store/TimelineSpace/Contents/Lists/Show.ts +++ b/src/renderer/store/TimelineSpace/Contents/Lists/Show.ts @@ -11,15 +11,13 @@ export type ShowState = { unreadTimeline: Array lazyLoading: boolean heading: boolean - filter: string } const state = (): ShowState => ({ timeline: [], unreadTimeline: [], lazyLoading: false, - heading: true, - filter: '' + heading: true }) export const MUTATION_TYPES = { @@ -32,8 +30,7 @@ export const MUTATION_TYPES = { CLEAR_TIMELINE: 'clearTimeline', UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', - CHANGE_LAZY_LOADING: 'changeLazyLoading', - CHANGE_FILTER: 'changeFilter' + CHANGE_LAZY_LOADING: 'changeLazyLoading' } const mutations: MutationTree = { @@ -94,9 +91,6 @@ const mutations: MutationTree = { }, [MUTATION_TYPES.CHANGE_LAZY_LOADING]: (state, value: boolean) => { state.lazyLoading = value - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } } diff --git a/src/renderer/store/TimelineSpace/Contents/Local.ts b/src/renderer/store/TimelineSpace/Contents/Local.ts index 772f45e5..0102139b 100644 --- a/src/renderer/store/TimelineSpace/Contents/Local.ts +++ b/src/renderer/store/TimelineSpace/Contents/Local.ts @@ -7,15 +7,13 @@ export type LocalState = { unreadTimeline: Array lazyLoading: boolean heading: boolean - filter: string } const state = (): LocalState => ({ timeline: [], unreadTimeline: [], lazyLoading: false, - heading: true, - filter: '' + heading: true }) export const MUTATION_TYPES = { @@ -28,8 +26,7 @@ export const MUTATION_TYPES = { CLEAR_TIMELINE: 'clearTimeline', UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', - CHANGE_LAZY_LOADING: 'changeLazyLoading', - CHANGE_FILTER: 'changeFilter' + CHANGE_LAZY_LOADING: 'changeLazyLoading' } const mutations: MutationTree = { @@ -90,9 +87,6 @@ const mutations: MutationTree = { }, [MUTATION_TYPES.CHANGE_LAZY_LOADING]: (state, value: boolean) => { state.lazyLoading = value - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } } diff --git a/src/renderer/store/TimelineSpace/Contents/Mentions.ts b/src/renderer/store/TimelineSpace/Contents/Mentions.ts index 85d619ca..10d3de94 100644 --- a/src/renderer/store/TimelineSpace/Contents/Mentions.ts +++ b/src/renderer/store/TimelineSpace/Contents/Mentions.ts @@ -7,15 +7,13 @@ export type MentionsState = { heading: boolean mentions: Array unreadMentions: Array - filter: string } const state = (): MentionsState => ({ lazyLoading: false, heading: true, mentions: [], - unreadMentions: [], - filter: '' + unreadMentions: [] }) export const MUTATION_TYPES = { @@ -28,8 +26,7 @@ export const MUTATION_TYPES = { ARCHIVE_MENTIONS: 'archiveMentions', CLEAR_MENTIONS: 'clearMentions', UPDATE_TOOT: 'updateToot', - DELETE_TOOT: 'deleteToot', - CHANGE_FILTER: 'changeFilter' + DELETE_TOOT: 'deleteToot' } const mutations: MutationTree = { @@ -90,9 +87,6 @@ const mutations: MutationTree = { return true } }) - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } } diff --git a/src/renderer/store/TimelineSpace/Contents/Notifications.ts b/src/renderer/store/TimelineSpace/Contents/Notifications.ts index 67b254a7..6f2436da 100644 --- a/src/renderer/store/TimelineSpace/Contents/Notifications.ts +++ b/src/renderer/store/TimelineSpace/Contents/Notifications.ts @@ -10,15 +10,13 @@ export type NotificationsState = { heading: boolean notifications: Array unreadNotifications: Array - filter: string } const state = (): NotificationsState => ({ lazyLoading: false, heading: true, notifications: [], - unreadNotifications: [], - filter: '' + unreadNotifications: [] }) export const MUTATION_TYPES = { @@ -31,8 +29,7 @@ export const MUTATION_TYPES = { UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', CLEAR_NOTIFICATIONS: 'clearNotifications', - ARCHIVE_NOTIFICATIONS: 'archiveNotifications', - CHANGE_FILTER: 'changeFilter' + ARCHIVE_NOTIFICATIONS: 'archiveNotifications' } const mutations: MutationTree = { @@ -97,9 +94,6 @@ const mutations: MutationTree = { }, [MUTATION_TYPES.ARCHIVE_NOTIFICATIONS]: state => { state.notifications = state.notifications.slice(0, 30) - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } } diff --git a/src/renderer/store/TimelineSpace/Contents/Public.ts b/src/renderer/store/TimelineSpace/Contents/Public.ts index 382f42ee..75861168 100644 --- a/src/renderer/store/TimelineSpace/Contents/Public.ts +++ b/src/renderer/store/TimelineSpace/Contents/Public.ts @@ -7,15 +7,13 @@ export type PublicState = { unreadTimeline: Array lazyLoading: boolean heading: boolean - filter: string } const state = (): PublicState => ({ timeline: [], unreadTimeline: [], lazyLoading: false, - heading: true, - filter: '' + heading: true }) export const MUTATION_TYPES = { @@ -28,8 +26,7 @@ export const MUTATION_TYPES = { CLEAR_TIMELINE: 'clearTimeline', UPDATE_TOOT: 'updateToot', DELETE_TOOT: 'deleteToot', - CHANGE_LAZY_LOADING: 'changeLazyLoading', - CHANGE_FILTER: 'changeFilter' + CHANGE_LAZY_LOADING: 'changeLazyLoading' } const mutations: MutationTree = { @@ -90,9 +87,6 @@ const mutations: MutationTree = { }, [MUTATION_TYPES.CHANGE_LAZY_LOADING]: (state, value: boolean) => { state.lazyLoading = value - }, - [MUTATION_TYPES.CHANGE_FILTER]: (state, filter: string) => { - state.filter = filter } }