bin/main.ml

@@ -14,11 +14,12 @@ let no_timestamp = Option.is_some (Sys.getenv_opt "LOG_NO_TIMESTAMP")
 let no_namespace = Option.is_some (Sys.getenv_opt "LOG_NO_NAMESPACE")
 
 let () =
-  if Logging.should_upgrade_to_journald () then
+  match Sys.getenv_opt "JOURNAL_STREAM" with
+  | Some _ ->
     Logging.init_journald_writer ()
       ~min_level
-  else
+  | None ->
-    Logging.init_pretty_writer stdout
+    Logging.init_pretty_writer stderr
       ~min_level
       ~color:(not no_color)
       ~timestamp:(not no_timestamp)

conf.txt

@@ -1,3 +0,0 @@
-IRC_MOTD=/etc/talircd.motd
-IRC_HOSTNAME=irc.tali.software
-IRC_PORT=6667

deploy/_build.sh

@@ -6,16 +6,17 @@ eval $(opam env)
 
 root=dist/root
 rm -rf $root
-mkdir -p $root/usr/lib/systemd/system $root/DEBIAN
+mkdir -p $root/DEBIAN $root/etc $root/usr/lib/systemd/system
 
 # build ocaml program
 
 opam pin add ./talircd --kind=path --no-action --yes
 opam install talircd --destdir=$root/usr --yes
 
-# install service file
+# install helper files
 
 install -m 644 talircd/deploy/talircd.service $root/usr/lib/systemd/system
+install -m 644 talircd/deploy/talircd.conf $root/etc
 
 # generate package control file
 
@@ -36,8 +37,6 @@ echo "Description: ${dsc}"   >> $control
 echo "Maintainer: ${mtr}"    >> $control
 echo "Architecture: ${arch}" >> $control
 
-install -m 755 talircd/deploy/postinst.sh $root/DEBIAN/postinst
-
 # generate .deb
 
 dpkg-deb --root-owner-group -b $root "dist/${pkg}_${ver}-${rev}_${arch}.deb"

deploy/postinst.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/sh
-[ -f /etc/talircd.conf ] || install -m 644 /usr/share/talircd/default/conf /etc/talircd.conf
-[ -f /etc/talircd.motd ] || install -m 644 /usr/share/talircd/default/motd /etc/talircd.motd
-systemctl daemon-reload

deploy/talircd.conf

@@ -0,0 +1,4 @@
+IRC_MOTD=/usr/share/talircd/motd
+IRC_HOSTNAME=irc.tali.software
+IRC_PORT=6667
+LOG_LEVEL=debug

dune

@@ -1,6 +1,4 @@
 (install
  (package talircd)
- (files
+ (files (motd.txt as motd))
-  (motd.txt as default/motd)
-  (conf.txt as default/conf))
  (section share))

dune-project

@@ -1,6 +1,6 @@
 (lang dune 3.8)
 (name talircd)
-(version 0.0.3)
+(version 0.0.2)
 
 (generate_opam_files true)
 

lib/logging/journald.ml

@@ -9,11 +9,6 @@ type t = {
   buf : Buffer.t;
 }
 
-let should_upgrade () =
-  let stderr = Unix.fstat Unix.stderr in
-  let dev_ino = Printf.sprintf "%d:%d" stderr.st_dev stderr.st_ino in
-  Sys.getenv_opt "JOURNAL_STREAM" = Some dev_ino
-
 let make ?(path = default_socket_path) () = {
   mutex = Mutex.create ();
   sock_fd = Unix.socket PF_UNIX SOCK_DGRAM 0 ~cloexec:true;

lib/logging/logging.ml

@@ -107,5 +107,3 @@ let init_journald_writer
   Journald.make () ?path |>
   Journald.writer |>
   add_writer ?min_level
-
-let should_upgrade_to_journald = Journald.should_upgrade

lib/logging/logging.mli

@@ -36,5 +36,3 @@ val init_journald_writer :
   ?min_level:level ->
   ?path:string ->
   unit -> unit
-
-val should_upgrade_to_journald : unit -> bool

lib/server/chan.ml

@@ -24,7 +24,6 @@ let creation_time t = t.creation_time
 let topic t = fst t.topic
 let topic_who_time t = snd t.topic
 let set_topic ~who ?time t text = t.topic <- text, Some (who, value_or_now time)
-let member_count t = t.member_count
 let mode t = t.chan_mode
 let set_mode t new_mode = t.chan_mode <- new_mode
 let limit t = t.chan_limit

lib/server/connection.ml

@@ -280,22 +280,22 @@ let on_msg_mode t name args =
   Ok ()
 
 
-(* messages *)
+(* messages and channels *)
-
-let get_priv_opt chan user =
-  try
-    let mem = Router.membership chan user in
-    Some mem.mem_priv
-  with Not_found ->
-    None
 
 let send_to_chan ~from chan =
-  let priv_required =
+  let cannot_send =
-    if      Mode.Set.mem `m (Chan.mode chan) then Some Voice
+    try
-    else if Mode.Set.mem `n (Chan.mode chan) then Some Normal
+      let mem = Router.membership chan from in
-    else None
+      (* check if moderated (+m) *)
+      if Mode.Set.mem `m (Chan.mode chan) then
+        mem.mem_priv < Voice
+      else
+        false
+    with Not_found ->
+      (* check if no external messages (+n) *)
+      Mode.Set.mem `n (Chan.mode chan)
   in
-  if get_priv_opt chan from < priv_required then
+  if cannot_send then
     Error (cannotsendtochan (Chan.name chan))
   else
     Ok (Chan.name chan, [`to_chan chan])
@@ -336,9 +336,6 @@ let on_msg_away t status =
   set_away t me status;
   Ok ()
 
-
-(* channels *)
-
 let membership_prefix = function
   | Normal -> ""
   | Voice -> "+"
@@ -347,29 +344,30 @@ let membership_prefix = function
 let is_invisible user =
   Mode.Set.mem `i (User.mode user)
 
-let is_secret chan =
-  Mode.Set.mem `s (Chan.mode chan)
-
 let list_names t me chan =
+  let is_secret = Mode.Set.mem `s (Chan.mode chan) in
+
   let members =
     match Router.membership chan me with
     | _is_member -> Chan.membership chan
     | exception Not_found ->
-      if is_secret chan then
+      if is_secret then
         []
       else
         Chan.membership_when
           (fun mem -> not (is_invisible mem.mem_user))
           chan
   in
+
   let nicks =
     List.map
       (fun mem ->
          membership_prefix mem.mem_priv ^ User.nick mem.mem_user)
       members
   in
+
   let chan_name = Chan.name chan in
-  let chan_sym = if is_secret chan then "@" else "=" in
+  let chan_sym = if is_secret then "@" else "=" in
   begin
     (* TODO: concat member names until message becomes too long *)
     List.iter (fun nick -> reply t ("353", [chan_sym; chan_name; nick])) nicks;
@@ -685,43 +683,6 @@ let on_msg_userhost t nicks =
   reply t ("302", [String.concat " " results]);
   Ok ()
 
-let list_channels t me channels =
-  begin
-    reply t ("321", ["Channel"; "Users  Name"]);
-    Seq.iter
-      (function
-        | Error err -> reply t err
-        | Ok chan ->
-          try
-            if is_secret chan then Router.membership chan me |> ignore;
-            let count = Chan.member_count chan in
-            let topic = Option.value (Chan.topic chan) ~default:"" in
-            reply t ("322", [Chan.name chan; string_of_int count; topic])
-          with Not_found ->
-            ())
-      channels;
-    reply t ("323", ["End of /LIST"]);
-  end
-
-let on_msg_list t names =
-  let* me = require_registered t in
-  let channels = match names with
-    | [] ->
-      Seq.map Result.ok
-        (Router.all_channels_seq t.router)
-    | _ ->
-      Seq.map
-        (fun name ->
-           try
-             match name_type name with
-             | `chan -> Ok (Router.find_chan t.router name)
-             | `nick | `invalid -> raise Not_found
-           with Not_found ->
-             Error (nosuchnick name))
-        (List.to_seq names)
-  in
-  list_channels t me channels;
-  Ok ()
 
 (* welcome and quit *)
 
@@ -974,8 +935,6 @@ let dispatch t = function
   | "WHOWAS", ([] | "" :: _) -> Error nonicknamegiven
   | "WHOWAS", [nick] -> on_msg_whowas t nick ""
   | "WHOWAS", nick :: count :: _ -> on_msg_whowas t nick count
-  | "LIST", chans :: _ -> on_msg_list t (String.split_on_char ',' chans)
-  | "LIST", [] -> on_msg_list t []
   | "USERHOST", nicks -> on_msg_userhost t nicks
   | ("USER" | "JOIN" | "NAMES" | "PART" | "KICK" | "MODE" | "WHO") as cmd, _ ->
     Error (needmoreparams cmd)
@@ -989,6 +948,7 @@ let dispatch t = function
       | tgt :: msg :: _ -> on_msg_privmsg t tgt msg ~cmd
     end
 
+  (* TODO: "LIST" *)
   | cmd, _ ->
     Error (unknowncommand cmd)
 

lib/server/router.ml

@@ -28,9 +28,6 @@ let find_chan t name =
 let whowas t nick =
   Cache.find_all t.whowas (string_ci nick)
 
-let all_channels_seq t =
-  Hashtbl.to_seq_values t.channels
-
 let nuke t =
   begin
     Hashtbl.iter (fun _ u -> Dllist.reset u.membership) t.users;

talircd.opam

@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.0.3"
+version: "0.0.2"
 synopsis: "IRC server"
 description: "IRC server for cats written in ocaml"
 maintainer: ["iitalics <git.lain.faith/iitalics>"]