Resurrect muc_show_join_leave option
The option got lost in commit 9528d81c00
.
Fixes #1263
This commit is contained in:
parent
26b0934ab6
commit
af091faf33
|
@ -9,6 +9,7 @@
|
||||||
- #1408 new config option `roomconfig_whitelist`
|
- #1408 new config option `roomconfig_whitelist`
|
||||||
- #1417 Margin between nickname and badge
|
- #1417 Margin between nickname and badge
|
||||||
- #1421 fix direct invite for membersonly room
|
- #1421 fix direct invite for membersonly room
|
||||||
|
- #1422 Resurrect the `muc_show_join_leave` option
|
||||||
|
|
||||||
## 4.1.0 (2019-01-11)
|
## 4.1.0 (2019-01-11)
|
||||||
|
|
||||||
|
|
4
dist/converse.js
vendored
4
dist/converse.js
vendored
|
@ -54801,7 +54801,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
|
||||||
},
|
},
|
||||||
|
|
||||||
showJoinNotification(occupant) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54861,7 +54861,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
|
||||||
},
|
},
|
||||||
|
|
||||||
showLeaveNotification(occupant) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1523,7 +1523,8 @@ converse.plugins.add('converse-muc-views', {
|
||||||
},
|
},
|
||||||
|
|
||||||
showJoinNotification (occupant) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
const nick = occupant.get('nick'),
|
const nick = occupant.get('nick'),
|
||||||
|
@ -1576,7 +1577,9 @@ converse.plugins.add('converse-muc-views', {
|
||||||
},
|
},
|
||||||
|
|
||||||
showLeaveNotification (occupant) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
const nick = occupant.get('nick'),
|
const nick = occupant.get('nick'),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user