diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java index 443a65fad..dc65cf8d5 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java @@ -165,11 +165,10 @@ public class MessageController { @HeaderParam("User-Agent") String userAgent, @HeaderParam("X-Forwarded-For") String forwardedFor, @PathParam("destination") UUID destinationUuid, + @QueryParam("story") boolean isStory, @NotNull @Valid IncomingMessageList messages) throws RateLimitExceededException { - boolean isStory = messages.story(); - if (source.isEmpty() && accessKey.isEmpty() && !isStory) { throw new WebApplicationException(Response.Status.UNAUTHORIZED); } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java index 7631f70f8..d5bb2af4e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java @@ -11,15 +11,14 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; public record IncomingMessageList(@NotNull @Valid List<@NotNull IncomingMessage> messages, - boolean online, boolean urgent, boolean story, long timestamp) { + boolean online, boolean urgent, long timestamp) { @JsonCreator public IncomingMessageList(@JsonProperty("messages") @NotNull @Valid List<@NotNull IncomingMessage> messages, @JsonProperty("online") boolean online, @JsonProperty("urgent") Boolean urgent, - @JsonProperty("story") Boolean story, @JsonProperty("timestamp") long timestamp) { - this(messages, online, urgent == null || urgent, story != null && story, timestamp); + this(messages, online, urgent == null || urgent, timestamp); } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java index fb40d7c2a..5cc87eaaf 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java @@ -676,7 +676,7 @@ class MessageControllerTest { .request() .header(OptionalAccess.UNIDENTIFIED, Base64.getEncoder().encodeToString(UNIDENTIFIED_ACCESS_BYTES)) .put(Entity.entity(new IncomingMessageList( - List.of(new IncomingMessage(1, 1L, 1, new String(contentBytes))), false, true, false, + List.of(new IncomingMessage(1, 1L, 1, new String(contentBytes))), false, true, System.currentTimeMillis()), MediaType.APPLICATION_JSON_TYPE));