From af830182a0dced903d47a1ef96e573799ab810b3 Mon Sep 17 00:00:00 2001 From: Gustavo Trott Date: Tue, 16 Jan 2024 10:16:27 -0300 Subject: [PATCH] Send full html content to akka --- config/settings.json.template | 2 +- lib/redis/database.js | 2 +- run-dev.sh | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 run-dev.sh diff --git a/config/settings.json.template b/config/settings.json.template index 880b226..2c89f2f 100644 --- a/config/settings.json.template +++ b/config/settings.json.template @@ -11,7 +11,7 @@ "ttl": 21600000 }, "update": { - "throttle": 15000 + "throttle": 5000 } }, "express": { diff --git a/lib/redis/database.js b/lib/redis/database.js index 2e09084..35c155d 100644 --- a/lib/redis/database.js +++ b/lib/redis/database.js @@ -261,7 +261,7 @@ const onPadUpdate = (meetingId, groupId, padId, rev) => { database[meetingId].groups[groupId].pads[padId].html = html; logger.info(ids.PAD, 'content', { meetingId, groupId, padId, rev, ...change }); - sender.send('padContent', meetingId, { groupId, padId, rev, ...change }); + sender.send('padContent', meetingId, { groupId, padId, rev, html, ...change }); } }).catch(() => logger.error(ids.PAD, 'content', { meetingId, groupId, padId, rev })); } diff --git a/run-dev.sh b/run-dev.sh new file mode 100755 index 0000000..737700a --- /dev/null +++ b/run-dev.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +cd "$(dirname "$0")" + +cp config/settings.json.template config/settings.json +sed -i "s/ETHERPAD_API_KEY/\"$(cat /usr/share/etherpad-lite/APIKEY.txt)\"/" config/settings.json + +for var in "$@" +do + if [[ $var == --reset ]] ; then + echo "Performing a full reset..." + rm -rf node_modules + fi +done + +if [ ! -d ./node_modules ] ; then + npm install +fi + +sudo systemctl stop bbb-pads +npm start