Browse Source

parse remote msg content

feature/dockerfile-arm
Evan Feenstra 5 years ago
parent
commit
1e1e86d8f6
  1. 5
      api/controllers/chatTribes.ts
  2. 9
      dist/api/controllers/chatTribes.js
  3. 2
      dist/api/controllers/chatTribes.js.map

5
api/controllers/chatTribes.ts

@ -162,8 +162,11 @@ async function replayChatHistory(chat, contact) {
...owner.dataValues,
...m.senderAlias && {alias: m.senderAlias},
}
let content = ''
try {content = JSON.parse(m.remoteMessageContent)} catch(e) {}
if(!content) return
let msg = network.newmsg(m.type, chat, sender, {
content: m.remoteMessageContent, // replace with the received content (u are owner)
content, // replace with the remoteMessageContent (u are owner)
...m.mediaKey && {mediaKey: m.mediaKey},
...m.mediaType && {mediaType: m.mediaType},
...m.mediaToken && {mediaToken: m.mediaToken}

9
dist/api/controllers/chatTribes.js

@ -157,7 +157,14 @@ function replayChatHistory(chat, contact) {
asyncForEach(msgs, (m) => __awaiter(this, void 0, void 0, function* () {
console.log('==> m', m.dataValues);
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.remoteMessageContent }, m.mediaKey && { mediaKey: m.mediaKey }), m.mediaType && { mediaType: m.mediaType }), m.mediaToken && { mediaToken: m.mediaToken }));
let content = '';
try {
content = JSON.parse(m.remoteMessageContent);
}
catch (e) { }
if (!content)
return;
let msg = network.newmsg(m.type, chat, sender, Object.assign(Object.assign(Object.assign({ content }, m.mediaKey && { mediaKey: m.mediaKey }), m.mediaType && { mediaType: m.mediaType }), m.mediaToken && { mediaToken: m.mediaToken }));
console.log('==> msg', msg);
msg = yield msg_1.decryptMessage(msg, chat);
console.log('==> msg decrypted', msg);

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

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