improve onboarding emails and add conditional Slack follow-up

thibaultleouay · thibaultleouay · commit 292b0b2ffbde · 2026-03-04T22:20:05.000+01:00
- Rewrite welcome email to focus on creating a status page
- Rewrite follow-up email to promote Slack app installation
- Add slack-feedback email variant sent when Slack is already installed
- Update cron logic to check integration table and branch accordingly
- Change follow-up timing from 2-3 days to 24-48h after signup
diff --git a/apps/web/src/app/api/internal/email/route.ts b/apps/web/src/app/api/internal/email/route.ts
@@ -1,9 +1,17 @@
 import type { NextRequest } from "next/server";
 
-import { and, gte, lte } from "@openstatus/db";
+import { and, eq, gte, inArray, lte } from "@openstatus/db";
 import { db } from "@openstatus/db/src/db";
-import { user } from "@openstatus/db/src/schema";
-import { FollowUpEmail, sendEmail } from "@openstatus/emails";
+import {
+  integration,
+  user,
+  usersToWorkspaces,
+} from "@openstatus/db/src/schema";
+import {
+  FollowUpEmail,
+  SlackFeedbackEmail,
+  sendEmail,
+} from "@openstatus/emails";
 
 export async function GET(request: NextRequest) {
   const authHeader = request.headers.get("authorization");
@@ -15,23 +23,57 @@ export async function GET(request: NextRequest) {
   }
 
   const date1 = new Date();
-  date1.setDate(date1.getDate() - 3);
+  date1.setDate(date1.getDate() - 2);
   const date2 = new Date();
-  date2.setDate(date2.getDate() - 2);
+  date2.setDate(date2.getDate() - 1);
+
   const users = await db
-    .select()
+    .select({
+      email: user.email,
+      workspaceId: usersToWorkspaces.workspaceId,
+    })
     .from(user)
+    .innerJoin(usersToWorkspaces, eq(user.id, usersToWorkspaces.userId))
     .where(and(gte(user.createdAt, date1), lte(user.createdAt, date2)))
     .all();
-  for (const user of users) {
-    if (user.email) {
-      await sendEmail({
-        from: "Thibault from OpenStatus <thibault@openstatus.dev>",
-        subject: "How's it going with OpenStatus?",
-        to: [user.email],
-        react: FollowUpEmail(),
-      });
+
+  const workspaceIds = [
+    ...new Set(users.map((u) => u.workspaceId).filter(Boolean)),
+  ];
+
+  const slackWorkspaceIds = new Set<number>();
+  if (workspaceIds.length > 0) {
+    const slackIntegrations = await db
+      .select({ workspaceId: integration.workspaceId })
+      .from(integration)
+      .where(
+        and(
+          eq(integration.name, "slack-agent"),
+          inArray(integration.workspaceId, workspaceIds),
+        ),
+      )
+      .all();
+    for (const row of slackIntegrations) {
+      if (row.workspaceId) {
+        slackWorkspaceIds.add(row.workspaceId);
+      }
     }
   }
+
+  for (const u of users) {
+    if (!u.email) continue;
+    const hasSlack = u.workspaceId
+      ? slackWorkspaceIds.has(u.workspaceId)
+      : false;
+
+    await sendEmail({
+      from: "Thibault from OpenStatus <thibault@openstatus.dev>",
+      subject: hasSlack
+        ? "How's the Slack app working for you?"
+        : "Manage incidents from Slack",
+      to: [u.email],
+      react: hasSlack ? SlackFeedbackEmail() : FollowUpEmail(),
+    });
+  }
   return Response.json({ success: true });
 }
diff --git a/apps/workflows/src/cron/emails.ts b/apps/workflows/src/cron/emails.ts
@@ -1,45 +1,90 @@
-import { and, gte, lte } from "@openstatus/db";
+import { and, eq, gte, inArray, lte } from "@openstatus/db";
 import { db } from "@openstatus/db";
-import { user } from "@openstatus/db/src/schema";
+import {
+  integration,
+  user,
+  usersToWorkspaces,
+} from "@openstatus/db/src/schema";
 import { EmailClient } from "@openstatus/emails";
 import { env } from "../env";
-// import { db } from "../lib/db";
 
 const email = new EmailClient({ apiKey: env().RESEND_API_KEY });
 
 export async function sendFollowUpEmails() {
-  // Get users created 2-3 days ago
   const date1 = new Date();
-  date1.setDate(date1.getDate() - 3);
+  date1.setDate(date1.getDate() - 2);
   const date2 = new Date();
-  date2.setDate(date2.getDate() - 2);
+  date2.setDate(date2.getDate() - 1);
 
   const users = await db
     .select({
       email: user.email,
+      workspaceId: usersToWorkspaces.workspaceId,
     })
     .from(user)
+    .innerJoin(usersToWorkspaces, eq(user.id, usersToWorkspaces.userId))
     .where(and(gte(user.createdAt, date1), lte(user.createdAt, date2)))
     .all();
 
   console.log(`Found ${users.length} users to send follow ups.`);
 
-  // Filter valid emails
-  const validEmails = users
-    .map((u) => u.email)
-    .filter((email) => email !== null)
-    //  I don't know why but I can't have both filter at the same time
-    .filter((email) => email.trim() !== "");
+  const workspaceIds = [
+    ...new Set(users.map((u) => u.workspaceId).filter(Boolean)),
+  ];
+
+  const slackWorkspaceIds = new Set<number>();
+  if (workspaceIds.length > 0) {
+    const slackIntegrations = await db
+      .select({ workspaceId: integration.workspaceId })
+      .from(integration)
+      .where(
+        and(
+          eq(integration.name, "slack-agent"),
+          inArray(integration.workspaceId, workspaceIds),
+        ),
+      )
+      .all();
+    for (const row of slackIntegrations) {
+      if (row.workspaceId) {
+        slackWorkspaceIds.add(row.workspaceId);
+      }
+    }
+  }
+
+  const slackEmails: string[] = [];
+  const noSlackEmails: string[] = [];
+
+  for (const u of users) {
+    if (!u.email || u.email.trim() === "") continue;
+    const hasSlack = u.workspaceId
+      ? slackWorkspaceIds.has(u.workspaceId)
+      : false;
+    if (hasSlack) {
+      slackEmails.push(u.email);
+    } else {
+      noSlackEmails.push(u.email);
+    }
+  }
 
-  // Chunk emails into batches of 80
   const batchSize = 80;
-  for (let i = 0; i < validEmails.length; i += batchSize) {
-    const batch = validEmails.slice(i, i + batchSize);
-    console.log(`Sending batch with ${batch.length} emails...`);
+
+  for (let i = 0; i < noSlackEmails.length; i += batchSize) {
+    const batch = noSlackEmails.slice(i, i + batchSize);
+    console.log(`Sending follow-up batch with ${batch.length} emails...`);
     try {
       await email.sendFollowUpBatched({ to: batch });
     } catch {
-      //Stop email send when rate limit error is faced in order to avoid wasteful API calls
+      console.error("Rate limit exceeded. Stopping further sends.");
+      break;
+    }
+  }
+
+  for (let i = 0; i < slackEmails.length; i += batchSize) {
+    const batch = slackEmails.slice(i, i + batchSize);
+    console.log(`Sending slack feedback batch with ${batch.length} emails...`);
+    try {
+      await email.sendSlackFeedbackBatched({ to: batch });
+    } catch {
       console.error("Rate limit exceeded. Stopping further sends.");
       break;
     }
diff --git a/packages/emails/emails/followup.tsx b/packages/emails/emails/followup.tsx
@@ -6,21 +6,27 @@ const FollowUpEmail = () => {
   return (
     <Html>
       <Head>
-        <title>How's it going with openstatus?</title>
+        <title>Manage incidents from Slack</title>
       </Head>
-      <Preview>How's it going with openstatus?</Preview>
+      <Preview>Update your status page without leaving Slack</Preview>
       <Body>
         Hey
         <br />
         <br />
-        How’s everything going with openstatus so far? Let me know if you run
-        into any issues, or have any feedback, good or bad!
+        Quick tip: connect the OpenStatus Slack app and manage incident updates for your status page
+        directly from Slack — no need to switch tabs during an outage.
         <br />
+        <br />👉{" "}
+        <a href="https://app.openstatus.dev/agents?ref=email-followup">Install the Slack app</a>
         <br />
-        Thank you,
         <br />
+        When something goes wrong, just mention @openstatus to create or update an incident.
         <br />
-        Thibault Le Ouay Ducasse
+        <br />
+        Hit reply if you have questions — happy to help.
+        <br />
+        <br />
+        Thibault Le Ouay Ducasse, co-founder of OpenStatus
         <br />
       </Body>
     </Html>
diff --git a/packages/emails/emails/slack-feedback.tsx b/packages/emails/emails/slack-feedback.tsx
@@ -0,0 +1,36 @@
+/** @jsxImportSource react */
+
+import { Body, Head, Html, Preview } from "@react-email/components";
+
+const SlackFeedbackEmail = () => {
+  return (
+    <Html>
+      <Head>
+        <title>How's the Slack app working for you?</title>
+      </Head>
+      <Preview>We'd love your feedback on the OpenStatus Slack app</Preview>
+      <Body>
+        Hey
+        <br />
+        <br />
+        I saw you installed the OpenStatus Slack app — thanks for trying it out!
+        <br />
+        <br />
+        Quick question: how's the incident management from Slack going so far?
+        <br />
+        <br />
+        Anything missing or confusing? I'd love to hear what's working and what
+        we could improve.
+        <br />
+        <br />
+        Just hit reply — I read every response.
+        <br />
+        <br />
+        Thibault Le Ouay Ducasse, co-founder of OpenStatus
+        <br />
+      </Body>
+    </Html>
+  );
+};
+
+export default SlackFeedbackEmail;
diff --git a/packages/emails/emails/welcome.tsx b/packages/emails/emails/welcome.tsx
@@ -6,50 +6,35 @@ const WelcomeEmail = () => {
   return (
     <Html>
       <Head>
-        <title>Welcome to openstatus</title>
+        <title>Welcome to OpenStatus</title>
       </Head>
-      <Preview>Few tips to get started with your uptime monitoring</Preview>
+      <Preview>Set up your status page in under 5 minutes</Preview>
 
       <Body>
         Hey 👋
         <br />
         <br />
-        Welcome to openstatus <br />
+        Thanks for signing up for OpenStatus.
         <br />
         <br />
-        Openstatus is global uptime monitoring service with status page.
+        The fastest way to get started: create your status page. It takes under 5 minutes and your
+        users will have a single place to check if your services are up.
         <br />
-        Here are a few things you can do with openstatus:
-        <br />- Use our{" "}
-        <a href="https://docs.openstatus.dev/cli/getting-started/?ref=email-onboarding">
-          CLI
-        </a>{" "}
-        to create, update and trigger your monitors.
-        <br />- Learn how to monitor a{" "}
-        <a href="https://docs.openstatus.dev/guides/how-to-monitor-mcp-server?ref=email-onboarding">
-          MCP server
+        <br />👉{" "}
+        <a href="https://app.openstatus.dev/status-pages/create?ref=email-onboarding">
+          Create your status page
         </a>
-        .
-        <br />- Explore our uptime monitoring as code{" "}
-        <a href="https://github.com/openstatusHQ/cli-template/?ref=email-onboarding">
-          template directory
-        </a>
-        .
-        <br />- Build your own status page with our{" "}
-        <a href="https://api.openstatus.dev/v1">API</a> and host it where you
-        want. Here's our{" "}
-        <a href="https://github.com/openstatusHQ/astro-status-page">
-          Astro template
-        </a>{" "}
-        that you can easily host on CloudFlare.
         <br />
         <br />
-        Quick question: How did you learn about us? and why did you sign up?
+        Want full control? Use our{" "}
+        <a href="https://www.openstatus.dev/registry?ref=email-onboarding">open source</a> to build
+        your own status page and host it anywhere.
+        <br />
         <br />
-        Thank you,
+        Hit reply if you get stuck — I read every response.
         <br />
         <br />
-        Thibault Le Ouay Ducasse, co-founder of openstatus
+        Thibault Le Ouay Ducasse, co-founder of OpenStatus
         <br />
       </Body>
     </Html>
diff --git a/packages/emails/src/client.tsx b/packages/emails/src/client.tsx
diff --git a/packages/emails/src/index.ts b/packages/emails/src/index.ts
