From a44882d0e2c7b3397fc6c6c616e554eeb2248fdb Mon Sep 17 00:00:00 2001 From: Matias Goldfeld Date: Fri, 29 Jan 2021 13:40:47 -0500 Subject: Revert "More Int64 refactors" This reverts commit b499169e93e9f7bdd0f877a3cdf0247ec495abe1. --- lib/models/channel/channel.ml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/models/channel/channel.ml') 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 -- cgit v1.2.3