Merge pull request #489 from msgmaxim/replies

Enable quotes in public chats
pull/500/head
Beaudan Campbell-Brown 6 years ago committed by GitHub
commit ec5a69f1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -95,6 +95,7 @@ class LokiMessageAPI {
}
const res = await publicSendData.sendMessage(
data.body,
data.quote,
messageTimeStamp,
displayName,
this.ourKey

@ -523,6 +523,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;
}
@ -531,7 +532,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)
@ -573,7 +578,7 @@ class LokiPublicChannelAPI {
timestamp,
received_at: receivedAt,
sent_at: timestamp,
quote: null,
quote,
contact: [],
preview: [],
profile: {
@ -599,7 +604,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: [
@ -611,6 +616,7 @@ class LokiPublicChannelAPI {
from: displayName,
// will deprecated
source: pubKey,
quote,
},
},
],

Loading…
Cancel
Save