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 index 84445737..09ac0d18 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/Message.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/Message.java @@ -13,7 +13,7 @@ public record Message( List previews, Optional storyReply, List textStyles, - boolean noPush + boolean noUrgent ) { public record Mention(RecipientIdentifier.Single recipient, int start, int length) {} diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java index 7ef25274..f14cb014 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java @@ -800,7 +800,7 @@ public class ManagerImpl implements Manager { } final var messageBuilder = SignalServiceDataMessage.newBuilder(); applyMessage(messageBuilder, message); - return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty(), !message.noPush()); + return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty(), !message.noUrgent()); } @Override @@ -811,7 +811,7 @@ public class ManagerImpl implements Manager { ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException { final var messageBuilder = SignalServiceDataMessage.newBuilder(); applyMessage(messageBuilder, message); - return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp), !message.noPush()); + return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp), !message.noUrgent()); } private void applyMessage( diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 42342c33..81d14d05 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -105,9 +105,9 @@ public class SendCommand implements JsonRpcLocalCommand { subparser.addArgument("--edit-timestamp") .type(long.class) .help("Specify the timestamp of a previous message with the recipient or group to send an edited message."); - subparser.addArgument("--no-push") + subparser.addArgument("--no-urgent") .action(Arguments.storeTrue()) - .help("Send the message without triggering a push notification for the recipient. " + .help("Send the message without the urgent flag, so no push notification is triggered for the recipient. " + "The message will still be delivered in real-time if the recipient's app is active."); } @@ -119,7 +119,7 @@ public class SendCommand implements JsonRpcLocalCommand { ) throws CommandException { final var notifySelf = Boolean.TRUE.equals(ns.getBoolean("notify-self")); final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self")); - final var noPush = Boolean.TRUE.equals(ns.getBoolean("no-push")); + final var noUrgent = Boolean.TRUE.equals(ns.getBoolean("no-urgent")); final var recipientStrings = ns.getList("recipient"); final var groupIdStrings = ns.getList("group-id"); final var usernameStrings = ns.getList("username"); @@ -253,7 +253,7 @@ public class SendCommand implements JsonRpcLocalCommand { previews, Optional.ofNullable((storyReply)), textStyles, - noPush); + noUrgent); var results = editTimestamp != null ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp) : m.sendMessage(message, recipientIdentifiers, notifySelf);