rename slack req/res atd types so they're not webhook-specific

Slack Webhooks and Web API should be able to share the same
payload structure.

Author: yasunariw

lib/api.ml

@@ -9,5 +9,5 @@ module type Github = sig
 end
 
 module type Slack = sig
-  val send_notification : chan:string -> msg:webhook_notification -> url:string -> (unit, string) Result.t Lwt.t
+  val send_notification : chan:string -> msg:post_message_req -> url:string -> (unit, string) Result.t Lwt.t
 end

lib/api_local.ml

@@ -22,9 +22,7 @@ end
 
 module Slack : Api.Slack = struct
   let send_notification ~chan ~msg ~url:_ =
-    let json =
-      msg |> Slack_j.string_of_webhook_notification |> Yojson.Basic.from_string |> Yojson.Basic.pretty_to_string
-    in
+    let json = msg |> Slack_j.string_of_post_message_req |> Yojson.Basic.from_string |> Yojson.Basic.pretty_to_string in
     Stdio.printf "will notify #%s\n" chan;
     Stdio.printf "%s\n" json;
     Lwt.return @@ Ok ()
@@ -46,7 +44,7 @@ module Slack_json : Api.Slack = struct
   let log = Log.from "slack"
 
   let send_notification ~chan ~msg ~url:_ =
-    let json = Slack_j.string_of_webhook_notification msg in
+    let json = Slack_j.string_of_post_message_req msg in
     log#info "will notify %s" chan;
     let url = Uri.of_string "https://api.slack.com/docs/messages/builder" in
     let url = Uri.add_query_param url ("msg", [ json ]) in

lib/api_remote.ml

@@ -51,7 +51,7 @@ module Slack : Api.Slack = struct
   let log = Log.from "slack"
 
   let send_notification ~chan ~msg ~url =
-    let data = Slack_j.string_of_webhook_notification msg in
+    let data = Slack_j.string_of_post_message_req msg in
     let body = `Raw ("application/json", data) in
     log#info "sending to %s : %s" chan data;
     match%lwt http_request ~body `POST url with

lib/slack.atd

@@ -1,9 +1,9 @@
-type webhook_notification_field = {
+type message_field = {
   ?title: string nullable;
   value: string;
 }
 
-type webhook_notification_attachment = {
+type message_attachment = {
   fallback: string nullable;
   ?mrkdwn_in: string list nullable;
   ?color: string nullable;
@@ -14,18 +14,18 @@ type webhook_notification_attachment = {
   ?title: string nullable;
   ?title_link: string nullable;
   ?text: string nullable;
-  ?fields: webhook_notification_field list nullable;
+  ?fields: message_field list nullable;
   ?image_url: string nullable;
   ?thumb_url: string nullable;
   ?ts: int nullable;
   ?footer: string nullable;
 }
 
-type notification_section_block_type = [
+type message_section_block_type = [
   Section <json name="section">
 ] <ocaml repr="classic">
 
-type notification_divider_block_type = [
+type message_divider_block_type = [
   Divider <json name="divider">
 ] <ocaml repr="classic">
 
@@ -39,22 +39,22 @@ type text_object = {
   text: string;
 }
 
-type webhook_notification_text_block = {
-  notification_type <json name="type"> : notification_section_block_type;
+type message_text_block = {
+  message_type <json name="type"> : message_section_block_type;
   text: text_object;
 }
 
-type webhook_notification_divider_block = {
-  notification_type <json name="type"> : notification_divider_block_type;
+type message_divider_block = {
+  message_type <json name="type"> : message_divider_block_type;
 }
 
-type webhook_notification_block = [
-  Text of webhook_notification_text_block
-  | Divider of webhook_notification_divider_block
+type message_block = [
+  Text of message_text_block
+  | Divider of message_divider_block
 ] <json adapter.ocaml="Atdgen_runtime.Json_adapter.Type_field">
 
-type webhook_notification = {
+type post_message_req = {
   ?text: string nullable;
-  ?attachments: webhook_notification_attachment list nullable;
-  ?blocks: webhook_notification_block list nullable;
+  ?attachments: message_attachment list nullable;
+  ?blocks: message_block list nullable;
 }

src/monorobot.ml

@@ -46,7 +46,7 @@ let check_gh_action file json config secrets state =
 let check_slack_action url file =
   let data = Stdio.In_channel.read_all file in
   let chan = Printf.sprintf "webhook %s" url in
-  match Slack_j.webhook_notification_of_string data with
+  match Slack_j.post_message_req_of_string data with
   | exception exn -> log#error ~exn "unable to parse notification"
   | msg ->
     Lwt_main.run