diff options
| author | Zeyla Hellyer <[email protected]> | 2018-07-02 09:53:52 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2018-07-02 09:53:52 -0700 |
| commit | dd1e97a2cbcf597bb1a7f54a845866dd0089799f (patch) | |
| tree | da08367dffafd563ba3f993ad6e6036f3d5acc99 | |
| parent | Fix 'nsfw-' case in utils::is_nsfw (diff) | |
| download | serenity-dd1e97a2cbcf597bb1a7f54a845866dd0089799f.tar.xz serenity-dd1e97a2cbcf597bb1a7f54a845866dd0089799f.zip | |
Simplify utils::is_nsfw
| -rw-r--r-- | src/utils/mod.rs | 10 | ||||
| -rw-r--r-- | tests/test_utils.rs | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/utils/mod.rs b/src/utils/mod.rs index dad5112..fc95a86 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -92,15 +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 { - let char_count = name.chars().count(); - - if char_count == 4 { - name == "nsfw" - } else if char_count > 5 { - name.starts_with("nsfw-") - } else { - false - } + name == "nsfw" || name.starts_with("nsfw-") } /// Retrieves the "code" part of an invite out of a URL. diff --git a/tests/test_utils.rs b/tests/test_utils.rs index d2d1783..99308e4 100644 --- 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"));
}
\ No newline at end of file |