From 36aa37f1ac94ee07368fc6e1e39cb568772c7af9 Mon Sep 17 00:00:00 2001
From: "Pedro S. Lopez" <pedroslopez@me.com>
Date: Fri, 21 Oct 2022 00:12:02 -0400
Subject: [PATCH] fix: set ephemeral fields and get links from messages (#1752)

* fix setting ephemeral fields

* fix missing links method
---
 src/util/Injected.js | 11 ++++-------
 tests/client.js      |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/util/Injected.js b/src/util/Injected.js
index b09b27e..b1ae286 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -51,6 +51,7 @@ exports.ExposeStore = (moduleRaidStr) => {
     window.Store.ConversationMsgs = window.mR.findModule('loadEarlierMsgs')[0];
     window.Store.sendReactionToMsg = window.mR.findModule('sendReactionToMsg')[0].sendReactionToMsg;
     window.Store.createOrUpdateReactionsModule = window.mR.findModule('createOrUpdateReactions')[0];
+    window.Store.EphemeralFields = window.mR.findModule('getEphemeralFields')[0];
     window.Store.StickerTools = {
         ...window.mR.findModule('toWebpSticker')[0],
         ...window.mR.findModule('addWebpMetadata')[0]
@@ -227,11 +228,7 @@ exports.LoadUtils = () => {
         const extraOptions = options.extraOptions || {};
         delete options.extraOptions;
 
-        const ephemeralSettings = {
-            ephemeralDuration: chat.isEphemeralSettingOn() ? chat.getEphemeralSetting() : undefined,
-            ephemeralSettingTimestamp: chat.getEphemeralSettingTimestamp() || undefined,
-            disappearingModeInitiator: chat.getDisappearingModeInitiator() || undefined,
-        };
+        const ephemeralFields = window.Store.EphemeralFields.getEphemeralFields(chat);
 
         const message = {
             ...options,
@@ -245,7 +242,7 @@ exports.LoadUtils = () => {
             t: parseInt(new Date().getTime() / 1000),
             isNewMsg: true,
             type: 'chat',
-            ...ephemeralSettings,
+            ...ephemeralFields,
             ...locationOptions,
             ...attOptions,
             ...quotedMsgOptions,
@@ -366,7 +363,7 @@ exports.LoadUtils = () => {
 
         msg.isEphemeral = message.isEphemeral;
         msg.isStatusV3 = message.isStatusV3;
-        msg.links = (message.getLinks()).map(link => ({
+        msg.links = (message.getRawLinks()).map(link => ({
             link: link.href,
             isSuspicious: Boolean(link.suspiciousCharacters && link.suspiciousCharacters.size)
         }));
diff --git a/tests/client.js b/tests/client.js
index 2335905..55f5334 100644
--- a/tests/client.js
+++ b/tests/client.js
@@ -313,6 +313,7 @@ describe('Client', function() {
                     'Conn',
                     'Contact',
                     'DownloadManager',
+                    'EphemeralFields',
                     'Features',
                     'GroupMetadata',
                     'GroupParticipants',