Merge pull request #1253 from Bilb/fix-expire-timer

5 years ago · 5ec3a5b3f7
parent b34470c215 ac4a608b4b
commit 5ec3a5b3f7
1 changed files with 6 additions and 1 deletions
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@ -1935,7 +1935,12 @@
        message
      );

-      if (groupUpdate.joined && groupUpdate.joined.length) {
+      // send a expireTimer update message to all add members if the expireTimer is set
+      if (
+        groupUpdate.joined &&
+        groupUpdate.joined.length &&
+        this.get('expireTimer')
+      ) {
        const expireUpdate = {
          timestamp: Date.now(),
          expireTimer: this.get('expireTimer'),