Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Resurrect muc_show_join_leave option

Browse Source 
The option got lost in commit 9528d81c00.

Fixes #1263
This commit is contained in:
Holger Weiss 2019-01-22 01:08:12 +01:00 committed by JC Brand
parent 26b0934ab6
commit af091faf33
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -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)

4
dist/converse.js vendored
View File

@ -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;
}

7
src/converse-muc-views.js
View File

@ -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'),