From bb6d4f75bf15c75ce6dbf3a32f676fc07427b5d3 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 31 Aug 2018 10:36:51 +0200
Subject: [PATCH] Fade out enter/leave messages sooner and add check

---
 dist/converse.js          | 20 ++++++++++----------
 src/converse-muc-views.js | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dist/converse.js b/dist/converse.js
index abb163b43..da1f9ce02 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -69091,8 +69091,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           }
 
           const nick = occupant.get('nick'),
-                stat = occupant.get('status');
-          let last_el = this.content.lastElementChild;
+                stat = occupant.get('status'),
+                last_el = this.content.lastElementChild;
 
           if (_.includes(_.get(last_el, 'classList', []), 'chat-info') && _.get(last_el, 'dataset', {}).leave === `"${nick}"`) {
             last_el.outerHTML = tpl_info({
@@ -69101,9 +69101,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
               'extra_classes': 'chat-event',
               'message': __('%1$s has left and re-entered the groupchat', nick)
             });
-            last_el = this.content.lastElementChild;
-            setTimeout(() => u.addClass('fade-out', last_el), 10000);
-            setTimeout(() => last_el.parentElement.removeChild(last_el), 11500);
+            const el = this.content.lastElementChild;
+            setTimeout(() => u.addClass('fade-out', el), 5000);
+            setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
           } else {
             let message;
 
@@ -69134,8 +69134,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         showLeaveNotification(occupant) {
           const nick = occupant.get('nick'),
-                stat = occupant.get('status');
-          let last_el = this.content.lastElementChild;
+                stat = occupant.get('status'),
+                last_el = this.content.lastElementChild;
 
           if (last_el && _.includes(_.get(last_el, 'classList', []), 'chat-info') && moment(last_el.getAttribute('data-isodate')).isSame(new Date(), "day") && _.get(last_el, 'dataset', {}).join === `"${nick}"`) {
             let message;
@@ -69152,9 +69152,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
               'extra_classes': 'chat-event',
               'message': message
             });
-            last_el = this.content.lastElementChild;
-            setTimeout(() => u.addClass('fade-out', last_el), 10000);
-            setTimeout(() => last_el.parentElement.removeChild(last_el), 11500);
+            const el = this.content.lastElementChild;
+            setTimeout(() => u.addClass('fade-out', el), 5000);
+            setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
           } else {
             let message;
 
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index 634709882..b9fab16fb 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -1442,8 +1442,8 @@
                         return;
                     }
                     const nick = occupant.get('nick'),
-                          stat = occupant.get('status');
-                    let last_el = this.content.lastElementChild;
+                          stat = occupant.get('status'),
+                          last_el = this.content.lastElementChild;
 
                     if (_.includes(_.get(last_el, 'classList', []), 'chat-info') &&
                         _.get(last_el, 'dataset', {}).leave === `"${nick}"`) {
@@ -1455,9 +1455,9 @@
                                 'extra_classes': 'chat-event',
                                 'message': __('%1$s has left and re-entered the groupchat', nick)
                             });
-                        last_el = this.content.lastElementChild;
-                        setTimeout(() => u.addClass('fade-out', last_el), 10000);
-                        setTimeout(() => last_el.parentElement.removeChild(last_el), 11500);
+                        const el = this.content.lastElementChild;
+                        setTimeout(() => u.addClass('fade-out', el), 5000);
+                        setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
                     } else {
                         let  message;
                         if (_.isNil(stat)) {
@@ -1486,8 +1486,8 @@
 
                 showLeaveNotification (occupant) {
                     const nick = occupant.get('nick'),
-                          stat = occupant.get('status');
-                    let last_el = this.content.lastElementChild;
+                          stat = occupant.get('status'),
+                          last_el = this.content.lastElementChild;
 
                     if (last_el &&
                             _.includes(_.get(last_el, 'classList', []), 'chat-info') &&
@@ -1507,9 +1507,9 @@
                                 'extra_classes': 'chat-event',
                                 'message': message
                             });
-                        last_el = this.content.lastElementChild;
-                        setTimeout(() => u.addClass('fade-out', last_el), 10000);
-                        setTimeout(() => last_el.parentElement.removeChild(last_el), 11500);
+                        const el = this.content.lastElementChild;
+                        setTimeout(() => u.addClass('fade-out', el), 5000);
+                        setTimeout(() => el.parentElement && el.parentElement.removeChild(el), 5250);
                     } else {
                         let message;
                         if (_.isNil(stat)) {