Skip to content

fix(call): define target param for 'switch-to-conversation' #17717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Apr 15, 2026
Merged

fix(call): define target param for 'switch-to-conversation' #17717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export default {
}

if (newIsVoiceRoom && newToken) {
this.joinCallAutomatically()
this.joinCallAutomatically(newToken, oldToken)
}
},
},
Expand Down Expand Up @@ -298,7 +298,7 @@ export default {
})

EventBus.on('switch-to-conversation', async (params) => {
this.joinCallAutomatically()
await this.joinCallAutomatically(params.token)

this.skipLeaveWarning = true
this.$router.push({ name: 'conversation', params: { token: params.token } })
Expand Down Expand Up @@ -520,26 +520,26 @@ export default {
}
},

async joinCallAutomatically() {
async joinCallAutomatically(targetToken, prevToken = this.token) {
if (this.isInCall || this.isVoiceRoom) {
this.callViewStore.setForceCallView(true)

const enableAudio = !BrowserStorage.getItem('audioDisabled_' + this.token)
const enableVideo = !BrowserStorage.getItem('videoDisabled_' + this.token)
const enableAudio = !BrowserStorage.getItem('audioDisabled_' + prevToken)
const enableVideo = !BrowserStorage.getItem('videoDisabled_' + prevToken)
const enableVirtualBackground = !!BrowserStorage.getItem('virtualBackgroundEnabled')
const virtualBackgroundType = BrowserStorage.getItem('virtualBackgroundType')
const virtualBackgroundBlurStrength = BrowserStorage.getItem('virtualBackgroundBlurStrength')
const virtualBackgroundUrl = BrowserStorage.getItem('virtualBackgroundUrl')

// Fetch conversation object, if it's not known yet to the client
if (!this.$store.getters.conversation(this.token)) {
await this.fetchSingleConversation(this.token)
if (!this.$store.getters.conversation(targetToken)) {
await this.fetchSingleConversation(targetToken)
}

const conversation = this.$store.getters.conversation(this.token)
const previousConversation = this.$store.getters.conversation(prevToken)
const previousParticipants = []
if (conversation.type === CONVERSATION.TYPE.ONE_TO_ONE) {
previousParticipants.push(conversation.name)
if (previousConversation.type === CONVERSATION.TYPE.ONE_TO_ONE) {
previousParticipants.push(previousConversation.name)
}

// Remove previous listener to prevent stacking on rapid token changes
Expand All @@ -548,7 +548,7 @@ export default {
}

this._joinCallHandler = async ({ token }) => {
if (this.token !== token) {
if (targetToken !== token) {
return
}
if (enableAudio) {
Expand Down Expand Up @@ -593,7 +593,7 @@ export default {
}

const payload = {
token: this.token,
token,
participantIdentifier: this.actorStore.participantIdentifier,
flags,
silent: true,
Expand All @@ -613,8 +613,8 @@ export default {
}

const currentJoinedToken = SessionStorage.getItem('joined_conversation')
if (currentJoinedToken === this.token) {
this._joinCallHandler({ token: this.token })
if (currentJoinedToken === targetToken) {
this._joinCallHandler({ token: currentJoinedToken })
} else {
EventBus.once('joined-conversation', this._joinCallHandler)
}
Expand Down
Loading