aboutsummaryrefslogtreecommitdiff
path: root/src/model/mod.rs
diff options
context:
space:
mode:
authorMaiddog <[email protected]>2017-08-26 17:55:43 -0500
committeralex <[email protected]>2017-08-27 00:55:43 +0200
commit3e0b1032d80a1847558a752e8316d97f9ae58f04 (patch)
treeca65390091cb3c0ab98b6497a1447ba69df3d20d /src/model/mod.rs
parentUse `$crate` for `Args` (diff)
downloadserenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.tar.xz
serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.zip
Add ability to play DCA and Opus files. (#148)
Diffstat (limited to 'src/model/mod.rs')
-rw-r--r--src/model/mod.rs47
1 files changed, 31 insertions, 16 deletions
diff --git a/src/model/mod.rs b/src/model/mod.rs
index cc8860f..d512ffb 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -198,26 +198,41 @@ pub struct CurrentApplicationInfo {
pub id: UserId,
pub name: String,
pub owner: User,
- #[serde(default)] pub rpc_origins: Vec<String>,
+ #[serde(default)]
+ pub rpc_origins: Vec<String>,
}
/// The name of a region that a voice server can be located in.
#[derive(Copy, Clone, Debug, Deserialize, Eq, Hash, PartialEq, PartialOrd, Ord, Serialize)]
pub enum Region {
- #[serde(rename = "amsterdam")] Amsterdam,
- #[serde(rename = "brazil")] Brazil,
- #[serde(rename = "eu-central")] EuCentral,
- #[serde(rename = "eu-west")] EuWest,
- #[serde(rename = "frankfurt")] Frankfurt,
- #[serde(rename = "london")] London,
- #[serde(rename = "sydney")] Sydney,
- #[serde(rename = "us-central")] UsCentral,
- #[serde(rename = "us-east")] UsEast,
- #[serde(rename = "us-south")] UsSouth,
- #[serde(rename = "us-west")] UsWest,
- #[serde(rename = "vip-amsterdam")] VipAmsterdam,
- #[serde(rename = "vip-us-east")] VipUsEast,
- #[serde(rename = "vip-us-west")] VipUsWest,
+ #[serde(rename = "amsterdam")]
+ Amsterdam,
+ #[serde(rename = "brazil")]
+ Brazil,
+ #[serde(rename = "eu-central")]
+ EuCentral,
+ #[serde(rename = "eu-west")]
+ EuWest,
+ #[serde(rename = "frankfurt")]
+ Frankfurt,
+ #[serde(rename = "london")]
+ London,
+ #[serde(rename = "sydney")]
+ Sydney,
+ #[serde(rename = "us-central")]
+ UsCentral,
+ #[serde(rename = "us-east")]
+ UsEast,
+ #[serde(rename = "us-south")]
+ UsSouth,
+ #[serde(rename = "us-west")]
+ UsWest,
+ #[serde(rename = "vip-amsterdam")]
+ VipAmsterdam,
+ #[serde(rename = "vip-us-east")]
+ VipUsEast,
+ #[serde(rename = "vip-us-west")]
+ VipUsWest,
}
impl Region {
@@ -245,6 +260,6 @@ use serde::{Deserialize, Deserializer};
use std::result::Result as StdResult;
fn deserialize_sync_user<'de, D: Deserializer<'de>>(deserializer: D)
--> StdResult<Arc<RwLock<User>>, D::Error>{
+ -> StdResult<Arc<RwLock<User>>, D::Error> {
Ok(Arc::new(RwLock::new(User::deserialize(deserializer)?)))
}