Switch to ID abstractions internally

1 files changed, 26 insertions, 8 deletions

diff --git a/lib/models/guild/member.ml b/lib/models/guild/member.ml
index 7634d85..f083cce 100644
--- a/lib/models/guild/member.ml
+++ b/lib/models/guild/member.ml
@@ -1,39 +1,57 @@
 include Member_t
 
 let add_role ~(role:Role_t.t) member =
-    Http.add_member_role member.guild_id member.user.id role.id
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    let `Role_id role_id = role.id in
+    Http.add_member_role guild_id user_id role_id
 
 let remove_role ~(role:Role_t.t) member =
-    Http.remove_member_role member.guild_id member.user.id role.id
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    let `Role_id role_id = role.id in
+    Http.remove_member_role guild_id user_id role_id
 
 let ban ?(reason="") ?(days=0) member =
-    Http.guild_ban_add member.guild_id member.user.id (`Assoc [
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    Http.guild_ban_add guild_id user_id (`Assoc [
         ("delete-message-days", `Int days);
         ("reason", `String reason);
     ])
 
 let kick ?reason member =
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
     let payload = match reason with
     | Some r -> `Assoc [("reason", `String r)]
     | None -> `Null
-    in Http.remove_member member.guild_id member.user.id payload
+    in Http.remove_member guild_id user_id payload
 
 let mute member =
-    Http.edit_member member.guild_id member.user.id (`Assoc [
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    Http.edit_member guild_id user_id (`Assoc [
         ("mute", `Bool true);
     ])
 
 let deafen member =
-    Http.edit_member member.guild_id member.user.id (`Assoc [
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    Http.edit_member guild_id user_id (`Assoc [
         ("deaf", `Bool true);
     ])
 
 let unmute member =
-    Http.edit_member member.guild_id member.user.id (`Assoc [
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    Http.edit_member guild_id user_id (`Assoc [
         ("mute", `Bool false);
     ])
 
 let undeafen member =
-    Http.edit_member member.guild_id member.user.id (`Assoc [
+    let `Guild_id guild_id = member.guild_id in
+    let `User_id user_id = member.user.id in
+    Http.edit_member guild_id user_id (`Assoc [
         ("deaf", `Bool false);
     ])