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

Update for upstream nostr-types Url::is_valid_relay_url()

Browse Source
This commit is contained in:
Mike Dilger 2022-12-31 20:50:00 +13:00
parent 503e9080ca
commit 12b0014485
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db/relay.rs
View File

@ -18,7 +18,7 @@ pub struct DbRelay {
impl DbRelay { impl DbRelay {
pub fn new(url: String) -> Result<DbRelay, Error> { pub fn new(url: String) -> Result<DbRelay, Error> {
let u = Url::new(&url); let u = Url::new(&url);
if !u.is_valid() { if !u.is_valid_relay_url() {
return Err(Error::InvalidUrl(u.inner().to_owned())); return Err(Error::InvalidUrl(u.inner().to_owned()));
} }
@ -83,7 +83,7 @@ impl DbRelay {
pub async fn insert(relay: DbRelay) -> Result<(), Error> { pub async fn insert(relay: DbRelay) -> Result<(), Error> {
let url = Url::new(&relay.url); let url = Url::new(&relay.url);
if !url.is_valid() { if !url.is_valid_relay_url() {
return Err(Error::InvalidUrl(relay.url.clone())); return Err(Error::InvalidUrl(relay.url.clone()));
} }
@ -218,7 +218,7 @@ impl DbRelay {
let urls: Vec<Url> = maybe_urls let urls: Vec<Url> = maybe_urls
.iter() .iter()
.map(|s| Url::new(s)) .map(|s| Url::new(s))
.filter(|r| r.is_valid()) .filter(|r| r.is_valid_relay_url())
.collect(); .collect();
// FIXME this is a lot of separate sql calls // FIXME this is a lot of separate sql calls

2
src/globals.rs
View File

@ -131,7 +131,7 @@ impl Globals {
.and_modify(|urls| { .and_modify(|urls| {
if let Some(ref u) = url { if let Some(ref u) = url {
let n = Url::new(u); let n = Url::new(u);
if n.is_valid() { if n.is_valid_relay_url() {
urls.push(n); urls.push(n);
} }
} }

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

@ -35,7 +35,7 @@ pub struct Minion {
impl Minion { impl Minion {
pub async fn new(url: Url) -> Result<Minion, Error> { pub async fn new(url: Url) -> Result<Minion, Error> {
if !url.is_valid() { if !url.is_valid_relay_url() {
return Err(Error::InvalidUrl(url.inner().to_owned())); return Err(Error::InvalidUrl(url.inner().to_owned()));
} }

10
src/overlord/mod.rs
View File

@ -263,7 +263,7 @@ impl Overlord {
async fn start_minion(&mut self, url: String) -> Result<(), Error> { async fn start_minion(&mut self, url: String) -> Result<(), Error> {
let url = Url::new(&url); let url = Url::new(&url);
if !url.is_valid() { if !url.is_valid_relay_url() {
return Err(Error::InvalidUrl(url.inner().to_owned())); return Err(Error::InvalidUrl(url.inner().to_owned()));
} }
let mut minion = Minion::new(url.clone()).await?; let mut minion = Minion::new(url.clone()).await?;
@ -521,7 +521,7 @@ impl Overlord {
let urls: Vec<Url> = desired_events_map let urls: Vec<Url> = desired_events_map
.keys() .keys()
.map(|u| u.to_owned()) .map(|u| u.to_owned())
.filter(|u| u.is_valid()) .filter(|u| u.is_valid_relay_url())
.collect(); .collect();
for url in urls.iter() { for url in urls.iter() {
@ -614,7 +614,7 @@ impl Overlord {
for relay in relays.iter() { for relay in relays.iter() {
// Save relay // Save relay
let relay_url = Url::new(relay); let relay_url = Url::new(relay);
if relay_url.is_valid() { if relay_url.is_valid_relay_url() {
let db_relay = DbRelay::new(relay_url.inner().to_owned())?; let db_relay = DbRelay::new(relay_url.inner().to_owned())?;
DbRelay::insert(db_relay).await?; DbRelay::insert(db_relay).await?;
@ -642,7 +642,7 @@ impl Overlord {
// Save relay // Save relay
let relay_url = Url::new(&relay); let relay_url = Url::new(&relay);
if !relay_url.is_valid() { if !relay_url.is_valid_relay_url() {
return Err(Error::InvalidUrl(relay)); return Err(Error::InvalidUrl(relay));
} }
let db_relay = DbRelay::new(relay.to_string())?; let db_relay = DbRelay::new(relay.to_string())?;
@ -670,7 +670,7 @@ impl Overlord {
// Save relay // Save relay
let relay_url = Url::new(&relay); let relay_url = Url::new(&relay);
if !relay_url.is_valid() { if !relay_url.is_valid_relay_url() {
return Err(Error::InvalidUrl(relay)); return Err(Error::InvalidUrl(relay));
} }
let db_relay = DbRelay::new(relay.to_string())?; let db_relay = DbRelay::new(relay.to_string())?;

4
src/process.rs
View File

@ -93,7 +93,7 @@ pub async fn process_new_event(
marker: _, marker: _,
} => { } => {
let url = Url::new(should_be_url); let url = Url::new(should_be_url);
if url.is_valid() { if url.is_valid_relay_url() {
// Insert (or ignore) into relays table // Insert (or ignore) into relays table
let dbrelay = DbRelay::new(url.inner().to_owned())?; let dbrelay = DbRelay::new(url.inner().to_owned())?;
DbRelay::insert(dbrelay).await?; DbRelay::insert(dbrelay).await?;
@ -105,7 +105,7 @@ pub async fn process_new_event(
petname: _, petname: _,
} => { } => {
let url = Url::new(should_be_url); let url = Url::new(should_be_url);
if url.is_valid() { if url.is_valid_relay_url() {
// Insert (or ignore) into relays table // Insert (or ignore) into relays table
let dbrelay = DbRelay::new(url.inner().to_owned())?; let dbrelay = DbRelay::new(url.inner().to_owned())?;
DbRelay::insert(dbrelay).await?; DbRelay::insert(dbrelay).await?;

2
src/ui/relays.rs
View File

@ -78,7 +78,7 @@ fn render_relay(ui: &mut Ui, relay: &DbRelay, bold: bool) {
let mut post = relay.post; // checkbox needs a mutable state variable. let mut post = relay.post; // checkbox needs a mutable state variable.
let url = Url::new(&relay.url); let url = Url::new(&relay.url);
if url.is_valid() && ui.checkbox(&mut post, "Post Here") if url.is_valid_relay_url() && ui.checkbox(&mut post, "Post Here")
.on_hover_text("If selected, posts you create will be sent to this relay. But you have to press [SAVE CHANGES] at the bottom of this page.") .on_hover_text("If selected, posts you create will be sent to this relay. But you have to press [SAVE CHANGES] at the bottom of this page.")
.clicked() .clicked()
{ {