github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-01-27 00:43:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

realtime.ts: Fix bug in user-color setup

Browse source 
The code was incorrectly migrated from JavaScript set colors in the wrong way.

Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-05-31 21:40:05 +02:00
parent 5c4820483c
commit d2963eedc6
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/lib/realtime.ts
View file

@ -467,16 +467,21 @@ function finishConnection (socket: SocketWithNoteId, noteId: string, socketId: s
return failConnection(403, 'connection forbidden', socket)
}
const user = users.get(socketId)
if (!user || !user.userid) return
// update user color to author color
const author = note.authors.get(user.userid)
if (author) {
const socketIdUser = users.get(socket.id)
if (!socketIdUser) return
user.color = socketIdUser.color
users.set(socket.id, user)
if (!user) {
logger.warn('Could not find user for socketId ' + socketId)
return
}
if (user.userid) {
// update user color to author color
const author = note.authors.get(user.userid)
if (author) {
const socketIdUser = users.get(socket.id)
if (!socketIdUser) return
user.color = author.color
socketIdUser.color = author.color
users.set(socket.id, user)
}
}
note.users.set(socket.id, user)
note.socks.push(socket)
note.server.addClient(socket)