Skip to content

Commit

Permalink
fix delete bug - removal of pads wasnt really called and the wrong me…
Browse files Browse the repository at this point in the history
…thod was used
  • Loading branch information
JannikStreek committed Mar 12, 2024
1 parent 7604326 commit 0c869c6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@ services:
ep_align
ep_font_color
ep_delete_empty_pads
ep_delete_after_delay
kitsteam/ep_delete_after_delay
ep_helmet
ep_font_size
ep_disable_imports
target: development
tty: true
stdin_open: true
volumes:
- .:/opt/etherpad-lite
- node_modules:/opt/etherpad-lite/src/node_modules
depends_on:
- postgres
environment:
NODE_ENV: development
ADMIN_PASSWORD: ${DOCKER_COMPOSE_APP_DEV_ENV_ADMIN_PASSWORD:?}
ETHERPAD_PRODUCTION: false
DB_CHARSET: ${DOCKER_COMPOSE_APP_DEV_ENV_DB_CHARSET:-utf8mb4}
DB_HOST: postgres
Expand All @@ -46,6 +44,8 @@ services:
SOFFICE: ${DOCKER_COMPOSE_APP_DEV_ENV_SOFFICE:-null}
TRUST_PROXY: ${DOCKER_COMPOSE_APP_DEV_ENV_TRUST_PROXY:-true}
restart: always
volumes:
- ./src:/opt/etherpad-lite/src
ports:
- "${DOCKER_COMPOSE_APP_DEV_PORT_PUBLISHED:-9001}:${DOCKER_COMPOSE_APP_DEV_PORT_TARGET:-9001}"

Expand Down
2 changes: 1 addition & 1 deletion src/node/handler/PadMessageHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ exports.handleConnect = (socket) => {
* Kicks all sessions from a pad
*/
exports.kickSessionsFromPad = (padID) => {
if (typeof socketio.sockets.clients !== 'function') return;
if (typeof socketio?.sockets?.clients !== 'function') return;

// skip if there is nobody on this pad
if (_getRoomSockets(padID).length === 0) return;
Expand Down
6 changes: 3 additions & 3 deletions src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"terser": "^5.26.0",
"threads": "^1.7.0",
"tinycon": "0.6.8",
"ueberdb2": "^4.2.45",
"ueberdb2": "4.2.62",
"underscore": "1.13.6",
"unorm": "1.6.0",
"wtfnode": "^0.9.1",
Expand Down

0 comments on commit 0c869c6

Please sign in to comment.