From 678e3d3f28cb8594204dc5e2b7597ae66a4582c7 Mon Sep 17 00:00:00 2001 From: David Blajda Date: Thu, 27 Dec 2018 22:03:23 +0000 Subject: Use Id types for endpoints and implement kraken headers --- src/kraken/mod.rs | 46 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) (limited to 'src/kraken/mod.rs') diff --git a/src/kraken/mod.rs b/src/kraken/mod.rs index 59d00c0..0201295 100644 --- a/src/kraken/mod.rs +++ b/src/kraken/mod.rs @@ -1,53 +1,19 @@ -use reqwest::header; -use std::sync::Arc; -use reqwest::r#async::RequestBuilder; -use reqwest::r#async::Client as ReqwestClient; +use crate::client::Client as GenericClient; +use crate::client::Version; pub use super::types; -mod endpoints; -mod models; - - -const ACCEPT: &str = "application/vnd.twitchtv.v5+json"; -pub const API_DOMAIN: &str = "api.twitch.tv"; +mod namespaces; +pub mod models; #[derive(Clone)] pub struct Client { - inner: Arc, -} - -struct ClientRef { - id: String, - client: ReqwestClient + inner: GenericClient } impl Client { pub fn new(id: &str) -> Client { Client { - inner: Arc::new(ClientRef { - id: id.to_owned(), - client: ReqwestClient::new(), - }) + inner: GenericClient::new(id, Version::Kraken) } } - - pub fn new_with_client(id: &str, client: ReqwestClient) -> Client { - Client { - inner: Arc::new(ClientRef { - id: id.to_owned(), - client: client, - }) - } - } - - fn apply_standard_headers(&self, request: RequestBuilder) - -> RequestBuilder - { - let client_header = header::HeaderValue::from_str(&self.inner.id).unwrap(); - let accept_header = header::HeaderValue::from_str(ACCEPT).unwrap(); - - request - .header("Accept", accept_header) - .header("Client-ID", client_header) - } } -- cgit v1.2.3