From b99cb3b81f952e0f64eb489fe9322b45632c1380 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Wed, 29 May 2019 23:53:16 +0900
Subject: [PATCH] refs #630 Handle delete event for local streaming
---
.../TimelineSpace/Contents/Local.spec.ts | 154 ++++++++++++++++++
.../TimelineSpace/Contents/Local.vue | 2 +-
src/renderer/store/TimelineSpace.ts | 3 +
.../store/TimelineSpace/Contents/Local.ts | 37 ++---
4 files changed, 174 insertions(+), 22 deletions(-)
create mode 100644 spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts
diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts
new file mode 100644
index 00000000..cea66ea8
--- /dev/null
+++ b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts
@@ -0,0 +1,154 @@
+import { Account, Status, Application } from 'megalodon'
+import Local, { LocalState, MUTATION_TYPES } from '@/store/TimelineSpace/Contents/Local'
+
+const account: Account = {
+ id: '1',
+ username: 'h3poteto',
+ acct: 'h3poteto@pleroma.io',
+ display_name: 'h3poteto',
+ locked: false,
+ created_at: '2019-03-26T21:30:32',
+ followers_count: 10,
+ following_count: 10,
+ statuses_count: 100,
+ note: 'engineer',
+ url: 'https://pleroma.io',
+ avatar: '',
+ avatar_static: '',
+ header: '',
+ header_static: '',
+ emojis: [],
+ moved: null,
+ fields: null,
+ bot: false
+}
+const status1: Status = {
+ id: '1',
+ uri: 'http://example.com',
+ url: 'http://example.com',
+ account: account,
+ in_reply_to_id: null,
+ in_reply_to_account_id: null,
+ reblog: null,
+ content: 'hoge',
+ created_at: '2019-03-26T21:40:32',
+ emojis: [],
+ replies_count: 0,
+ reblogs_count: 0,
+ favourites_count: 0,
+ reblogged: null,
+ favourited: null,
+ muted: null,
+ sensitive: false,
+ spoiler_text: '',
+ visibility: 'public',
+ media_attachments: [],
+ mentions: [],
+ tags: [],
+ card: null,
+ application: {
+ name: 'Web'
+ } as Application,
+ language: null,
+ pinned: null
+}
+const status2: Status = {
+ id: '2',
+ uri: 'http://example.com',
+ url: 'http://example.com',
+ account: account,
+ in_reply_to_id: null,
+ in_reply_to_account_id: null,
+ reblog: null,
+ content: 'fuga',
+ created_at: '2019-03-26T21:40:32',
+ emojis: [],
+ replies_count: 0,
+ reblogs_count: 0,
+ favourites_count: 0,
+ reblogged: null,
+ favourited: null,
+ muted: null,
+ sensitive: false,
+ spoiler_text: '',
+ visibility: 'public',
+ media_attachments: [],
+ mentions: [],
+ tags: [],
+ card: null,
+ application: {
+ name: 'Web'
+ } as Application,
+ language: null,
+ pinned: null
+}
+
+describe('TimelineSpace/Contents/Local', () => {
+ describe('mutations', () => {
+ let state: LocalState
+
+ describe('deleteToot', () => {
+ describe('message is not reblogged', () => {
+ beforeEach(() => {
+ state = {
+ lazyLoading: false,
+ heading: true,
+ timeline: [status2, status1],
+ unreadTimeline: [],
+ filter: ''
+ }
+ })
+ it('should be deleted', () => {
+ Local.mutations![MUTATION_TYPES.DELETE_TOOT](state, status1.id)
+ expect(state.timeline).toEqual([status2])
+ })
+ })
+
+ describe('message is reblogged', () => {
+ beforeEach(() => {
+ const rebloggedStatus: Status = {
+ id: '3',
+ uri: 'http://example.com',
+ url: 'http://example.com',
+ account: account,
+ in_reply_to_id: null,
+ in_reply_to_account_id: null,
+ reblog: status1,
+ content: '',
+ created_at: '2019-03-31T21:40:32',
+ emojis: [],
+ replies_count: 0,
+ reblogs_count: 0,
+ favourites_count: 0,
+ reblogged: null,
+ favourited: null,
+ muted: null,
+ sensitive: false,
+ spoiler_text: '',
+ visibility: 'public',
+ media_attachments: [],
+ mentions: [],
+ tags: [],
+ card: null,
+ application: {
+ name: 'Web'
+ } as Application,
+ language: null,
+ pinned: null
+ }
+ state = {
+ lazyLoading: false,
+ heading: true,
+ timeline: [status2, rebloggedStatus],
+ unreadTimeline: [],
+ filter: ''
+ }
+ })
+ it('should be deleted', () => {
+ Local.mutations![MUTATION_TYPES.DELETE_TOOT](state, status1.id)
+ expect(state.timeline).toEqual([status2])
+ })
+ })
+ })
+ })
+})
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index 578a191d..f5ddff93 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -144,7 +144,7 @@ export default {
this.$store.commit('TimelineSpace/Contents/Local/updateToot', message)
},
deleteToot(message) {
- this.$store.commit('TimelineSpace/Contents/Local/deleteToot', message)
+ this.$store.commit('TimelineSpace/Contents/Local/deleteToot', message.id)
},
onScroll(event) {
if (event.target.clientHeight + event.target.scrollTop >= document.getElementById('local').clientHeight - 10 && !this.lazyloading) {
diff --git a/src/renderer/store/TimelineSpace.ts b/src/renderer/store/TimelineSpace.ts
index 38ace3d2..34c8367c 100644
--- a/src/renderer/store/TimelineSpace.ts
+++ b/src/renderer/store/TimelineSpace.ts
@@ -361,6 +361,9 @@ const actions: ActionTree = {
}
commit('TimelineSpace/SideMenu/changeUnreadLocalTimeline', true, { root: true })
})
+ ipcRenderer.on('delete-start-local-streaming', (_, id: string) => {
+ commit('TimelineSpace/Contents/Local/deleteToot', id, { root: true })
+ })
},
startLocalStreaming: ({ state }) => {
// @ts-ignore
diff --git a/src/renderer/store/TimelineSpace/Contents/Local.ts b/src/renderer/store/TimelineSpace/Contents/Local.ts
index 23779a97..74c7109d 100644
--- a/src/renderer/store/TimelineSpace/Contents/Local.ts
+++ b/src/renderer/store/TimelineSpace/Contents/Local.ts
@@ -3,10 +3,10 @@ import { Module, MutationTree, ActionTree } from 'vuex'
import { RootState } from '@/store'
export interface LocalState {
- timeline: Array,
- unreadTimeline: Array,
- lazyLoading: boolean,
- heading: boolean,
+ timeline: Array
+ unreadTimeline: Array
+ lazyLoading: boolean
+ heading: boolean
filter: string
}
@@ -46,22 +46,22 @@ const mutations: MutationTree = {
[MUTATION_TYPES.UPDATE_TIMELINE]: (state, messages: Array) => {
state.timeline = messages
},
- [MUTATION_TYPES.MERGE_TIMELINE]: (state) => {
+ [MUTATION_TYPES.MERGE_TIMELINE]: state => {
state.timeline = state.unreadTimeline.slice(0, 80).concat(state.timeline)
state.unreadTimeline = []
},
[MUTATION_TYPES.INSERT_TIMELINE]: (state, messages: Array) => {
state.timeline = state.timeline.concat(messages)
},
- [MUTATION_TYPES.ARCHIVE_TIMELINE]: (state) => {
+ [MUTATION_TYPES.ARCHIVE_TIMELINE]: state => {
state.timeline = state.timeline.slice(0, 40)
},
- [MUTATION_TYPES.CLEAR_TIMELINE]: (state) => {
+ [MUTATION_TYPES.CLEAR_TIMELINE]: state => {
state.timeline = []
state.unreadTimeline = []
},
[MUTATION_TYPES.UPDATE_TOOT]: (state, message: Status) => {
- state.timeline = state.timeline.map((toot) => {
+ state.timeline = state.timeline.map(toot => {
if (toot.id === message.id) {
return message
} else if (toot.reblog !== null && toot.reblog.id === message.id) {
@@ -76,12 +76,12 @@ const mutations: MutationTree = {
}
})
},
- [MUTATION_TYPES.DELETE_TOOT]: (state, message: Status) => {
- state.timeline = state.timeline.filter((toot) => {
- if (toot.reblog !== null && toot.reblog.id === message.id) {
+ [MUTATION_TYPES.DELETE_TOOT]: (state, id: string) => {
+ state.timeline = state.timeline.filter(toot => {
+ if (toot.reblog !== null && toot.reblog.id === id) {
return false
} else {
- return toot.id !== message.id
+ return toot.id !== id
}
})
},
@@ -95,10 +95,7 @@ const mutations: MutationTree = {
const actions: ActionTree = {
fetchLocalTimeline: async ({ commit, rootState }) => {
- const client = new Mastodon(
- rootState.TimelineSpace.account.accessToken!,
- rootState.TimelineSpace.account.baseURL + '/api/v1'
- )
+ const client = new Mastodon(rootState.TimelineSpace.account.accessToken!, rootState.TimelineSpace.account.baseURL + '/api/v1')
const res: Response> = await client.get>('/timelines/public', { limit: 40, local: true })
commit(MUTATION_TYPES.UPDATE_TIMELINE, res.data)
return res.data
@@ -108,11 +105,9 @@ const actions: ActionTree = {
return Promise.resolve(null)
}
commit(MUTATION_TYPES.CHANGE_LAZY_LOADING, true)
- const client = new Mastodon(
- rootState.TimelineSpace.account.accessToken!,
- rootState.TimelineSpace.account.baseURL + '/api/v1'
- )
- return client.get>('/timelines/public', { max_id: lastStatus.id, limit: 40, local: true })
+ const client = new Mastodon(rootState.TimelineSpace.account.accessToken!, rootState.TimelineSpace.account.baseURL + '/api/v1')
+ return client
+ .get>('/timelines/public', { max_id: lastStatus.id, limit: 40, local: true })
.then(res => {
commit(MUTATION_TYPES.INSERT_TIMELINE, res.data)
return res.data