Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Co-locate messages code under `lib/messages` (#4014)

Kiran Kee96fd7a0031
diff --git a/apps/web/app/(ee)/api/messages/count/route.ts b/apps/web/app/(ee)/api/messages/count/route.ts
index 605a749406..c92121656e 100644
--- a/apps/web/app/(ee)/api/messages/count/route.ts
+++ b/apps/web/app/(ee)/api/messages/count/route.ts
@@ -1,6 +1,6 @@
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
-import { countMessagesQuerySchema } from "@/lib/zod/schemas/messages";
+import { countMessagesQuerySchema } from "@/lib/messages/schemas";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
diff --git a/apps/web/app/(ee)/api/messages/route.ts b/apps/web/app/(ee)/api/messages/route.ts
index cffed06101..8277334336 100644
--- a/apps/web/app/(ee)/api/messages/route.ts
+++ b/apps/web/app/(ee)/api/messages/route.ts
@@ -5,7 +5,7 @@ import { enrichMessage } from "@/lib/messages/enrich";
import {
PartnerMessagesSchema,
getPartnerMessagesQuerySchema,
-} from "@/lib/zod/schemas/messages";
+} from "@/lib/messages/schemas";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
diff --git a/apps/web/app/(ee)/api/partner-profile/messages/count/route.ts b/apps/web/app/(ee)/api/partner-profile/messages/count/route.ts
index fc50204a57..4cfd5f8958 100644
--- a/apps/web/app/(ee)/api/partner-profile/messages/count/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/messages/count/route.ts
@@ -1,5 +1,5 @@
import { withPartnerProfile } from "@/lib/auth/partner";
-import { countMessagesQuerySchema } from "@/lib/zod/schemas/messages";
+import { countMessagesQuerySchema } from "@/lib/messages/schemas";
import { prisma } from "@dub/prisma";
import { NETWORK_PROGRAM_ID } from "@dub/utils";
import { NextResponse } from "next/server";
diff --git a/apps/web/app/(ee)/api/partner-profile/messages/route.ts b/apps/web/app/(ee)/api/partner-profile/messages/route.ts
index a0ef36ae8b..2e0a521d0b 100644
--- a/apps/web/app/(ee)/api/partner-profile/messages/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/messages/route.ts
@@ -3,7 +3,7 @@ import { enrichMessage } from "@/lib/messages/enrich";
import {
ProgramMessagesSchema,
getProgramMessagesQuerySchema,
-} from "@/lib/zod/schemas/messages";
+} from "@/lib/messages/schemas";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page-client.tsx
index 8911803126..548d50d379 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page-client.tsx
@@ -1,18 +1,18 @@
"use client";
import { parseActionError } from "@/lib/actions/parse-action-errors";
-import { markProgramMessagesReadAction } from "@/lib/actions/partners/mark-program-messages-read";
-import { messageProgramAction } from "@/lib/actions/partners/message-program";
-import { uploadPartnerMessageAttachmentAction } from "@/lib/actions/partners/upload-partner-message-attachment";
+import { PARTNER_ALLOWED_ATTACHMENT_TYPES } from "@/lib/messages/constants";
+import { useProgramMessages } from "@/lib/messages/hooks/use-program-messages";
+import { markProgramMessagesReadAction } from "@/lib/messages/mark-program-messages-read";
+import { messageProgramAction } from "@/lib/messages/message-program";
+import { uploadPartnerMessageAttachmentAction } from "@/lib/messages/upload-partner-message-attachment";
import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
import { mutatePrefix } from "@/lib/swr/mutate";
import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import { useProgramMessages } from "@/lib/swr/use-program-messages";
import useUser from "@/lib/swr/use-user";
import { ProgramEnrollmentProps } from "@/lib/types";
-import { PARTNER_ALLOWED_ATTACHMENT_TYPES } from "@/lib/zod/schemas/messages";
import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
import { useMessagesContext } from "@/ui/messages/messages-context";
import { MessagesPanel } from "@/ui/messages/messages-panel";
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx
index 401b5aeea4..4bb702d602 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/layout.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useProgramMessages } from "@/lib/swr/use-program-messages";
+import { useProgramMessages } from "@/lib/messages/hooks/use-program-messages";
import { NavButton } from "@/ui/layout/page-content/nav-button";
import { MessagesContext, MessagesPanel } from "@/ui/messages/messages-context";
import { MessagesList } from "@/ui/messages/messages-list";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
index 07fc705d20..b2fd7bbf89 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
@@ -1,16 +1,16 @@
"use client";
import { parseActionError } from "@/lib/actions/parse-action-errors";
-import { markPartnerMessagesReadAction } from "@/lib/actions/partners/mark-partner-messages-read";
-import { messagePartnerAction } from "@/lib/actions/partners/message-partner";
-import { uploadMessageAttachmentAction } from "@/lib/actions/partners/upload-message-attachment";
+import { PROGRAM_ALLOWED_ATTACHMENT_TYPES } from "@/lib/messages/constants";
+import { usePartnerMessages } from "@/lib/messages/hooks/use-partner-messages";
+import { markPartnerMessagesReadAction } from "@/lib/messages/mark-partner-messages-read";
+import { messagePartnerAction } from "@/lib/messages/message-partner";
+import { uploadMessageAttachmentAction } from "@/lib/messages/upload-message-attachment";
import { mutatePrefix } from "@/lib/swr/mutate";
import usePartner from "@/lib/swr/use-partner";
-import { usePartnerMessages } from "@/lib/swr/use-partner-messages";
import useProgram from "@/lib/swr/use-program";
import useUser from "@/lib/swr/use-user";
import useWorkspace from "@/lib/swr/use-workspace";
-import { PROGRAM_ALLOWED_ATTACHMENT_TYPES } from "@/lib/zod/schemas/messages";
import { useMessagesContext } from "@/ui/messages/messages-context";
import { MessagesPanel } from "@/ui/messages/messages-panel";
import { ToggleSidePanelButton } from "@/ui/messages/toggle-side-panel-button";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
index 57c722ec69..108cbef7cc 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
@@ -1,7 +1,7 @@
"use client";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
-import { usePartnerMessages } from "@/lib/swr/use-partner-messages";
+import { usePartnerMessages } from "@/lib/messages/hooks/use-partner-messages";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import LayoutLoader from "@/ui/layout/layout-loader";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
index 09d38e9924..539c525214 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-tasks.tsx
@@ -1,4 +1,4 @@
-import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
+import { usePartnerMessagesCount } from "@/lib/messages/hooks/use-partner-messages-count";
import usePartnersCount from "@/lib/swr/use-partners-count";
import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useWorkspace from "@/lib/swr/use-workspace";
diff --git a/apps/web/lib/messages/constants.ts b/apps/web/lib/messages/constants.ts
new file mode 100644
index 0000000000..ed2ed27ecd
--- /dev/null
+++ b/apps/web/lib/messages/constants.ts
@@ -0,0 +1,41 @@
+export const MAX_MESSAGE_LENGTH = 2000;
+
+export const MAX_ATTACHMENTS_PER_MESSAGE = 5;
+
+export const MAX_ATTACHMENT_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
+
+export const MAX_ATTACHMENT_NAME_LENGTH = 255;
+
+export const PROGRAM_ALLOWED_ATTACHMENT_TYPES = [
+ "image/png",
+ "image/jpeg",
+ "image/webp",
+ "application/pdf",
+] as const;
+
+export const PARTNER_ALLOWED_ATTACHMENT_TYPES = [
+ "image/png",
+ "image/jpeg",
+ "image/webp",
+] as const;
+
+export const ATTACHMENT_MIME_TYPE_LABELS: Record<string, string> = {
+ "application/pdf": "PDF",
+ "image/png": "PNG",
+ "image/jpeg": "JPG",
+ "image/webp": "WEBP",
+};
+
+// MIME types that are safe to render as inline image previews.
+export const PREVIEWABLE_IMAGE_TYPES = new Set([
+ "image/png",
+ "image/jpeg",
+ "image/webp",
+]);
+
+export const ATTACHMENT_MIME_TYPE_COLOR: Record<string, string> = {
+ "application/pdf": "bg-red-600",
+ "image/png": "bg-blue-600",
+ "image/jpeg": "bg-blue-500",
+ "image/webp": "bg-blue-500",
+};
diff --git a/apps/web/lib/swr/use-partner-messages-count.ts b/apps/web/lib/messages/hooks/use-partner-messages-count.ts
similarity index 84%
rename from apps/web/lib/swr/use-partner-messages-count.ts
rename to apps/web/lib/messages/hooks/use-partner-messages-count.ts
index adbf656568..2c1291b612 100644
--- a/apps/web/lib/swr/use-partner-messages-count.ts
+++ b/apps/web/lib/messages/hooks/use-partner-messages-count.ts
@@ -1,9 +1,9 @@
import { fetcher } from "@dub/utils";
import useSWR, { SWRConfiguration } from "swr";
import * as z from "zod/v4";
-import { getPlanCapabilities } from "../plan-capabilities";
-import { countMessagesQuerySchema } from "../zod/schemas/messages";
-import useWorkspace from "./use-workspace";
+import { getPlanCapabilities } from "../../plan-capabilities";
+import useWorkspace from "../../swr/use-workspace";
+import { countMessagesQuerySchema } from "../schemas";
const partialQuerySchema = countMessagesQuerySchema.partial();
diff --git a/apps/web/lib/swr/use-partner-messages.ts b/apps/web/lib/messages/hooks/use-partner-messages.ts
similarity index 93%
rename from apps/web/lib/swr/use-partner-messages.ts
rename to apps/web/lib/messages/hooks/use-partner-messages.ts
index 69b9ac798c..8d71cbd8ff 100644
--- a/apps/web/lib/swr/use-partner-messages.ts
+++ b/apps/web/lib/messages/hooks/use-partner-messages.ts
@@ -1,11 +1,11 @@
import { fetcher } from "@dub/utils";
import useSWR, { SWRConfiguration } from "swr";
import * as z from "zod/v4";
+import useWorkspace from "../../swr/use-workspace";
import {
PartnerMessagesSchema,
getPartnerMessagesQuerySchema,
-} from "../zod/schemas/messages";
-import useWorkspace from "./use-workspace";
+} from "../schemas";
const partialQuerySchema = getPartnerMessagesQuerySchema.partial();
diff --git a/apps/web/lib/swr/use-program-messages-count.ts b/apps/web/lib/messages/hooks/use-program-messages-count.ts
similarity index 91%
rename from apps/web/lib/swr/use-program-messages-count.ts
rename to apps/web/lib/messages/hooks/use-program-messages-count.ts
index def8157a2c..fce9844820 100644
--- a/apps/web/lib/swr/use-program-messages-count.ts
+++ b/apps/web/lib/messages/hooks/use-program-messages-count.ts
@@ -1,7 +1,7 @@
import { fetcher } from "@dub/utils";
import useSWR, { SWRConfiguration } from "swr";
import * as z from "zod/v4";
-import { countMessagesQuerySchema } from "../zod/schemas/messages";
+import { countMessagesQuerySchema } from "../schemas";
const partialQuerySchema = countMessagesQuerySchema.partial();
diff --git a/apps/web/lib/swr/use-program-messages.ts b/apps/web/lib/messages/hooks/use-program-messages.ts
similarity index 96%
rename from apps/web/lib/swr/use-program-messages.ts
rename to apps/web/lib/messages/hooks/use-program-messages.ts
index c7702dbfb8..7a0b8c6ae5 100644
--- a/apps/web/lib/swr/use-program-messages.ts
+++ b/apps/web/lib/messages/hooks/use-program-messages.ts
@@ -4,7 +4,7 @@ import * as z from "zod/v4";
import {
ProgramMessagesSchema,
getProgramMessagesQuerySchema,
-} from "../zod/schemas/messages";
+} from "../schemas";
const partialQuerySchema = getProgramMessagesQuerySchema.partial();
diff --git a/apps/web/lib/actions/partners/mark-partner-messages-read.ts b/apps/web/lib/messages/mark-partner-messages-read.ts
similarity index 87%
rename from apps/web/lib/actions/partners/mark-partner-messages-read.ts
rename to apps/web/lib/messages/mark-partner-messages-read.ts
index 9d1c5b1494..e4fc9e8d30 100644
--- a/apps/web/lib/actions/partners/mark-partner-messages-read.ts
+++ b/apps/web/lib/messages/mark-partner-messages-read.ts
@@ -3,8 +3,8 @@
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { prisma } from "@dub/prisma";
import * as z from "zod/v4";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
+import { authActionClient } from "../actions/safe-action";
+import { throwIfNoPermission } from "../actions/throw-if-no-permission";
const schema = z.object({
workspaceId: z.string(),
diff --git a/apps/web/lib/actions/partners/mark-program-messages-read.ts b/apps/web/lib/messages/mark-program-messages-read.ts
similarity index 94%
rename from apps/web/lib/actions/partners/mark-program-messages-read.ts
rename to apps/web/lib/messages/mark-program-messages-read.ts
index 7403c6bc2c..b1061a5d3f 100644
--- a/apps/web/lib/actions/partners/mark-program-messages-read.ts
+++ b/apps/web/lib/messages/mark-program-messages-read.ts
@@ -2,7 +2,7 @@
import { prisma } from "@dub/prisma";
import * as z from "zod/v4";
-import { authPartnerActionClient } from "../safe-action";
+import { authPartnerActionClient } from "../actions/safe-action";
const schema = z.object({
programSlug: z.string(),
diff --git a/apps/web/lib/actions/partners/message-partner.ts b/apps/web/lib/messages/message-partner.ts
similarity index 95%
rename from apps/web/lib/actions/partners/message-partner.ts
rename to apps/web/lib/messages/message-partner.ts
index d43800506c..3ebcf78160 100644
--- a/apps/web/lib/actions/partners/message-partner.ts
+++ b/apps/web/lib/messages/message-partner.ts
@@ -11,12 +11,9 @@ import { prisma } from "@dub/prisma";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
import * as z from "zod/v4";
-import {
- MessageSchema,
- messagePartnerSchema,
-} from "../../zod/schemas/messages";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
+import { authActionClient } from "../actions/safe-action";
+import { throwIfNoPermission } from "../actions/throw-if-no-permission";
+import { MessageSchema, messagePartnerSchema } from "./schemas";
const schema = messagePartnerSchema
.extend({
diff --git a/apps/web/lib/actions/partners/message-program.ts b/apps/web/lib/messages/message-program.ts
similarity index 95%
rename from apps/web/lib/actions/partners/message-program.ts
rename to apps/web/lib/messages/message-program.ts
index ad8c33ce53..051e6bcffc 100644
--- a/apps/web/lib/actions/partners/message-program.ts
+++ b/apps/web/lib/messages/message-program.ts
@@ -5,11 +5,8 @@ import { qstash } from "@/lib/cron";
import { prisma } from "@dub/prisma";
import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
-import {
- MessageSchema,
- messageProgramSchema,
-} from "../../zod/schemas/messages";
-import { authPartnerActionClient } from "../safe-action";
+import { authPartnerActionClient } from "../actions/safe-action";
+import { MessageSchema, messageProgramSchema } from "./schemas";
const schema = messageProgramSchema.refine(
(data) => data.text.trim().length > 0 || data.attachments.length > 0,
diff --git a/apps/web/lib/zod/schemas/messages.ts b/apps/web/lib/messages/schemas.ts
similarity index 71%
rename from apps/web/lib/zod/schemas/messages.ts
rename to apps/web/lib/messages/schemas.ts
index 412d2346d7..892e313573 100644
--- a/apps/web/lib/zod/schemas/messages.ts
+++ b/apps/web/lib/messages/schemas.ts
@@ -1,50 +1,13 @@
+import {
+ MAX_ATTACHMENT_SIZE_BYTES,
+ MAX_ATTACHMENTS_PER_MESSAGE,
+ MAX_MESSAGE_LENGTH,
+} from "@/lib/messages/constants";
import { MessageType } from "@dub/prisma/client";
import * as z from "zod/v4";
-import { PartnerSchema } from "./partners";
-import { ProgramSchema } from "./programs";
-import { UserSchema } from "./users";
-
-export const MAX_MESSAGE_LENGTH = 2000;
-
-export const MAX_ATTACHMENTS_PER_MESSAGE = 5;
-
-export const MAX_ATTACHMENT_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
-
-export const MAX_ATTACHMENT_NAME_LENGTH = 255;
-
-export const PROGRAM_ALLOWED_ATTACHMENT_TYPES = [
- "image/png",
- "image/jpeg",
- "image/webp",
- "application/pdf",
-] as const;
-
-export const PARTNER_ALLOWED_ATTACHMENT_TYPES = [
- "image/png",
- "image/jpeg",
- "image/webp",
-] as const;
-
-export const ATTACHMENT_MIME_TYPE_LABELS: Record<string, string> = {
- "application/pdf": "PDF",
- "image/png": "PNG",
- "image/jpeg": "JPG",
- "image/webp": "WEBP",
-};
-
-// MIME types that are safe to render as inline image previews.
-export const PREVIEWABLE_IMAGE_TYPES = new Set([
- "image/png",
- "image/jpeg",
- "image/webp",
-]);
-
-export const ATTACHMENT_MIME_TYPE_COLOR: Record<string, string> = {
- "application/pdf": "bg-red-600",
- "image/png": "bg-blue-600",
- "image/jpeg": "bg-blue-500",
- "image/webp": "bg-blue-500",
-};
+import { PartnerSchema } from "../zod/schemas/partners";
+import { ProgramSchema } from "../zod/schemas/programs";
+import { UserSchema } from "../zod/schemas/users";
const messageTextSchema = z.string().max(MAX_MESSAGE_LENGTH);
diff --git a/apps/web/lib/actions/partners/upload-message-attachment.ts b/apps/web/lib/messages/upload-message-attachment.ts
similarity index 91%
rename from apps/web/lib/actions/partners/upload-message-attachment.ts
rename to apps/web/lib/messages/upload-message-attachment.ts
index 93749f9d83..11512bb930 100644
--- a/apps/web/lib/actions/partners/upload-message-attachment.ts
+++ b/apps/web/lib/messages/upload-message-attachment.ts
@@ -1,19 +1,19 @@
"use server";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { sanitizeFileName } from "@/lib/messages/utils";
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
-import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
import {
MAX_ATTACHMENT_NAME_LENGTH,
MAX_ATTACHMENT_SIZE_BYTES,
PROGRAM_ALLOWED_ATTACHMENT_TYPES,
-} from "@/lib/zod/schemas/messages";
+} from "@/lib/messages/constants";
+import { sanitizeFileName } from "@/lib/messages/utils";
+import { storage } from "@/lib/storage";
+import { ratelimit } from "@/lib/upstash";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
import { nanoid } from "@dub/utils";
import * as z from "zod/v4";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
+import { authActionClient } from "../actions/safe-action";
+import { throwIfNoPermission } from "../actions/throw-if-no-permission";
const schema = z.object({
workspaceId: z.string(),
diff --git a/apps/web/lib/actions/partners/upload-partner-message-attachment.ts b/apps/web/lib/messages/upload-partner-message-attachment.ts
similarity index 95%
rename from apps/web/lib/actions/partners/upload-partner-message-attachment.ts
rename to apps/web/lib/messages/upload-partner-message-attachment.ts
index 2297799455..bcba2ee143 100644
--- a/apps/web/lib/actions/partners/upload-partner-message-attachment.ts
+++ b/apps/web/lib/messages/upload-partner-message-attachment.ts
@@ -1,18 +1,18 @@
"use server";
-import { sanitizeFileName } from "@/lib/messages/utils";
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
-import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
import {
MAX_ATTACHMENT_NAME_LENGTH,
MAX_ATTACHMENT_SIZE_BYTES,
PARTNER_ALLOWED_ATTACHMENT_TYPES,
-} from "@/lib/zod/schemas/messages";
+} from "@/lib/messages/constants";
+import { sanitizeFileName } from "@/lib/messages/utils";
+import { storage } from "@/lib/storage";
+import { ratelimit } from "@/lib/upstash";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
import { prisma } from "@dub/prisma";
import { nanoid } from "@dub/utils";
import * as z from "zod/v4";
-import { authPartnerActionClient } from "../safe-action";
+import { authPartnerActionClient } from "../actions/safe-action";
const schema = z.object({
programSlug: z.string(),
diff --git a/apps/web/lib/messages/utils.ts b/apps/web/lib/messages/utils.ts
index bc209575a7..1af9b366f8 100644
--- a/apps/web/lib/messages/utils.ts
+++ b/apps/web/lib/messages/utils.ts
@@ -1,7 +1,7 @@
import {
ATTACHMENT_MIME_TYPE_LABELS,
PREVIEWABLE_IMAGE_TYPES,
-} from "../zod/schemas/messages";
+} from "./constants";
// Normalize a user-supplied file name
export function sanitizeFileName(name: string): string {
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index d9f57c38e9..6cbb675b58 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -58,6 +58,7 @@ import {
FOLDER_PERMISSIONS,
FOLDER_WORKSPACE_ACCESS,
} from "./folder/constants";
+import { MessageAttachmentSchema, MessageSchema } from "./messages/schemas";
import { POSTBACK_TRIGGERS } from "./postback/constants";
import { postbackEventInputSchemaTB, postbackSchema } from "./postback/schemas";
import { WEBHOOK_TRIGGER_DESCRIPTIONS } from "./webhook/constants";
@@ -132,7 +133,6 @@ import {
ABTestVariantsSchema,
createLinkBodySchema,
} from "./zod/schemas/links";
-import { MessageAttachmentSchema, MessageSchema } from "./zod/schemas/messages";
import { createOAuthAppSchema, oAuthAppSchema } from "./zod/schemas/oauth";
import {
NetworkPartnerSchema,
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index aa28603512..dea7ae15e5 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -7,7 +7,7 @@ import {
useBountySubmissionsCount,
} from "@/lib/swr/use-bounty-submissions-count";
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
-import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
+import { usePartnerMessagesCount } from "@/lib/messages/hooks/use-partner-messages-count";
import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
import { useProgramSubmittedLeadsCount } from "@/lib/swr/use-program-submitted-leads-count";
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index 29fbb7b64e..3edc16486b 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -1,10 +1,10 @@
"use client";
+import { useProgramMessagesCount } from "@/lib/messages/hooks/use-program-messages-count";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { usePartnerProgramBounties } from "@/lib/swr/use-partner-program-bounties";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
-import { useProgramMessagesCount } from "@/lib/swr/use-program-messages-count";
import { ProgramsPromoCard } from "@/ui/partners/program-marketplace/programs-promo-card";
import { type Icon, useRouterStuff } from "@dub/ui";
import {
diff --git a/apps/web/ui/messages/message-attachments.tsx b/apps/web/ui/messages/message-attachments.tsx
index befc41762a..9078888a76 100644
--- a/apps/web/ui/messages/message-attachments.tsx
+++ b/apps/web/ui/messages/message-attachments.tsx
@@ -1,8 +1,8 @@
"use client";
+import { ATTACHMENT_MIME_TYPE_COLOR } from "@/lib/messages/constants";
import { getAttachmentTypeLabel } from "@/lib/messages/utils";
import { MessageAttachment } from "@/lib/types";
-import { ATTACHMENT_MIME_TYPE_COLOR } from "@/lib/zod/schemas/messages";
import { formatFileSize } from "@dub/utils";
import { cn } from "@dub/utils/src";
import { Download, File } from "lucide-react";
diff --git a/apps/web/ui/shared/message-input.tsx b/apps/web/ui/shared/message-input.tsx
index ca770d98ca..7f7b0efea7 100644
--- a/apps/web/ui/shared/message-input.tsx
+++ b/apps/web/ui/shared/message-input.tsx
@@ -1,13 +1,13 @@
-import {
- getAttachmentTypeLabel,
- isPreviewableImageType,
-} from "@/lib/messages/utils";
import {
ATTACHMENT_MIME_TYPE_COLOR,
MAX_ATTACHMENTS_PER_MESSAGE,
MAX_MESSAGE_LENGTH,
- messageAttachmentInputSchema,
-} from "@/lib/zod/schemas/messages";
+} from "@/lib/messages/constants";
+import { messageAttachmentInputSchema } from "@/lib/messages/schemas";
+import {
+ getAttachmentTypeLabel,
+ isPreviewableImageType,
+} from "@/lib/messages/utils";
import {
ArrowTurnLeft,
Button,