tinkering to address slackapi#354

marks · Dec 22, 2019 · 6a94f91 · 6a94f91
1 parent e8bb742
commit 6a94f91
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 1 deletion.
diff --git a/src/App.ts b/src/App.ts
@@ -411,14 +411,15 @@ export default class App {
     // Set body and payload (this value will eventually conform to AnyMiddlewareArgs)
     // NOTE: the following doesn't work because... distributive?
     // const listenerArgs: Partial<AnyMiddlewareArgs> = {
-    const listenerArgs: Pick<AnyMiddlewareArgs, 'body' | 'payload'> & {
+    const listenerArgs: Pick<AnyMiddlewareArgs, 'body' | 'payload' | 'client'> & {
       /** Say function might be set below */
       say?: SayFn
       /** Respond function might be set below */
       respond?: RespondFn,
       /** Ack function might be set below */
       ack?: AckFn<any>,
     } = {
+      client: this.client,
       body: bodyArg,
       payload:
         (type === IncomingEventType.Event) ?

diff --git a/src/types/actions/index.ts b/src/types/actions/index.ts
@@ -8,6 +8,7 @@ import { InteractiveMessage } from './interactive-message';
 import { DialogSubmitAction, DialogValidation } from './dialog-action';
 import { MessageAction } from './message-action';
 import { SayFn, SayArguments, RespondFn, AckFn } from '../utilities';
+import { WebClient } from '@slack/web-api';
 
 /**
  * All known actions from Slack's Block Kit interactive components, message actions, dialogs, and legacy interactive
@@ -45,6 +46,7 @@ export interface SlackActionMiddlewareArgs<Action extends SlackAction = SlackAct
   say: Action extends Exclude<SlackAction, DialogSubmitAction> ? SayFn : never;
   respond: RespondFn;
   ack: ActionAckFn<Action>;
+  client: WebClient;
 }
 
 /**

diff --git a/src/types/command/index.ts b/src/types/command/index.ts
@@ -1,5 +1,6 @@
 import { StringIndexed } from '../helpers';
 import { SayFn, RespondFn, RespondArguments, AckFn } from '../utilities';
+import { WebClient } from '@slack/web-api';
 
 /**
  * Arguments which listeners and middleware receive to process a slash command from Slack.
@@ -11,6 +12,7 @@ export interface SlackCommandMiddlewareArgs {
   say: SayFn;
   respond: RespondFn;
   ack: AckFn<string | RespondArguments>;
+  client: WebClient;
 }
 
 /**

diff --git a/src/types/events/index.ts b/src/types/events/index.ts
@@ -2,6 +2,7 @@ export * from './base-events';
 import { SlackEvent, BasicSlackEvent } from './base-events';
 import { StringIndexed } from '../helpers';
 import { SayFn } from '../utilities';
+import { WebClient } from '@slack/web-api';
 
 /**
  * Arguments which listeners and middleware receive to process an event from Slack's Events API.
@@ -12,6 +13,7 @@ export interface SlackEventMiddlewareArgs<EventType extends string = string> {
   message: EventType extends 'message' ? this['payload'] : never;
   body: EnvelopedEvent<this['payload']>;
   say: WhenEventHasChannelContext<this['payload'], SayFn>;
+  client: WebClient;
 }
 
 /**

diff --git a/src/types/options/index.ts b/src/types/options/index.ts
@@ -1,6 +1,7 @@
 import { Option } from '@slack/types';
 import { StringIndexed, XOR } from '../helpers';
 import { AckFn } from '../utilities';
+import { WebClient } from '@slack/web-api';
 
 /**
  * Arguments which listeners and middleware receive to process an options request from Slack
@@ -10,6 +11,7 @@ export interface SlackOptionsMiddlewareArgs<Source extends OptionsSource = Optio
   body: this['payload'];
   options: this['payload'];
   ack: OptionsAckFn<Source>;
+  client: WebClient;
 }
 
 /**

diff --git a/src/types/view/index.ts b/src/types/view/index.ts
@@ -1,5 +1,6 @@
 import { StringIndexed } from '../helpers';
 import { RespondArguments, AckFn } from '../utilities';
+import { WebClient } from '@slack/web-api';
 
 /**
  * Known view action types
@@ -14,6 +15,7 @@ export interface SlackViewMiddlewareArgs<ViewActionType extends SlackViewAction
   view: this['payload'];
   body: ViewActionType;
   ack: AckFn<string | RespondArguments>;
+  client: WebClient;
 }
 
 interface PlainTextElementOutput {