diff --git a/src/api/channels/channels.rs b/src/api/channels/channels.rs index bf2c48c..0c6f3e3 100644 --- a/src/api/channels/channels.rs +++ b/src/api/channels/channels.rs @@ -19,7 +19,7 @@ impl Channel { let url = user.belongs_to.borrow().urls.api.clone(); let chorus_request = ChorusRequest { request: Client::new() - .get(format!("{}/channels/{}/", url, channel_id)) + .get(format!("{}/channels/{}", url, channel_id)) .bearer_auth(user.token()), limit_type: LimitType::Channel(channel_id), }; @@ -37,7 +37,7 @@ impl Channel { let chorus_request = ChorusRequest { request: Client::new() .delete(format!( - "{}/channels/{}/", + "{}/channels/{}", user.belongs_to.borrow().urls.api, self.id )) @@ -70,7 +70,7 @@ impl Channel { let chorus_request = ChorusRequest { request: Client::new() .patch(format!( - "{}/channels/{}/", + "{}/channels/{}", user.belongs_to.borrow().urls.api, channel_id )) @@ -124,7 +124,7 @@ impl Channel { ) -> ChorusResult<()> { let mut request = Client::new() .put(format!( - "{}/channels/{}/recipients/{}/", + "{}/channels/{}/recipients/{}", user.belongs_to.borrow().urls.api, self.id, recipient_id @@ -152,7 +152,7 @@ impl Channel { ) -> ChorusResult<()> { let request = Client::new() .delete(format!( - "{}/channels/{}/recipients/{}/", + "{}/channels/{}/recipients/{}", user.belongs_to.borrow().urls.api, self.id, recipient_id diff --git a/src/api/channels/messages.rs b/src/api/channels/messages.rs index 5f1745b..b93ce2e 100644 --- a/src/api/channels/messages.rs +++ b/src/api/channels/messages.rs @@ -25,7 +25,7 @@ impl Message { if message.attachments.is_none() { let chorus_request = ChorusRequest { request: Client::new() - .post(format!("{}/channels/{}/messages/", url_api, channel_id)) + .post(format!("{}/channels/{}/messages", url_api, channel_id)) .bearer_auth(user.token()) .body(to_string(&message).unwrap()), limit_type: LimitType::Channel(channel_id), @@ -61,7 +61,7 @@ impl Message { let chorus_request = ChorusRequest { request: Client::new() - .post(format!("{}/channels/{}/messages/", url_api, channel_id)) + .post(format!("{}/channels/{}/messages", url_api, channel_id)) .bearer_auth(user.token()) .multipart(form), limit_type: LimitType::Channel(channel_id), diff --git a/src/api/channels/reactions.rs b/src/api/channels/reactions.rs index b7b221f..05fcea0 100644 --- a/src/api/channels/reactions.rs +++ b/src/api/channels/reactions.rs @@ -23,7 +23,7 @@ impl ReactionMeta { /// See pub async fn delete_all(&self, user: &mut UserMeta) -> ChorusResult<()> { let url = format!( - "{}/channels/{}/messages/{}/reactions/", + "{}/channels/{}/messages/{}/reactions", user.belongs_to.borrow().urls.api, self.channel_id, self.message_id @@ -44,7 +44,7 @@ impl ReactionMeta { /// See pub async fn get(&self, emoji: &str, user: &mut UserMeta) -> ChorusResult> { let url = format!( - "{}/channels/{}/messages/{}/reactions/{}/", + "{}/channels/{}/messages/{}/reactions/{}", user.belongs_to.borrow().urls.api, self.channel_id, self.message_id, @@ -70,7 +70,7 @@ impl ReactionMeta { /// See pub async fn delete_emoji(&self, emoji: &str, user: &mut UserMeta) -> ChorusResult<()> { let url = format!( - "{}/channels/{}/messages/{}/reactions/{}/", + "{}/channels/{}/messages/{}/reactions/{}", user.belongs_to.borrow().urls.api, self.channel_id, self.message_id, @@ -97,7 +97,7 @@ impl ReactionMeta { /// See pub async fn create(&self, emoji: &str, user: &mut UserMeta) -> ChorusResult<()> { let url = format!( - "{}/channels/{}/messages/{}/reactions/{}/@me/", + "{}/channels/{}/messages/{}/reactions/{}/@me", user.belongs_to.borrow().urls.api, self.channel_id, self.message_id, @@ -119,7 +119,7 @@ impl ReactionMeta { /// See pub async fn remove(&self, emoji: &str, user: &mut UserMeta) -> ChorusResult<()> { let url = format!( - "{}/channels/{}/messages/{}/reactions/{}/@me/", + "{}/channels/{}/messages/{}/reactions/{}/@me", user.belongs_to.borrow().urls.api, self.channel_id, self.message_id, diff --git a/src/api/guilds/guilds.rs b/src/api/guilds/guilds.rs index 43a8cdf..0c8b9cf 100644 --- a/src/api/guilds/guilds.rs +++ b/src/api/guilds/guilds.rs @@ -19,7 +19,7 @@ impl Guild { user: &mut UserMeta, guild_create_schema: GuildCreateSchema, ) -> ChorusResult { - let url = format!("{}/guilds/", user.belongs_to.borrow().urls.api); + let url = format!("{}/guilds", user.belongs_to.borrow().urls.api); let chorus_request = ChorusRequest { request: Client::new() .post(url.clone()) @@ -51,7 +51,7 @@ impl Guild { /// See pub async fn delete(user: &mut UserMeta, guild_id: Snowflake) -> ChorusResult<()> { let url = format!( - "{}/guilds/{}/delete/", + "{}/guilds/{}/delete", user.belongs_to.borrow().urls.api, guild_id ); @@ -91,7 +91,7 @@ impl Guild { let chorus_request = ChorusRequest { request: Client::new() .get(format!( - "{}/guilds/{}/channels/", + "{}/guilds/{}/channels", user.belongs_to.borrow().urls.api, self.id )) @@ -125,7 +125,7 @@ impl Guild { let chorus_request = ChorusRequest { request: Client::new() .get(format!( - "{}/guilds/{}/", + "{}/guilds/{}", user.belongs_to.borrow().urls.api, guild_id )) @@ -152,7 +152,7 @@ impl Channel { let chorus_request = ChorusRequest { request: Client::new() .post(format!( - "{}/guilds/{}/channels/", + "{}/guilds/{}/channels", user.belongs_to.borrow().urls.api, guild_id )) diff --git a/src/api/guilds/member.rs b/src/api/guilds/member.rs index d3e0e80..28fa68f 100644 --- a/src/api/guilds/member.rs +++ b/src/api/guilds/member.rs @@ -19,7 +19,7 @@ impl types::GuildMember { member_id: Snowflake, ) -> ChorusResult { let url = format!( - "{}/guilds/{}/members/{}/", + "{}/guilds/{}/members/{}", user.belongs_to.borrow().urls.api, guild_id, member_id @@ -46,7 +46,7 @@ impl types::GuildMember { role_id: Snowflake, ) -> ChorusResult<()> { let url = format!( - "{}/guilds/{}/members/{}/roles/{}/", + "{}/guilds/{}/members/{}/roles/{}", user.belongs_to.borrow().urls.api, guild_id, member_id, @@ -72,7 +72,7 @@ impl types::GuildMember { role_id: Snowflake, ) -> Result<(), crate::errors::ChorusError> { let url = format!( - "{}/guilds/{}/members/{}/roles/{}/", + "{}/guilds/{}/members/{}/roles/{}", user.belongs_to.borrow().urls.api, guild_id, member_id, diff --git a/src/api/guilds/roles.rs b/src/api/guilds/roles.rs index 2787400..91b7bd4 100644 --- a/src/api/guilds/roles.rs +++ b/src/api/guilds/roles.rs @@ -19,7 +19,7 @@ impl types::RoleObject { guild_id: Snowflake, ) -> ChorusResult> { let url = format!( - "{}/guilds/{}/roles/", + "{}/guilds/{}/roles", user.belongs_to.borrow().urls.api, guild_id ); @@ -44,7 +44,7 @@ impl types::RoleObject { role_id: Snowflake, ) -> ChorusResult { let url = format!( - "{}/guilds/{}/roles/{}/", + "{}/guilds/{}/roles/{}", user.belongs_to.borrow().urls.api, guild_id, role_id @@ -70,7 +70,7 @@ impl types::RoleObject { role_create_schema: RoleCreateModifySchema, ) -> ChorusResult { let url = format!( - "{}/guilds/{}/roles/", + "{}/guilds/{}/roles", user.belongs_to.borrow().urls.api, guild_id ); @@ -100,7 +100,7 @@ impl types::RoleObject { role_position_update_schema: RolePositionUpdateSchema, ) -> ChorusResult { let url = format!( - "{}/guilds/{}/roles/", + "{}/guilds/{}/roles", user.belongs_to.borrow().urls.api, guild_id ); diff --git a/src/api/invites/mod.rs b/src/api/invites/mod.rs index 9492d8e..ac9c120 100644 --- a/src/api/invites/mod.rs +++ b/src/api/invites/mod.rs @@ -21,7 +21,7 @@ impl UserMeta { let mut request = ChorusRequest { request: Client::new() .post(format!( - "{}/invites/{}/", + "{}/invites/{}", self.belongs_to.borrow().urls.api, invite_code )) @@ -46,7 +46,7 @@ impl UserMeta { ChorusRequest { request: Client::new() .post(format!( - "{}/users/@me/invites/", + "{}/users/@me/invites", self.belongs_to.borrow().urls.api )) .body(to_string(&code).unwrap()) @@ -72,7 +72,7 @@ impl UserMeta { ChorusRequest { request: Client::new() .post(format!( - "{}/channels/{}/invites/", + "{}/channels/{}/invites", self.belongs_to.borrow().urls.api, channel_id )) diff --git a/src/api/policies/instance/instance.rs b/src/api/policies/instance/instance.rs index 768c7fd..aa529ad 100644 --- a/src/api/policies/instance/instance.rs +++ b/src/api/policies/instance/instance.rs @@ -13,7 +13,7 @@ impl Instance { /// # Reference /// See pub async fn general_configuration_schema(&self) -> ChorusResult { - let endpoint_url = self.urls.api.clone() + "/policies/instance/"; + let endpoint_url = self.urls.api.clone() + "/policies/instance"; let request = match self.client.get(&endpoint_url).send().await { Ok(result) => result, Err(e) => { diff --git a/src/api/users/guilds.rs b/src/api/users/guilds.rs index a446029..3967e8e 100644 --- a/src/api/users/guilds.rs +++ b/src/api/users/guilds.rs @@ -18,7 +18,7 @@ impl UserMeta { ChorusRequest { request: Client::new() .delete(format!( - "{}/users/@me/guilds/{}/", + "{}/users/@me/guilds/{}", self.belongs_to.borrow().urls.api, guild_id )) diff --git a/src/api/users/relationships.rs b/src/api/users/relationships.rs index a5afaac..41270e1 100644 --- a/src/api/users/relationships.rs +++ b/src/api/users/relationships.rs @@ -21,7 +21,7 @@ impl UserMeta { user_id: Snowflake, ) -> ChorusResult> { let url = format!( - "{}/users/{}/relationships/", + "{}/users/{}/relationships", self.belongs_to.borrow().urls.api, user_id ); @@ -40,7 +40,7 @@ impl UserMeta { /// See pub async fn get_relationships(&mut self) -> ChorusResult> { let url = format!( - "{}/users/@me/relationships/", + "{}/users/@me/relationships", self.belongs_to.borrow().urls.api ); let chorus_request = ChorusRequest { @@ -61,7 +61,7 @@ impl UserMeta { schema: FriendRequestSendSchema, ) -> ChorusResult<()> { let url = format!( - "{}/users/@me/relationships/", + "{}/users/@me/relationships", self.belongs_to.borrow().urls.api ); let body = to_string(&schema).unwrap(); @@ -85,7 +85,7 @@ impl UserMeta { RelationshipType::None => { let chorus_request = ChorusRequest { request: Client::new() - .delete(format!("{}/users/@me/relationships/{}/", api_url, user_id)) + .delete(format!("{}/users/@me/relationships/{}", api_url, user_id)) .bearer_auth(self.token()), limit_type: LimitType::Global, }; @@ -99,7 +99,7 @@ impl UserMeta { }; let chorus_request = ChorusRequest { request: Client::new() - .put(format!("{}/users/@me/relationships/{}/", api_url, user_id)) + .put(format!("{}/users/@me/relationships/{}", api_url, user_id)) .bearer_auth(self.token()) .body(to_string(&body).unwrap()), limit_type: LimitType::Global, @@ -114,7 +114,7 @@ impl UserMeta { }; let chorus_request = ChorusRequest { request: Client::new() - .put(format!("{}/users/@me/relationships/{}/", api_url, user_id)) + .put(format!("{}/users/@me/relationships/{}", api_url, user_id)) .bearer_auth(self.token()) .body(to_string(&body).unwrap()), limit_type: LimitType::Global, @@ -131,7 +131,7 @@ impl UserMeta { /// See pub async fn remove_relationship(&mut self, user_id: Snowflake) -> ChorusResult<()> { let url = format!( - "{}/users/@me/relationships/{}/", + "{}/users/@me/relationships/{}", self.belongs_to.borrow().urls.api, user_id ); diff --git a/src/api/users/users.rs b/src/api/users/users.rs index 03af2f9..fd28b7a 100644 --- a/src/api/users/users.rs +++ b/src/api/users/users.rs @@ -49,7 +49,7 @@ impl UserMeta { return Err(ChorusError::PasswordRequired); } let request = Client::new() - .patch(format!("{}/users/@me/", self.belongs_to.borrow().urls.api)) + .patch(format!("{}/users/@me", self.belongs_to.borrow().urls.api)) .body(to_string(&modify_schema).unwrap()) .bearer_auth(self.token()); let chorus_request = ChorusRequest { @@ -71,7 +71,7 @@ impl UserMeta { pub async fn delete(mut self) -> ChorusResult<()> { let request = Client::new() .post(format!( - "{}/users/@me/delete/", + "{}/users/@me/delete", self.belongs_to.borrow().urls.api )) .bearer_auth(self.token()); @@ -92,7 +92,7 @@ impl User { pub async fn get(user: &mut UserMeta, id: Option<&String>) -> ChorusResult { let url_api = user.belongs_to.borrow().urls.api.clone(); let url = if id.is_none() { - format!("{}/users/@me/", url_api) + format!("{}/users/@me", url_api) } else { format!("{}/users/{}", url_api, id.unwrap()) }; @@ -120,7 +120,7 @@ impl User { instance: &mut Instance, ) -> ChorusResult { let request: reqwest::RequestBuilder = Client::new() - .get(format!("{}/users/@me/settings/", url_api)) + .get(format!("{}/users/@me/settings", url_api)) .bearer_auth(token); let mut user = UserMeta::shell(Rc::new(RefCell::new(instance.clone())), token.clone()).await;