LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-23 21:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing pointless URL building in url blocklist regex.

Browse source
This commit is contained in:
Dessalines 2024-04-22 15:14:52 -04:00
parent 0e2b3952bf
commit 7f5fcf882e
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/api_common/src/utils.rs
View file

@ -536,17 +536,8 @@ pub async fn get_url_blocklist(context: &LemmyContext) -> LemmyResult<RegexSet>
.try_get_with::<_, LemmyError>((), async { .try_get_with::<_, LemmyError>((), async {
let urls = LocalSiteUrlBlocklist::get_all(&mut context.pool()).await?; let urls = LocalSiteUrlBlocklist::get_all(&mut context.pool()).await?;
let regexes = urls.iter().map(|url| { // The urls are already validated on saving, so just escape them.
// The scheme is removed in the saving, let regexes = urls.iter().map(|url| escape(&url.url));
// so fake it here to build the url.
let url = &format!("https://{}", url.url);
let parsed = Url::parse(url).expect("Couldn't parse URL.");
format!(
"{}{}",
escape(parsed.host_str().expect("No domain.")),
escape(parsed.path())
)
});
let set = RegexSet::new(regexes)?; let set = RegexSet::new(regexes)?;
Ok(set) Ok(set)