msfjarvis
/
linkleaner
mirror of https://github.com/msfjarvis/linkleaner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: use typed URLs

This commit is contained in:
Harsh Shandilya 2024-05-05 20:55:23 +05:30
parent a64762a70d
commit f696f25913
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/deamp/mod.rs
View File

@ -5,7 +5,6 @@ use crate::{
utils::{get_urls_from_message, AsyncError},
};
use model::AMPResponse;
use reqwest::Url;
use std::str::FromStr;
use teloxide::{prelude::Requester, types::Message, utils::html::link, Bot};
use tracing::debug;
@ -31,7 +30,7 @@ pub async fn handler(bot: Bot, message: Message) -> Result<(), AsyncError> {
debug!(?resp, "{url}");
let resp = deserialize_amp_response(&resp)?;
if let AMPResponse::Success(ok) = resp {
text = text.replace(url, &ok[0].canonical.url);
text = text.replace(url.as_str(), &ok[0].canonical.url);
} else {
return Ok(());
}
@ -50,7 +49,7 @@ pub fn is_amp(msg: Message) -> bool {
if urls.is_empty() {
return false;
}
urls.iter().flat_map(|url| Url::parse(url)).any(|url| {
urls.iter().any(|url| {
if let Some(mut segments) = url.path_segments()
&& let Some(host) = url.host_str()
{

18
src/utils.rs
View File

@ -6,7 +6,7 @@ use tracing::{error, info};
pub(crate) type AsyncError = Box<dyn Error + Send + Sync + 'static>;
pub(crate) fn get_urls_from_message(msg: &Message) -> Vec<String> {
pub(crate) fn get_urls_from_message(msg: &Message) -> Vec<Url> {
if let Some(entities) = msg.entities()
&& !entities.is_empty()
&& let Some(text) = msg.text()
@ -24,9 +24,11 @@ pub(crate) fn get_urls_from_message(msg: &Message) -> Vec<String> {
let utf16 = text.encode_utf16().collect::<Vec<u16>>();
let mut urls = Vec::with_capacity(url_entities.len());
for entity in &url_entities {
urls.push(String::from_utf16_lossy(
if let Ok(url) = Url::parse(&String::from_utf16_lossy(
&utf16[entity.offset..entity.offset + entity.length],
));
)) {
urls.push(url);
}
}
info!(message_id = %msg.id.0, ?urls, "get_urls_from_message");
return urls;
@ -38,12 +40,10 @@ pub(crate) fn scrub_urls(msg: &Message) -> Option<String> {
if let Some(text) = msg.text() {
let urls = get_urls_from_message(msg);
let mut final_text = text.to_owned();
for item in urls {
if let Ok(url) = Url::parse(&item)
&& let Some(query_str) = url.query()
{
let scrubbed_url = item.replace(&format!("?{query_str}"), "");
final_text = final_text.replace(&item, &scrubbed_url);
for url in urls {
if let Some(query_str) = url.query() {
let scrubbed_url = url.as_str().replace(&format!("?{query_str}"), "");
final_text = final_text.replace(url.as_str(), &scrubbed_url);
}
}
info!(?text, ?final_text, "scrub_urls");