+6 -2

stack/zulip/lib/zulip/lib/user.ml

reviewed

··· 1 1 type t = { 2 2 email : string; 3 3 full_name : string; 4 4 + user_id : int option; 5 5 + delivery_email : string option; 4 6 is_active : bool; 5 7 is_admin : bool; 6 8 is_bot : bool; 7 9 } 8 10 9 9 - let create ~email ~full_name ?(is_active = true) ?(is_admin = false) ?(is_bot = false) () = 10 10 - { email; full_name; is_active; is_admin; is_bot } 11 11 + let create ~email ~full_name ?user_id ?delivery_email ?(is_active = true) ?(is_admin = false) ?(is_bot = false) () = 12 12 + { email; full_name; user_id; delivery_email; is_active; is_admin; is_bot } 11 13 12 14 let email t = t.email 13 15 let full_name t = t.full_name 16 16 + let user_id t = t.user_id 17 17 + let delivery_email t = t.delivery_email 14 18 let is_active t = t.is_active 15 19 let is_admin t = t.is_admin 16 20 let is_bot t = t.is_bot

+2

stack/zulip/lib/zulip/lib/user.mli

reviewed

··· 10 10 11 11 val email : t -> string 12 12 val full_name : t -> string 13 13 + val user_id : t -> int option 14 14 + val delivery_email : t -> string option 13 15 val is_active : t -> bool 14 16 val is_admin : t -> bool 15 17 val is_bot : t -> bool

+2 -2

stack/zulip/lib/zulip/lib/users.ml

reviewed

··· 15 15 | Error msg -> Error (Zulip_types.create_error ~code:(Other "api_error") ~msg ())) 16 16 | Error err -> Error err 17 17 18 18 - let get client ~email = 18 18 + let get client ~email = 19 19 match Client.request client ~method_:`GET ~path:("/api/v1/users/" ^ email) () with 20 20 - | Ok json -> 20 20 + | Ok json -> 21 21 (match User.of_json json with 22 22 | Ok user -> Ok user 23 23 | Error err -> Error err)

+1

stack/zulip/lib/zulip/lib/users.mli

reviewed

··· 1 1 val list : Client.t -> (User.t list, Zulip_types.zerror) result 2 2 val get : Client.t -> email:string -> (User.t, Zulip_types.zerror) result 3 3 + val get_by_id : Client.t -> user_id:int -> (User.t, Zulip_types.zerror) result 3 4 val create_user : Client.t -> email:string -> full_name:string -> (unit, Zulip_types.zerror) result 4 5 val deactivate : Client.t -> email:string -> (unit, Zulip_types.zerror) result

+4 -1

stack/zulip/lib/zulip_bot/lib/bot_storage.mli

reviewed

··· 21 21 val keys : t -> (string list, Zulip.zerror) result 22 22 23 23 (** Flush all dirty keys to the API *) 24 24 - val flush : t -> (unit, Zulip.zerror) result 24 24 + val flush : t -> (unit, Zulip.zerror) result 25 25 + 26 26 + (** Get the underlying Zulip client *) 27 27 + val client : t -> Zulip.Client.t