summaryrefslogtreecommitdiffstats
path: root/server/src/api/community.rs
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-02-02 22:51:54 -0500
committerDessalines <tyhou13@gmx.com>2020-02-02 22:51:54 -0500
commitee2038a75a137ad53632d76b42588605b52ac422 (patch)
tree7b53f8a9a447cdc5781b07742db7d9590971af96 /server/src/api/community.rs
parenta2267aa0560731ba090091cd946922cdaac72354 (diff)
Returning specific slurs from slur filter on failure. Fixes #463
Diffstat (limited to 'server/src/api/community.rs')
-rw-r--r--server/src/api/community.rs31
1 files changed, 24 insertions, 7 deletions
diff --git a/server/src/api/community.rs b/server/src/api/community.rs
index 80cc2b65..936e54cd 100644
--- a/server/src/api/community.rs
+++ b/server/src/api/community.rs
@@ -176,11 +176,18 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> {
Err(_e) => return Err(APIError::err("not_logged_in").into()),
};
- if has_slurs(&data.name)
- || has_slurs(&data.title)
- || (data.description.is_some() && has_slurs(&data.description.to_owned().unwrap()))
- {
- return Err(APIError::err("no_slurs").into());
+ if let Err(slurs) = slur_check(&data.name) {
+ return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
+ }
+
+ if let Err(slurs) = slur_check(&data.title) {
+ return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
+ }
+
+ if let Some(description) = &data.description {
+ if let Err(slurs) = slur_check(description) {
+ return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
+ }
}
let user_id = claims.id;
@@ -242,8 +249,18 @@ impl Perform<CommunityResponse> for Oper<EditCommunity> {
fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> {
let data: &EditCommunity = &self.data;
- if has_slurs(&data.name) || has_slurs(&data.title) {
- return Err(APIError::err("no_slurs").into());
+ if let Err(slurs) = slur_check(&data.name) {
+ return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
+ }
+
+ if let Err(slurs) = slur_check(&data.title) {
+ return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
+ }
+
+ if let Some(description) = &data.description {
+ if let Err(slurs) = slur_check(description) {
+ return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
+ }
}
let claims = match Claims::decode(&data.auth) {