- {speaker.about} -
+ )} diff --git a/src/app/conf/2025/schedule/[id]/format-description.test.tsx b/src/app/conf/2025/schedule/[id]/format-description.test.tsx new file mode 100644 index 0000000000..f6d4418dcf --- /dev/null +++ b/src/app/conf/2025/schedule/[id]/format-description.test.tsx @@ -0,0 +1,52 @@ +import { it } from "node:test" +import { strict as assert } from "node:assert" + +import { formatDescription } from "./format-description" + +it("does not double-wrap links", () => { + assert.equal( + formatDescription(`Check out Y! https://y.dev`), + `Check out Y! y.dev`, + ) +}) + +it("enriches plain URLs", () => { + assert.equal( + formatDescription(`Visit https://example.com for more info`), + `Visit example.com for more info`, + ) +}) + +it("adds attributes to existing links without URL content", () => { + assert.equal( + formatDescription(`Click here`), + `Click here`, + ) +}) + +it("handles mixed content", () => { + assert.equal( + formatDescription( + `Check Y site and https://example.com`, + ), + `Check Y site and example.com`, + ) +}) + +it("handles multiple URLs in one text", () => { + assert.equal( + formatDescription( + `Visit https://github.com and https://example.org for info`, + ), + `Visit github.com and example.org for info`, + ) +}) + +it("handles existing link with existing class", () => { + assert.equal( + formatDescription( + `Click here`, + ), + `Click here`, + ) +}) diff --git a/src/app/conf/2025/schedule/[id]/format-description.tsx b/src/app/conf/2025/schedule/[id]/format-description.tsx index a34c253d98..c528048547 100644 --- a/src/app/conf/2025/schedule/[id]/format-description.tsx +++ b/src/app/conf/2025/schedule/[id]/format-description.tsx @@ -1,45 +1,48 @@ -const URL_REGEX = /https?:\/\/[^\s]+/g -const LINK_REGEX = /- {formatDescription(speaker.about)} -
+ )} {currentYearSessions.length > 0 && ( diff --git a/src/app/conf/_api/sched-client.tsx b/src/app/conf/_api/sched-client.tsx index 67e4ab7740..d2f1c16757 100644 --- a/src/app/conf/_api/sched-client.tsx +++ b/src/app/conf/_api/sched-client.tsx @@ -135,9 +135,7 @@ export async function getSchedule( ...session, event_type, event_subtype, - description: preprocessDescription(description, { - allowSomeHtml: true, - }), + description: preprocessDescription(description), } }) @@ -185,10 +183,7 @@ export async function getSpeakerDetails( return shapeSpeaker(data as SchedSpeaker) } -function preprocessDescription( - description: string | undefined | null, - options: { allowSomeHtml?: boolean } = {}, -): string { +function preprocessDescription(description: string | undefined | null): string { let res = description || "" // we respect manual line breaks @@ -197,9 +192,18 @@ function preprocessDescription( // respecting