Skip to content

[stable20.1] Stop sending the nick through data channels after some time #4726

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
nickvergessen merged 9 commits into from
Dec 9, 2020
Merged

[stable20.1] Stop sending the nick through data channels after some time #4726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df70457
Specialize "startSendingNick" function to use only the own peer
danxuliu Sep 19, 2020
a5ed998
Do not explicitly send "nickChanged" message on connection
danxuliu Sep 28, 2020
d874cca
Unify sending "nickChanged" data channel messages
danxuliu Sep 29, 2020
07530c4
Generalize function name
danxuliu Sep 28, 2020
fffa58d
Stop sending the nick through data channels after some time
danxuliu Sep 19, 2020
351345a
Remove "userId" property from internal "nick" event
danxuliu Sep 29, 2020
8b149ef
Send and handle "nickChanged" message also through signaling
danxuliu Sep 29, 2020
38e71ce
Fix initial nick for participants without Peer when HPB is not used
danxuliu Sep 30, 2020
77d2daa
Add explicit documentation about payload of "nickChanged" message
danxuliu Nov 18, 2020
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
Prev Previous commit
Next Next commit
Unify sending "nickChanged" data channel messages 
Instead of sending "nickChanged" data channel messages from different
places now an internal "nickChanged" event with the name is emitted, and
its handler takes care of sending the data channel message as needed.

This also fixes trying to send data channel messages to receiving only
peers when the nick is changed and the HPB is used.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Dec 9, 2020
commit d874ccac73a4d01597831df7f56a356c14f6da4d
2 changes: 1 addition & 1 deletion src/utils/webrtc/models/LocalCallParticipantModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ LocalCallParticipantModel.prototype = {

this.set('guestName', guestName)

this._webRtc.sendDirectlyToAll('status', 'nickChanged', guestName)
this._webRtc.webrtc.emit('nickChanged', guestName)
},

_handleForcedMute: function() {
Expand Down
26 changes: 16 additions & 10 deletions src/utils/webrtc/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,16 +524,7 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local

stopSendingNick()
ownPeer.nickInterval = setInterval(function() {
let payload
if (signaling.settings.userId === null) {
payload = store.getters.getDisplayName()
} else {
payload = {
'name': store.getters.getDisplayName(),
'userid': signaling.settings.userId,
}
}
ownPeer.sendDirectly('status', 'nickChanged', payload)
webrtc.webrtc.emit('nickChanged', store.getters.getDisplayName())
}, 1000)
}

Expand Down Expand Up @@ -1010,6 +1001,21 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
sendDataChannelToAll('status', 'videoOff')
})

// Send the nick changed event via data channel
webrtc.on('nickChanged', function(name) {
let payload
if (signaling.settings.userId === null) {
payload = name
} else {
payload = {
'name': name,
'userid': signaling.settings.userId,
}
}

sendDataChannelToAll('status', 'nickChanged', payload)
})

// Local screen added.
webrtc.on('localScreenAdded', function(/* video */) {
const currentSessionId = signaling.getSessionId()
Expand Down