From 01f1a8b75ea389216972eb0bf8146232c03a54a0 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Fri, 8 Apr 2022 04:26:32 -0400 Subject: [PATCH] chat: Move `chatHead` initialization to `padLoad` hook --- src/ep.json | 1 + src/node/chat.js | 4 ++++ src/node/db/Pad.js | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ep.json b/src/ep.json index 566be503c..7b657c05a 100644 --- a/src/ep.json +++ b/src/ep.json @@ -26,6 +26,7 @@ "eejsBlock_stickyContainer": "ep_etherpad-lite/node/chat", "handleMessage": "ep_etherpad-lite/node/chat", "padCheck": "ep_etherpad-lite/node/chat", + "padLoad": "ep_etherpad-lite/node/chat", "socketio": "ep_etherpad-lite/node/chat" } }, diff --git a/src/node/chat.js b/src/node/chat.js index f805f6306..935607db9 100644 --- a/src/node/chat.js +++ b/src/node/chat.js @@ -156,6 +156,10 @@ exports.padCheck = async (hookName, {pad}) => { for (const p of chats.batch(100).buffer(99)) await p; }; +exports.padLoad = async (hookName, {pad}) => { + if (!('chatHead' in pad)) pad.chatHead = -1; +}; + exports.socketio = (hookName, {io}) => { socketio = io; }; diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index ec7cef6c7..ee080b112 100644 --- a/src/node/db/Pad.js +++ b/src/node/db/Pad.js @@ -49,7 +49,6 @@ class Pad { this.atext = Changeset.makeAText('\n'); this.pool = new AttributePool(); this.head = -1; - this.chatHead = -1; this.publicStatus = false; this.id = id; this.savedRevisions = [];