3 files changed, 12 insertions, 9 deletions
diff --git a/lib/models/channel/channel.ml b/lib/models/channel/channel.ml
index 4d7b29d..47cf500 100644
--- a/lib/models/channel/channel.ml
+++ b/lib/models/channel/channel.ml
@@ -33,13 +33,16 @@ 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", id
-    | `Before -> "before", id
-    | `After -> "after", id
+    | `Around -> "around", limit
+    | `Before -> "before", limit
+    | `After -> "after", limit
     in
-    Http.get_messages (get_id ch) limit kind
+    let id = match id with
+    | Some id -> id
+    | None -> raise No_message_found in
+    Http.get_messages (get_id ch) id kind
 
 let broadcast_typing ch =
     Http.broadcast_typing (get_id ch)
@@ -48,5 +51,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 -> `Intlit (Int64.to_string id)) msgs) in
+    let msgs = `List (List.map ~f:(fun id -> `Int id) msgs) in
     Http.bulk_delete (get_id ch) msgs
 \ No newline at end of file
diff --git a/lib/models/channel/channel.mli b/lib/models/channel/channel.mli
index cb01533..0d7431b 100644
--- a/lib/models/channel/channel.mli
+++ b/lib/models/channel/channel.mli
@@ -36,7 +36,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/channel/message/message.ml b/lib/models/channel/message/message.ml
index a94d15e..7f03638 100644
--- a/lib/models/channel/message/message.ml
+++ b/lib/models/channel/message/message.ml
@@ -6,7 +6,7 @@ let add_reaction msg (emoji:Emoji.t) =
     let `Message_id id = msg.id in
     let `Channel_id channel_id = msg.channel_id in
     let e = match emoji.id with
-    | Some i -> Printf.sprintf "%s:%Ld" emoji.name i
+    | Some i -> Printf.sprintf "%s:%d" emoji.name i
     | None -> emoji.name
     in
     Http.create_reaction channel_id id e
@@ -17,7 +17,7 @@ let remove_reaction msg (emoji:Emoji.t) (user:User_t.t) =
     let `Channel_id channel_id = msg.channel_id in
     let `User_id user_id = user.id in
     let e = match emoji.id with
-    | Some i -> Printf.sprintf "%s:%Ld" emoji.name i
+    | Some i -> Printf.sprintf "%s:%d" emoji.name i
     | None -> emoji.name
     in
     Http.delete_reaction channel_id id e user_id