diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-10-09 05:11:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-10-09 05:11:42 +0900 |
| commit | 32371ed2bdb23d4a4c5fb01c15f7466f62d5d0c9 (patch) | |
| tree | e26d30a206f8584e43685cfc45bb3f2018692800 /src | |
| parent | Merge pull request #2860 from mei23/mei-1009-v10d (diff) | |
| download | sharkey-32371ed2bdb23d4a4c5fb01c15f7466f62d5d0c9.tar.gz sharkey-32371ed2bdb23d4a4c5fb01c15f7466f62d5d0c9.tar.bz2 sharkey-32371ed2bdb23d4a4c5fb01c15f7466f62d5d0c9.zip | |
Fix #2858
Diffstat (limited to 'src')
3 files changed, 15 insertions, 9 deletions
diff --git a/src/client/app/desktop/views/components/user-list-timeline.vue b/src/client/app/desktop/views/components/user-list-timeline.vue index 3407851fc5..d370754fef 100644 --- a/src/client/app/desktop/views/components/user-list-timeline.vue +++ b/src/client/app/desktop/views/components/user-list-timeline.vue @@ -26,12 +26,14 @@ export default Vue.extend({ this.init(); }, beforeDestroy() { - this.connection.close(); + this.connection.dispose(); }, methods: { init() { - if (this.connection) this.connection.close(); - this.connection = new UserListStream((this as any).os, this.$store.state.i, this.list.id); + if (this.connection) this.connection.dispose(); + this.connection = (this as any).os.stream.connectToChannel('userList', { + listId: this.list.id + }); this.connection.on('note', this.onNote); this.connection.on('userAdded', this.onUserAdded); this.connection.on('userRemoved', this.onUserRemoved); diff --git a/src/client/app/desktop/views/pages/deck/deck.list-tl.vue b/src/client/app/desktop/views/pages/deck/deck.list-tl.vue index e543130310..bc17a6cbff 100644 --- a/src/client/app/desktop/views/pages/deck/deck.list-tl.vue +++ b/src/client/app/desktop/views/pages/deck/deck.list-tl.vue @@ -46,8 +46,10 @@ export default Vue.extend({ }, mounted() { - if (this.connection) this.connection.close(); - this.connection = new UserListStream((this as any).os, this.$store.state.i, this.list.id); + if (this.connection) this.connection.dispose(); + this.connection = (this as any).os.stream.connectToChannel('userList', { + listId: this.list.id + }); this.connection.on('note', this.onNote); this.connection.on('userAdded', this.onUserAdded); this.connection.on('userRemoved', this.onUserRemoved); @@ -56,7 +58,7 @@ export default Vue.extend({ }, beforeDestroy() { - this.connection.close(); + this.connection.dispose(); }, methods: { diff --git a/src/client/app/mobile/views/components/user-list-timeline.vue b/src/client/app/mobile/views/components/user-list-timeline.vue index 97200eb5b3..f0137d5df4 100644 --- a/src/client/app/mobile/views/components/user-list-timeline.vue +++ b/src/client/app/mobile/views/components/user-list-timeline.vue @@ -36,13 +36,15 @@ export default Vue.extend({ }, beforeDestroy() { - this.connection.close(); + this.connection.dispose(); }, methods: { init() { - if (this.connection) this.connection.close(); - this.connection = new UserListStream((this as any).os, this.$store.state.i, this.list.id); + if (this.connection) this.connection.dispose(); + this.connection = (this as any).os.stream.connectToChannel('userList', { + listId: this.list.id + }); this.connection.on('note', this.onNote); this.connection.on('userAdded', this.onUserAdded); this.connection.on('userRemoved', this.onUserRemoved); |