mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 18:36:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pad: Pass color and display name in CLIENT_READY

Browse source
This commit is contained in:
Richard Hansen 2021-11-03 00:50:51 -04:00
parent 7a0d8cb52e
commit 56cb08f4c5
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/static/js/collab_client.js
View file

@ -245,14 +245,6 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
} else if (msg.type === 'USER_NEWINFO') {
const userInfo = msg.userInfo;
const id = userInfo.userId;
// Avoid a race condition when setting colors. If our color was set by a
// query param, ignore our own "new user" message's color value.
if (id === initialUserInfo.userId && initialUserInfo.globalUserColor) {
msg.userInfo.colorId = initialUserInfo.globalUserColor;
}
if (userSet[id]) {
userSet[id] = userInfo;
callbacks.onUpdateUserInfo(userInfo);

11
src/static/js/pad.js
View file

@ -184,12 +184,23 @@ const sendClientReady = (isReconnect) => {
Cookies.set('token', token, {expires: 60});
}
// If known, propagate the display name and color to the server in the CLIENT_READY message. This
// allows the server to include the values in its reply CLIENT_VARS message (which avoids
// initialization race conditions) and in the USER_NEWINFO messages sent to the other users on the
// pad (which enables them to display a user join notification with the correct name).
const params = getUrlVars();
const userInfo = {
colorId: params.get('userColor'),
name: params.get('userName'),
};
const msg = {
component: 'pad',
type: 'CLIENT_READY',
padId,
sessionID: Cookies.get('sessionID'),
token,
userInfo,
};
// this is a reconnect, lets tell the server our revisionnumber