Overview
Comment: | 0.1.3 - different list, enable, disable, fix throttle |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
075be7e40e4abc787a350381bdf2c660 |
User & Date: | arcade on 2020-11-18 17:55:07.065 |
Other Links: | manifest | tags |
Context
2020-11-18
| ||
18:30 | optimize prelease check-in: 6f950e082f user: arcade tags: trunk | |
17:55 | 0.1.3 - different list, enable, disable, fix throttle check-in: 075be7e40e user: arcade tags: trunk | |
15:11 | minor fixes: regexp, ordering check-in: 21d16a0993 user: arcade tags: trunk | |
Changes
Modified Cargo.toml
from [1eac192b0a]
to [c79cfce273].
1 2 | [package] name = "rsstg" | | | 1 2 3 4 5 6 7 8 9 10 | [package] name = "rsstg" version = "0.1.3" authors = ["arcade"] edition = "2018" [dependencies] config = "*" futures = "*" |
︙ | ︙ |
Modified rsstg.sql
from [0ef80cd9ad]
to [37cfc2ad41].
1 2 3 4 5 6 7 | create table rsstg_updates (owner integer, update jsonb); create unique index rsstg_updates__id on rsstg_updates(update->>'update_id'); -- create table rsstg_users (id integer); create table rsstg_channel ( channel_id bigint primary key, | | < | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | create table rsstg_updates (owner integer, update jsonb); create unique index rsstg_updates__id on rsstg_updates(update->>'update_id'); -- create table rsstg_users (id integer); create table rsstg_channel ( channel_id bigint primary key, username text not null); create unique index rsstg_channel__username on rsstg_channel(username); create table rsstg_source ( source_id serial, channel_id integer not null, url text not null, last_scrape not null timestamptz default now(), enabled boolean not null default false, iv_hash text, owner bigint not null); create unique index rsstg_source__source_id on rsstg_source(source_id); create unique index rsstg_source__channel_id__owner on rsstg_source(channel_id, owner); create index rsstg_source__owner on rsstg_source(owner); create table rsstg_post ( source_id integer not null, date int not null, url text not null, hour smallint not null generated always as (extract('hour' from posted)) stored, FOREIGN KEY (source_id) REFERENCES rsstg_source(source_id) ); 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 |
︙ | ︙ |
Modified src/main.rs
from [04985cd265]
to [979a29cb75].
︙ | ︙ | |||
51 52 53 54 55 56 57 | } fn debug(&self, msg: &str) -> Result<()> { self.tg.spawn(SendMessage::new(self.owner_chat, msg)); Ok(()) } | | | | < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < < < < < < < < < < < < | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | } fn debug(&self, msg: &str) -> Result<()> { self.tg.spawn(SendMessage::new(self.owner_chat, msg)); Ok(()) } async fn check(&self, id: &i32, real: Option<bool>) -> Result<()> { match sqlx::query("select source_id, channel_id, url, iv_hash, owner from rsstg_source where source_id = $1") .bind(id) .fetch_one(&self.pool).await { Ok(row) => { let channel_id: i64 = row.try_get("channel_id")?; let destination = match real { Some(true) => UserId::new(channel_id), Some(false) | None => UserId::new(row.try_get("owner")?), }; let url: &str = row.try_get("url")?; let mut this_fetch: Option<DateTime<chrono::FixedOffset>> = None; let iv_hash: Option<&str> = row.try_get("iv_hash")?; match rss::Channel::from_url(url) { Ok(feed) => { self.debug(&format!("# title:{:?} ttl:{:?} hours:{:?} days:{:?}", feed.title(), feed.ttl(), feed.skip_hours(), feed.skip_days()))?; for item in feed.items() { let date = match item.pub_date() { Some(feed_date) => DateTime::parse_from_rfc2822(feed_date), None => DateTime::parse_from_rfc3339(&item.dublin_core_ext().unwrap().dates()[0]), }?; let url = item.link().unwrap().to_string(); match sqlx::query("select exists(select true from rsstg_post where url = $1 and source_id = $2) as exists;") .bind(&url) .bind(id) .fetch_one(&self.pool).await { Ok(row) => { let exists: bool = row.try_get("exists")?; if ! exists { if this_fetch == None || date > this_fetch.unwrap() { this_fetch = Some(date); } match self.tg.send( match iv_hash { Some(x) => SendMessage::new(destination, format!("<a href=\"https://t.me/iv?url={}&rhash={}\"> </a>{0}", url, x)), None => SendMessage::new(destination, format!("{}", url)), }.parse_mode(types::ParseMode::Html)).await { Ok(_) => { match sqlx::query("insert into rsstg_post (source_id, posted, url) values ($1, $2, $3);") .bind(id) .bind(date) .bind(url) .execute(&self.pool).await { Ok(_) => {}, Err(err) => { self.debug(&err.to_string())?; }, }; }, Err(err) => { self.debug(&err.to_string())?; }, }; tokio::time::delay_for(std::time::Duration::new(4, 0)).await; } }, Err(err) => { self.debug(&err.to_string())?; }, }; }; }, Err(err) => { self.debug(&err.to_string())?; }, }; match sqlx::query("update rsstg_source set last_scrape = now() where source_id = $1;") .bind(id) |
︙ | ︙ | |||
149 150 151 152 153 154 155 | self.debug(&err.to_string())?; }, }; Ok(()) } async fn clean(&self, source_id: i32) -> Result<()> { | < | | | | | | | | < | | | < | | | < > | < < | < > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | self.debug(&err.to_string())?; }, }; Ok(()) } async fn clean(&self, source_id: i32) -> Result<()> { match sqlx::query("delete from rsstg_post where source_id = $1;") .bind(source_id) .execute(&self.pool).await { Ok(_) => {}, Err(err) => { self.debug(&err.to_string())?; }, }; Ok(()) } async fn enable(&self, source_id: &i32) -> Result<()> { match sqlx::query("update rsstg_source set enabled = true where source_id = $1") .bind(source_id) .execute(&self.pool).await { Ok(_) => {}, Err(err) => { self.debug(&err.to_string())?; }, } Ok(()) } async fn disable(&self, source_id: &i32) -> Result<()> { match sqlx::query("update rsstg_source set enabled = false where source_id = $1") .bind(source_id) .execute(&self.pool).await { Ok(_) => {}, Err(err) => { self.debug(&err.to_string())?; }, } Ok(()) } async fn autofetch(&self) -> Result<()> { let mut delay = chrono::Duration::minutes(5); let mut next_fetch: DateTime<chrono::Local>; let mut now; loop { self.debug("cycle")?; let mut rows = sqlx::query("select source_id, next_fetch from rsstg_order natural left join rsstg_source natural left join rsstg_channel;") .fetch(&self.pool); while let Some(row) = rows.try_next().await.unwrap() { now = chrono::Local::now(); let source_id: i32 = row.try_get("source_id")?; next_fetch = row.try_get("next_fetch")?; if next_fetch < now { match sqlx::query("update rsstg_source set last_scrape = now() + interval '1 hour' where source_id = $1;") .bind(source_id) .execute(&self.pool).await { Ok(_) => {}, Err(err) => { self.debug(&err.to_string())?; }, }; let clone = self.clone(); tokio::spawn(async move { if let Err(err) = clone.check(&source_id.clone(), Some(true)).await { eprintln!("connection error: {}", err); } }); } else { if next_fetch - now < delay { delay = next_fetch - now; } } }; tokio::time::delay_for(delay.to_std()?).await; delay = chrono::Duration::minutes(5); } //Ok(()) } } #[tokio::main(basic_scheduler)] |
︙ | ︙ | |||
257 258 259 260 261 262 263 | let mut words = data.split_whitespace(); let cmd = words.next().unwrap(); match cmd { // start "/start" => { | | | > | | > > > > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | let mut words = data.split_whitespace(); let cmd = words.next().unwrap(); match cmd { // start "/start" => { reply.push("Not in service yet\\. Try later\\.".to_string()); }, // list "/list" => { reply.push("Channels:".to_string()); let mut rows = sqlx::query("select source_id, username, enabled, url, iv_hash from rsstg_source left join rsstg_channel using (channel_id) where owner = $1 order by source_id") .bind(i64::from(message.from.id)) .fetch(&core.pool); while let Some(row) = rows.try_next().await? { let source_id: i32 = row.try_get("source_id")?; let username: &str = row.try_get("username")?; let enabled: bool = row.try_get("enabled")?; let url: &str = row.try_get("url")?; let iv_hash: Option<&str> = row.try_get("iv_hash")?; reply.push(format!("\n\\#ļøā£ {} \\*ļøā£ `{}` {}\nš `{}`", source_id, username, match enabled { true => "š enabled", false => "ā disabled", }, url)); if let Some(hash) = iv_hash { reply.push(format!("IV `{}`", hash)); } } }, // add "/add" | "/update" => { let mut source_id: i32 = 0; if cmd == "/update" { source_id = words.next().unwrap().parse::<i32>()?; } let (channel, url, iv_hash) = (words.next().unwrap(), words.next().unwrap(), words.next()); let ok_link = re_link.is_match(&url); let ok_hash = match iv_hash { Some(hash) => re_iv_hash.is_match(&hash), None => true, }; if ! ok_link { |
︙ | ︙ | |||
315 316 317 318 319 320 321 | }, Err(err) => { reply.push("Sorry, unknown error\\.".to_string()); core.debug(&format!("Sorry, unknown error: {:#?}\n", err))?; None }, }; | < | > > > | > | | | | | | | | | | | | | | | | | | | | | | | | < < | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | }, Err(err) => { reply.push("Sorry, unknown error\\.".to_string()); core.debug(&format!("Sorry, unknown error: {:#?}\n", err))?; None }, }; if let Some(chan) = chan { match if cmd == "/update" { sqlx::query("update rsstg_source set channel_id = $2, url = $3, iv_hash = $4, owner = $4 where source_id = $1").bind(source_id) } else { sqlx::query("insert into rsstg_source (channel_id, url, iv_hash, owner) values ($1, $2, $3, $4)") } .bind(chan) .bind(url) .bind(iv_hash) .bind(i64::from(message.from.id)) .execute(&core.pool).await { Ok(_) => reply.push("Channel added\\.".to_string()), Err(sqlx::Error::Database(err)) => { match err.downcast::<sqlx::postgres::PgDatabaseError>().routine() { Some("_bt_check_unique", ) => { reply.push("Duplicate key\\.".to_string()); }, Some(_) => { reply.push("Database error\\.".to_string()); }, None => { reply.push("No database error extracted\\.".to_string()); }, }; }, Err(err) => { reply.push("Sorry, unknown error\\.".to_string()); core.debug(&format!("Sorry, unknown error: {:#?}\n", err))?; }, }; }; }; }, // addchan "/addchan" => { |
︙ | ︙ | |||
410 411 412 413 414 415 416 | }; }; }, // check "/check" => { | | < < < < < | < < < < | | | | | | | < | < < < < | | | | | | | < | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 | }; }; }, // check "/check" => { &core.check(&words.next().unwrap().parse::<i32>()?, None).await?; }, // clear "/clean" => { if core.owner != i64::from(message.from.id) { reply.push("Reserved for testing\\.".to_string()); } else { let source_id = words.next().unwrap().parse::<i32>().unwrap_or(0); &core.clean(source_id).await?; } }, // enable "/enable" => { match core.enable(&words.next().unwrap().parse::<i32>()?).await { Ok(_) => { reply.push("Channel enabled\\.".to_string()); } Err(err) => { core.debug(&err.to_string())?; }, }; }, // disable "/disable" => { match core.disable(&words.next().unwrap().parse::<i32>()?).await { Ok(_) => { reply.push("Channel disabled\\.".to_string()); } Err(err) => { core.debug(&err.to_string())?; }, }; }, _ => { }, }; }, _ => { |
︙ | ︙ |