grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Dont append ? to url when cleaning it (#1716)

Browse source
This commit is contained in:
Nutomic 2021-08-21 13:36:33 +00:00 committed by GitHub
parent f6f169b4eb
commit 3b37ea6c8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/utils/src/utils.rs
View file

@ -149,12 +149,14 @@ pub fn get_ip(conn_info: &ConnectionInfo) -> IpAddr {
} }
pub fn clean_url_params(mut url: Url) -> Url { pub fn clean_url_params(mut url: Url) -> Url {
let new_query = url if url.query().is_some() {
.query_pairs() let new_query = url
.filter(|q| !CLEAN_URL_PARAMS_REGEX.is_match(&q.0)) .query_pairs()
.map(|q| format!("{}={}", q.0, q.1)) .filter(|q| !CLEAN_URL_PARAMS_REGEX.is_match(&q.0))
.join("&"); .map(|q| format!("{}={}", q.0, q.1))
url.set_query(Some(&new_query)); .join("&");
url.set_query(Some(&new_query));
}
url url
} }
@ -169,5 +171,9 @@ mod tests {
let cleaned = clean_url_params(url); let cleaned = clean_url_params(url);
let expected = Url::parse("https://example.com/path/123?username=randomuser&id=123").unwrap(); let expected = Url::parse("https://example.com/path/123?username=randomuser&id=123").unwrap();
assert_eq!(expected.to_string(), cleaned.to_string()); assert_eq!(expected.to_string(), cleaned.to_string());
let url = Url::parse("https://example.com/path/123").unwrap();
let cleaned = clean_url_params(url.clone());
assert_eq!(url.to_string(), cleaned.to_string());
} }
} }