webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-02 12:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issues and added mentions in quotes

Browse source
This commit is contained in:
david-harley 2020-12-23 14:20:53 +10:30
parent 7eb0487719
commit ee2848db23
7 changed files with 68 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/org/asamk/signal/ReceiveMessageHandler.java
View file

@ -447,8 +447,14 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
if (message.getQuote().isPresent()) {
SignalServiceDataMessage.Quote quote = message.getQuote().get();
System.out.println("Quote: (" + quote.getId() + ")");
System.out.println(" Author: " + quote.getAuthor().getLegacyIdentifier());
System.out.println(" Author: " + m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier());
System.out.println(" Text: " + quote.getText());
if (quote.getMentions().size() > 0) {
System.out.println(" Mentions: ");
for (SignalServiceDataMessage.Mention mention : quote.getMentions()) {
printMention(mention, m);
}
}
if (quote.getAttachments().size() > 0) {
System.out.println(" Attachments: ");
for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
@ -467,16 +473,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
System.out.println("Remote delete message: timestamp = " + remoteDelete.getTargetSentTimestamp());
}
if (message.getMentions().isPresent()) {
final List<SignalServiceDataMessage.Mention> mentions = message.getMentions().get();
System.out.println("Mentions: ");
for (SignalServiceDataMessage.Mention mention : mentions) {
System.out.println("- "
+ mention.getUuid()
+ ": "
+ mention.getStart()
+ " (length: "
+ mention.getLength()
+ ")");
for (SignalServiceDataMessage.Mention mention : message.getMentions().get()) {
printMention(mention, m);
}
}
@ -488,6 +487,18 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
}
}
private void printMention(SignalServiceDataMessage.Mention mention, Manager m) {
System.out.println("- "
+ m.resolveSignalServiceAddress(
new SignalServiceAddress(mention.getUuid(), null)
).getLegacyIdentifier()
+ ": "
+ mention.getStart()
+ " (length: "
+ mention.getLength()
+ ")");
}
private void printAttachment(SignalServiceAttachment attachment) {
System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (
attachment.isStream() ? "Stream" : ""

4
src/main/java/org/asamk/signal/json/JsonDataMessage.java
View file

@ -42,12 +42,12 @@ class JsonDataMessage {
this.reaction = new JsonReaction(dataMessage.getReaction().get(), m);
}
if (dataMessage.getQuote().isPresent()) {
this.quote = new JsonQuote(dataMessage.getQuote().get());
this.quote = new JsonQuote(dataMessage.getQuote().get(), m);
}
if (dataMessage.getMentions().isPresent()) {
this.mentions = new ArrayList<>(dataMessage.getMentions().get().size());
for (SignalServiceDataMessage.Mention mention : dataMessage.getMentions().get()) {
this.mentions.add(new JsonMention(mention));
this.mentions.add(new JsonMention(mention, m));
}
} else {
this.mentions = new ArrayList<>();

1
src/main/java/org/asamk/signal/json/JsonGroupInfo.java
View file

@ -32,7 +32,6 @@ class JsonGroupInfo {
JsonGroupInfo(SignalServiceGroupV2 groupInfo) {
this.groupId = Base64.encodeBytes(GroupUtils.getGroupId(groupInfo.getMasterKey()));
// TODO populate members and name fields
this.type = groupInfo.hasSignedGroupChange() ? "UPDATE" : "DELIVER";
}

12
src/main/java/org/asamk/signal/json/JsonMention.java
View file

@ -1,18 +1,22 @@
package org.asamk.signal.json;
import java.util.UUID;
import org.asamk.signal.manager.Manager;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
public class JsonMention {
UUID uuid;
String name;
int start;
int length;
JsonMention(SignalServiceDataMessage.Mention mention) {
this.uuid = mention.getUuid();
JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {
this.name = m.resolveSignalServiceAddress(
new SignalServiceAddress(mention.getUuid(), null)
).getLegacyIdentifier();
this.start = mention.getStart();
this.length = mention.getLength();
}
}

4
src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
View file

@ -19,9 +19,7 @@ public class JsonMessageEnvelope {
JsonCallMessage callMessage;
JsonReceiptMessage receiptMessage;
public JsonMessageEnvelope(
SignalServiceEnvelope envelope, SignalServiceContent content, Manager m
) {
public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
SignalServiceAddress source = envelope.getSourceAddress();
this.source = source.getLegacyIdentifier();

29
src/main/java/org/asamk/signal/json/JsonQuote.java
View file

@ -1,6 +1,6 @@
package org.asamk.signal.json;
import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
import org.asamk.signal.manager.Manager;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
import java.util.ArrayList;
@ -11,27 +11,28 @@ public class JsonQuote {
long id;
String author;
String text;
List<JsonAttachment> attachments;
JsonQuote(SignalServiceDataMessage.Quote quote) {
List<JsonMention> mentions;
List<JsonQuotedAttachment> attachments;
JsonQuote(SignalServiceDataMessage.Quote quote, Manager m) {
this.id = quote.getId();
this.author = quote.getAuthor().getLegacyIdentifier();
this.author = m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier();
this.text = quote.getText();
if (quote.getMentions().size() > 0) {
this.mentions = new ArrayList<>(quote.getMentions().size());
for (SignalServiceDataMessage.Mention quotedMention: quote.getMentions()){
this.mentions.add(new JsonMention(quotedMention, m));
}
}
if (quote.getAttachments().size() > 0) {
this.attachments = new ArrayList<>(quote.getAttachments().size());
SignalServiceAttachmentPointer attachmentPointer;
for (SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment : quote.getAttachments()) {
JsonAttachment recentAttachment = new JsonAttachment(quotedAttachment.getThumbnail());
// Its possible the name might be missing, if it is then we'll use the other one
attachmentPointer = quotedAttachment.getThumbnail().asPointer();
if (!attachmentPointer.getFileName().isPresent()) {
recentAttachment.filename = quotedAttachment.getFileName();
}
this.attachments.add(recentAttachment);
this.attachments.add(new JsonQuotedAttachment(quotedAttachment));
}
} else {
this.attachments = new ArrayList<>();

21
src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java Normal file
View file

@ -0,0 +1,21 @@
package org.asamk.signal.json;
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
public class JsonQuotedAttachment {
String contextType;
String filename;
JsonAttachment thumbnail;
JsonQuotedAttachment(SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment) {
contextType = quotedAttachment.getContentType();
filename = quotedAttachment.getFileName();
if (quotedAttachment.getThumbnail() != null) {
thumbnail = new JsonAttachment(quotedAttachment.getThumbnail());
}
else {
thumbnail = null;
}
}
}