Implement sending mentions

Closes #584
AsamK · Nov 13, 2021 · 53b84ba · 53b84ba
1 parent 89f568d
commit 53b84ba
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 5 deletions.
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -683,6 +683,16 @@ private void applyMessage(
         if (attachments != null) {
             messageBuilder.withAttachments(attachmentHelper.uploadAttachments(attachments));
         }
+        if (message.mentions().size() > 0) {
+            final var mentions = new ArrayList<SignalServiceDataMessage.Mention>();
+            for (final var m : message.mentions()) {
+                final var recipientId = resolveRecipient(m.recipient());
+                mentions.add(new SignalServiceDataMessage.Mention(resolveSignalServiceAddress(recipientId).getAci(),
+                        m.start(),
+                        m.length()));
+            }
+            messageBuilder.withMentions(mentions);
+        }
     }
 
     @Override

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Message.java b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
@@ -2,4 +2,7 @@
 
 import java.util.List;
 
-public record Message(String messageText, List<String> attachments) {}
+public record Message(String messageText, List<String> attachments, List<Mention> mentions) {
+
+    public record Mention(RecipientIdentifier.Single recipient, int start, int length) {}
+}
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
@@ -205,6 +205,11 @@ Send the message to self without notification.
 *-e*, *--end-session*::
 Clear session state and send end session message.
 
+*--mention*::
+Mention another group member (syntax: start:length:recipientNumber)
+In the apps the mention replaces part of the message text, which is specified by the start and length values.
+e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
+
 === sendReaction
 
 Send reaction to a previously received or sent message.

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -25,8 +25,10 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class SendCommand implements JsonRpcLocalCommand {
@@ -52,6 +54,9 @@ public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--mention")
+                .nargs("*")
+                .help("Mention another group member (syntax: start:length:recipientNumber)");
     }
 
     @Override
@@ -100,8 +105,27 @@ public void handleCommand(
             attachments = List.of();
         }
 
+        List<String> mentionStrings = ns.getList("mention");
+        List<Message.Mention> mentions;
+        if (mentionStrings == null) {
+            mentions = List.of();
+        } else {
+            final Pattern mentionPattern = Pattern.compile("([0-9]+):([0-9]+):(.+)");
+            mentions = new ArrayList<>();
+            for (final var mention : mentionStrings) {
+                final var matcher = mentionPattern.matcher(mention);
+                if (!matcher.matches()) {
+                    throw new UserErrorException("Invalid mention syntax ("
+                            + mention
+                            + ") expected 'start:end:recipientNumber'");
+                }
+                mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3),
+                        m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))));
+            }
+        }
+
         try {
-            var results = m.sendMessage(new Message(messageText, attachments), recipientIdentifiers);
+            var results = m.sendMessage(new Message(messageText, attachments, mentions), recipientIdentifiers);
             outputResult(outputWriter, results.timestamp());
             ErrorUtils.handleSendMessageResults(results.results());
         } catch (AttachmentInvalidException | IOException e) {

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -201,7 +201,7 @@ public long sendMessage(final String message, final List<String> attachments, fi
     @Override
     public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
         try {
-            final var results = m.sendMessage(new Message(message, attachments),
+            final var results = m.sendMessage(new Message(message, attachments, List.of()),
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
@@ -367,7 +367,7 @@ public long sendNoteToSelfMessage(
             final String message, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
-            final var results = m.sendMessage(new Message(message, attachments),
+            final var results = m.sendMessage(new Message(message, attachments, List.of()),
                     Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
             checkSendMessageResults(results.timestamp(), results.results());
             return results.timestamp();
@@ -393,7 +393,7 @@ public void sendEndSessionMessage(final List<String> recipients) {
     @Override
     public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
         try {
-            var results = m.sendMessage(new Message(message, attachments),
+            var results = m.sendMessage(new Message(message, attachments, List.of()),
                     Set.of(new RecipientIdentifier.Group(getGroupId(groupId))));
             checkSendMessageResults(results.timestamp(), results.results());
             return results.timestamp();