nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-19 11:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for nostr-types change

Browse Source
This commit is contained in:
Mike Dilger 2023-01-02 08:34:54 +13:00
parent b8230d66a7
commit cf7a495ba3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/overlord/minion/mod.rs
View File

@ -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());

8
src/overlord/minion/subscription.rs
View File

@ -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
}