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

Revert "Improve ancestor seeking, including trick from #187"

Browse Source 
This reverts commit f39d1698e2.
This commit is contained in:
Mike Dilger 2023-02-05 04:14:04 +13:00
parent f39d1698e2
commit 398f72ef93
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/overlord/mod.rs
View File

@ -1075,14 +1075,6 @@ impl Overlord {
}
async fn set_thread_feed(&mut self, id: Id, referenced_by: Id) -> Result<(), Error> {
// Don't do anything if it is already the current thread parent. That way if we
// move to a different tab (e.g. relays) and then hit back, it doesn't resubscribe.
if let Some(current_parent) = GLOBALS.feed.get_thread_parent() {
if id == current_parent {
return Ok(());
}
}
// Cancel current thread subscriptions, if any
let _ = self.to_minions.send(ToMinionMessage {
target: "all".to_string(),
@ -1106,32 +1098,19 @@ impl Overlord {
// Climb the tree as high as we can, and if there are higher events,
// we will ask for those in the initial subscription
let highest_parent_id =
if let Some(hpid) = GLOBALS.events.get_highest_local_parent(&id).await? {
hpid
} else {
missing_ancestors.push(id);
referenced_by
};
GLOBALS.feed.set_thread_parent(highest_parent_id);
if let Some(highest_parent_event) = GLOBALS.events.get_local(highest_parent_id).await? {
// Use relays in 'e' tags
for (higher_id, opturl) in highest_parent_event.replies_to_ancestors() {
missing_ancestors.push(higher_id);
if let Some(url) = opturl {
relays.push(url);
}
}
// fiatjaf's suggestion from issue #187, use 'p' tag url mentions too, since
// those people probably wrote the ancestor events so probably on those
// relays
for (_pk, opturl) in highest_parent_event.mentions() {
if let Some(url) = opturl {
relays.push(url);
if let Some(highest_parent_id) = GLOBALS.events.get_highest_local_parent(&id).await? {
GLOBALS.feed.set_thread_parent(highest_parent_id);
if let Some(highest_parent) = GLOBALS.events.get_local(highest_parent_id).await? {
for (id, opturl) in highest_parent.replies_to_ancestors() {
missing_ancestors.push(id);
if let Some(url) = opturl {
relays.push(url);
}
}
}
} else {
GLOBALS.feed.set_thread_parent(id);
missing_ancestors.push(id);
}
let missing_ancestors_hex: Vec<IdHex> =