slack_message, github: simplify gh_link_re, and fixed condense files modified notification

Author: dombong

lib/github.ml

@@ -95,7 +95,7 @@ type gh_link =
   | Commit of repository * commit_hash
   | Compare of repository * basehead
 
-let gh_link_re = Re2.create_exn {|^(.*)/(.+)/(.+)/(commit|pull|issues|compare)/([a-zA-Z0-9/:\-_.~\^]+)/?$|}
+let gh_link_re = Re2.create_exn {|^(.*)/(.+)/(.+)/(commit|pull|issues|compare)/([a-zA-Z0-9/:\-_.~\^]+)$|}
 let commit_sha_re = Re2.create_exn {|[a-f0-9]{4,40}|}
 let comparer_re = {|([a-zA-Z0-9/:\-_.~\^]+)|}
 let compare_basehead_re = Re2.create_exn (sprintf {|%s([.]{3})%s|} comparer_re comparer_re)

lib/slack_message.ml

@@ -143,7 +143,7 @@ let condense_file_changes files =
       |> List.drop_last_exn
       |> String.concat ~sep:"/"
     in
-    if String.is_empty prefix_path then "" else sprintf " in `%s/`" prefix_path
+    if String.is_empty prefix_path then "" else sprintf "modified %d files in `%s/`" (List.length files) prefix_path
 
 let populate_commit ?(include_changes = true) repository (commit : api_commit) =
   let ({ sha; commit; url; author; files; _ } : api_commit) = commit in
@@ -175,19 +175,17 @@ let populate_commit ?(include_changes = true) repository (commit : api_commit) =
           in
           ( match List.map ~f:Int.of_string @@ String.split date ~on:'-' with
           | [ y; m; d ] when y = yy && m = mm && d = dd -> "today"
-          | [ y; m; d ] when y = yy -> sprintf " on %s %d" (month m) d
-          | _ -> date
+          | [ y; m; d ] when y = yy -> sprintf "on %s %d" (month m) d
+          | _ -> "on " ^ date
           )
         | _ -> failwith "wut"
-      with _ -> " on " ^ commit.author.date
+      with _ -> "on " ^ commit.author.date
     in
-    sprintf "modified %d files%s %s" (List.length files) where when_
-  in
-  let text =
-    match include_changes with
-    | false -> sprintf "%s\n" title
-    | true -> sprintf "%s\n%s" title (changes ())
+    match where, when_ with
+    | "", when_ -> when_
+    | where, when_ -> sprintf "%s %s" where when_
   in
+  let text = sprintf "%s\n%s" title (if include_changes then changes () else "") in
   let fallback = sprintf "[%s] %s - %s" (Slack.git_short_sha_hash sha) commit.message commit.author.name in
   {
     (base_attachment repository) with

test/slack_payloads.expected

@@ -586,7 +586,7 @@ will unfurl in #C047QTRD1CH
       "mrkdwn_in": [ "text" ],
       "color": "#f6f8fa",
       "author_icon": "https://github.com/avatars/u/0",
-      "text": "`<https://github.com/ahrefs/monorepo/commit/0d95302addd66c1816bce1b1d495ed1c93ccd478|0d95302a>` Update README.md - <https://github.com/Khady|Louis>\nmodified 1 files_modified `README.md` (+1-1)_ 2020-06-02",
+      "text": "`<https://github.com/ahrefs/monorepo/commit/0d95302addd66c1816bce1b1d495ed1c93ccd478|0d95302a>` Update README.md - <https://github.com/Khady|Louis>\n_modified `README.md` (+1-1)_ on 2020-06-02",
       "footer": "<https://github.com/ahrefs/monorobot|ahrefs/monorobot>"
     }
   }