Merge pull request #166 from aoberoi/fix-block-action-detection

Fix block action detection, remove StringIndexed from action body types
slackapi · Apr 24, 2019 · 8f9245f · 8f9245f
2 parents 1ed27bb + 40b621a
commit 8f9245f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/src/App.ts b/src/App.ts
@@ -481,7 +481,7 @@ function buildSource(
 function isBlockActionOrInteractiveMessageBody(
   body: SlackActionMiddlewareArgs['body'],
 ): body is SlackActionMiddlewareArgs<BlockAction | InteractiveMessage>['body'] {
-  return (body as SlackActionMiddlewareArgs<BlockAction | InteractiveMessage>['body']).action !== undefined;
+  return (body as SlackActionMiddlewareArgs<BlockAction | InteractiveMessage>['body']).actions !== undefined;
 }
 
 function defaultErrorHandler(logger: Logger): ErrorHandler {

diff --git a/src/types/actions/block-action.ts b/src/types/actions/block-action.ts
@@ -118,7 +118,7 @@ export interface DatepickerAction extends BasicElementAction<'datepicker'> {
  *
  * This describes the entire JSON-encoded body of a request from Slack's Block Kit interactive components.
  */
-export interface BlockAction<ElementAction extends BasicElementAction = BlockElementAction> extends StringIndexed {
+export interface BlockAction<ElementAction extends BasicElementAction = BlockElementAction> {
   type: 'block_actions';
   actions: [ElementAction];
   team: {
@@ -166,9 +166,3 @@ export type BlockChannelsSelectAction = BlockAction<ChannelsSelectAction>;
 export type BlockExternalSelectAction = BlockAction<ExternalSelectAction>;
 export type BlockOverflowAction = BlockAction<OverflowAction>;
 export type BlockDatepickerAction = BlockAction<DatepickerAction>;
-
-// Relics of the past
-
-// type KnownActionFromElementType<T extends string> = Extract<ElementAction, { type: T }>;
-// type ActionFromElementType<T extends string> = KnownActionFromElementType<T> extends never ?
-//   BasicElementAction<T> : KnownActionFromElementType<T>;
diff --git a/src/types/actions/dialog-action.ts b/src/types/actions/dialog-action.ts
@@ -1,11 +1,9 @@
-import { StringIndexed } from '../helpers';
-
 /**
  * A Slack dialog submit action wrapped in the standard metadata.
  *
  * This describes the entire JSON-encoded body of a request from Slack dialogs.
  */
-export interface DialogSubmitAction extends StringIndexed {
+export interface DialogSubmitAction {
   type: 'dialog_submission';
   callback_id: string;
   submission: { [name: string]: string };

diff --git a/src/types/actions/interactive-message.ts b/src/types/actions/interactive-message.ts
@@ -1,5 +1,3 @@
-import { StringIndexed } from '../helpers';
-
 /**
  * All actions which Slack delivers from legacy interactive messages. The full body of these actions are represented
  * as [[InteractiveMessage]].
@@ -31,7 +29,7 @@ export interface MenuSelect {
  *
  * This describes the entire JSON-encoded body of a request from Slack's legacy interactive messages.
  */
-export interface InteractiveMessage<Action extends InteractiveAction = InteractiveAction> extends StringIndexed {
+export interface InteractiveMessage<Action extends InteractiveAction = InteractiveAction> {
   type: 'interactive_message';
   callback_id: string;
   actions: [Action];

diff --git a/src/types/actions/message-action.ts b/src/types/actions/message-action.ts
@@ -1,11 +1,9 @@
-import { StringIndexed } from '../helpers';
-
 /**
  * A Slack message action wrapped in the standard metadata.
  *
  * This describes the entire JSON-encoded body of a request from Slack message actions.
  */
-export interface MessageAction extends StringIndexed {
+export interface MessageAction {
   type: 'message_action';
   callback_id: string;
   trigger_id: string;