Handle timer updates along with group updates

2026-04-28 12:23:31 +01:00 · 2018-06-25 15:58:55 -07:00
parent 67464774c3
commit 9d9a797bda
4 changed files with 18 additions and 8 deletions
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -899,13 +899,12 @@
      providedExpireTimer,
      providedSource,
      receivedAt,
-      providedOptions
+      options = {}
    ) {
-      const options = providedOptions || {};
      let expireTimer = providedExpireTimer;
      let source = providedSource;

-      _.defaults(options, { fromSync: false });
+      _.defaults(options, { fromSync: false, fromGroupUpdate: false });

      if (!expireTimer) {
        expireTimer = null;
@@ -942,6 +941,7 @@
          expireTimer,
          source,
          fromSync: options.fromSync,
+          fromGroupUpdate: options.fromGroupUpdate,
        },
      });
      if (this.isPrivate()) {