diff options
| author | Maiddog <[email protected]> | 2017-08-26 17:55:43 -0500 |
|---|---|---|
| committer | alex <[email protected]> | 2017-08-27 00:55:43 +0200 |
| commit | 3e0b1032d80a1847558a752e8316d97f9ae58f04 (patch) | |
| tree | ca65390091cb3c0ab98b6497a1447ba69df3d20d /src/model/user.rs | |
| parent | Use `$crate` for `Args` (diff) | |
| download | serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.tar.xz serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.zip | |
Add ability to play DCA and Opus files. (#148)
Diffstat (limited to 'src/model/user.rs')
| -rw-r--r-- | src/model/user.rs | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/src/model/user.rs b/src/model/user.rs index c3b131b..66b7285 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -25,11 +25,14 @@ use http::{self, GuildPagination}; pub struct CurrentUser { pub id: UserId, pub avatar: Option<String>, - #[serde(default)] pub bot: bool, - #[serde(deserialize_with = "deserialize_u16")] pub discriminator: u16, + #[serde(default)] + pub bot: bool, + #[serde(deserialize_with = "deserialize_u16")] + pub discriminator: u16, pub email: Option<String>, pub mfa_enabled: bool, - #[serde(rename = "username")] pub name: String, + #[serde(rename = "username")] + pub name: String, pub verified: bool, } @@ -85,7 +88,10 @@ impl CurrentUser { pub fn edit<F>(&mut self, f: F) -> Result<()> where F: FnOnce(EditProfile) -> EditProfile { let mut map = Map::new(); - map.insert("username".to_owned(), Value::String(self.name.clone())); + map.insert( + "username".to_owned(), + Value::String(self.name.clone()), + ); if let Some(email) = self.email.as_ref() { map.insert("email".to_owned(), Value::String(email.clone())); @@ -110,8 +116,9 @@ impl CurrentUser { /// [`avatar_url`]: #method.avatar_url /// [`default_avatar_url`]: #method.default_avatar_url pub fn face(&self) -> String { - self.avatar_url() - .unwrap_or_else(|| self.default_avatar_url()) + self.avatar_url().unwrap_or_else( + || self.default_avatar_url(), + ) } /// Gets a list of guilds that the current user is in. @@ -322,11 +329,16 @@ enum_number!( /// [`Invisible`]: #variant.Invisible #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, PartialOrd, Ord, Serialize)] pub enum OnlineStatus { - #[serde(rename = "dnd")] DoNotDisturb, - #[serde(rename = "idle")] Idle, - #[serde(rename = "invisible")] Invisible, - #[serde(rename = "offline")] Offline, - #[serde(rename = "online")] Online, + #[serde(rename = "dnd")] + DoNotDisturb, + #[serde(rename = "idle")] + Idle, + #[serde(rename = "invisible")] + Invisible, + #[serde(rename = "offline")] + Offline, + #[serde(rename = "online")] + Online, } impl OnlineStatus { @@ -534,7 +546,7 @@ impl User { /// [direct_message]: #method.direct_message #[cfg(feature = "builder")] #[inline] -pub fn dm<F: FnOnce(CreateMessage) -> CreateMessage>(&self, f: F) -> Result<Message>{ + pub fn dm<F: FnOnce(CreateMessage) -> CreateMessage>(&self, f: F) -> Result<Message> { self.direct_message(f) } @@ -547,8 +559,9 @@ pub fn dm<F: FnOnce(CreateMessage) -> CreateMessage>(&self, f: F) -> Result<Mess /// [`avatar_url`]: #method.avatar_url /// [`default_avatar_url`]: #method.default_avatar_url pub fn face(&self) -> String { - self.avatar_url() - .unwrap_or_else(|| self.default_avatar_url()) + self.avatar_url().unwrap_or_else( + || self.default_avatar_url(), + ) } /// Check if a user has a [`Role`]. This will retrieve the [`Guild`] from @@ -794,7 +807,9 @@ fn default_avatar_url(discriminator: u16) -> String { #[cfg(feature = "model")] fn static_avatar_url(user_id: UserId, hash: Option<&String>) -> Option<String> { - hash.map(|hash| cdn!("/avatars/{}/{}.webp?size=1024", user_id, hash)) + hash.map( + |hash| cdn!("/avatars/{}/{}.webp?size=1024", user_id, hash), + ) } #[cfg(feature = "model")] |