properly fix the is_nsfw check this time

serenity-rs · Jul 2, 2018 · ccd2506 · ccd2506
1 parent dd1e97a
commit ccd2506
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -92,7 +92,7 @@ pub fn vecmap_to_json_map<K: PartialEq + ToString>(map: VecMap<K, Value>) -> Map
 /// assert!(!utils::is_nsfw("nsfwstuff"));
 /// ```
 pub fn is_nsfw(name: &str) -> bool {
-    name == "nsfw" || name.starts_with("nsfw-")
+    name == "nsfw" || name.chars().count() > 5 && name.starts_with("nsfw-")
 }
 
 /// Retrieves the "code" part of an invite out of a URL.

diff --git a/tests/test_channels.rs b/tests/test_channels.rs
@@ -65,7 +65,7 @@ mod utils {
 
         channel.kind = ChannelType::Text;
         channel.name = "nsfw-".to_string();
-        assert!(channel.is_nsfw());
+        assert!(!channel.is_nsfw());
 
         channel.name = "nsfw".to_string();
         assert!(channel.is_nsfw());

diff --git a/tests/test_utils.rs b/tests/test_utils.rs
@@ -9,6 +9,7 @@ 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"));
-}
+    assert!(is_nsfw("nsfw-général"));
+}