aboutsummaryrefslogtreecommitdiff
path: root/lib/models
diff options
context:
space:
mode:
authorAdelyn Breelove <[email protected]>2018-12-19 15:50:16 -0700
committerAdelyn Breelove <[email protected]>2018-12-19 15:50:16 -0700
commit66e1462b8dd3f2b89cf066f314eeb9070b05be69 (patch)
tree1f55452f959b7ea3f8c20e14fb8b3a58c89e8f37 /lib/models
parentAdd proper type parsing to Guild (diff)
downloaddisml-66e1462b8dd3f2b89cf066f314eeb9070b05be69.tar.xz
disml-66e1462b8dd3f2b89cf066f314eeb9070b05be69.zip
Fix member abstraction and helper methods
Diffstat (limited to 'lib/models')
-rw-r--r--lib/models/guild.ml4
-rw-r--r--lib/models/role.ml4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/models/guild.ml b/lib/models/guild.ml
index 1e870f9..a10cd6c 100644
--- a/lib/models/guild.ml
+++ b/lib/models/guild.ml
@@ -35,7 +35,7 @@ module Make(Http : S.Http) = struct
in Http.guild_role_add guild.id (`Assoc payload)
>>| Result.map ~f:(fun r ->
Role_j.role_of_string r
- |> Event.wrap_role_with_id ~guild_id:guild.id)
+ |> Event.wrap_role ~guild_id:guild.id)
let create_channel ~mode ~name guild =
let kind = match mode with
@@ -87,7 +87,7 @@ module Make(Http : S.Http) = struct
(* TODO add HTTP fallback *)
let get_role ~id guild =
let role = List.find ~f:(fun r -> r.id = id) guild.roles in
- Option.(role >>| Event.wrap_role_with_id ~guild_id:guild.id)
+ Option.(role >>| Event.wrap_role ~guild_id:guild.id)
(* TODO add webhook abstraction? *)
let get_webhooks guild =
diff --git a/lib/models/role.ml b/lib/models/role.ml
index 5a3701c..aa931d6 100644
--- a/lib/models/role.ml
+++ b/lib/models/role.ml
@@ -3,12 +3,12 @@ module Make(Http : S.Http) = struct
type t = Role_t.t
- let edit_role ~body role = Http.guild_role_edit role.guild_id role.id body
+ let edit_role ~body (role:t) = Http.guild_role_edit role.guild_id role.id body
let allow_mention role =
edit_role ~body:(`Assoc [("mentionable", `Bool true)]) role
- let delete role = Http.guild_role_remove role.guild_id role.id
+ let delete (role:t) = Http.guild_role_remove role.guild_id role.id
let disallow_mention role =
edit_role ~body:(`Assoc [("mentionable", `Bool false)]) role