diff options
Diffstat (limited to 'src/nostr/policy/announcement.rs')
| -rw-r--r-- | src/nostr/policy/announcement.rs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/nostr/policy/announcement.rs b/src/nostr/policy/announcement.rs index b366f0b..aba5181 100644 --- a/src/nostr/policy/announcement.rs +++ b/src/nostr/policy/announcement.rs | |||
| @@ -70,7 +70,10 @@ impl AnnouncementPolicy { | |||
| 70 | .is_some_and(|entry| event.created_at > entry.event.created_at); | 70 | .is_some_and(|entry| event.created_at > entry.event.created_at); |
| 71 | 71 | ||
| 72 | if should_evict { | 72 | if should_evict { |
| 73 | self.remove_purgatory_announcement(&event.pubkey, &announcement.identifier); | 73 | self.remove_purgatory_announcement( |
| 74 | &event.pubkey, | ||
| 75 | &announcement.identifier, | ||
| 76 | ); | ||
| 74 | } | 77 | } |
| 75 | 78 | ||
| 76 | match self | 79 | match self |
| @@ -145,10 +148,9 @@ impl AnnouncementPolicy { | |||
| 145 | ); | 148 | ); |
| 146 | AnnouncementResult::AcceptPurgatory | 149 | AnnouncementResult::AcceptPurgatory |
| 147 | } | 150 | } |
| 148 | Err(e) => AnnouncementResult::Reject(format!( | 151 | Err(e) => { |
| 149 | "Failed to parse announcement: {}", | 152 | AnnouncementResult::Reject(format!("Failed to parse announcement: {}", e)) |
| 150 | e | 153 | } |
| 151 | )), | ||
| 152 | } | 154 | } |
| 153 | } | 155 | } |
| 154 | // AcceptPurgatory shouldn't come from validate_announcement, but handle it | 156 | // AcceptPurgatory shouldn't come from validate_announcement, but handle it |
| @@ -161,11 +163,7 @@ impl AnnouncementPolicy { | |||
| 161 | /// Called when a replacement announcement arrives for a (pubkey, identifier) pair | 163 | /// Called when a replacement announcement arrives for a (pubkey, identifier) pair |
| 162 | /// that is currently in purgatory. Updates the purgatory entry and extends the | 164 | /// that is currently in purgatory. Updates the purgatory entry and extends the |
| 163 | /// expiry so the new announcement has a fresh waiting window. | 165 | /// expiry so the new announcement has a fresh waiting window. |
| 164 | fn replace_purgatory_announcement( | 166 | fn replace_purgatory_announcement(&self, event: &Event, announcement: &RepositoryAnnouncement) { |
| 165 | &self, | ||
| 166 | event: &Event, | ||
| 167 | announcement: &RepositoryAnnouncement, | ||
| 168 | ) { | ||
| 169 | let repo_path = self.ctx.git_data_path.join(announcement.repo_path()); | 167 | let repo_path = self.ctx.git_data_path.join(announcement.repo_path()); |
| 170 | let relays: HashSet<String> = announcement.relays.iter().cloned().collect(); | 168 | let relays: HashSet<String> = announcement.relays.iter().cloned().collect(); |
| 171 | 169 | ||