瀏覽代碼

Resurrect muc_show_join_leave option

The option got lost in commit 9528d81c00bc4a876fecbd5cb72cac0f35f24b75.

Fixes #1263
Holger Weiss 6 年之前
父節點
當前提交
af091faf33
共有 3 個文件被更改,包括 8 次插入4 次删除
  1. 1 0
      CHANGES.md
  2. 2 2
      dist/converse.js
  3. 5 2
      src/converse-muc-views.js

+ 1 - 0
CHANGES.md

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

+ 2 - 2
dist/converse.js

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

+ 5 - 2
src/converse-muc-views.js

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