Index: Cargo.toml ================================================================== --- Cargo.toml +++ Cargo.toml @@ -1,8 +1,8 @@ [package] name = "rsstg" -version = "0.1.1" +version = "0.1.2" authors = ["arcade"] edition = "2018" [dependencies] config = "*" Index: rsstg.sql ================================================================== --- rsstg.sql +++ rsstg.sql @@ -31,11 +31,11 @@ create unique index rsstg_post__url on rsstg_post(url); create index rsstg_post__hour on rsstg_post(hour); create index rsstg_post__posted_hour on rsstg_post(posted,hour); create or replace view rsstg_order as - select source_id, coalesce(last_scrape + make_interval(0,0,0,0,0,(420 / coalesce(activity , 1))::integer), now() - interval '1 minute') as next_fetch + select source_id, coalesce(last_scrape + make_interval(0,0,0,0,0,(60 / (coalesce(activity, 1)/7 + 1) )::integer), now() - interval '1 minute') as next_fetch from rsstg_source natural left join (select source_id, count(*) as activity from rsstg_post where hour = extract('hour' from now()) and posted > now() - interval '7 days' Index: src/main.rs ================================================================== --- src/main.rs +++ src/main.rs @@ -238,11 +238,11 @@ async fn main() -> Result<()> { let mut settings = config::Config::default(); settings.merge(config::File::with_name("rsstg"))?; let re_username = Regex::new(r"^@[a-zA-Z][a-zA-Z0-9_]+$")?; - let re_link = Regex::new(r"^https?://[a-zA-Z.0-9]+/[-_a-zA-Z.0-9/?=]+$")?; + let re_link = Regex::new(r"^https?://[a-zA-Z.0-9-]+/[-_a-zA-Z.0-9/?=]+$")?; let re_iv_hash = Regex::new(r"^[a-f0-9]{14}$")?; let core = Core::new(settings).await?; let mut stream = core.stream();