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

Send self messages as normal messages, new flag --note-to-self for sync message

Browse source 
Fixes #373
This commit is contained in:
AsamK 2021-01-16 11:56:41 +01:00
parent b31e97dd2d
commit e1134d832a
7 changed files with 98 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -953,6 +953,17 @@ public class Manager implements Closeable {
return sendMessage(messageBuilder, getSignalServiceAddresses(recipients));
}
public Pair<Long, List<SendMessageResult>> sendSelfMessage(
String messageText, List<String> attachments
) throws IOException, AttachmentInvalidException {
final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
.withBody(messageText);
if (attachments != null) {
messageBuilder.withAttachments(AttachmentUtils.getSignalServiceAttachments(attachments));
}
return sendSelfMessage(messageBuilder);
}
public Pair<Long, List<SendMessageResult>> sendMessageReaction(
String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
) throws IOException, InvalidNumberException {
@ -1253,11 +1264,7 @@ public class Manager implements Closeable {
final int expirationTime = contact != null ? contact.messageExpirationTime : 0;
messageBuilder.withExpiration(expirationTime);
message = messageBuilder.build();
if (address.matches(account.getSelfAddress())) {
results.add(sendSelfMessage(message));
} else {
results.add(sendMessage(address, message));
}
results.add(sendMessage(address, message));
}
return new Pair<>(timestamp, results);
}
@ -1271,6 +1278,28 @@ public class Manager implements Closeable {
}
}
private Pair<Long, List<SendMessageResult>> sendSelfMessage(
SignalServiceDataMessage.Builder messageBuilder
) throws IOException {
final long timestamp = System.currentTimeMillis();
messageBuilder.withTimestamp(timestamp);
getOrCreateMessagePipe();
getOrCreateUnidentifiedMessagePipe();
try {
final SignalServiceAddress address = getSelfAddress();
final ContactInfo contact = account.getContactStore().getContact(address);
final int expirationTime = contact != null ? contact.messageExpirationTime : 0;
messageBuilder.withExpiration(expirationTime);
SignalServiceDataMessage message = messageBuilder.build();
final SendMessageResult result = sendSelfMessage(message);
return new Pair<>(timestamp, List.of(result));
} finally {
account.save();
}
}
private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) throws IOException {
SignalServiceMessageSender messageSender = createMessageSender();