diff --git a/packages/features/ee/workflows/api/scheduleSMSReminders.ts b/packages/features/ee/workflows/api/scheduleSMSReminders.ts index 2319e9bff5..19f9d6fdaf 100644 --- a/packages/features/ee/workflows/api/scheduleSMSReminders.ts +++ b/packages/features/ee/workflows/api/scheduleSMSReminders.ts @@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from "next"; import dayjs from "@calcom/dayjs"; -import { getShortenLink } from "@calcom/ee/workflows/lib/reminders/utils"; +import { bulkShortenLinks } from "@calcom/ee/workflows/lib/reminders/utils"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import { defaultHandler } from "@calcom/lib/server"; @@ -127,26 +127,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { rescheduleLink: `${bookerUrl}/reschedule/${reminder.booking.uid}` || "", }; - const [meetingUrl, cancelLink, rescheduleLink] = await Promise.allSettled([ - getShortenLink(urls.meetingUrl), - getShortenLink(urls.cancelLink), - getShortenLink(urls.rescheduleLink), - ]).then((results) => { - return results.map((result) => { - let finalResult = ""; - - if (result.status === "fulfilled") { - const v = result.value; - if (typeof v === "string") { - finalResult = v; - } else { - finalResult = v.shortLink; - } - } - - return finalResult; - }); - }); + const [{ shortLink: meetingUrl }, { shortLink: cancelLink }, { shortLink: rescheduleLink }] = + await bulkShortenLinks([urls.meetingUrl, urls.cancelLink, urls.rescheduleLink]); const variables: VariablesType = { eventName: reminder.booking?.eventType?.title, diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts index b2171e46c5..c288d64216 100644 --- a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts @@ -1,5 +1,5 @@ import dayjs from "@calcom/dayjs"; -import { getShortenLink } from "@calcom/ee/workflows/lib/reminders/utils"; +import { bulkShortenLinks } from "@calcom/ee/workflows/lib/reminders/utils"; import { SENDER_ID, WEBSITE_URL } from "@calcom/lib/constants"; import logger from "@calcom/lib/logger"; import type { TimeFormat } from "@calcom/lib/timeFormat"; @@ -153,26 +153,8 @@ export const scheduleSMSReminder = async (args: ScheduleTextReminderArgs) => { rescheduleLink: `${evt.bookerUrl ?? WEBSITE_URL}/reschedule/${evt.uid}`, }; - const [meetingUrl, cancelLink, rescheduleLink] = await Promise.allSettled([ - getShortenLink(urls.meetingUrl), - getShortenLink(urls.cancelLink), - getShortenLink(urls.rescheduleLink), - ]).then((results) => { - return results.map((result) => { - let finalResult = ""; - - if (result.status === "fulfilled") { - const v = result.value; - if (typeof v === "string") { - finalResult = v; - } else { - finalResult = v.shortLink; - } - } - - return finalResult; - }); - }); + const [{ shortLink: meetingUrl }, { shortLink: cancelLink }, { shortLink: rescheduleLink }] = + await bulkShortenLinks([urls.meetingUrl, urls.cancelLink, urls.rescheduleLink]); const variables: VariablesType = { eventName: evt.title, diff --git a/packages/features/ee/workflows/lib/reminders/utils.ts b/packages/features/ee/workflows/lib/reminders/utils.ts index c976d8d024..1e78cbcda3 100644 --- a/packages/features/ee/workflows/lib/reminders/utils.ts +++ b/packages/features/ee/workflows/lib/reminders/utils.ts @@ -1,14 +1,15 @@ import { dub } from "@calcom/features/auth/lib/dub"; -export const getShortenLink = (link: string) => { - // don't hit dub with with empty string - if (!link.length) { - const pr: Promise = new Promise((resolve) => resolve(link)); - return pr; - } else { - return dub.links.create({ - url: link, - domain: "sms.cal.com", - }); - } +export const bulkShortenLinks = async (links: string[]) => { + const results = await dub.links.createMany(links.map((link) => ({ domain: "sms.cal.com", url: link }))); + + return links.map((link) => { + const createdLink = results.find((result) => result.url === link); + if (createdLink) { + return { shortLink: createdLink.shortLink }; + // if invalid link, return the original link as it is + } else { + return { shortLink: link }; + } + }); };