Move group classes to separate package

[signal-cli] / src / main / java / org / asamk / signal / commands / SendReactionCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index 3d000a621acbe14ea6e843a31fb504c75bf537cc..c680bfd7b1784433bc4647bfd962fca563d14dcc 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,10 +4,11 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.manager.GroupNotFoundException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.NotAGroupMemberException;
-import org.asamk.signal.util.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
@@ -29,11 +30,8 @@ public class SendReactionCommand implements LocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Send reaction to a previously received or sent message.");
-        subparser.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        subparser.addArgument("recipient")
-                .help("Specify the recipients' phone number.")
-                .nargs("*");
+        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+        subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
         subparser.addArgument("-e", "--emoji")
                 .required(true)
                 .help("Specify the emoji, should be a single unicode grapheme cluster.");
@@ -44,9 +42,7 @@ public class SendReactionCommand implements LocalCommand {
                 .required(true)
                 .type(long.class)
                 .help("Specify the timestamp of the message to which to react.");
-        subparser.addArgument("-r", "--remove")
-                .help("Remove a reaction.")
-                .action(Arguments.storeTrue());
+        subparser.addArgument("-r", "--remove").help("Remove a reaction.").action(Arguments.storeTrue());
     }
 
     @Override
@@ -70,13 +66,16 @@ public class SendReactionCommand implements LocalCommand {
         try {
             final Pair<Long, List<SendMessageResult>> results;
             if (ns.getString("group") != null) {
-                byte[] groupId = Util.decodeGroupId(ns.getString("group"));
+                GroupId groupId = Util.decodeGroupId(ns.getString("group"));
                 results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {
-                results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.getList("recipient"));
+                results = m.sendMessageReaction(emoji,
+                        isRemove,
+                        targetAuthor,
+                        targetTimestamp,
+                        ns.getList("recipient"));
             }
-            handleTimestampAndSendMessageResults(results.first(), results.second());
-            return 0;
+            return handleTimestampAndSendMessageResults(results.first(), results.second());
         } catch (IOException e) {
             handleIOException(e);
             return 3;