Fixed sending picture to peers if you have it.

master
Håvar Aambø Fosstveit 2019-06-04 11:29:00 +02:00
parent 38627e485d
commit a763d37879
2 changed files with 16 additions and 4 deletions

View File

@ -1583,7 +1583,10 @@ export default class RoomClient
{ {
logger.debug('_joinRoom()'); logger.debug('_joinRoom()');
const { displayName } = store.getState().settings; const {
displayName,
picture
} = store.getState().settings;
try try
{ {
@ -1702,6 +1705,7 @@ export default class RoomClient
'join', 'join',
{ {
displayName : displayName, displayName : displayName,
picture : picture,
device : this._device, device : this._device,
rtpCapabilities : this._consume rtpCapabilities : this._consume
? this._mediasoupDevice.rtpCapabilities ? this._mediasoupDevice.rtpCapabilities

View File

@ -316,10 +316,16 @@ class Room extends EventEmitter
if (peer.data.joined) if (peer.data.joined)
throw new Error('Peer already joined'); throw new Error('Peer already joined');
const { displayName, device, rtpCapabilities } = request.data; const {
displayName,
picture,
device,
rtpCapabilities
} = request.data;
// Store client data into the protoo Peer data object. // Store client data into the protoo Peer data object.
peer.data.displayName = displayName; peer.data.displayName = displayName;
peer.data.picture = picture;
peer.data.device = device; peer.data.device = device;
peer.data.rtpCapabilities = rtpCapabilities; peer.data.rtpCapabilities = rtpCapabilities;
@ -336,6 +342,7 @@ class Room extends EventEmitter
{ {
id : joinedPeer.id, id : joinedPeer.id,
displayName : joinedPeer.data.displayName, displayName : joinedPeer.data.displayName,
picture : joinedPeer.data.picture,
device : joinedPeer.data.device device : joinedPeer.data.device
}); });
@ -362,14 +369,15 @@ class Room extends EventEmitter
{ {
id : peer.id, id : peer.id,
displayName : displayName, displayName : displayName,
picture : picture,
device : device device : device
}, },
true true
); );
logger.debug( logger.debug(
'peer joined [peeerId: %s, displayName: %s, device: %o]', 'peer joined [peeerId: %s, displayName: %s, picture: %s, device: %o]',
peer.id, displayName, device); peer.id, displayName, picture, device);
break; break;
} }