slack_msg: unfurling commits always have timestamps in footer

Author: dombong

lib/slack.ml

@@ -1,6 +1,7 @@
 open Printf
 open Base
 open Common
+open Mrkdwn
 open Github_j
 open Slack_j
 
@@ -217,9 +218,18 @@ let generate_issue_comment_notification notification channel =
 let git_short_sha_hash hash = String.sub ~pos:0 ~len:8 hash
 
 (** pretty print github commit *)
-let pp_commit ({ url; id; message; author; _ } : commit) =
+let pp_commit_common url id message author =
   let title = first_line message in
-  sprintf "`<%s|%s>` %s - %s" url (git_short_sha_hash id) title author.name
+  sprintf "`<%s|%s>` %s - %s" url (git_short_sha_hash id) (escape_mrkdwn @@ title) author
+
+let pp_commit ({ url; id; message; author; _ } : commit) = pp_commit_common url id message (escape_mrkdwn @@ author.name)
+
+let pp_api_commit ({ sha; commit; url; author; _ } : api_commit) =
+  match author with
+  | Some author ->
+    pp_commit_common url sha commit.message
+      (sprintf "<%s|%s>" (escape_mrkdwn author.html_url) (escape_mrkdwn commit.author.name))
+  | None -> pp_commit_common url sha commit.message commit.author.name
 
 (** pretty print list with previews of each item per line--will always show at most 7 and drop the rest*)
 let pp_list_with_previews ~pp_item list =

lib/slack_message.ml

@@ -2,7 +2,6 @@ open Base
 open Printf
 open Github_t
 open Slack_t
-open Common
 open Mrkdwn
 
 let color_of_state ?(draft = false) ?(merged = false) state =
@@ -146,19 +145,9 @@ let condense_file_changes files =
     sprintf "modified %d files%s" (List.length files)
       (if String.is_empty prefix_path then "" else sprintf " in `%s/`" prefix_path)
 
-let populate_commit ?(include_changes = true) repository (commit : api_commit) =
-  let ({ sha; commit; url; author; files; _ } : api_commit) = commit in
-  let title =
-    match author with
-    | Some author ->
-      sprintf "`<%s|%s>` %s - <%s|%s>" url (Slack.git_short_sha_hash sha)
-        (escape_mrkdwn @@ first_line commit.message)
-        (escape_mrkdwn author.html_url) (escape_mrkdwn commit.author.name)
-    | None ->
-      sprintf "`<%s|%s>` %s - %s" url (Slack.git_short_sha_hash sha)
-        (escape_mrkdwn @@ first_line commit.message)
-        (escape_mrkdwn commit.author.name)
-  in
+let populate_commit ?(include_changes = true) repository (api_commit : api_commit) =
+  let ({ sha; commit; author; files; _ } : api_commit) = api_commit in
+  let title = Slack.pp_api_commit api_commit in
   let changes () =
     let where = condense_file_changes files in
     let when_ =
@@ -190,11 +179,7 @@ let populate_commit ?(include_changes = true) repository (commit : api_commit) =
   let fallback = sprintf "[%s] %s - %s" (Slack.git_short_sha_hash sha) commit.message commit.author.name in
   {
     (base_attachment repository) with
-    footer =
-      Some
-        (simple_footer repository
-        ^ if String.equal commit.committer.date commit.author.date then "" else " " ^ commit.committer.date
-        );
+    footer = Some (simple_footer repository ^ commit.committer.date);
     (*
     author_name = Some author.login;
     author_link = Some author.html_url;

test/slack_payloads.expected

@@ -587,7 +587,7 @@ will unfurl in #C047QTRD1CH
       "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>\n_modified `README.md` (+1-1)_ on 2020-06-02",
-      "footer": "<https://github.com/ahrefs/monorobot|ahrefs/monorobot>"
+      "footer": "<https://github.com/ahrefs/monorobot|ahrefs/monorobot>2020-06-02T03:14:51Z"
     }
   }
 }