Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions apps/api/src/handlers/github/handleInstallationCreated.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { completePendingGitHubInstallation } from '@roomote/github';
import { sendUserDirectMessageBestEffort } from '@roomote/sdk/server';
import { attemptUserDirectMessage } from '@roomote/sdk/server';
import { Env } from '@roomote/env';
import { communicationProviders } from '@roomote/types';

import type { WebhookResponse } from '../../types';

Expand All @@ -23,13 +24,19 @@ export async function handleInstallationCreated(
if (result.success) {
// The requester was waiting on a GitHub org owner's approval; let them
// know on whichever chat integrations they have linked.
await sendUserDirectMessageBestEffort({
userId: result.requestedByUserId,
text: buildInstallationApprovedMessage(
result.githubInstallation.accountLogin,
const text = buildInstallationApprovedMessage(
result.githubInstallation.accountLogin,
);
await Promise.all(
communicationProviders.map((provider) =>
attemptUserDirectMessage({
provider,
userId: result.requestedByUserId,
text,
logContext: 'handleInstallationCreated',
}),
),
logContext: 'handleInstallationCreated',
});
);
}
} catch (error) {
console.error(
Expand Down
6 changes: 2 additions & 4 deletions packages/sdk/src/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,11 @@ export {
} from './lib/teams-primary-conversation';

export {
attemptUserDirectMessage,
findSlackUserDirectMessageDestination,
findUserDirectMessageDestination,
hasUserDirectMessageIdentity,
sendUserDirectMessage,
sendUserDirectMessageBestEffort,
type UserDirectMessageAttempt,
type UserDirectMessageDestination,
type UserDirectMessageProvider,
} from './lib/user-direct-message';

export {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ import {
} from '@roomote/slack';
import { createDiscordCommunicationProviderFromRuntimeCredentials } from '../discord-communication';
import { listConnectedCommunicationProviders } from '../../automations/destination';
import {
hasUserDirectMessageIdentity,
sendUserDirectMessage,
} from '../user-direct-message';
import { attemptUserDirectMessage } from '../user-direct-message';
import {
appendManagerSlackFooter,
buildAutomationSettingsMessage,
Expand Down Expand Up @@ -242,24 +239,14 @@ async function notifyDeploymentAdminsOfPlatformIssue(params: {
let deliveredAdmins = 0;

for (const admin of admins) {
const linkedProviders: CommunicationProvider[] = [];
let eligible = false;
for (const provider of providers) {
if (await hasUserDirectMessageIdentity(provider, admin.id)) {
linkedProviders.push(provider);
}
}
if (linkedProviders.length === 0) {
continue;
}

eligibleAdmins += 1;
for (const provider of linkedProviders) {
const slackText = buildPlatformIssueAlertText({
taskId: params.taskId,
report: params.report,
utmSource: provider,
});
const sent = await sendUserDirectMessage({
const attempt = await attemptUserDirectMessage({
provider,
userId: admin.id,
text:
Expand All @@ -269,12 +256,18 @@ async function notifyDeploymentAdminsOfPlatformIssue(params: {
logContext: 'recordTaskMessageEnvelope',
});

if (sent) {
if (attempt.status !== 'unlinked') {
eligible = true;
}
if (attempt.status === 'sent') {
delivered = true;
deliveredAdmins += 1;
break;
}
}
if (eligible) {
eligibleAdmins += 1;
}
}

return {
Expand Down
137 changes: 52 additions & 85 deletions packages/sdk/src/server/lib/user-direct-message.test.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading