Refactor receive api

[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 b231d67e457b1d51b36955f7eed76e11c22522f8..0df82b1c764ac74013aa0ddcf6827ba9e051613c 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
@@ -2,25 +2,17 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
-
-import java.util.Base64;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.groups.GroupId;
 
 record JsonTypingMessage(
         String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
 ) {
 
-    JsonTypingMessage(final String action, final long timestamp, final String groupId) {
-        this.action = action;
-        this.timestamp = timestamp;
-        this.groupId = groupId;
-    }
-
-    static JsonTypingMessage from(SignalServiceTypingMessage typingMessage) {
-        final var action = typingMessage.getAction().name();
-        final var timestamp = typingMessage.getTimestamp();
-        final var encoder = Base64.getEncoder();
-        final var 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);
     }
 }