From 5cf63af3a3cd8c9430806342740bbf82961ae9cc Mon Sep 17 00:00:00 2001 From: Maxim Shishmarev Date: Fri, 6 Sep 2019 12:48:33 +1000 Subject: [PATCH] Enable quotes in public chats --- js/modules/loki_message_api.js | 1 + js/modules/loki_public_chat_api.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js index 227541929..f9c3610d6 100644 --- a/js/modules/loki_message_api.js +++ b/js/modules/loki_message_api.js @@ -95,6 +95,7 @@ class LokiMessageAPI { } const res = await publicSendData.sendMessage( data.body, + data.quote, messageTimeStamp, displayName, this.ourKey diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index 07629bf18..2b598d2a9 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -521,6 +521,7 @@ class LokiPublicChannelAPI { let timestamp = new Date(adnMessage.created_at).getTime(); // pubKey lives in the username field let from = adnMessage.user.name; + let quote = null; if (adnMessage.is_deleted) { return; } @@ -529,7 +530,11 @@ class LokiPublicChannelAPI { adnMessage.annotations.length !== 0 ) { const noteValue = adnMessage.annotations[0].value; - ({ timestamp } = noteValue); + ({ timestamp, quote } = noteValue); + + if (quote) { + quote.attachments = []; + } // if user doesn't have a name set, fallback to annotation // pubkeys are already there in v1 (first release) @@ -571,7 +576,7 @@ class LokiPublicChannelAPI { timestamp, received_at: receivedAt, sent_at: timestamp, - quote: null, + quote, contact: [], preview: [], profile: { @@ -597,7 +602,7 @@ class LokiPublicChannelAPI { } // create a message in the channel - async sendMessage(text, messageTimeStamp, displayName, pubKey) { + async sendMessage(text, quote, messageTimeStamp, displayName, pubKey) { const payload = { text, annotations: [ @@ -609,6 +614,7 @@ class LokiPublicChannelAPI { from: displayName, // will deprecated source: pubKey, + quote, }, }, ],