From 60786019c61c3b9c090da06236b49cffd8baf920 Mon Sep 17 00:00:00 2001 From: Jk Jensen Date: Fri, 2 Feb 2024 15:44:50 -0700 Subject: [PATCH] make ts build happy --- src/api/pd/pagerduty.ts | 18 +++++++----------- src/listeners/messages/oncall-mentioned.ts | 5 ++--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/api/pd/pagerduty.ts b/src/api/pd/pagerduty.ts index 7029157..eda20af 100644 --- a/src/api/pd/pagerduty.ts +++ b/src/api/pd/pagerduty.ts @@ -1,18 +1,10 @@ -import querystring from "querystring"; import { type BotConfig } from "../../types"; import NodeCache from "node-cache"; import jsonConfig from "config"; const config: BotConfig = jsonConfig as BotConfig; -interface OncallsParams { - time_zone: string; - "include[]": string; - limit: number; - offset: number; -} - -const oncallsParams: OncallsParams = { +const oncallsParams: Record = { time_zone: "UTC", "include[]": "users", offset: 0, @@ -39,7 +31,7 @@ interface OncallOptions { contentIndex: string; secondaryIndex: string; uri: string; - params: OncallsParams; + params: Record; } /** @@ -119,7 +111,11 @@ class PagerDuty { this.endpoint + options.uri + "?" + - querystring.stringify(options.params); + new URLSearchParams({ + ...options.params, + offset: options.params.offset.toString(), + limit: options.params.limit.toString(), + }).toString(); requestOptions.url = url; const response = await fetch(url, requestOptions); diff --git a/src/listeners/messages/oncall-mentioned.ts b/src/listeners/messages/oncall-mentioned.ts index 47a534c..f1348d9 100644 --- a/src/listeners/messages/oncall-mentioned.ts +++ b/src/listeners/messages/oncall-mentioned.ts @@ -6,12 +6,11 @@ import { getOncallSlackMembers } from "@api/oncall"; import { oncallMap } from "@api/pd"; import { type OncallSlackUser } from "@srcapi/slack"; -const oncallMentionedCallback: AllMiddlewareArgs & - SlackEventMiddlewareArgs<"message"> = async ({ +const oncallMentionedCallback = async ({ context, event, say, -}: AllMiddlewareArgs & SlackEventMiddlewareArgs<"message">) => { +}: AllMiddlewareArgs & SlackEventMiddlewareArgs<"message">): Promise => { console.log("**** oncall mentioned"); const oncallTagged = context.matches[1]; const oncalls = await getOncallSlackMembers();