@bash-app/bash-common 30.224.0 → 30.226.0

package/src/utils/blog/blogDbUtils.ts

@@ -345,4 +345,98 @@ export async function getRecentBlogPosts(
   });
 
   return posts as BlogPostExt[];
-} 
+}
+
+export interface RelatedBlogPost {
+  id: string;
+  slug: string | null;
+  title: string;
+  excerpt: string | null;
+  coverImage: string | null;
+  readTime: number | null;
+  publishedAt: Date | null;
+}
+
+// Score candidate posts by (1) tag overlap with the source post, (2) shared
+// category, then (3) recency. Drives the "Related posts" module that internal-
+// links blog detail pages -- a major SEO lever per the backlink/SEO plan.
+// Falls back to recent same-category posts when the source has no tags.
+export async function getRelatedBlogPosts(
+  prisma: PrismaClient,
+  postId: string,
+  limit: number = 4
+): Promise<RelatedBlogPost[]> {
+  const source = await prisma.blogPost.findUnique({
+    where: { id: postId },
+    select: {
+      id: true,
+      categoryId: true,
+      tags: { select: { id: true } },
+    },
+  });
+  if (!source) {
+    return [];
+  }
+  const tagIds = source.tags.map((t) => t.id);
+
+  const orClauses: Prisma.BlogPostWhereInput[] = [];
+  if (tagIds.length > 0) {
+    orClauses.push({ tags: { some: { id: { in: tagIds } } } });
+  }
+  if (source.categoryId) {
+    orClauses.push({ categoryId: source.categoryId });
+  }
+
+  const where: Prisma.BlogPostWhereInput = {
+    id: { not: postId },
+    status: BlogStatus.Published,
+    publishedAt: { not: null },
+    ...(orClauses.length > 0 ? { OR: orClauses } : {}),
+  };
+
+  const candidates = await prisma.blogPost.findMany({
+    where,
+    select: {
+      id: true,
+      slug: true,
+      title: true,
+      excerpt: true,
+      coverImage: true,
+      readTime: true,
+      publishedAt: true,
+      categoryId: true,
+      tags: { select: { id: true } },
+    },
+    orderBy: { publishedAt: 'desc' },
+    take: limit * 4,
+  });
+
+  const scored = candidates.map((c) => {
+    const sharedTagCount = c.tags.filter((t) => tagIds.includes(t.id)).length;
+    const sharedCategory =
+      source.categoryId && c.categoryId === source.categoryId ? 1 : 0;
+    const recency = c.publishedAt ? c.publishedAt.getTime() : 0;
+    return { c, sharedTagCount, sharedCategory, recency };
+  });
+
+  scored.sort((a, b) => {
+    if (b.sharedTagCount !== a.sharedTagCount) {
+      return b.sharedTagCount - a.sharedTagCount;
+    }
+    if (b.sharedCategory !== a.sharedCategory) {
+      return b.sharedCategory - a.sharedCategory;
+    }
+    return b.recency - a.recency;
+  });
+
+  return scored.slice(0, limit).map(({ c }) => ({
+    id: c.id,
+    slug: c.slug,
+    title: c.title,
+    excerpt: c.excerpt,
+    coverImage: c.coverImage,
+    readTime: c.readTime,
+    publishedAt: c.publishedAt,
+  }));
+}
+

package/src/utils/urlUtils.ts

@@ -1,4 +1,3 @@
-import { isProduction } from "./apiUtils.js";
 import { BASH_DETAIL_URL, STRIPE_CHECKOUT_TIMEOUT_MS, STRIPE_REDIRECT_TIMEOUT_MS } from "../definitions.js";
 import { generateBashDetailUrl } from "./slugUtils.js";
 
@@ -17,11 +16,34 @@ function isCapacitorNativePlatform(): boolean {
   return cap?.isNativePlatform?.() === true;
 }
 
+/** True when the current page is being served from a developer's local machine (not ngrok, not deployed). */
+function isLocalDevHostname(hostname: string): boolean {
+  return (
+    hostname === "localhost" ||
+    hostname === "127.0.0.1" ||
+    hostname.startsWith("192.168.")
+  );
+}
+
+/**
+ * Canonical frontend origin for share links, embeds, QR codes, etc.
+ *
+ * Browser-hostname-driven (NOT env-var driven) so the answer is correct in any
+ * deployed environment — including ones where `process.env.ENVIRONMENT` /
+ * `BASH_ENV` aren't inlined into the bundle (Vite only inlines REACT_APP_* /
+ * VITE_* / NODE_ENV / PUBLIC_URL). Previously this depended on `isProduction()`
+ * and produced URLs like `https://bash.community:3000/bash/...` in production,
+ * which broke Facebook/iMessage previews because `:3000` isn't publicly reachable.
+ */
 export function getFrontendHost(): string {
-  const host = isProduction()
-    ? `${window.location.protocol}//${window.location.host}`
-    : `${window.location.protocol}//${window.location.hostname}:3000`;
-  return host;
+  if (typeof window === "undefined") {
+    return "";
+  }
+  const { protocol, hostname, host, port } = window.location;
+  if (isLocalDevHostname(hostname)) {
+    return `${protocol}//${hostname}:${port || "3000"}`;
+  }
+  return `${protocol}//${host}`;
 }
 
 export function getBackendHost(): string {

package/src/utils/userUtils.ts

@@ -1 +1,41 @@
+import { Gender } from "@prisma/client";
+
 export const MAX_USER_NAME_CHANGES = 3 as const;
+
+/**
+ * Minimum shape needed by `getDisplayGender` — accepts any object that has the
+ * two relevant columns (e.g. `User`, `UserExt`, `PublicUser`, or a partial
+ * select). The free-text `genderIdentity` is the source of truth for *display*
+ * because it is user-self-described and may not map to a `Gender` enum value
+ * (e.g. "Non-binary", "Genderfluid").
+ */
+export interface GenderDisplayUser {
+  gender?: Gender | null;
+  genderIdentity?: string | null;
+}
+
+/**
+ * Resolve the gender label that should be **displayed in the UI** (profile
+ * header, badges, organizer cards, etc.) for a given user.
+ *
+ * Precedence:
+ *   1. `genderIdentity` (free-text self-description) when present and
+ *      non-blank — wins over the enum so the user sees their own words.
+ *   2. `gender` (enum) when present.
+ *   3. `null` when neither is set.
+ *
+ * IMPORTANT: This helper is for **display only**. Analytics, demographics
+ * cohorts, target-audience matching, and anything that needs a stable
+ * categorical value should keep reading `user.gender` directly. Adding a
+ * comment at those sites (e.g. "intentional: analytics uses raw enum") makes
+ * the divergence explicit.
+ *
+ * @returns the user-facing string (free-text or enum value), or `null` if no
+ *   gender info has been provided.
+ */
+export function getDisplayGender(user: GenderDisplayUser): string | null {
+  const trimmedIdentity = user.genderIdentity?.trim();
+  if (trimmedIdentity) return trimmedIdentity;
+  if (user.gender) return user.gender;
+  return null;
+}