From ac4a608b4ba2de36a98c76936db39d7d99c8fd25 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 15 Jul 2020 14:46:58 +1000
Subject: [PATCH] send an expireTimer message when member added and expireTimer
 is set

---
 js/models/conversations.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 6611f9578..d91f3e9c8 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1925,7 +1925,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'),