grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Dessalines 2021-02-10 15:13:22 -05:00
commit 1af906c224
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/api/src/comment.rs
View file

@ -672,7 +672,7 @@ impl Perform for CreateCommentReport {
if reason.is_empty() { if reason.is_empty() {
return Err(APIError::err("report_reason_required").into()); return Err(APIError::err("report_reason_required").into());
} }
if reason.len() > 1000 { if reason.chars().count() > 1000 {
return Err(APIError::err("report_too_long").into()); return Err(APIError::err("report_too_long").into());
} }

2
crates/api/src/post.rs
View file

@ -749,7 +749,7 @@ impl Perform for CreatePostReport {
if reason.is_empty() { if reason.is_empty() {
return Err(APIError::err("report_reason_required").into()); return Err(APIError::err("report_reason_required").into());
} }
if reason.len() > 1000 { if reason.chars().count() > 1000 {
return Err(APIError::err("report_too_long").into()); return Err(APIError::err("report_too_long").into());
} }

4
crates/utils/src/utils.rs
View file

@ -110,8 +110,8 @@ pub fn is_valid_username(name: &str) -> bool {
// Can't do a regex here, reverse lookarounds not supported // Can't do a regex here, reverse lookarounds not supported
pub fn is_valid_preferred_username(preferred_username: &str) -> bool { pub fn is_valid_preferred_username(preferred_username: &str) -> bool {
!preferred_username.starts_with('@') !preferred_username.starts_with('@')
&& preferred_username.len() >= 3 && preferred_username.chars().count() >= 3
&& preferred_username.len() <= 20 && preferred_username.chars().count() <= 20
} }
pub fn is_valid_community_name(name: &str) -> bool { pub fn is_valid_community_name(name: &str) -> bool {