nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-31 15:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Invert urgent boolean in Message to be consistent

Browse Source
This commit is contained in:
AsamK 2026-02-25 21:43:52 +01:00
parent d4b3816c5d
commit f9cbfa6d6c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/api/Message.java
View File

@ -13,7 +13,7 @@ public record Message(
List<Preview> previews, List<Preview> previews,
Optional<StoryReply> storyReply, Optional<StoryReply> storyReply,
List<TextStyle> textStyles, List<TextStyle> textStyles,
boolean noUrgent boolean urgent
) { ) {
public record Mention(RecipientIdentifier.Single recipient, int start, int length) {} public record Mention(RecipientIdentifier.Single recipient, int start, int length) {}

4
lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
View File

@ -800,7 +800,7 @@ public class ManagerImpl implements Manager {
} }
final var messageBuilder = SignalServiceDataMessage.newBuilder(); final var messageBuilder = SignalServiceDataMessage.newBuilder();
applyMessage(messageBuilder, message); applyMessage(messageBuilder, message);
return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty(), !message.noUrgent()); return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty(), message.urgent());
} }
@Override @Override
@ -811,7 +811,7 @@ public class ManagerImpl implements Manager {
) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException { ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
final var messageBuilder = SignalServiceDataMessage.newBuilder(); final var messageBuilder = SignalServiceDataMessage.newBuilder();
applyMessage(messageBuilder, message); applyMessage(messageBuilder, message);
return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp), !message.noUrgent()); return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp), message.urgent());
} }
private void applyMessage( private void applyMessage(

2
src/main/java/org/asamk/signal/commands/SendCommand.java
View File

@ -253,7 +253,7 @@ public class SendCommand implements JsonRpcLocalCommand {
previews, previews,
Optional.ofNullable((storyReply)), Optional.ofNullable((storyReply)),
textStyles, textStyles,
noUrgent); !noUrgent);
var results = editTimestamp != null var results = editTimestamp != null
? m.sendEditMessage(message, recipientIdentifiers, editTimestamp) ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
: m.sendMessage(message, recipientIdentifiers, notifySelf); : m.sendMessage(message, recipientIdentifiers, notifySelf);

6
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View File

@ -243,7 +243,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
List.of(), List.of(),
Optional.empty(), Optional.empty(),
List.of(), List.of(),
false); true);
final var recipientIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream() final var recipientIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast) .map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
@ -409,7 +409,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
List.of(), List.of(),
Optional.empty(), Optional.empty(),
List.of(), List.of(),
false); true);
final var results = m.sendMessage(message, Set.of(RecipientIdentifier.NoteToSelf.INSTANCE), false); final var results = m.sendMessage(message, Set.of(RecipientIdentifier.NoteToSelf.INSTANCE), false);
checkSendMessageResults(results); checkSendMessageResults(results);
return results.timestamp(); return results.timestamp();
@ -456,7 +456,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
List.of(), List.of(),
Optional.empty(), Optional.empty(),
List.of(), List.of(),
false); true);
var results = m.sendMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false); var results = m.sendMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false);
checkSendMessageResults(results); checkSendMessageResults(results);
return results.timestamp(); return results.timestamp();