diff --git a/CHANGELOG.md b/CHANGELOG.md index d918268f..31550332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## [Unreleased] + ## [0.14.0] - 2026-03-01 **Attention**: Now requires Java 25 diff --git a/build.gradle.kts b/build.gradle.kts index 8154425e..357fb3b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { group = "org.asamk" - version = "0.14.0" + version = "0.14.1-SNAPSHOT" } java { diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc index 62cc3b8c..969171c3 100644 --- a/man/signal-cli.1.adoc +++ b/man/signal-cli.1.adoc @@ -442,6 +442,7 @@ By default, recipients can select multiple options. *-o* OPTION [OPTION ...], *--option* OPTION [OPTION ...]*:: The options for the poll. +Between 2 and 10 options must be specified. === sendPollVote diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java index 81a1bcb1..b382e7ac 100644 --- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java @@ -144,6 +144,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand { contact.nickNameFamilyName(), contact.note(), contact.color(), + contact.isArchived(), contact.isBlocked(), contact.isHidden(), contact.messageExpirationTime(), diff --git a/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java b/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java index 5c2d7d57..02b89e5e 100644 --- a/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java @@ -24,6 +24,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult; public class SendPollCreateCommand implements JsonRpcLocalCommand { private static final Logger logger = LoggerFactory.getLogger(SendPollCreateCommand.class); + private static final int MAX_POLL_OPTIONS = 10; @Override public String getName() { @@ -72,6 +73,9 @@ public class SendPollCreateCommand implements JsonRpcLocalCommand { if (options.size() < 2) { throw new UserErrorException("Poll needs at least two options"); } + if (options.size() > MAX_POLL_OPTIONS) { + throw new UserErrorException("Poll cannot have more than " + MAX_POLL_OPTIONS + " options"); + } try { var results = m.sendPollCreateMessage(question, !noMulti, options, recipientIdentifiers, notifySelf); diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java index 108706e7..7bc0174f 100644 --- a/src/main/java/org/asamk/signal/json/JsonContact.java +++ b/src/main/java/org/asamk/signal/json/JsonContact.java @@ -20,6 +20,7 @@ public record JsonContact( @JsonProperty(required = true) String nickFamilyName, @JsonProperty(required = true) String note, @JsonProperty(required = true) String color, + @JsonProperty(required = true) boolean isArchived, @JsonProperty(required = true) boolean isBlocked, @JsonProperty(required = true) boolean isHidden, @JsonProperty(required = true) int messageExpirationTime,