Prevent non-admins from sending to announcement groups

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

diff --git a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
index eb135e13c64215a9c324c35f26c2ff8db5df709b..73c88947c413abac3b3544d23673ef647ab61f05 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
@@ -1,45 +1,38 @@
 package org.asamk.signal;
 
 package org.asamk.signal;
 

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-

 import org.asamk.signal.json.JsonError;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.json.JsonError;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 

-import java.io.IOException;
+import java.util.HashMap;

 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 

-    final Manager m;
-    private final ObjectMapper jsonProcessor;
+    private final static Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);
+
+    protected final Manager m;
+    private final JsonWriter jsonWriter;

 
 

-    public JsonReceiveMessageHandler(Manager m) {
+    public JsonReceiveMessageHandler(Manager m, JsonWriter jsonWriter) {

         this.m = m;
         this.m = m;

-        this.jsonProcessor = new ObjectMapper();
-        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        this.jsonWriter = jsonWriter;

     }
 
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
     }
 
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {

-        ObjectNode result = jsonProcessor.createObjectNode();
+        final var object = new HashMap<String, Object>();

         if (exception != null) {
         if (exception != null) {

-            result.putPOJO("error", new JsonError(exception));
+            object.put("error", new JsonError(exception));

         }
         }

+

         if (envelope != null) {
         if (envelope != null) {

-            result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content, m));
-        }
-        try {
-            jsonProcessor.writeValue(System.out, result);
-            System.out.println();
-        } catch (IOException e) {
-            e.printStackTrace();
+            object.put("envelope", new JsonMessageEnvelope(envelope, content, exception, m));

         }
         }

+
+        jsonWriter.write(object);

     }
 }
     }
 }