Renaming to slur_filter. Fixes #1773

config/config.hjson

@@ -5,4 +5,21 @@
   federation: {
     enabled: true
   }
+#  # email sending configuration
+#  email: {
+#    # hostname and port of the smtp server
+#    smtp_server: ""
+#    # login name for smtp server
+#    smtp_login: ""
+#    # password to login to the smtp server
+#    smtp_password: ""
+#    # address to send emails from, eg "noreply@your-instance.com"
+#    smtp_from_address: ""
+#    # whether or not smtp connections should use tls
+#    use_tls: true
+#  }
+  slur_filter:
+    '''
+    (fag(g|got|tard)?\b|cock\s?sucker(s|ing)?|ni((g{2,}|q)+|[gq]{2,})[e3r]+(s|z)?|mudslime?s?|kikes?|\bspi(c|k)s?\b|\bchinks?|gooks?|bitch(es|ing|y)?|whor(es?|ing)|\btr(a|@)nn?(y|ies?)|\b(b|re|r)tard(ed)?s?)
+    '''
 }

crates/utils/src/settings/mod.rs

@@ -113,15 +113,12 @@ impl Settings {
     WEBFINGER_USER_REGEX.to_owned()
   }
 
-  pub fn slur_regex(&self) -> Regex {
+  pub fn slur_regex(&self) -> Option<Regex> {
-    let mut slurs = r"(fag(g|got|tard)?\b|cock\s?sucker(s|ing)?|ni((g{2,}|q)+|[gq]{2,})[e3r]+(s|z)?|mudslime?s?|kikes?|\bspi(c|k)s?\b|\bchinks?|gooks?|bitch(es|ing|y)?|whor(es?|ing)|\btr(a|@)nn?(y|ies?)|\b(b|re|r)tard(ed)?s?)".to_string();
+    self.slur_filter.as_ref().map(|slurs| {
-    if let Some(additional_slurs) = &self.additional_slurs {
+      RegexBuilder::new(slurs)
-      slurs.push('|');
-      slurs.push_str(additional_slurs);
-    };
-    RegexBuilder::new(&slurs)
         .case_insensitive(true)
         .build()
         .expect("compile regex")
+    })
   }
 }

crates/utils/src/settings/structs.rs

@@ -42,7 +42,7 @@ pub struct Settings {
   pub pictrs_url: Option<String>,
   /// Regex for slurs which are prohibited. Example: `(\bThis\b)|(\bis\b)|(\bsample\b)`
   #[default(None)]
-  pub additional_slurs: Option<String>,
+  pub slur_filter: Option<String>,
   /// Maximum length of local community and user names
   #[default(20)]
   pub actor_name_max_length: usize,

crates/utils/src/utils.rs

@@ -28,11 +28,19 @@ pub fn convert_datetime(datetime: NaiveDateTime) -> DateTime<FixedOffset> {
   DateTime::<FixedOffset>::from_utc(datetime, FixedOffset::east(0))
 }
 
-pub fn remove_slurs(test: &str, slur_regex: &Regex) -> String {
+pub fn remove_slurs(test: &str, slur_regex: &Option<Regex>) -> String {
+  if let Some(slur_regex) = slur_regex {
     slur_regex.replace_all(test, "*removed*").to_string()
+  } else {
+    test.to_string()
+  }
 }
 
-pub(crate) fn slur_check<'a>(test: &'a str, slur_regex: &'a Regex) -> Result<(), Vec<&'a str>> {
+pub(crate) fn slur_check<'a>(
+  test: &'a str,
+  slur_regex: &'a Option<Regex>,
+) -> Result<(), Vec<&'a str>> {
+  if let Some(slur_regex) = slur_regex {
     let mut matches: Vec<&str> = slur_regex.find_iter(test).map(|mat| mat.as_str()).collect();
 
     // Unique
@@ -44,14 +52,20 @@ pub(crate) fn slur_check<'a>(test: &'a str, slur_regex: &'a Regex) -> Result<(),
     } else {
       Err(matches)
     }
+  } else {
+    Ok(())
+  }
 }
 
-pub fn check_slurs(text: &str, slur_regex: &Regex) -> Result<(), ApiError> {
+pub fn check_slurs(text: &str, slur_regex: &Option<Regex>) -> Result<(), ApiError> {
-  slur_check(text, slur_regex)
+  if let Err(slurs) = slur_check(text, slur_regex) {
-    .map_err(|slurs| ApiError::err_plain(&slurs_vec_to_str(slurs.clone())))
+    Err(ApiError::err_plain(&slurs_vec_to_str(slurs)))
+  } else {
+    Ok(())
+  }
 }
 
-pub fn check_slurs_opt(text: &Option<String>, slur_regex: &Regex) -> Result<(), ApiError> {
+pub fn check_slurs_opt(text: &Option<String>, slur_regex: &Option<Regex>) -> Result<(), ApiError> {
   match text {
     Some(t) => check_slurs(t, slur_regex),
     None => Ok(()),

docker/lemmy.hjson

@@ -34,6 +34,10 @@
     # maximum number of active sql connections
     pool_size: 5
   }
+  slur_filter:
+    '''
+    (fag(g|got|tard)?\b|cock\s?sucker(s|ing)?|ni((g{2,}|q)+|[gq]{2,})[e3r]+(s|z)?|mudslime?s?|kikes?|\bspi(c|k)s?\b|\bchinks?|gooks?|bitch(es|ing|y)?|whor(es?|ing)|\btr(a|@)nn?(y|ies?)|\b(b|re|r)tard(ed)?s?)
+    '''
 #  # optional: email sending configuration
 #  email: {
 #    # hostname and port of the smtp server