Browse Source

Fix

feature/dockerfile-arm
Evan Feenstra 4 years ago
parent
commit
7c3dfe3c7f
  1. 2
      api/controllers/chatTribes.ts
  2. 2
      dist/api/controllers/chatTribes.js
  3. 2
      dist/api/controllers/chatTribes.js.map

2
api/controllers/chatTribes.ts

@ -163,7 +163,7 @@ async function replayChatHistory(chat, contact) {
...m.senderAlias && {alias: m.senderAlias}, ...m.senderAlias && {alias: m.senderAlias},
} }
let msg = network.newmsg(m.type, chat, sender, { let msg = network.newmsg(m.type, chat, sender, {
content: m.remoteContent, // replace with the received content (u are owner) content: m.remoteMessageContent, // replace with the received content (u are owner)
...m.mediaKey && {mediaKey: m.mediaKey}, ...m.mediaKey && {mediaKey: m.mediaKey},
...m.mediaType && {mediaType: m.mediaType}, ...m.mediaType && {mediaType: m.mediaType},
...m.mediaToken && {mediaToken: m.mediaToken} ...m.mediaToken && {mediaToken: m.mediaToken}

2
dist/api/controllers/chatTribes.js

@ -157,7 +157,7 @@ function replayChatHistory(chat, contact) {
asyncForEach(msgs, (m) => __awaiter(this, void 0, void 0, function* () { asyncForEach(msgs, (m) => __awaiter(this, void 0, void 0, function* () {
console.log('==> msg', m.dataValues); console.log('==> msg', m.dataValues);
const sender = Object.assign(Object.assign({}, owner.dataValues), m.senderAlias && { alias: m.senderAlias }); const sender = Object.assign(Object.assign({}, owner.dataValues), m.senderAlias && { alias: m.senderAlias });
let msg = network.newmsg(m.type, chat, sender, Object.assign(Object.assign(Object.assign({ content: m.remoteContent }, m.mediaKey && { mediaKey: m.mediaKey }), m.mediaType && { mediaType: m.mediaType }), m.mediaToken && { mediaToken: m.mediaToken })); let msg = network.newmsg(m.type, chat, sender, Object.assign(Object.assign(Object.assign({ content: m.remoteMessageContent }, m.mediaKey && { mediaKey: m.mediaKey }), m.mediaType && { mediaType: m.mediaType }), m.mediaToken && { mediaToken: m.mediaToken }));
msg = yield msg_1.decryptMessage(msg, chat); msg = yield msg_1.decryptMessage(msg, chat);
const data = yield msg_1.personalizeMessage(msg, contact, true); const data = yield msg_1.personalizeMessage(msg, contact, true);
const mqttTopic = `${contact.publicKey}/${chat.uuid}`; const mqttTopic = `${contact.publicKey}/${chat.uuid}`;

2
dist/api/controllers/chatTribes.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save