chore: Remove the vector parameter from add_{read,write}_relays
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
@@ -82,6 +82,7 @@ impl ContentDetails {
|
||||
tags.extend(self.hashtags.into_iter().map(Tag::hashtag));
|
||||
tags.extend(self.p_tagged.into_iter().map(Tag::public_key));
|
||||
tags.extend(self.quotes.into_iter().map(|(event_id, relay_url)| {
|
||||
// TODO: Add the author public key if we know it
|
||||
Tag::from_standardized(TagStandard::Quote {
|
||||
event_id,
|
||||
relay_url,
|
||||
@@ -281,16 +282,10 @@ impl NostrClient {
|
||||
.map(|e| e.pubkey))
|
||||
}
|
||||
|
||||
/// Adds read relays from the user to the given vector of relays.
|
||||
pub async fn read_relays_from_user(
|
||||
&self,
|
||||
vector: Vec<RelayUrl>,
|
||||
user: PublicKey,
|
||||
) -> Vec<RelayUrl> {
|
||||
utils::add_read_relays(
|
||||
vector,
|
||||
self.user_relays_list(user).await.ok().flatten().as_ref(),
|
||||
)
|
||||
/// Returns the read relays of the given user if found, otherwise empty
|
||||
/// vector
|
||||
pub async fn read_relays_from_user(&self, user: PublicKey) -> Vec<RelayUrl> {
|
||||
utils::add_read_relays(self.user_relays_list(user).await.ok().flatten().as_ref())
|
||||
}
|
||||
|
||||
/// Parse the given content and returns the details that inside it
|
||||
@@ -313,14 +308,14 @@ impl NostrClient {
|
||||
|
||||
for (user, relays) in &p_tagged_users {
|
||||
self.add_relays(relays).await;
|
||||
write_relays = self.read_relays_from_user(write_relays, *user).await
|
||||
write_relays.extend(self.read_relays_from_user(*user).await);
|
||||
}
|
||||
for (event_id, relays) in "es {
|
||||
self.add_relays(relays).await;
|
||||
// Add the event author to the p-tagged users
|
||||
if let Ok(Some(author)) = self.event_author(*event_id).await {
|
||||
p_tagged_users.push((author, Vec::new()));
|
||||
write_relays = self.read_relays_from_user(write_relays, author).await;
|
||||
write_relays.extend(self.read_relays_from_user(author).await);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -140,8 +140,10 @@ pub fn repo_naddr(
|
||||
.map_err(N34Error::from)
|
||||
}
|
||||
|
||||
/// Extends the given vector with write relays found in the event (if any).
|
||||
pub fn add_write_relays(mut vector: Vec<RelayUrl>, event: Option<&Event>) -> Vec<RelayUrl> {
|
||||
/// Extracts write relay URLs from an event if present, otherwise returns an
|
||||
/// empty vector.
|
||||
pub fn add_write_relays(event: Option<&Event>) -> Vec<RelayUrl> {
|
||||
let mut vector = Vec::new();
|
||||
if let Some(event) = event {
|
||||
vector.extend(
|
||||
nip65::extract_owned_relay_list(event.clone())
|
||||
@@ -151,8 +153,10 @@ pub fn add_write_relays(mut vector: Vec<RelayUrl>, event: Option<&Event>) -> Vec
|
||||
vector
|
||||
}
|
||||
|
||||
/// Extends the given vector with read relays found in the event (if any).
|
||||
pub fn add_read_relays(mut vector: Vec<RelayUrl>, event: Option<&Event>) -> Vec<RelayUrl> {
|
||||
/// Extracts read relay URLs from an event if present, otherwise returns an
|
||||
/// empty vector.
|
||||
pub fn add_read_relays(event: Option<&Event>) -> Vec<RelayUrl> {
|
||||
let mut vector = Vec::new();
|
||||
if let Some(event) = event {
|
||||
vector.extend(
|
||||
nip65::extract_owned_relay_list(event.clone())
|
||||
|
||||
Reference in New Issue
Block a user