fix interaction payloads for block actions

Author: koonwen

lib/block_kit.atd

@@ -2,6 +2,7 @@ type json <ocaml module="Yojson.Basic" t="t"> = abstract
 
 type view = [
   | Modal <json name="modal"> of modal
+  | Home <json name="home"> of json
 ] <ocaml repr="classic"> <json adapter.ocaml="Atdgen_runtime.Json_adapter.Type_field">
 
 type modal <ocaml attr="deriving make"> = {
@@ -22,11 +23,17 @@ type modal <ocaml attr="deriving make"> = {
 type blocks = block list
 
 type block = [
+  | Actions <json name = "actions"> of actions
   | Divider <json name = "divider"> of divider
   | Input <json name = "input"> of input
   | Section <json name = "section"> of section
 ] <ocaml repr="classic"> <json adapter.ocaml="Atdgen_runtime.Json_adapter.Type_field">
 
+type actions <ocaml attr="deriving make"> = {
+  elements : element list <ocaml valid="fun l -> List.length l <= 25">;
+  ?block_id : string nullable <ocaml valid="fun s -> String.length s <= 255">
+}
+
 type divider <ocaml attr="deriving make"> = {
   block_id : string nullable <ocaml valid="fun s -> String.length s <= 255">
 }
@@ -54,7 +61,7 @@ type element = [
   | Button <json name = "button"> of button
   | Plain_text_input <json name = "plain_text_input"> of plain_text_input
   | Multi_static_select_menu <json name = "multi_static_select"> of multi_static_select_menu
-  | Multi_users_select_menu <json name = "multi_users_select_menu"> of multi_users_select_menu
+  | Multi_users_select_menu <json name = "multi_users_select"> of multi_users_select_menu
   | Static_select_menu <json name = "static_select"> of static_select_menu
 ] <ocaml repr="classic"> <json adapter.ocaml="Atdgen_runtime.Json_adapter.Type_field">
 
@@ -92,7 +99,7 @@ type multi_static_select_menu <ocaml attr="deriving make"> = {
 
 type multi_users_select_menu <ocaml attr="deriving make"> = {
   ?action_id : string nullable <ocaml valid="fun s -> String.length s <= 255">;
-  ?initial_users : string nullable;
+  ?initial_users : string list nullable;
   ?confirm : confirmation_dialog_object nullable;
   ?max_selected_items : int nullable <ocaml valid="fun i -> i >= 1">;
   ?focus_on_load : bool nullable;

lib/block_kit_safe.ml

@@ -147,6 +147,7 @@ let make_button ~(text : plain_text) ?action_id ?url ?value ?style ?confirm ?acc
 
 (******************* Blocks ***********************)
 
+let make_actions ~elements ?block_id () = Block_kit_j.(Actions (make_actions ~elements ?block_id ()))
 let make_divider ?block_id () = Block_kit_j.(Divider (make_divider ?block_id ()))
 
 let make_input ~(label : plain_text) ~element ?dispatch_action ?block_id ?(hint : plain_text option) ?optional () =

lib/slack.atd

@@ -701,23 +701,25 @@ type 'ok slack_response = ('ok, slack_api_error) http_response
 
 
 type interaction = [
-| Shortcut <json name="shortcut"> of interaction_payload
-| Message_actions <json name="message_action"> of interaction_payload
-| Block_actions <json name="block_actions"> of interaction_payload
-| View_submission <json name="view_submission"> of json
-| View_closed <json name="view_closed"> of json
+  | Shortcut <json name="shortcut"> of interaction_payload
+  | Message_actions <json name="message_action"> of interaction_payload
+  | Block_actions <json name="block_actions"> of interaction_payload
+  | View_submission <json name="view_submission"> of json
+  | View_closed <json name="view_closed"> of json
 ] <ocaml repr="classic"> <json adapter.ocaml="Atdgen_runtime.Json_adapter.Type_field">
 
 type interaction_payload = {
   trigger_id: string;
   token: string;
   team: interaction_team;
+  ?container : json nullable;   (* Only available in block_actions *)
   ?callback_id: string nullable;
   ?response_url: string nullable;
   ?message: interaction_message nullable;
   ?user: interaction_user nullable;
   ?channel : interaction_channel nullable;
   ?actions : interaction_action list nullable;
+  ?view : view nullable;
   ?state : json nullable
 }
 
@@ -761,11 +763,18 @@ type open_views_req <ocaml attr="deriving make"> = {
   ?interactivity_pointer : string nullable;
 }
 
+type view_res = {
+  id : string;
+  team_id : string;
+  hash : string
+  (* https://api.slack.com/methods/views.open#examples *)
+}
+
 type open_views_res = {
   ok : bool;
-  view : view;
+  view : view_res;
   ~response_metadata <ocaml default="[]">: (string * json) list <json repr="object">;
-}
+                     }
 
 type push_views_req <ocaml attr="deriving make"> = {
   view: view;
@@ -794,11 +803,11 @@ type update_views_res = {
 }
 
 type get_permalink_req <ocaml attr="deriving make"> = {
-     channel: string;
-     message_ts: string;
+  channel: string;
+  message_ts: string;
 }
 
 type get_permalink_res = {
-     channel: string;
-     permalink: string;
+  channel: string;
+  permalink: string;
 }

lib/utils.ml

@@ -56,7 +56,7 @@ let process_slack_interaction (ctx : Context.t) headers body ~interaction_handle
   | [] -> Lwt.return_error "Empty payload"
   | payload :: _ ->
   match interaction_of_string payload with
-  | exception Yojson.Json_error e -> Lwt.return_error (sprintf "Invalid interaction: %s" e)
+  | exception Yojson.Json_error e -> Lwt.return_error (sprintf "Invalid interaction: %s, payload: %s" e payload)
   | interaction ->
   match validate_signature ?signing_key:ctx.secrets.slack_signing_secret ~headers body with
   | Error e -> Lwt.return_error (sprintf "signature not validated: %s" e)