Merge branch 'main' into fix-buttons-list

This commit is contained in:
Rajeh Taher
2022-10-22 21:34:23 +03:00
committed by GitHub
66 changed files with 1485 additions and 229 deletions

View File

@@ -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]
@@ -555,11 +556,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,
@@ -573,7 +570,7 @@ exports.LoadUtils = () => {
t: parseInt(new Date().getTime() / 1000),
isNewMsg: true,
type: 'chat',
...ephemeralSettings,
...ephemeralFields,
...locationOptions,
...attOptions,
...quotedMsgOptions,
@@ -694,7 +691,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)
}));