Fall back to str::parse if parse_username fails

serenity-rs · Oct 24, 2017 · 292ceda · 292ceda
1 parent d3015a0
commit 292ceda
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/model/misc.rs b/src/model/misc.rs
@@ -125,9 +125,10 @@ impl FromStr for UserId {
     type Err = UserIdParseError;
 
     fn from_str(s: &str) -> StdResult<Self, Self::Err> {
-        utils::parse_username(s)
-            .ok_or_else(|| UserIdParseError::InvalidFormat)
-            .map(UserId)
+        Ok(match utils::parse_username(s) {
+            Some(id) => UserId(id),
+            None => s.parse::<u64>().map(UserId).map_err(|_| UserIdParseError::InvalidFormat)?,
+        })
     }
 }