From e252c9252e338fdf4589bcb601d3b3ac412440a1 Mon Sep 17 00:00:00 2001 From: Benedetta Date: Thu, 2 May 2024 11:54:36 +0200 Subject: [PATCH] prepare for release --- pam/bin/main.ml | 3 +-- pam/lib/issuelib.ml | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pam/bin/main.ml b/pam/bin/main.ml index 98b0acc..f626026 100644 --- a/pam/bin/main.ml +++ b/pam/bin/main.ml @@ -79,7 +79,7 @@ let main (config: Config.config) = let _ = Riot.register _HTTP_CLIENT http_client_pid in let _ = Riot.register _MQ_CLIENT mq_client_pid in - let timeout = 3.0 in + let timeout = 30.0 in let rec loop_ () = let _ = send http_client_pid ListIssues in sleep timeout |> loop_ @@ -89,6 +89,5 @@ let main (config: Config.config) = let () = - if true then failwith "Testa che manda gli errori su matrix" else 2 |> ignore in let config = Config.configuration () |> Result.fold ~error:exit2 ~ok:identity in Riot.run (fun () -> main config) diff --git a/pam/lib/issuelib.ml b/pam/lib/issuelib.ml index 0beefe1..f055bf3 100644 --- a/pam/lib/issuelib.ml +++ b/pam/lib/issuelib.ml @@ -73,9 +73,9 @@ module Private = struct else (Ok (0, str), SameDay) in Result.bind od (fun (offset, date_str) -> + let date_str = String.trim date_str |> BatString.trim in match String.split_on_char ':' date_str with | h::m::[] when is_number h && is_number m -> - let (h, m) = (h, m) |> BatTuple.Tuple2.map1 BatString.trim in begin match int_of_string_opt h, int_of_string_opt m with | Some h, Some m -> Ok {date_offset=offset; exact_time=(h, m); when_=when_} @@ -135,7 +135,9 @@ let issue_data_to_json (issue: Datatypes.forgejo_issue_data) = let open Yojson.Basic in let due_date = Option.value ~default:"" issue.due_date in let room_id = issue.matrix_target in - let content = [%string {|[%{issue.title}](%{issue.url}) - %{due_date}\n%{issue.body}|} ] in + let content = [%string {|[%{issue.title}](%{issue.url}) - %{due_date} + +%{issue.body}|} ] in let d = `Assoc [ ("content", `String content);