Merge pull request #96 from polyphony-chat/feature/permissions-and-roles

src/api/auth/login.rs

@@ -63,7 +63,7 @@ pub mod login {
                 login_result.token,
                 cloned_limits,
                 login_result.settings,
-                Some(object),
+                object,
             );
 
             Ok(user)

src/api/auth/register.rs

@@ -71,7 +71,7 @@ pub mod register {
                 token.clone(),
                 cloned_limits,
                 settings,
-                Some(user_object),
+                user_object,
             );
             Ok(user)
         }

src/api/guilds/member.rs

@@ -0,0 +1,91 @@
+use reqwest::Client;
+
+use crate::{instance::UserMeta, limit::LimitedRequester, types};
+
+impl types::GuildMember {
+    /// Adds a role to a guild member.
+    ///
+    /// # Arguments
+    ///
+    /// * `user` - A mutable reference to a `UserMeta` instance.
+    /// * `guild_id` - The ID of the guild.
+    /// * `member_id` - The ID of the member.
+    /// * `role_id` - The ID of the role to add.
+    ///
+    /// # Returns
+    ///
+    /// An `Option` containing a `ChorusLibError` if the request fails, or `None` if the request succeeds.
+    pub async fn add_role(
+        user: &mut UserMeta,
+        guild_id: &str,
+        member_id: &str,
+        role_id: &str,
+    ) -> Option<crate::errors::ChorusLibError> {
+        let mut belongs_to = user.belongs_to.borrow_mut();
+        let url = format!(
+            "{}/guilds/{}/members/{}/roles/{}/",
+            belongs_to.urls.get_api(),
+            guild_id,
+            member_id,
+            role_id
+        );
+        let request = Client::new().put(url).bearer_auth(user.token());
+        let response = LimitedRequester::new()
+            .await
+            .send_request(
+                request,
+                crate::api::limits::LimitType::Guild,
+                &mut belongs_to.limits,
+                &mut user.limits,
+            )
+            .await;
+        if response.is_err() {
+            return Some(response.err().unwrap());
+        } else {
+            return None;
+        }
+    }
+
+    /// Removes a role from a guild member.
+    ///
+    /// # Arguments
+    ///
+    /// * `user` - A mutable reference to a `UserMeta` instance.
+    /// * `guild_id` - The ID of the guild.
+    /// * `member_id` - The ID of the member.
+    /// * `role_id` - The ID of the role to remove.
+    ///
+    /// # Returns
+    ///
+    /// An `Option` containing a `ChorusLibError` if the request fails, or `None` if the request succeeds.
+    pub async fn remove_role(
+        user: &mut UserMeta,
+        guild_id: &str,
+        member_id: &str,
+        role_id: &str,
+    ) -> Option<crate::errors::ChorusLibError> {
+        let mut belongs_to = user.belongs_to.borrow_mut();
+        let url = format!(
+            "{}/guilds/{}/members/{}/roles/{}/",
+            belongs_to.urls.get_api(),
+            guild_id,
+            member_id,
+            role_id
+        );
+        let request = Client::new().delete(url).bearer_auth(user.token());
+        let response = LimitedRequester::new()
+            .await
+            .send_request(
+                request,
+                crate::api::limits::LimitType::Guild,
+                &mut belongs_to.limits,
+                &mut user.limits,
+            )
+            .await;
+        if response.is_err() {
+            return Some(response.err().unwrap());
+        } else {
+            return None;
+        }
+    }
+}

src/api/guilds/mod.rs

@@ -1,5 +1,7 @@
 pub mod guilds;
+pub mod member;
 pub mod roles;
 
 pub use guilds::*;
 pub use roles::*;
+pub use roles::*;

src/api/users/users.rs

@@ -72,10 +72,7 @@ impl UserMeta {
             Err(e) => return Err(e),
         };
         let user_updated: User = from_str(&result.text().await.unwrap()).unwrap();
-        let _ = std::mem::replace(
+        let _ = std::mem::replace(&mut self.object, user_updated.clone());
-            &mut self.object.as_mut().unwrap(),
-            &mut user_updated.clone(),
-        );
         Ok(user_updated)
     }
 

src/instance.rs

@@ -90,7 +90,7 @@ pub struct UserMeta {
     pub token: String,
     pub limits: Limits,
     pub settings: UserSettings,
-    pub object: Option<User>,
+    pub object: User,
 }
 
 impl UserMeta {
@@ -107,7 +107,7 @@ impl UserMeta {
         token: String,
         limits: Limits,
         settings: UserSettings,
-        object: Option<User>,
+        object: User,
     ) -> UserMeta {
         UserMeta {
             belongs_to,

tests/common/mod.rs

@@ -1,6 +1,9 @@
 use chorus::{
     instance::{Instance, UserMeta},
-    types::{Channel, ChannelCreateSchema, Guild, GuildCreateSchema, RegisterSchema},
+    types::{
+        Channel, ChannelCreateSchema, Guild, GuildCreateSchema, RegisterSchema,
+        RoleCreateModifySchema, RoleObject,
+    },
     URLBundle,
 };
 
@@ -10,6 +13,7 @@ pub struct TestBundle {
     pub user: UserMeta,
     pub instance: Instance,
     pub guild: Guild,
+    pub role: RoleObject,
     pub channel: Channel,
 }
 
@@ -70,11 +74,27 @@ pub async fn setup() -> TestBundle {
         .await
         .unwrap();
 
+    let role_create_schema: chorus::types::RoleCreateModifySchema = RoleCreateModifySchema {
+        name: Some("Bundle role".to_string()),
+        permissions: Some("8".to_string()), // Administrator permissions
+        hoist: Some(true),
+        icon: None,
+        unicode_emoji: Some("".to_string()),
+        mentionable: Some(true),
+        position: None,
+        color: None,
+    };
+    let guild_id = guild.id.clone().to_string();
+    let role = chorus::types::RoleObject::create(&mut user, &guild_id, role_create_schema)
+        .await
+        .unwrap();
+
     TestBundle {
         urls,
         user,
         instance,
         guild,
+        role,
         channel,
     }
 }

tests/member.rs

@@ -0,0 +1,13 @@
+mod common;
+
+#[tokio::test]
+async fn add_remove_role() {
+    let mut bundle = common::setup().await;
+    let guild_id = &bundle.guild.id.to_string();
+    let role_id = &bundle.role.id.to_string();
+    let user_id = &bundle.user.object.id.to_string();
+    chorus::types::GuildMember::add_role(&mut bundle.user, guild_id, user_id, role_id).await;
+    chorus::types::GuildMember::remove_role(&mut bundle.user, guild_id, user_id, role_id).await;
+    // TODO: Implement /guilds/{guild_id}/members/{member_id}/ GET route.
+    common::teardown(bundle).await
+}

tests/roles.rs

@@ -27,7 +27,7 @@ async fn create_and_get_roles() {
         .unwrap()
         .unwrap()
         .iter()
-        .nth(1)
+        .nth(2)
         .unwrap()
         .clone();