From cf7a495ba3a3b2f5f3bb1548d279739803463ef0 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Mon, 2 Jan 2023 08:34:54 +1300
Subject: [PATCH] Update for nostr-types change

---
 src/overlord/minion/mod.rs          | 10 +++++-----
 src/overlord/minion/subscription.rs |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/overlord/minion/mod.rs b/src/overlord/minion/mod.rs
index 308f4909..6e2907d8 100644
--- a/src/overlord/minion/mod.rs
+++ b/src/overlord/minion/mod.rs
@@ -10,7 +10,7 @@ use futures::{SinkExt, StreamExt};
 use futures_util::stream::{SplitSink, SplitStream};
 use http::Uri;
 use nostr_types::{
-    EventKind, Filters, IdHex, PublicKeyHex, RelayInformationDocument, Unixtime, Url,
+    EventKind, Filter, IdHex, PublicKeyHex, RelayInformationDocument, Unixtime, Url,
 };
 use subscription::Subscriptions;
 use tokio::net::TcpStream;
@@ -301,7 +301,7 @@ impl Minion {
         };
 
         // Create the author filter
-        let mut feed_filter: Filters = Filters::new();
+        let mut feed_filter: Filter = Filter::new();
         for pk in pubkeys.iter() {
             feed_filter.add_author(pk, None);
         }
@@ -317,7 +317,7 @@ impl Minion {
         );
 
         // Create the lookback filter
-        let mut special_filter: Filters = Filters::new();
+        let mut special_filter: Filter = Filter::new();
         for pk in pubkeys.iter() {
             special_filter.add_author(pk, None);
         }
@@ -335,7 +335,7 @@ impl Minion {
         // Get the subscription
         let req_message = if self.subscriptions.has("following") {
             let sub = self.subscriptions.get_mut("following").unwrap();
-            let vec: &mut Vec<Filters> = sub.get_mut();
+            let vec: &mut Vec<Filter> = sub.get_mut();
             vec.clear();
             vec.push(feed_filter);
             vec.push(special_filter);
@@ -361,7 +361,7 @@ impl Minion {
         }
 
         // create the filter
-        let mut filter = Filters::new();
+        let mut filter = Filter::new();
         filter.ids = ids;
 
         debug!("{}: Event Filter: {} events", &self.url, filter.ids.len());
diff --git a/src/overlord/minion/subscription.rs b/src/overlord/minion/subscription.rs
index e54851e1..fd623ab8 100644
--- a/src/overlord/minion/subscription.rs
+++ b/src/overlord/minion/subscription.rs
@@ -1,4 +1,4 @@
-use nostr_types::{ClientMessage, Filters, SubscriptionId};
+use nostr_types::{ClientMessage, Filter, SubscriptionId};
 use std::collections::HashMap;
 
 pub struct Subscriptions {
@@ -14,7 +14,7 @@ impl Subscriptions {
         }
     }
 
-    pub fn add(&mut self, handle: &str, filters: Vec<Filters>) {
+    pub fn add(&mut self, handle: &str, filters: Vec<Filter>) {
         let mut sub = Subscription::new();
         sub.filters = filters;
         self.handle_to_id.insert(handle.to_owned(), sub.get_id());
@@ -78,7 +78,7 @@ impl Subscriptions {
 #[derive(Clone, Debug)]
 pub struct Subscription {
     id: String,
-    filters: Vec<Filters>,
+    filters: Vec<Filter>,
     eose: bool,
 }
 
@@ -95,7 +95,7 @@ impl Subscription {
         self.id.clone()
     }
 
-    pub fn get_mut(&mut self) -> &mut Vec<Filters> {
+    pub fn get_mut(&mut self) -> &mut Vec<Filter> {
         &mut self.filters
     }