@bash-app/bash-common 30.220.0 → 30.222.0

package/src/utils/paymentUtils.ts

@@ -1,11 +1,20 @@
-import { BashEventPromoCode, MembershipTier, TicketTier, VenuePricingPlan as VenuePricingPlanOption } from "@prisma/client";
+import {
+  BashEventPromoCode,
+  BashPassTier,
+  MembershipTier,
+  TicketTier,
+  VenuePricingPlan as VenuePricingPlanOption,
+} from "@prisma/client";
 import {
   BASH_EVENT_FEES,
+  MEMBERSHIP_BASH_PASS_TIER,
   PARTNER_PAYMENT_FEES,
   SERVICE_BOOKING_FEES,
   STRIPE_PROCESSING_FEE,
 } from "../membershipDefinitions.js";
 import {
+  BASH_PASS_EVENT_CAPS,
+  BASH_PASS_TIER_RANK,
   NumberOfTicketsForDate,
   PRICE_DOLLARS_AND_CENTS_RATIO,
 } from "../definitions.js";
@@ -309,6 +318,64 @@ export function userHasActiveBashPass(user: {
   return user.bashPassCurrentPeriodEnd > new Date();
 }
 
+/** When a user has both membership-included BashPass and a standalone subscription, keep the higher tier. */
+export function higherBashPassTier(
+  a: BashPassTier | null,
+  b: BashPassTier | null
+): BashPassTier | null {
+  if (!a && !b) return null;
+  if (!a) return b;
+  if (!b) return a;
+  return BASH_PASS_TIER_RANK[a] >= BASH_PASS_TIER_RANK[b] ? a : b;
+}
+
+export function membershipGrantsBashPassTier(user: {
+  membershipTier: MembershipTier;
+  membershipExpiresAt: Date | null | undefined;
+}): BashPassTier | null {
+  if (user.membershipTier === MembershipTier.Basic) return null;
+  if (user.membershipExpiresAt && user.membershipExpiresAt <= new Date()) {
+    return null;
+  }
+  return MEMBERSHIP_BASH_PASS_TIER[user.membershipTier] ?? null;
+}
+
+/** Effective BashPass tier from paid membership bundle and/or active standalone BashPass subscription. */
+export function getEffectiveBashPassTier(user: {
+  bashPassTier: BashPassTier | null | undefined;
+  bashPassStripeSubscriptionId: string | null | undefined;
+  bashPassCurrentPeriodEnd: Date | null | undefined;
+  membershipTier: MembershipTier;
+  membershipExpiresAt: Date | null | undefined;
+}): BashPassTier | null {
+  const fromMembership = membershipGrantsBashPassTier(user);
+  const fromStandalone =
+    userHasActiveBashPass(user) && user.bashPassTier ? user.bashPassTier : null;
+  return higherBashPassTier(fromMembership, fromStandalone);
+}
+
+/**
+ * Remaining BashPass redemptions this billing month.
+ * - `0` — no BashPass or cap exhausted
+ * - positive integer — spots left
+ * - `null` — unlimited tier (no monthly cap)
+ */
+export function getBashPassMonthlyCapRemaining(user: {
+  bashPassTier: BashPassTier | null | undefined;
+  bashPassEventsUsedThisMonth: number;
+  bashPassStripeSubscriptionId: string | null | undefined;
+  bashPassCurrentPeriodEnd: Date | null | undefined;
+  membershipTier: MembershipTier;
+  membershipExpiresAt: Date | null | undefined;
+}): number | null {
+  const effective = getEffectiveBashPassTier(user);
+  if (!effective) return 0;
+  const cap = BASH_PASS_EVENT_CAPS[effective];
+  if (cap === null) return null;
+  const used = user.bashPassEventsUsedThisMonth ?? 0;
+  return Math.max(0, cap - used);
+}
+
 // ============================================
 // VENUE PRICING PLANS
 // ============================================

package/src/utils/urlUtils.ts

@@ -206,3 +206,48 @@ export function redirectToStripeWithTimeout(
     }
   }
 }
+
+/**
+ * Builds a safe absolute URL for `<a href>` from user-edited service/profile links.
+ *
+ * Browsers resolve `href="example.com"` as a **relative** URL (under the current path),
+ * not `https://example.com`, so bare domains must be prefixed with `https://`.
+ * Stores sometimes save Instagram as `@handle` instead of a full URL — those are mapped
+ * to `https://www.instagram.com/{handle}/`.
+ *
+ * @returns `"#"` when the value is empty or unsafe (`javascript:`, `data:`).
+ */
+export function toExternalLinkHref(raw: string | undefined | null): string {
+  if (raw == null) {
+    return "#";
+  }
+  const trimmed = raw.trim();
+  if (trimmed === "") {
+    return "#";
+  }
+
+  const lower = trimmed.toLowerCase();
+  if (lower.startsWith("javascript:") || lower.startsWith("data:")) {
+    return "#";
+  }
+
+  if (/^https?:\/\//i.test(trimmed)) {
+    return trimmed;
+  }
+  if (/^mailto:/i.test(trimmed) || /^tel:/i.test(trimmed)) {
+    return trimmed;
+  }
+
+  // Instagram @handle (often stored as a handle instead of a URL)
+  if (trimmed.startsWith("@")) {
+    const handle = trimmed
+      .slice(1)
+      .trim()
+      .replace(/^@+/, "");
+    if (/^[a-zA-Z0-9._]{1,30}$/.test(handle)) {
+      return `https://www.instagram.com/${handle}/`;
+    }
+  }
+
+  return `https://${trimmed}`;
+}