Filters, FiltersEncoder, FiltersDecoder re-implemenation

nostr-java-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>xyz.tcheeric</groupId>
         <artifactId>nostr-java</artifactId>
-        <version>0.6.3-SNAPSHOT</version>
+        <version>0.6.4-SNAPSHOT</version>
     </parent>
     <artifactId>nostr-java-api</artifactId>
     <packaging>jar</packaging>
@@ -45,9 +45,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>nostr-java-command-provider</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
         </dependency>
     </dependencies>
     <properties>

nostr-java-api/src/main/java/module-info.java

@@ -5,16 +5,16 @@
     requires nostr.id;
     requires nostr.client;
     requires nostr.context;
-    requires nostr.context.impl;
     requires nostr.encryption;
     requires nostr.encryption.nip04dm;
     requires nostr.encryption.nip44dm;
-    
+
     requires com.fasterxml.jackson.databind;
-    
+
     requires lombok;
     requires java.logging;
     requires nostr.crypto;
+    requires org.apache.commons.lang3;
 
     exports nostr.api;
 }

nostr-java-api/src/main/java/nostr/api/EventNostr.java

@@ -10,15 +10,16 @@
 import lombok.Setter;
 import nostr.api.factory.impl.GenericEventFactory;
 import nostr.base.PublicKey;
+import nostr.event.BaseMessage;
 import nostr.event.BaseTag;
 import nostr.event.impl.GenericEvent;
 import nostr.event.json.codec.BaseMessageDecoder;
 import nostr.id.Identity;
+import org.apache.commons.lang3.stream.Streams.FailableStream;
 
 import java.util.List;
 import java.util.Map;
-
-import nostr.event.BaseMessage;
+import java.util.Objects;
 
 /**
  * @author guilhermegps
@@ -46,14 +47,14 @@ public <U extends BaseMessage> U send() {
         return this.send(getRelays());
     }
 
-    @SuppressWarnings("unchecked")
     public <U extends BaseMessage> U send(Map<String, String> relays) {
-        List<String> messages = super.send(this.event, relays);
-        BaseMessageDecoder<U> decoder = new BaseMessageDecoder<U>();
+        List<String> messages = super.sendEvent(this.event, relays);
+        BaseMessageDecoder<U> decoder = new BaseMessageDecoder<>();
 
-        return messages.stream()
+        return new FailableStream<>(messages.stream())
                 .map(msg -> (U) decoder.decode(msg))
-                .filter(msg -> msg != null)
+                .filter(Objects::nonNull)
+                .stream()
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("No message received"));
     }

nostr-java-api/src/main/java/nostr/api/NIP01.java

@@ -19,17 +19,14 @@
 import nostr.api.factory.impl.NIP01Impl.ReplaceableEventFactory;
 import nostr.api.factory.impl.NIP01Impl.ReqMessageFactory;
 import nostr.api.factory.impl.NIP01Impl.TextNoteEventFactory;
-import nostr.base.GenericTagQuery;
 import nostr.base.IEvent;
 import nostr.base.PublicKey;
 import nostr.base.Relay;
 import nostr.base.UserProfile;
 import nostr.event.BaseTag;
-import nostr.event.Kind;
 import nostr.event.Marker;
 import nostr.event.NIP01Event;
-import nostr.event.impl.Filters;
-import nostr.event.impl.GenericEvent;
+import nostr.event.filter.Filters;
 import nostr.event.message.CloseMessage;
 import nostr.event.message.EoseMessage;
 import nostr.event.message.EventMessage;
@@ -42,7 +39,6 @@
 import nostr.id.Identity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  *
@@ -98,7 +94,7 @@ public NIP01<T> createMetadataEvent(@NonNull UserProfile profile) {
 
     /**
      * Create a replaceable event
-     * 
+     *
      * @param kind    the kind (10000 <= kind < 20000 || kind == 0 || kind == 3)
      * @param content the content
      */
@@ -111,7 +107,7 @@ public NIP01<T> createReplaceableEvent(@NonNull Integer kind, String content) {
 
     /**
      * Create a replaceable event
-     * 
+     *
      * @param tags    the note's tags
      * @param kind    the kind (10000 <= kind < 20000 || kind == 0 || kind == 3)
      * @param content the note's content
@@ -125,7 +121,7 @@ public NIP01<T> createReplaceableEvent(@NonNull List<BaseTag> tags, @NonNull Int
 
     /**
      * Create an ephemeral event
-     * 
+     *
      * @param kind    the kind (20000 <= n < 30000)
      * @param content the note's content
      */
@@ -190,48 +186,6 @@ public static PubKeyTag createPubKeyTag(@NonNull PublicKey publicKey, String mai
         return result;
     }
 
-    /**
-     * Create a NIP01 filters object (all parameters are optional)
-     *
-     * @param events           a list of event
-     * @param authors          a list of pubkeys or prefixes, the pubkey of an event
-     *                         must
-     *                         be one of these
-     * @param kinds            a list of a kind numbers
-     * @param referencedEvents a list of event ids that are referenced in an "e"
-     *                         tag
-     * @param referencePubKeys a list of pubkeys that are referenced in a "p"
-     *                         tag
-     * @param since            an integer unix timestamp in seconds, events must be
-     *                         newer
-     *                         than this to pass
-     * @param until            an integer unix timestamp in seconds, events must be
-     *                         older
-     *                         than this to pass
-     * @param limit            maximum number of events to be returned in the
-     *                         initial query
-     * @param genericTagQuery  a generic tag query
-     * @return a filters object
-     */
-    @Deprecated(forRemoval = true)
-    public static Filters createFilters(List<GenericEvent> events, List<PublicKey> authors, List<Kind> kinds,
-            List<GenericEvent> referencedEvents, List<PublicKey> referencePubKeys, Long since, Long until,
-            Integer limit, GenericTagQuery genericTagQuery) {
-        return Filters.builder()
-                .authors(authors)
-                .events(events)
-                .genericTagQuery(
-                    Map.of(
-                        genericTagQuery.getTagName(),
-                        genericTagQuery.getValue()))
-                .kinds(kinds).limit(limit)
-                .referencePubKeys(referencePubKeys)
-                .referencedEvents(referencedEvents)
-                .since(since)
-                .until(until)
-                .build();
-    }
-
     /**
      * Create an event message to send events requested by clients
      *

nostr-java-api/src/main/java/nostr/api/NIP52.java

@@ -1,21 +1,28 @@
 package nostr.api;
 
 import lombok.NonNull;
+import nostr.api.factory.impl.NIP52Impl.CalendarRsvpEventFactory;
 import nostr.api.factory.impl.NIP52Impl.CalendarTimeBasedEventFactory;
 import nostr.event.BaseTag;
 import nostr.event.NIP52Event;
 import nostr.event.impl.CalendarContent;
+import nostr.event.impl.CalendarRsvpContent;
 import nostr.id.Identity;
 
 import java.util.List;
 
 public class NIP52<T extends NIP52Event> extends EventNostr<T> {
-  public NIP52(@NonNull Identity sender) {
-    setSender(sender);
-  }
+    public NIP52(@NonNull Identity sender) {
+        setSender(sender);
+    }
 
-  public NIP52<T> createCalendarTimeBasedEvent(@NonNull List<BaseTag> baseTags, @NonNull String content, @NonNull CalendarContent calendarContent) {
-    setEvent((T) new CalendarTimeBasedEventFactory(getSender(), baseTags, content, calendarContent).create());
-    return this;
-  }
+    public NIP52<T> createCalendarTimeBasedEvent(@NonNull List<BaseTag> baseTags, @NonNull String content, @NonNull CalendarContent calendarContent) {
+        setEvent((T) new CalendarTimeBasedEventFactory(getSender(), baseTags, content, calendarContent).create());
+        return this;
+    }
+
+    public NIP52<T> createCalendarRsvpEvent(@NonNull List<BaseTag> baseTags, @NonNull String content, @NonNull CalendarRsvpContent calendarRsvpContent) {
+        setEvent((T) new CalendarRsvpEventFactory(getSender(), baseTags, content, calendarRsvpContent).create());
+        return this;
+    }
 }