From 0c76f0c9727a512475e29b5d099b5b7188f72052 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 3 Jan 2020 23:32:44 +0100 Subject: Move Client out of the api objects. Also make constructor functions in the zotapi namespace. --- src/client.rs | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'src/client.rs') diff --git a/src/client.rs b/src/client.rs index 4c20854..dc6cf43 100644 --- a/src/client.rs +++ b/src/client.rs @@ -14,14 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use crate::{ - abconfig::ABConfigFetcher, - abook::AbookFetcher, - error::Error, - group::{GroupFetcher, GroupMembersFetcher}, - item::ItemBuilder, - xchan::XChanFetcher, -}; +use crate::error::Error; use reqwest::{ self, header::{ACCEPT, CONTENT_TYPE}, @@ -50,14 +43,6 @@ impl Client { } } - pub fn abconfig(&self) -> ABConfigFetcher { - ABConfigFetcher::new(self) - } - - pub fn abook(&self) -> AbookFetcher { - AbookFetcher::new(self) - } - pub fn channel_stream(&self) -> Result { self.fetch_stream("channel/stream", &()) } @@ -66,22 +51,6 @@ impl Client { self.fetch_stream("network/stream", &()) } - pub fn group(&self) -> GroupFetcher { - GroupFetcher::new(self) - } - - pub fn group_members(&self) -> GroupMembersFetcher { - GroupMembersFetcher::new(self) - } - - pub fn item(&self) -> ItemBuilder { - ItemBuilder::new(self) - } - - pub fn xchan(&self) -> XChanFetcher { - XChanFetcher::new(self) - } - fn url(&self, path: &str, args: &T) -> String where T: Serialize + std::fmt::Debug, -- cgit v1.2.3