feat(call): sidebar audio/video mute state fix & chat online state fi…

…xes continued
Satellite-im · May 12, 2022 · df6616d · df6616d
1 parent 7339fa3
commit df6616d
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 23 deletions.
diff --git a/components/views/chat/chatbar/footer/is-connected/Connected.vue b/components/views/chat/chatbar/footer/is-connected/Connected.vue
@@ -54,6 +54,7 @@ export default Vue.extend({
     'conversation.participants': {
       handler() {},
       deep: true,
+      immediate: true,
     },
   },
   methods: {

diff --git a/components/views/navigation/sidebar/controls/Controls.vue b/components/views/navigation/sidebar/controls/Controls.vue
@@ -33,10 +33,10 @@ export default Vue.extend({
   computed: {
     ...mapState(['audio', 'video', 'webrtc', 'accounts']),
     audioMuted(): boolean {
-      return this.webrtc.streamMuted[p2p.id]?.audio
+      return this.audio.muted || this.webrtc.streamMuted[p2p.id]?.audio
     },
     videoMuted(): boolean {
-      return this.webrtc.streamMuted[p2p.id]?.video
+      return this.video.disabled || this.webrtc.streamMuted[p2p.id]?.video
     },
     screenMuted(): boolean {
       return this.webrtc.streamMuted[p2p.id]?.screen
@@ -49,13 +49,17 @@ export default Vue.extend({
      * @example
      */
     async toggleMute(kind = 'audio') {
-      this.isLoading = true
-      this.$store.dispatch(
-        'webrtc/toggleMute',
-        { kind, peerId: p2p.id },
-        { root: true },
-      )
-      this.isLoading = false
+      if (kind === 'audio') {
+        this.$store.dispatch('audio/toggleMute')
+        return
+      }
+
+      if (kind === 'video') {
+        this.$store.dispatch('video/toggle')
+        return
+      }
+
+      this.$store.dispatch('webrtc/toggleMute', { kind })
     },
     async toggleDeafen() {
       this.isLoading = true

diff --git a/libraries/WebRTC/Call.ts b/libraries/WebRTC/Call.ts
@@ -228,6 +228,9 @@ export class Call extends Emitter<CallEventListeners> {
    * await call.sendPeerCallRequest(peerId)
    */
   async sendPeerCallRequest(peerId: string, force = false) {
+    if (!peerId) {
+      return
+    }
     if (
       !force &&
       (this.peerConnected[peerId] || this.peerDialingDisabled[peerId])

diff --git a/store/audio/actions.ts b/store/audio/actions.ts
@@ -7,19 +7,25 @@ export default {
    * @description Toggles mute for outgoing audio
    * @example @click="toggleMute"
    */
-  toggleMute({ dispatch, muted, rootState }: any) {
+  toggleMute({
+    state,
+    commit,
+    dispatch,
+    muted = !state.muted,
+    rootState,
+  }: any) {
     const { activeCall } = rootState.webrtc
-    const call = $WebRTC.getCall(activeCall.callId)
+    const call = activeCall && $WebRTC.getCall(activeCall.callId)
 
-    if (call) {
-      if (muted) {
-        call.unmute({ kind: 'audio' })
-        dispatch('sounds/playSound', Sounds.UNMUTE, { root: true })
-        return
-      }
-      call.mute({ kind: 'audio' })
-      dispatch('sounds/playSound', Sounds.MUTE, { root: true })
+    commit('setMuted', muted)
+
+    if (muted) {
+      if (call) call.unmute({ kind: 'audio' })
+      dispatch('sounds/playSound', Sounds.UNMUTE, { root: true })
+      return
     }
+    if (call) call.mute({ kind: 'audio' })
+    dispatch('sounds/playSound', Sounds.MUTE, { root: true })
   },
   /**
    * @method toggleDeafen

diff --git a/store/friends/actions.ts b/store/friends/actions.ts
@@ -234,7 +234,7 @@ export default {
         },
         { root: true },
       )
-      commit('conversation/addParticipant', friend.address, { root: true })
+      dispatch('conversation/addParticipant', friend.address, { root: true })
       return
     }
     commit(

diff --git a/store/video/actions.ts b/store/video/actions.ts
@@ -0,0 +1,26 @@
+import type { VideoState } from './types'
+import { ActionsArguments } from '~/types/store/store'
+import { Sounds } from '~/libraries/SoundManager/SoundManager'
+import { $WebRTC } from '~/libraries/WebRTC/WebRTC'
+
+const videoActions = {
+  toggle(
+    { state, commit, dispatch, rootState }: ActionsArguments<VideoState>,
+    disabled = !state.disabled,
+  ) {
+    const { activeCall } = rootState.webrtc
+    const call = activeCall && $WebRTC.getCall(activeCall.callId)
+
+    commit('setDisabled', disabled)
+
+    if (disabled) {
+      if (call) call.unmute({ kind: 'audio' })
+      dispatch('sounds/playSound', Sounds.UNMUTE, { root: true })
+      return
+    }
+    if (call) call.mute({ kind: 'audio' })
+    dispatch('sounds/playSound', Sounds.MUTE, { root: true })
+  },
+}
+
+export default videoActions
diff --git a/store/webrtc/actions.ts b/store/webrtc/actions.ts
@@ -232,7 +232,7 @@ const webRTCActions = {
     setInterval(() => {
       if (rootState.conversation) {
         rootState.conversation.participants
-          .filter((p) => p.peerId !== $Peer2Peer.id)
+          .filter((p) => p.peerId && p.peerId !== $Peer2Peer.id)
           .forEach((p) => {
             $Peer2Peer.sendMessage(
               {
@@ -279,8 +279,8 @@ const webRTCActions = {
     { state }: ActionsArguments<WebRTCState>,
     { peerId, kind }: { peerId: string; kind: 'audio' | 'video' | 'screen' },
   ) {
-    if (!state.activeCall) {
-      throw new Error('mute: no active call')
+    if (!state.activeCall || !peerId) {
+      return
     }
     const call = $WebRTC.getCall(state.activeCall.callId)
     if (!call) {