jakob/PairDrop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix displayName sometimes not exchanged on reload

Browse source
This commit is contained in:
schlagmichdoch 2023-03-06 11:24:19 +01:00
parent 8e219914ec
commit 9f2e4c5f8f
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/scripts/network.js
View file

@ -194,6 +194,10 @@ class Peer {
this._send(JSON.stringify(message)); this._send(JSON.stringify(message));
} }
sendDisplayName(displayName) {
this.sendJSON({type: 'display-name-changed', displayName: displayName});
}
async createHeader(file) { async createHeader(file) {
return { return {
name: file.name, name: file.name,
@ -490,7 +494,8 @@ class Peer {
} }
_onDisplayNameChanged(message) { _onDisplayNameChanged(message) {
if (!message.displayName) return; if (!message.displayName || this._displayName === message.displayName) return;
this._displayName = message.displayName;
Events.fire('peer-display-name-changed', {peerId: this._peerId, displayName: message.displayName}); Events.fire('peer-display-name-changed', {peerId: this._peerId, displayName: message.displayName});
} }
} }
@ -707,6 +712,7 @@ class PeersManager {
Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail)); Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail));
Events.on('display-name', e => this._onDisplayName(e.detail.message.displayName)); Events.on('display-name', e => this._onDisplayName(e.detail.message.displayName));
Events.on('self-display-name-changed', e => this._notifyPeersDisplayNameChanged(e.detail)); Events.on('self-display-name-changed', e => this._notifyPeersDisplayNameChanged(e.detail));
Events.on('peer-display-name-changed', e => this._notifyPeerDisplayNameChanged(e.detail.peerId));
} }
_onMessage(message) { _onMessage(message) {
@ -793,7 +799,7 @@ class PeersManager {
_notifyPeerDisplayNameChanged(peerId) { _notifyPeerDisplayNameChanged(peerId) {
const peer = this.peers[peerId]; const peer = this.peers[peerId];
if (!peer) return; if (!peer) return;
this.peers[peerId].sendJSON({type: 'display-name-changed', displayName: this._displayName}); this.peers[peerId].sendDisplayName(this._displayName);
} }
_onDisplayName(displayName) { _onDisplayName(displayName) {

10
public_included_ws_fallback/scripts/network.js
View file

@ -205,6 +205,10 @@ class Peer {
this._send(JSON.stringify(message)); this._send(JSON.stringify(message));
} }
sendDisplayName(displayName) {
this.sendJSON({type: 'display-name-changed', displayName: displayName});
}
async createHeader(file) { async createHeader(file) {
return { return {
name: file.name, name: file.name,
@ -501,7 +505,8 @@ class Peer {
} }
_onDisplayNameChanged(message) { _onDisplayNameChanged(message) {
if (!message.displayName) return; if (!message.displayName || this._displayName === message.displayName) return;
this._displayName = message.displayName;
Events.fire('peer-display-name-changed', {peerId: this._peerId, displayName: message.displayName}); Events.fire('peer-display-name-changed', {peerId: this._peerId, displayName: message.displayName});
} }
} }
@ -760,6 +765,7 @@ class PeersManager {
Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail)); Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail));
Events.on('display-name', e => this._onDisplayName(e.detail.message.displayName)); Events.on('display-name', e => this._onDisplayName(e.detail.message.displayName));
Events.on('self-display-name-changed', e => this._notifyPeersDisplayNameChanged(e.detail)); Events.on('self-display-name-changed', e => this._notifyPeersDisplayNameChanged(e.detail));
Events.on('peer-display-name-changed', e => this._notifyPeerDisplayNameChanged(e.detail.peerId));
Events.on('ws-disconnected', _ => this._onWsDisconnected()); Events.on('ws-disconnected', _ => this._onWsDisconnected());
Events.on('ws-relay', e => this._onWsRelay(e.detail)); Events.on('ws-relay', e => this._onWsRelay(e.detail));
} }
@ -874,7 +880,7 @@ class PeersManager {
_notifyPeerDisplayNameChanged(peerId) { _notifyPeerDisplayNameChanged(peerId) {
const peer = this.peers[peerId]; const peer = this.peers[peerId];
if (!peer) return; if (!peer) return;
this.peers[peerId].sendJSON({type: 'display-name-changed', displayName: this._displayName}); this.peers[peerId].sendDisplayName(this._displayName);
} }
_onDisplayName(displayName) { _onDisplayName(displayName) {