diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-07-01 09:04:26 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-07-01 09:04:26 -0400 |
| commit | cd007febef64b980ddfeed157d097f0d23d452a4 (patch) | |
| tree | 3af2cda843437b1b4285689b1934f2512735c7f8 /server | |
| parent | a074564458b8a108b77d98e5e8ce24168656763a (diff) | |
| parent | 5c03e9e9ee53639c93e63253d99998a85b282ab8 (diff) | |
Merge branch 'master' into federation
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/api/user.rs | 3 | ||||
| -rw-r--r-- | server/src/lib.rs | 2 | ||||
| -rw-r--r-- | server/src/version.rs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/server/src/api/user.rs b/server/src/api/user.rs index e7c27def..a4e47e41 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -739,7 +739,8 @@ impl Perform for Oper<BanUser> { } let ban = data.ban; - let ban_user = move |conn: &'_ _| User_::ban_user(conn, user_id, ban); + let banned_user_id = data.user_id; + let ban_user = move |conn: &'_ _| User_::ban_user(conn, banned_user_id, ban); if blocking(pool, ban_user).await?.is_err() { return Err(APIError::err("couldnt_update_user").into()); } diff --git a/server/src/lib.rs b/server/src/lib.rs index 3657b4a2..3d09b25d 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -480,7 +480,7 @@ mod tests { lazy_static! { static ref EMAIL_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$").unwrap(); - static ref SLUR_REGEX: Regex = RegexBuilder::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|nig(\b|g?(a|er)?(s|z)?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btrann?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").case_insensitive(true).build().unwrap(); + static ref SLUR_REGEX: Regex = RegexBuilder::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|n(i|1)g(\b|g?(a|er)?(s|z)?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btr(a|@)nn?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").case_insensitive(true).build().unwrap(); static ref USERNAME_MATCHES_REGEX: Regex = Regex::new(r"/u/[a-zA-Z][0-9a-zA-Z_]*").unwrap(); // TODO keep this old one, it didn't work with port well tho // static ref WEBFINGER_USER_REGEX: Regex = Regex::new(r"@(?P<name>[\w.]+)@(?P<domain>[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)").unwrap(); diff --git a/server/src/version.rs b/server/src/version.rs index b49db803..b72c8198 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.2"; +pub const VERSION: &str = "v0.7.6"; |