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.

code improvements

Pedro Ladeira9b3f6d213b9e
diff --git a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
index 31c8c3a767..7deac88468 100644
--- a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
+++ b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
@@ -250,10 +250,14 @@ export async function POST(req: Request) {
const { data, error } = await sendBatchEmail(
partnerUsersChunk.map((partnerUser) => ({
- from: resolveCampaignFromAddress({
- from: campaign.from!,
- programName: program.name,
- }),
+ ...(campaign.from
+ ? {
+ from: resolveCampaignFromAddress({
+ from: campaign.from,
+ programName: program.name,
+ }),
+ }
+ : {}),
to: partnerUser.email!,
subject: campaign.subject,
...(program.supportEmail ? { replyTo: program.supportEmail } : {}),
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
index 14ded83a7f..d8bc9a6441 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
@@ -106,10 +106,18 @@ function CampaignFromField({
displayNamePlaceholder: string;
}) {
const parsed = value ? parseCampaignFromAddress(value) : null;
- const [displayName, setDisplayName] = useState(parsed?.displayName ?? "");
- const [localPart, setLocalPart] = useState(
- parsed?.email?.split("@")[0] ?? "",
- );
+ const initialDisplayName = parsed?.displayName ?? "";
+ const initialLocalPart = parsed?.email?.split("@")[0] ?? "";
+
+ const [displayName, setDisplayName] = useState(initialDisplayName);
+ const [localPart, setLocalPart] = useState(initialLocalPart);
+ const [localPartAutoGenerated, setLocalPartAutoGenerated] = useState(() => {
+ if (!initialLocalPart) {
+ return true;
+ }
+
+ return initialLocalPart === slugify(initialDisplayName);
+ });
const localPartMeasureRef = useRef<HTMLSpanElement>(null);
const [localPartWidth, setLocalPartWidth] = useState(0);
@@ -119,8 +127,13 @@ function CampaignFromField({
const next = parseCampaignFromAddress(value);
if (!next) return;
- setDisplayName(next.displayName ?? "");
- setLocalPart(next.email.split("@")[0] ?? "");
+ const nextDisplayName = next.displayName ?? "";
+ const nextLocalPart = next.email.split("@")[0] ?? "";
+ setDisplayName(nextDisplayName);
+ setLocalPart(nextLocalPart);
+ setLocalPartAutoGenerated(
+ !nextLocalPart || nextLocalPart === slugify(nextDisplayName),
+ );
}, [value]);
useEffect(() => {
@@ -160,6 +173,17 @@ function CampaignFromField({
value={displayName}
onChange={(e) => {
const nextDisplayName = e.target.value;
+
+ if (!localPartAutoGenerated) {
+ commit(nextDisplayName, localPart);
+ return;
+ }
+
+ if (!nextDisplayName.trim()) {
+ commit(nextDisplayName, localPart);
+ return;
+ }
+
commit(nextDisplayName, slugify(nextDisplayName));
}}
aria-label="From display name"
@@ -182,7 +206,13 @@ function CampaignFromField({
className="text-content-default placeholder:text-content-muted m-0 max-w-[12rem] border-0 bg-transparent p-0 text-sm leading-none focus:outline-none focus:ring-0"
disabled={disabled}
value={localPart}
- onChange={(e) => commit(displayName, e.target.value)}
+ onChange={(e) => {
+ const nextLocalPart = e.target.value;
+ setLocalPartAutoGenerated(
+ !nextLocalPart.trim() || nextLocalPart === slugify(displayName),
+ );
+ commit(displayName, nextLocalPart);
+ }}
aria-label="From email address"
/>
<span className="text-content-default shrink-0 text-sm leading-none">
diff --git a/apps/web/lib/email/parse-campaign-from-address.ts b/apps/web/lib/email/parse-campaign-from-address.ts
index 6b944395d3..789333b1b9 100644
--- a/apps/web/lib/email/parse-campaign-from-address.ts
+++ b/apps/web/lib/email/parse-campaign-from-address.ts
@@ -11,7 +11,7 @@ export function parseCampaignFromAddress(
const trimmed = value.trim();
if (!trimmed) return null;
- const namedMatch = trimmed.match(/^(.+?)s*<([^<>s]+@[^<>s]+)>$/);
+ const namedMatch = trimmed.match(/^(.+?)\s*<([^<>\s]+@[^<>\s]+)>$/);
if (namedMatch) {
const displayName = namedMatch[1].trim();
const email = namedMatch[2].trim();
diff --git a/apps/web/tests/misc/parse-campaign-from-address.test.ts b/apps/web/tests/misc/parse-campaign-from-address.test.ts
index b852e26f97..107bdcd67f 100644
--- a/apps/web/tests/misc/parse-campaign-from-address.test.ts
+++ b/apps/web/tests/misc/parse-campaign-from-address.test.ts
@@ -22,6 +22,7 @@ describe("parseCampaignFromAddress", () => {
"Bob from Acme",
],
+ ["Support <[email protected]>", "Support", "[email protected]"],
])("parses %s", (input, displayName, email) => {
expect(parseCampaignFromAddress(input)).toEqual({ displayName, email });
});