From af091faf33033fb982833e235063bf4401b39869 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 22 Jan 2019 01:08:12 +0100 Subject: [PATCH] Resurrect muc_show_join_leave option The option got lost in commit 9528d81c00bc4a876fecbd5cb72cac0f35f24b75. Fixes #1263 --- CHANGES.md | 1 + dist/converse.js | 4 ++-- src/converse-muc-views.js | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 715897062..dbf11538b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ - #1408 new config option `roomconfig_whitelist` - #1417 Margin between nickname and badge - #1421 fix direct invite for membersonly room +- #1422 Resurrect the `muc_show_join_leave` option ## 4.1.0 (2019-01-11) diff --git a/dist/converse.js b/dist/converse.js index 9d0dbdbdc..06df440d1 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -54801,7 +54801,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins }, showJoinNotification(occupant) { - if (this.model.get('connection_status') !== _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].ROOMSTATUS.ENTERED) { + if (!_converse.muc_show_join_leave || this.model.get('connection_status') !== _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].ROOMSTATUS.ENTERED) { return; } @@ -54861,7 +54861,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins }, showLeaveNotification(occupant) { - if (_.includes(occupant.get('states'), '303') || _.includes(occupant.get('states'), '307')) { + if (!_converse.muc_show_join_leave || _.includes(occupant.get('states'), '303') || _.includes(occupant.get('states'), '307')) { return; } diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js index 90126c056..12a5342ab 100644 --- a/src/converse-muc-views.js +++ b/src/converse-muc-views.js @@ -1523,7 +1523,8 @@ converse.plugins.add('converse-muc-views', { }, showJoinNotification (occupant) { - if (this.model.get('connection_status') !== converse.ROOMSTATUS.ENTERED) { + if (!_converse.muc_show_join_leave || + this.model.get('connection_status') !== converse.ROOMSTATUS.ENTERED) { return; } const nick = occupant.get('nick'), @@ -1576,7 +1577,9 @@ converse.plugins.add('converse-muc-views', { }, showLeaveNotification (occupant) { - if (_.includes(occupant.get('states'), '303') || _.includes(occupant.get('states'), '307')) { + if (!_converse.muc_show_join_leave || + _.includes(occupant.get('states'), '303') || + _.includes(occupant.get('states'), '307')) { return; } const nick = occupant.get('nick'),