Refactor manager lib package structure

[signal-cli] / src / main / java / org / asamk / signal / json / JsonTypingMessage.java

diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
index 18548ce315aff02afe522a25573d187d3c57e941..79a66d3491f043313ffce2b47860eab827f6de84 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
@@ -1,28 +1,18 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
-import java.util.Base64;
+record JsonTypingMessage(
+        String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
+) {
 
-class JsonTypingMessage {
-
-    @JsonProperty
-    final String action;
-
-    @JsonProperty
-    final long timestamp;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final String groupId;
-
-    JsonTypingMessage(SignalServiceTypingMessage typingMessage) {
-        this.action = typingMessage.getAction().name();
-        this.timestamp = typingMessage.getTimestamp();
-        final Base64.Encoder encoder = Base64.getEncoder();
-        this.groupId = typingMessage.getGroupId().transform(encoder::encodeToString).orNull();
+    static JsonTypingMessage from(MessageEnvelope.Typing typingMessage) {
+        final var action = typingMessage.type().name();
+        final var timestamp = typingMessage.timestamp();
+        final var groupId = typingMessage.groupId().map(GroupId::toBase64).orElse(null);
+        return new JsonTypingMessage(action, timestamp, groupId);
     }
 }