Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'from/develop/tusooa/1156-vue3-shoutbox' into 'develop'

Browse source 
Fix no reactivity on vuex 4 values

Closes #1156

See merge request pleroma/pleroma-fe!1505
This commit is contained in:
HJ 2022-04-07 07:01:09 +00:00
commit bfc7b6af8f
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.js
View file

@ -65,7 +65,7 @@ export default {
} }
} }
}, },
shout () { return this.$store.state.shout.channel.state === 'joined' }, shout () { return this.$store.state.shout.joined },
suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled }, suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
showInstanceSpecificPanel () { showInstanceSpecificPanel () {
return this.$store.state.instance.showInstanceSpecificPanel && return this.$store.state.instance.showInstanceSpecificPanel &&

2
src/components/side_drawer/side_drawer.js
View file

@ -49,7 +49,7 @@ const SideDrawer = {
currentUser () { currentUser () {
return this.$store.state.users.currentUser return this.$store.state.users.currentUser
}, },
shout () { return this.$store.state.shout.channel.state === 'joined' }, shout () { return this.$store.state.shout.joined },
unseenNotifications () { unseenNotifications () {
return unseenNotificationsFromStore(this.$store) return unseenNotificationsFromStore(this.$store)
}, },

15
src/modules/shout.js
View file

@ -1,7 +1,8 @@
const shout = { const shout = {
state: { state: {
messages: [], messages: [],
channel: { state: '' } channel: { state: '' },
joined: false
}, },
mutations: { mutations: {
setChannel (state, channel) { setChannel (state, channel) {
@ -13,11 +14,23 @@ const shout = {
}, },
setMessages (state, messages) { setMessages (state, messages) {
state.messages = messages.slice(-19, 20) state.messages = messages.slice(-19, 20)
},
setJoined (state, joined) {
state.joined = joined
} }
}, },
actions: { actions: {
initializeShout (store, socket) { initializeShout (store, socket) {
const channel = socket.channel('chat:public') const channel = socket.channel('chat:public')
channel.joinPush.receive('ok', () => {
store.commit('setJoined', true)
})
channel.onClose(() => {
store.commit('setJoined', false)
})
channel.onError(() => {
store.commit('setJoined', false)
})
channel.on('new_msg', (msg) => { channel.on('new_msg', (msg) => {
store.commit('addMessage', msg) store.commit('addMessage', msg)
}) })