fix some more bugs

Author: steven-tey

apps/web/lib/api/links/process-link.ts

@@ -10,7 +10,6 @@ import { isStored } from "@/lib/storage";
 import { NewLinkProps, ProcessedLinkProps, WorkspaceProps } from "@/lib/types";
 import {
   DUB_DOMAINS,
-  SHORT_DOMAIN,
   combineWords,
   getApexDomain,
   getDomainWithoutWWW,
@@ -141,7 +140,7 @@ export async function processLink<T extends Record<string, any>>({
 
   // if domain is not defined, set it to the workspace's primary domain
   if (!domain) {
-    domain = domains?.find((d) => d.primary)?.slug || SHORT_DOMAIN;
+    domain = domains?.find((d) => d.primary)?.slug || "dub.sh";
   }
 
   // checks for dub.sh links

apps/web/lib/api/links/utils.ts

@@ -7,7 +7,6 @@ import { checkIfKeyExists } from "@/lib/planetscale";
 import { WorkspaceProps } from "@/lib/types";
 import {
   DEFAULT_REDIRECTS,
-  SHORT_DOMAIN,
   isDubDomain,
   linkConstructor,
   punyEncode,
@@ -46,7 +45,7 @@ export async function keyChecks({
   key: string;
   workspace?: Pick<WorkspaceProps, "plan">;
 }): Promise<{ error: string | null; code?: DubApiError["code"] }> {
-  if (key.length === 0) {
+  if (key.length === 0 || key === "_root") {
     if (workspace?.plan === "free") {
       return {
         error:
@@ -71,7 +70,7 @@ export async function keyChecks({
   }
 
   if (isDubDomain(domain) && process.env.NEXT_PUBLIC_IS_DUB) {
-    if (domain === SHORT_DOMAIN) {
+    if (domain === "dub.sh") {
       if (DEFAULT_REDIRECTS[key] || (await isReservedKey(key))) {
         return {
           error: "Duplicate key: This short link already exists.",
@@ -92,6 +91,16 @@ export async function keyChecks({
         code: "forbidden",
       };
     }
+    if (
+      domain === "dub.link" &&
+      key.length <= 5 &&
+      (!workspace || workspace.plan === "free" || workspace.plan === "pro")
+    ) {
+      return {
+        error: `You can only use dub.link with keys that are 5 characters or less on a Business plan and above. Upgrade to Business to register a ${key.length}-character dub.link key.`,
+        code: "forbidden",
+      };
+    }
     if (
       (await isReservedUsername(key)) &&
       (!workspace || workspace.plan === "free")

apps/web/lib/swr/use-domains.ts

@@ -3,7 +3,6 @@ import { useRouterStuff } from "@dub/ui";
 import {
   DUB_DOMAINS,
   DUB_WORKSPACE_ID,
-  PREMIUM_SHORT_DOMAIN,
   SHORT_DOMAIN,
   fetcher,
 } from "@dub/utils";
@@ -59,10 +58,8 @@ export default function useDomains({
         activeWorkspaceDomains.find(({ primary }) => primary)?.slug ||
         activeWorkspaceDomains[0].slug
       );
-    } else if (
-      activeDefaultDomains.find(({ slug }) => slug === PREMIUM_SHORT_DOMAIN)
-    ) {
-      return PREMIUM_SHORT_DOMAIN;
+    } else if (activeDefaultDomains.find(({ slug }) => slug === "dub.link")) {
+      return "dub.link";
     }
     return SHORT_DOMAIN;
   }, [activeDefaultDomains, activeWorkspaceDomains]);

apps/web/ui/links/link-details-column.tsx

@@ -10,7 +10,7 @@ import {
   useMediaQuery,
   useRouterStuff,
 } from "@dub/ui";
-import { CursorRays, InvoiceDollar, LinesY } from "@dub/ui/src/icons";
+import { CursorRays, InvoiceDollar } from "@dub/ui/src/icons";
 import { cn, fetcher, nFormatter, timeAgo } from "@dub/utils";
 import Link from "next/link";
 import { useSearchParams } from "next/navigation";
@@ -137,12 +137,14 @@ function AnalyticsBadge({ link }: { link: ResponseLink }) {
 
   const { id: workspaceId, slug, exceededClicks } = useWorkspace();
   const { isMobile } = useMediaQuery();
+  const { variant } = useContext(CardList.Context);
 
   const { data: totalEvents } = useSWR<{
     [key in CompositeAnalyticsResponseOptions]?: number;
   }>(
     // Only fetch data if there's a slug and the usage is not exceeded
     workspaceId &&
+      variant === "loose" &&
       !exceededClicks &&
       `/api/analytics?event=composite&workspaceId=${workspaceId}&linkId=${id}&interval=all_unfiltered`,
     fetcher,
@@ -159,14 +161,12 @@ function AnalyticsBadge({ link }: { link: ResponseLink }) {
   const [hoveredId, setHoveredId] = useState<string>("clicks");
   const hoveredValue = totalEvents?.[hoveredId];
 
-  const { variant } = useContext(CardList.Context);
-
   return isMobile ? (
     <Link
       href={`/${slug}/analytics?domain=${domain}&key=${key}`}
       className="flex items-center gap-1 rounded-md border border-gray-200 bg-gray-50 px-2 py-0.5 text-sm text-gray-800"
     >
-      <LinesY className="h-4 w-4 text-gray-600" />
+      <CursorRays className="h-4 w-4 text-gray-600" />
       {nFormatter(totalEvents?.clicks)}
     </Link>
   ) : (

apps/web/ui/modals/add-edit-link-modal/index.tsx

@@ -84,6 +84,7 @@ function AddEditLinkModal({
   const { slug } = params;
   const {
     id: workspaceId,
+    nextPlan,
     aiUsage,
     aiLimit,
     mutate: mutateWorkspace,
@@ -435,10 +436,10 @@ function AddEditLinkModal({
                 } else {
                   const { error } = await res.json();
                   if (error) {
-                    if (error.message.includes("Upgrade to Pro")) {
+                    if (error.message.includes("Upgrade to")) {
                       toast.custom(() => (
                         <UpgradeRequiredToast
-                          title="You've discovered a Pro feature!"
+                          title={`You've discovered a ${nextPlan.name} feature!`}
                           message={error.message}
                         />
                       ));
@@ -714,18 +715,20 @@ function AddEditLinkModal({
                     )}
                   </div>
                   {keyError ? (
-                    keyError.includes("Upgrade to Pro") ? (
+                    keyError.includes("Upgrade to") ? (
                       <p className="mt-2 text-sm text-red-600" id="key-error">
-                        {keyError.split("Upgrade to Pro")[0]}
+                        {keyError.split(`Upgrade to ${nextPlan.name}`)[0]}
                         <span
                           className="cursor-pointer underline"
                           onClick={() =>
-                            queryParams({ set: { upgrade: "pro" } })
+                            queryParams({
+                              set: { upgrade: nextPlan.name.toLowerCase() },
+                            })
                           }
                         >
-                          Upgrade to Pro
+                          Upgrade to {nextPlan.name}
                         </span>
-                        {keyError.split("Upgrade to Pro")[1]}
+                        {keyError.split(`Upgrade to ${nextPlan.name}`)[1]}
                       </p>
                     ) : (
                       <p className="mt-2 text-sm text-red-600" id="key-error">

packages/utils/src/constants/main.ts

@@ -3,8 +3,6 @@ export const APP_NAME = process.env.NEXT_PUBLIC_APP_NAME || "Dub.co";
 export const SHORT_DOMAIN =
   process.env.NEXT_PUBLIC_APP_SHORT_DOMAIN || "dub.sh";
 
-export const PREMIUM_SHORT_DOMAIN = "dub.link";
-
 export const HOME_DOMAIN = `https://${process.env.NEXT_PUBLIC_APP_DOMAIN}`;
 
 export const APP_HOSTNAMES = new Set([