Infra-Mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-10-01 01:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing /

Browse Source
This commit is contained in:
Dessalines 2024-04-22 15:22:23 -04:00
parent 7f5fcf882e
commit e9ea53eb45
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/utils/src/utils/validation.rs
View File

@ -335,13 +335,18 @@ pub fn build_url_str_without_scheme(url_str: &str) -> LemmyResult<String> {
.set_scheme("http") .set_scheme("http")
.map_err(|_| LemmyErrorType::InvalidUrl)?; .map_err(|_| LemmyErrorType::InvalidUrl)?;
Ok( let mut out = url
url .to_string()
.to_string() .get(7..)
.get(7..) .ok_or(LemmyErrorType::InvalidUrl)?
.ok_or(LemmyErrorType::InvalidUrl)? .to_string();
.to_string(),
) // Remove trailing / if necessary
if out.ends_with('/') {
out.pop();
}
Ok(out)
} }
#[cfg(test)] #[cfg(test)]
@ -628,7 +633,7 @@ mod tests {
]) ])
.unwrap(), .unwrap(),
&vec![ &vec![
"example.com/".to_string(), "example.com".to_string(),
"example.com/test?q=test2&q2=test3#test4".to_string() "example.com/test?q=test2&q2=test3#test4".to_string()
], ],
); );