@bash-app/bash-common 30.429.0 → 30.431.0

package/src/bashFeedTypes.ts

@@ -4,6 +4,8 @@ import type {
   Privacy,
 } from "@prisma/client";
 
+import type { FeedPostSocialLink } from "./utils/feedPostSocialLinks.js";
+
 /**
  * Bash snippet on a feed post (matches typical `linkedBashInclude` / shaping output).
  * `activeOffers` replaces raw `ticketTiers` after API media-tree shaping.
@@ -122,6 +124,7 @@ export interface BashFeedDraftView {
   mediaIds: string[];
   mediaUrls: string[];
   isAnonymous: boolean;
+  socialLinks?: FeedPostSocialLink[] | null;
   bash: { id: string; title: string | null; coverPhoto: string | null } | null;
   service: { id: string; serviceName: string | null; coverPhoto: string | null } | null;
 }
@@ -213,6 +216,7 @@ export interface BashFeedPostData {
   content: string | null;
   mediaIds: string[];
   mediaUrls?: string[];
+  socialLinks?: FeedPostSocialLink[] | null;
   isFeatured?: boolean;
   isAnonymous?: boolean;
   createdAt: string;

package/src/definitions.ts

@@ -835,6 +835,7 @@ export type FilterFields = {
   incomeRange: string[];
   hasOpenTasks: boolean; // Boolean filter for events with open volunteer tasks
   acceptsBashPoints: boolean; // Boolean filter for events with BashPoints-priced tickets
+  acceptsBashPass: boolean; // Boolean filter for events with a BashPass-eligible ticket
   ambashadorOnly: boolean; // Boolean filter for events created by Ambashadors
 };
 
@@ -854,6 +855,7 @@ export const EMPTY_FILTER_FIELDS: FilterFields = {
   incomeRange: [],
   hasOpenTasks: false,
   acceptsBashPoints: false,
+  acceptsBashPass: false,
   ambashadorOnly: false,
 };
 
@@ -874,6 +876,7 @@ export function createEmptyFilterFields(): FilterFields {
     incomeRange: [],
     hasOpenTasks: false,
     acceptsBashPoints: false,
+    acceptsBashPass: false,
     ambashadorOnly: false,
   };
 }

package/src/index.ts

@@ -394,6 +394,7 @@ export * from "./utils/discountEngine/bestPriceResolver.js";
 export * from "./utils/discountEngine/eligibilityValidator.js";
 export * from "./utils/nonprofitUtils.js";
 export * from "./utils/objUtils.js";
+export * from "./utils/feedPostSocialLinks.js";
 export * from "./utils/paymentUtils.js";
 export * from "./utils/promoCodesUtils.js";
 export * from "./utils/qrCodeUtils.js";

package/src/utils/__tests__/feedPostSocialLinks.test.ts

@@ -0,0 +1,62 @@
+import {
+  parseFeedPostSocialLinks,
+  providerLinksFromOrganization,
+  withoutPosterSocialLinks,
+} from "../feedPostSocialLinks.js";
+
+describe("parseFeedPostSocialLinks", () => {
+  it("accepts https links and upgrades a bare host", () => {
+    const result = parseFeedPostSocialLinks([
+      { platform: "Website", url: "example.com/book" },
+      { platform: "Instagram", url: "@nightowl" },
+    ]);
+    expect("links" in result).toBe(true);
+    if (!("links" in result)) return;
+    expect(result.links[0]?.url).toBe("https://example.com/book");
+    expect(result.links[1]?.url).toBe("https://instagram.com/nightowl");
+  });
+
+  it("rejects scripts and too many links", () => {
+    expect(parseFeedPostSocialLinks([{ platform: "Website", url: "javascript:alert(1)" }])).toEqual({
+      error: "Links need a normal https address.",
+    });
+    expect(
+      parseFeedPostSocialLinks(
+        Array.from({ length: 6 }, () => ({
+          platform: "Website",
+          url: "https://example.com",
+        }))
+      )
+    ).toEqual({ error: "Add up to 5 links." });
+  });
+});
+
+describe("withoutPosterSocialLinks", () => {
+  it("drops links that match the poster's own profile", () => {
+    const links = parseFeedPostSocialLinks([
+      { platform: "Instagram", url: "https://instagram.com/me" },
+      { platform: "Website", url: "https://venue.example" },
+    ]);
+    if (!("links" in links)) throw new Error("expected links");
+    expect(
+      withoutPosterSocialLinks(links.links, ["https://www.instagram.com/me/"])
+    ).toEqual([
+      { platform: "Website", url: "https://venue.example/" },
+    ]);
+  });
+});
+
+describe("providerLinksFromOrganization", () => {
+  it("reads website and known social keys", () => {
+    expect(
+      providerLinksFromOrganization(
+        { instagram: "@club", twitter: "https://x.com/club" },
+        "https://club.example"
+      )
+    ).toEqual([
+      { platform: "Website", url: "https://club.example/" },
+      { platform: "Instagram", url: "https://instagram.com/club" },
+      { platform: "X", url: "https://x.com/club" },
+    ]);
+  });
+});

package/src/utils/__tests__/paymentUtils.test.ts

@@ -14,6 +14,7 @@ import {
   calculateStripeProcessingFeeCents,
   calculateTotalPriceWithoutTax,
   calculateTotalBashPoints,
+  calculateMixedPricingBashPoints,
   calculateStripeDonationFee,
   calculateServiceFeeWithMembershipDiscount,
   calculatePartnerFeeWithMembershipDiscount,
@@ -398,6 +399,18 @@ describe("PaymentUtils - Core Functions", () => {
       const ticketList = new Map([["t1", [{ numberOfTickets: 1, ticketDateTime: new Date() }]]]);
       expect(calculateTotalBashPoints(tiers, ticketList)).toBe(0);
     });
+
+    test("mixed tiers charge dollars and BashPoints", () => {
+      const tiers = [
+        { id: "t1", price: 500, pricingType: "MIXED", priceBashPoints: 50 },
+      ] as any;
+      const ticketList = new Map([
+        ["t1", [{ numberOfTickets: 2, ticketDateTime: new Date() }]],
+      ]);
+      expect(calculateTotalPriceWithoutTax(tiers, ticketList)).toBe(1000);
+      expect(calculateTotalBashPoints(tiers, ticketList)).toBe(100);
+      expect(calculateMixedPricingBashPoints(tiers, ticketList)).toBe(100);
+    });
   });
 
   describe("Stripe donation fee", () => {

package/src/utils/feedPostSocialLinks.ts

@@ -0,0 +1,174 @@
+/**
+ * Links stored on a service-mode BashFeed post. Not written back to a profile.
+ */
+export const FEED_POST_SOCIAL_PLATFORMS = [
+  "Instagram",
+  "LinkedIn",
+  "X",
+  "Website",
+] as const;
+
+export const FEED_POST_SOCIAL_LINK_MAX = 5;
+
+export type FeedPostSocialPlatform = (typeof FEED_POST_SOCIAL_PLATFORMS)[number];
+
+export type FeedPostSocialLink = {
+  platform: FeedPostSocialPlatform;
+  url: string;
+  label?: string;
+};
+
+function isPlatform(value: string): value is FeedPostSocialPlatform {
+  return (FEED_POST_SOCIAL_PLATFORMS as readonly string[]).includes(value);
+}
+
+/** https URL, or null when the value is not a normal web link. */
+export function toFeedPostHttpsUrl(raw: string): string | null {
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+  if (/^(javascript|data|file|mailto|tel):/i.test(trimmed)) return null;
+
+  let candidate = trimmed;
+  if (/^http:\/\//i.test(candidate)) {
+    candidate = `https://${candidate.slice("http://".length)}`;
+  } else if (!/^https:\/\//i.test(candidate)) {
+    if (candidate.startsWith("@")) return null;
+    candidate = `https://${candidate.replace(/^\/+/, "")}`;
+  }
+
+  try {
+    const url = new URL(candidate);
+    if (url.protocol !== "https:") return null;
+    if (!url.hostname || !url.hostname.includes(".")) return null;
+    return url.toString();
+  } catch {
+    return null;
+  }
+}
+
+function handleToHttps(platform: FeedPostSocialPlatform, raw: string): string | null {
+  const trimmed = raw.trim();
+  const handle = trimmed.replace(/^@/, "");
+  if (!handle || /\s/.test(handle)) return null;
+  if (platform === "Instagram") return toFeedPostHttpsUrl(`https://instagram.com/${handle}`);
+  if (platform === "X") return toFeedPostHttpsUrl(`https://x.com/${handle}`);
+  if (platform === "LinkedIn") return toFeedPostHttpsUrl(`https://www.linkedin.com/in/${handle}`);
+  return null;
+}
+
+export function parseFeedPostSocialLinks(
+  input: unknown
+): { links: FeedPostSocialLink[] } | { error: string } {
+  if (input == null) return { links: [] };
+  if (!Array.isArray(input)) {
+    return { error: "Social links must be a list." };
+  }
+  if (input.length > FEED_POST_SOCIAL_LINK_MAX) {
+    return { error: `Add up to ${FEED_POST_SOCIAL_LINK_MAX} links.` };
+  }
+
+  const links: FeedPostSocialLink[] = [];
+  for (const row of input) {
+    if (!row || typeof row !== "object") {
+      return { error: "Each social link needs a platform and a URL." };
+    }
+    const record = row as { platform?: unknown; url?: unknown; label?: unknown };
+    const platform = typeof record.platform === "string" ? record.platform.trim() : "";
+    const urlRaw = typeof record.url === "string" ? record.url : "";
+    if (!isPlatform(platform)) {
+      return { error: "Use Instagram, LinkedIn, X, or a website." };
+    }
+    const url =
+      toFeedPostHttpsUrl(urlRaw) ??
+      (urlRaw.trim().startsWith("@") ? handleToHttps(platform, urlRaw) : null);
+    if (!url) {
+      return { error: "Links need a normal https address." };
+    }
+    const label =
+      typeof record.label === "string" && record.label.trim()
+        ? record.label.trim().slice(0, 40)
+        : undefined;
+    links.push(label ? { platform, url, label } : { platform, url });
+  }
+  return { links };
+}
+
+function urlKey(url: string): string {
+  try {
+    const parsed = new URL(url);
+    const host = parsed.hostname.replace(/^www\./, "").toLowerCase();
+    const path = parsed.pathname.replace(/\/$/, "").toLowerCase();
+    return `${host}${path}`;
+  } catch {
+    return url.trim().toLowerCase();
+  }
+}
+
+/** Drop links that match the poster's own profile URLs. */
+export function withoutPosterSocialLinks(
+  links: FeedPostSocialLink[],
+  posterUrls: Array<string | null | undefined>
+): FeedPostSocialLink[] {
+  const blocked = new Set<string>();
+  for (const raw of posterUrls) {
+    if (!raw?.trim()) continue;
+    const https = toFeedPostHttpsUrl(raw);
+    if (https) blocked.add(urlKey(https));
+  }
+  if (blocked.size === 0) return links;
+  return links.filter((link) => !blocked.has(urlKey(link.url)));
+}
+
+function pushUnique(
+  links: FeedPostSocialLink[],
+  platform: FeedPostSocialPlatform,
+  raw: string
+): void {
+  if (links.length >= FEED_POST_SOCIAL_LINK_MAX) return;
+  const url =
+    toFeedPostHttpsUrl(raw) ??
+    (raw.trim().startsWith("@") ? handleToHttps(platform, raw) : null);
+  if (!url) return;
+  if (links.some((link) => link.platform === platform && urlKey(link.url) === urlKey(url))) {
+    return;
+  }
+  links.push({ platform, url });
+}
+
+/**
+ * Prefill from an organization's stored social JSON and website.
+ * Accepts `{ instagram, linkedin, x, twitter, website }` or an array of `{ platform, url }`.
+ */
+export function providerLinksFromOrganization(
+  socialLinks: unknown,
+  websiteUrl: string | null | undefined
+): FeedPostSocialLink[] {
+  const links: FeedPostSocialLink[] = [];
+  if (websiteUrl?.trim()) {
+    pushUnique(links, "Website", websiteUrl);
+  }
+  if (!socialLinks) return links;
+
+  if (Array.isArray(socialLinks)) {
+    const parsed = parseFeedPostSocialLinks(socialLinks);
+    if ("links" in parsed) {
+      for (const link of parsed.links) pushUnique(links, link.platform, link.url);
+    }
+    return links;
+  }
+
+  if (typeof socialLinks !== "object") return links;
+  const record = socialLinks as Record<string, unknown>;
+  const pairs: Array<[FeedPostSocialPlatform, unknown]> = [
+    ["Instagram", record.instagram ?? record.Instagram],
+    ["LinkedIn", record.linkedin ?? record.LinkedIn],
+    ["X", record.x ?? record.X ?? record.twitter ?? record.Twitter],
+    ["Website", record.website ?? record.Website ?? record.url],
+  ];
+  for (const [platform, value] of pairs) {
+    if (typeof value === "string" && value.trim()) {
+      pushUnique(links, platform, value);
+    }
+  }
+  return links;
+}

package/src/utils/paymentUtils.ts

@@ -96,7 +96,7 @@ export function calculateTotalPriceWithoutTax(
 ): number {
   let total = 0;
   ticketTiers.forEach((tier: TicketTier) => {
-    // Only calculate USD prices - BashPoints tickets should have price=0
+    // USD and mixed tiers charge the dollar price. Points-only tiers do not.
     if (tier.pricingType !== "BASHPOINTS") {
       const ticketListNumAndDate = ticketList.get(tier.id);
       ticketListNumAndDate?.forEach((numAndDate: NumberOfTicketsForDate) => {
@@ -120,8 +120,10 @@ export function calculateTotalBashPoints(
 ): number {
   let total = 0;
   ticketTiers.forEach((tier: TicketTier) => {
-    // Only calculate BashPoints prices
-    if (tier.pricingType === "BASHPOINTS" && tier.priceBashPoints) {
+    if (
+      (tier.pricingType === "BASHPOINTS" || tier.pricingType === "MIXED") &&
+      tier.priceBashPoints
+    ) {
       const ticketListNumAndDate = ticketList.get(tier.id);
       ticketListNumAndDate?.forEach((numAndDate: NumberOfTicketsForDate) => {
         total += tier.priceBashPoints! * (numAndDate.numberOfTickets ?? 0);
@@ -131,6 +133,22 @@ export function calculateTotalBashPoints(
   return total;
 }
 
+/** BashPoints due on tiers that also charge a card (pricingType MIXED). */
+export function calculateMixedPricingBashPoints(
+  ticketTiers: TicketTier[],
+  ticketList: Map<string, NumberOfTicketsForDate[]>
+): number {
+  let total = 0;
+  ticketTiers.forEach((tier: TicketTier) => {
+    if (tier.pricingType !== "MIXED" || !tier.priceBashPoints) return;
+    const ticketListNumAndDate = ticketList.get(tier.id);
+    ticketListNumAndDate?.forEach((numAndDate: NumberOfTicketsForDate) => {
+      total += tier.priceBashPoints! * (numAndDate.numberOfTickets ?? 0);
+    });
+  });
+  return total;
+}
+
 export function convertCentsToDollars(
   price: number | undefined | null
 ): number {