6 files changed, 11 insertions, 14 deletions
diff --git a/lib/models/id/channel_id.ml b/lib/models/id/channel_id.ml
index 1ea7a46..7c62d84 100644
--- a/lib/models/id/channel_id.ml
+++ b/lib/models/id/channel_id.ml
@@ -33,16 +33,13 @@ let delete ch =
 let get_message ~id ch =
     Http.get_message (get_id ch) id
 
-let get_messages ?(mode=`Around) ?id ?(limit=50) ch =
+let get_messages ?(mode=`Around) ~id ?(limit=50) ch =
     let kind = match mode with
-    | `Around -> "around", limit
-    | `Before -> "before", limit
-    | `After -> "after", limit
+    | `Around -> "around", id
+    | `Before -> "before", id
+    | `After -> "after", id
     in
-    let id = match id with
-    | Some id -> id
-    | None -> raise No_message_found in
-    Http.get_messages (get_id ch) id kind
+    Http.get_messages (get_id ch) limit kind
 
 let broadcast_typing ch =
     Http.broadcast_typing (get_id ch)
@@ -51,5 +48,5 @@ let get_pins ch =
     Http.get_pinned_messages (get_id ch)
 
 let bulk_delete msgs ch =
-    let msgs = `List (List.map ~f:(fun id -> `Int id) msgs) in
+    let msgs = `List (List.map ~f:(fun id -> `Intlit (Int64.to_string id)) msgs) in
     Http.bulk_delete (get_id ch) msgs
 \ No newline at end of file
diff --git a/lib/models/id/channel_id.mli b/lib/models/id/channel_id.mli
index 2dfff8f..5ecad0c 100644
--- a/lib/models/id/channel_id.mli
+++ b/lib/models/id/channel_id.mli
@@ -37,7 +37,7 @@ val delete : t -> Channel_t.t Deferred.Or_error.t
 val get_message : id:Snowflake.t -> t -> Message_t.t Deferred.Or_error.t
 val get_messages :
     ?mode:[ `Before | `After | `Around ] ->
-    ?id:Snowflake.t ->
+    id:Snowflake.t ->
     ?limit:int ->
     t ->
     Message_t.t list Deferred.Or_error.t
diff --git a/lib/models/id/channel_id_t.ml b/lib/models/id/channel_id_t.ml
index cea85e0..c6b80ec 100644
--- a/lib/models/id/channel_id_t.ml
+++ b/lib/models/id/channel_id_t.ml
@@ -2,7 +2,7 @@ open Core
 
 type t = [ `Channel_id of Snowflake.t ] [@@deriving sexp]
 
-let compare (`Channel_id t) (`Channel_id t') = Int.compare t t'
+let compare (`Channel_id t) (`Channel_id t') = Int64.compare t t'
 
 let of_yojson a : (t, string) result =
     match Snowflake.of_yojson a with
diff --git a/lib/models/id/guild_id.ml b/lib/models/id/guild_id.ml
index d4db185..1e0168f 100644
--- a/lib/models/id/guild_id.ml
+++ b/lib/models/id/guild_id.ml
@@ -82,7 +82,7 @@ let request_members guild =
     Http.get_members (get_id guild)
 
 let set_afk_channel ~id guild = Http.edit_guild (get_id guild) (`Assoc [
-    ("afk_channel_id", `Int id);
+    ("afk_channel_id", `Intlit (Int64.to_string id));
     ])
 
 let set_afk_timeout ~timeout guild = Http.edit_guild (get_id guild) (`Assoc [
diff --git a/lib/models/id/guild_id_t.ml b/lib/models/id/guild_id_t.ml
index a39c07d..b2fd202 100644
--- a/lib/models/id/guild_id_t.ml
+++ b/lib/models/id/guild_id_t.ml
@@ -2,7 +2,7 @@ open Core
 
 type t = [ `Guild_id of Snowflake.t ] [@@deriving sexp]
 
-let compare (`Guild_id t) (`Guild_id t') = Int.compare t t'
+let compare (`Guild_id t) (`Guild_id t') = Int64.compare t t'
 
 let of_yojson a : (t, string) result =
     match Snowflake.of_yojson a with
diff --git a/lib/models/id/user_id_t.ml b/lib/models/id/user_id_t.ml
index cf1634a..214fa14 100644
--- a/lib/models/id/user_id_t.ml
+++ b/lib/models/id/user_id_t.ml
@@ -2,7 +2,7 @@ open Core
 
 type t = [ `User_id of Snowflake.t ] [@@deriving sexp]
 
-let compare (`User_id t) (`User_id t') = Int.compare t t'
+let compare (`User_id t) (`User_id t') = Int64.compare t t'
 
 let of_yojson a : (t, string) result =
     match Snowflake.of_yojson a with