From 4aaa96c6c11767f445fd9b1fd655f102f361adf2 Mon Sep 17 00:00:00 2001 From: tali Date: Tue, 30 Jan 2024 19:21:47 -0500 Subject: [PATCH] make "Router.membership" easier to type --- lib/server/connection.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/server/connection.ml b/lib/server/connection.ml index 997ea28..9e2150e 100644 --- a/lib/server/connection.ml +++ b/lib/server/connection.ml @@ -1,5 +1,6 @@ open! Import open Result_syntax +type membership = Router.membership include (val Logging.sublogs logger "Connection") @@ -91,7 +92,7 @@ let require_membership chan me = | mem -> Ok mem | exception Not_found -> Error (notonchannel (Chan.name chan)) -let require_chan_op (m : Router.membership) = +let require_chan_op (m : membership) = match m.mem_priv with | Operator -> Ok () | _ -> Error (chanoprivsneeded (Chan.name m.mem_chan)) @@ -146,10 +147,9 @@ let set_chan_limit chan ~from chg = Router.relay msg ~from [`to_chan chan; `to_self]; Chan.set_limit chan limit -let set_member_priv ~from (mem : Router.membership) (priv : Router.priv) = +let set_member_priv ~from (mem : membership) (priv : Router.priv) = let user = mem.mem_user in let chan = mem.mem_chan in - (* let user = (mem : Router.membership).mem_user in *) let modestr = match mem.mem_priv, priv with | _, Voice -> "+v" | _, Operator -> "+o" @@ -319,14 +319,14 @@ let list_names t me chan = [] else Chan.membership_when - (fun (m : Router.membership) -> + (fun (m : membership) -> not (is_invisible m.mem_user)) chan in let nicks = List.map - (fun (m : Router.membership) -> + (fun (m : membership) -> let nick = User.nick m.mem_user in match m.mem_priv with | Normal -> nick