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

chat: Rename userId to authorId, userName to displayName

Browse source
This commit is contained in:
Richard Hansen 2021-10-26 01:05:24 -04:00
parent 0f47ca9046
commit 4c2f7f9a11
5 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/static/js/chat.js
View file

@ -111,15 +111,15 @@ exports.chat = (() => {
// correct the time
msg.time += this._pad.clientTimeOffset;
if (!msg.userId) {
if (!msg.authorId) {
/*
* If, for a bug or a database corruption, the message coming from the
* server does not contain the userId field (see for example #3731),
* server does not contain the authorId field (see for example #3731),
* let's be defensive and replace it with "unknown".
*/
msg.userId = 'unknown';
msg.authorId = 'unknown';
console.warn(
'The "userId" field of a chat message coming from the server was not present. ' +
'The "authorId" field of a chat message coming from the server was not present. ' +
'Replacing with "unknown". This may be a bug or a database corruption.');
}
@ -130,8 +130,8 @@ exports.chat = (() => {
// the hook args
const ctx = {
authorName: msg.userName != null ? msg.userName : html10n.get('pad.userlist.unnamed'),
author: msg.userId,
authorName: msg.displayName != null ? msg.displayName : html10n.get('pad.userlist.unnamed'),
author: msg.authorId,
text: padutils.escapeHtmlWithClickableLinks(msg.text, '_blank'),
message: msg,
rendered: null,