Fix 'nsfw-' case in utils::is_nsfw

In the utils::is_nsfw function, an input of 'nsfw-' shouldn't return true. Discord's (previous) NSFW detection classified 'nsfw' and anything starting with 'nsfw-' - but not including - as NSFW.
serenity-rs · Jul 2, 2018 · bd4aa0a · bd4aa0a
1 parent 0067c33
commit bd4aa0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -96,7 +96,7 @@ pub fn is_nsfw(name: &str) -> bool {
 
     if char_count == 4 {
         name == "nsfw"
-    } else if char_count > 4 {
+    } else if char_count > 5 {
         name.starts_with("nsfw-")
     } else {
         false

diff --git a/tests/test_utils.rs b/tests/test_utils.rs
@@ -9,6 +9,6 @@ fn test_is_nsfw() {
     assert!(!is_nsfw("general"));
     assert!(is_nsfw("nsfw"));
     assert!(is_nsfw("nsfw-test"));
-    assert!(is_nsfw("nsfw-"));
+    assert!(!is_nsfw("nsfw-"));
     assert!(!is_nsfw("général"));
 }