Fixing domain checking.

crates/api_common/src/utils.rs

@@ -537,23 +537,15 @@ pub async fn get_url_blocklist(context: &LemmyContext) -> LemmyResult<RegexSet>
         let urls = LocalSiteUrlBlocklist::get_all(&mut context.pool()).await?;
 
         let regexes = urls.iter().map(|url| {
-          let url = &url.url;
+          // The scheme is removed in the saving,
-          let parsed = Url::parse(url).expect("Coundln't parse URL.");
+          // so fake it here to build the url.
-          if url.ends_with('/') {
+          let url = &format!("https://{}", url.url);
-            format!(
+          let parsed = Url::parse(url).expect("Couldn't parse URL.");
-              "({}://)?{}{}?",
+          format!(
-              parsed.scheme(),
+            "{}{}",
-              escape(parsed.domain().expect("No domain.")),
+            escape(parsed.host_str().expect("No domain.")),
-              escape(parsed.path())
+            escape(parsed.path())
-            )
+          )
-          } else {
-            format!(
-              "({}://)?{}{}",
-              parsed.scheme(),
-              escape(parsed.domain().expect("No domain.")),
-              escape(parsed.path())
-            )
-          }
         });
 
         let set = RegexSet::new(regexes)?;

crates/utils/src/utils/validation.rs

@@ -624,12 +624,12 @@ mod tests {
         "example.com".to_string(),
         "http://example.com".to_string(),
         "https://example.com".to_string(),
-        "https://example.blog/test?q=test2&q2=test3#test4".to_string(),
+        "https://example.com/test?q=test2&q2=test3#test4".to_string(),
       ])
       .unwrap(),
       &vec![
         "example.com/".to_string(),
-        "example.blog/test?q=test2&q2=test3#test4".to_string()
+        "example.com/test?q=test2&q2=test3#test4".to_string()
       ],
     );