mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tazjin/tgsa): automatic clippy lint fixes

Browse source 
Change-Id: I30c380bd538dd5c697e529e7e18fe87b8bfea371
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8829
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-06-19 12:38:08 +03:00 committed by clbot
parent 39e2085db8
commit b399dad0ff
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
users/tazjin/tgsa/src/main.rs
View file

@ -28,7 +28,7 @@ impl TgLink {
} }
fn parse(url: &str, translated: bool) -> Option<Self> { fn parse(url: &str, translated: bool) -> Option<Self> {
let url = url.strip_prefix("/")?; let url = url.strip_prefix('/')?;
let parsed = url::Url::parse(url).ok()?; let parsed = url::Url::parse(url).ok()?;
if parsed.host()? != url::Host::Domain("t.me") { if parsed.host()? != url::Host::Domain("t.me") {
@ -83,7 +83,7 @@ fn fetch_fallback(link: &TgLink) -> Result<Option<String>> {
Some(content) => content.to_string(), Some(content) => content.to_string(),
}; };
return Ok(Some(content)); Ok(Some(content))
} }
#[derive(Debug)] #[derive(Debug)]
@ -127,8 +127,8 @@ fn parse_tgmessage(embed: &str) -> Result<TgMessage> {
for edge in &mut msg_elem.traverse() { for edge in &mut msg_elem.traverse() {
if let Edge::Open(node) = edge { if let Edge::Open(node) = edge {
match node.value() { match node.value() {
Node::Text(ref text) => out.push_str(&*text), Node::Text(ref text) => out.push_str(text),
Node::Element(elem) if elem.name() == "br" => out.push_str("\n"), Node::Element(elem) if elem.name() == "br" => out.push('\n'),
_ => {} _ => {}
} }
} }
@ -246,7 +246,7 @@ struct TgPost {
type Cache = RwLock<HashMap<TgLink, TgPost>>; type Cache = RwLock<HashMap<TgLink, TgPost>>;
fn fetch_with_cache(cache: &Cache, link: &TgLink) -> Result<TgPost> { fn fetch_with_cache(cache: &Cache, link: &TgLink) -> Result<TgPost> {
if let Some(entry) = cache.read().unwrap().get(&link) { if let Some(entry) = cache.read().unwrap().get(link) {
if Instant::now() - entry.at < CACHE_EXPIRY { if Instant::now() - entry.at < CACHE_EXPIRY {
println!("serving {}#{} from cache", link.username, link.message_id); println!("serving {}#{} from cache", link.username, link.message_id);
return Ok(entry.clone()); return Ok(entry.clone());
@ -257,11 +257,11 @@ fn fetch_with_cache(cache: &Cache, link: &TgLink) -> Result<TgPost> {
// TODO(tazjin): per link? // TODO(tazjin): per link?
let mut writer = cache.write().unwrap(); let mut writer = cache.write().unwrap();
let post = fetch_post(&link, true)?; let post = fetch_post(link, true)?;
let mut msg = parse_tgmessage(&post)?; let mut msg = parse_tgmessage(&post)?;
if msg.message.is_none() { if msg.message.is_none() {
msg.message = fetch_fallback(&link)?; msg.message = fetch_fallback(link)?;
} }
if let Some(message) = &msg.message { if let Some(message) = &msg.message {
@ -271,7 +271,7 @@ fn fetch_with_cache(cache: &Cache, link: &TgLink) -> Result<TgPost> {
} }
} }
let bbcode = to_bbcode(&link, &msg); let bbcode = to_bbcode(link, &msg);
let mut media = vec![]; let mut media = vec![];
media.append(&mut msg.photos); media.append(&mut msg.photos);
@ -298,7 +298,7 @@ fn handle_img_redirect(cache: &Cache, img_path: &str) -> Result<rouille::Respons
// | post ID // | post ID
// username // username
let img_parts: Vec<&str> = img_path.split("/").collect(); let img_parts: Vec<&str> = img_path.split('/').collect();
if img_parts.len() != 3 { if img_parts.len() != 3 {
println!("invalid image link: {}", img_path); println!("invalid image link: {}", img_path);