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

Changing name to is_valid_username

Browse source
This commit is contained in:
Dessalines 2020-05-28 14:05:54 -04:00
parent 1b8908061c
commit 7820885b5b
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/src/api/user.rs
View file

@ -1,5 +1,5 @@
use super::*;
use crate::is_valid_register_username;
use crate::is_valid_username;
use bcrypt::verify;
#[derive(Serialize, Deserialize, Debug)]
@ -262,7 +262,7 @@ impl Perform for Oper<Register> {
return Err(APIError::err("admin_already_created").into());
}
if !is_valid_register_username(&data.username) {
if !is_valid_username(&data.username) {
return Err(APIError::err("invalid_username").into());
}

16
server/src/lib.rs
View file

@ -269,15 +269,15 @@ pub fn get_ip(conn_info: &ConnectionInfo) -> String {
.to_string()
}
pub fn is_valid_register_username(name: &str) -> bool {
pub fn is_valid_username(name: &str) -> bool {
VALID_USERNAME_REGEX.is_match(name)
}
#[cfg(test)]
mod tests {
use crate::{
extract_usernames, is_email_regex, is_image_content_type, is_valid_register_username,
remove_slurs, slur_check, slurs_vec_to_str,
extract_usernames, is_email_regex, is_image_content_type, is_valid_username, remove_slurs,
slur_check, slurs_vec_to_str,
};
#[test]
@ -297,11 +297,11 @@ mod tests {
#[test]
fn test_valid_register_username() {
assert!(is_valid_register_username("Hello_98"));
assert!(is_valid_register_username("ten"));
assert!(!is_valid_register_username("Hello-98"));
assert!(!is_valid_register_username("a"));
assert!(!is_valid_register_username(""));
assert!(is_valid_username("Hello_98"));
assert!(is_valid_username("ten"));
assert!(!is_valid_username("Hello-98"));
assert!(!is_valid_username("a"));
assert!(!is_valid_username(""));
}
#[test]