about summary refs log tree commit diff
path: root/users/tazjin/tgsa/src/main.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-06-19T09·38+0300
committerclbot <clbot@tvl.fyi>2023-06-19T11·36+0000
commitb399dad0ffb9b97ce150b50425d5d97688399d3b (patch)
tree59896e222588340fc928ccab6d43d150797cba7d /users/tazjin/tgsa/src/main.rs
parent39e2085db835595a60f8b2da75caf14010e2cc49 (diff)
refactor(tazjin/tgsa): automatic clippy lint fixes r/6330
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
Diffstat (limited to 'users/tazjin/tgsa/src/main.rs')
-rw-r--r--users/tazjin/tgsa/src/main.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/users/tazjin/tgsa/src/main.rs b/users/tazjin/tgsa/src/main.rs
index cbdb272e0e3f..d9a5d4abc299 100644
--- a/users/tazjin/tgsa/src/main.rs
+++ b/users/tazjin/tgsa/src/main.rs
@@ -28,7 +28,7 @@ impl TgLink {
     }
 
     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()?;
 
         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(),
     };
 
-    return Ok(Some(content));
+    Ok(Some(content))
 }
 
 #[derive(Debug)]
@@ -127,8 +127,8 @@ fn parse_tgmessage(embed: &str) -> Result<TgMessage> {
         for edge in &mut msg_elem.traverse() {
             if let Edge::Open(node) = edge {
                 match node.value() {
-                    Node::Text(ref text) => out.push_str(&*text),
-                    Node::Element(elem) if elem.name() == "br" => out.push_str("\n"),
+                    Node::Text(ref text) => out.push_str(text),
+                    Node::Element(elem) if elem.name() == "br" => out.push('\n'),
                     _ => {}
                 }
             }
@@ -246,7 +246,7 @@ struct TgPost {
 type Cache = RwLock<HashMap<TgLink, 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 {
             println!("serving {}#{} from cache", link.username, link.message_id);
             return Ok(entry.clone());
@@ -257,11 +257,11 @@ fn fetch_with_cache(cache: &Cache, link: &TgLink) -> Result<TgPost> {
     // TODO(tazjin): per link?
     let mut writer = cache.write().unwrap();
 
-    let post = fetch_post(&link, true)?;
+    let post = fetch_post(link, true)?;
     let mut msg = parse_tgmessage(&post)?;
 
     if msg.message.is_none() {
-        msg.message = fetch_fallback(&link)?;
+        msg.message = fetch_fallback(link)?;
     }
 
     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![];
     media.append(&mut msg.photos);
@@ -298,7 +298,7 @@ fn handle_img_redirect(cache: &Cache, img_path: &str) -> Result<rouille::Respons
     // |          post ID
     // username
 
-    let img_parts: Vec<&str> = img_path.split("/").collect();
+    let img_parts: Vec<&str> = img_path.split('/').collect();
 
     if img_parts.len() != 3 {
         println!("invalid image link: {}", img_path);