From 8520afdd28303ed17f264a45b1e4df673a467b1b Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Thu, 29 Dec 2022 08:10:24 +1300 Subject: [PATCH] fix get desired events --- src/overlord/mod.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/overlord/mod.rs b/src/overlord/mod.rs index 8004e956..6b1d171b 100644 --- a/src/overlord/mod.rs +++ b/src/overlord/mod.rs @@ -8,7 +8,7 @@ use crate::globals::{Globals, GLOBALS}; use crate::settings::Settings; use minion::Minion; use nostr_types::{ - Event, EventKind, Nip05, PreEvent, PrivateKey, PublicKey, PublicKeyHex, Unixtime, Url, + Event, EventKind, Id, Nip05, PreEvent, PrivateKey, PublicKey, PublicKeyHex, Unixtime, Url, }; use relay_picker::{BestRelay, RelayPicker}; use std::collections::HashMap; @@ -483,7 +483,8 @@ impl Overlord { } async fn get_missing_events(&mut self) -> Result<(), Error> { - let (desired_events_map, desired_events_vec) = Globals::get_desired_events().await?; + let (desired_events_map, orphans): (HashMap>, Vec) = + Globals::get_desired_events().await?; let desired_count = GLOBALS.desired_events.read().await.len(); @@ -493,14 +494,14 @@ impl Overlord { info!("Seeking {} events", desired_count); - let urls = self.urls_watching.clone(); + let urls: Vec = desired_events_map.keys().map(|u| u.to_owned()).collect(); for url in urls.iter() { // Get all the ones slated for this relay let mut ids = desired_events_map.get(url).cloned().unwrap_or_default(); // Add the orphans - ids.extend(&desired_events_vec); + ids.extend(&orphans); if ids.is_empty() { continue;