Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(calendar): strip the Macro call from channel-shared mention previews (#9249)
gbirman8724fbac0573
diff --git a/.sqlx/query-305988961f4db0ae26c829c3a4185362f1134300cefe919efb569397271b61a6.json b/.sqlx/query-305988961f4db0ae26c829c3a4185362f1134300cefe919efb569397271b61a6.jsonnew file mode 100644index 0000000000..dfe3d30a05--- /dev/null+++ b/.sqlx/query-305988961f4db0ae26c829c3a4185362f1134300cefe919efb569397271b61a6.json@@ -0,0 +1,164 @@+{+ "db_name": "PostgreSQL",+ "query": "\n SELECT\n (mentioned.id IS NOT NULL) AS \"mention_exists!\",\n viewer_event.id AS \"resolved_event_id?\",\n viewer_event.is_channel_shared AS \"is_channel_shared?\",\n viewer_event.is_snapshot AS \"is_snapshot?\",\n viewer_event.inbox_organizes AS \"inbox_organizes?\",\n viewer_event.inbox_attends AS \"inbox_attends?\",\n COALESCE(occurrence_override.title, viewer_event.title) AS \"title?\",\n -- A channel share is capped after its Macro call comes out,\n -- since the join line closes the description.\n CASE\n WHEN viewer_event.is_channel_shared\n THEN COALESCE(occurrence_override.description, viewer_event.description)\n ELSE left(\n COALESCE(occurrence_override.description, viewer_event.description),\n $5\n )\n END AS \"description?\",\n COALESCE(occurrence_override.location, viewer_event.location) AS \"location?\",\n viewer_event.organizer_email AS \"organizer_email?\",\n viewer_event.organizer_name AS \"organizer_name?\",\n viewer_event.recurrence_lines AS \"recurrence_lines?\",\n viewer_event.starts_at AS \"event_starts_at?\",\n viewer_event.ends_at AS \"event_ends_at?\",\n viewer_event.start_date AS \"event_start_date?\",\n viewer_event.end_date AS \"event_end_date?\",\n viewer_event.time_zone AS \"time_zone?\",\n viewer_event.updated_at AS \"updated_at?\",\n occurrence.occurrence_key AS \"occurrence_key?\",\n occurrence.starts_at AS \"occurrence_starts_at?\",\n occurrence.ends_at AS \"occurrence_ends_at?\",\n occurrence.start_date AS \"occurrence_start_date?\",\n occurrence.end_date AS \"occurrence_end_date?\",\n attendees.attendee_count AS \"attendee_count?\"\n FROM unnest($2::uuid[], $3::text[])\n WITH ORDINALITY AS requested(event_id, occurrence_key, ord)\n LEFT JOIN calendar_events mentioned\n ON mentioned.id = requested.event_id\n AND mentioned.status <> 'cancelled'\n LEFT JOIN LATERAL (\n SELECT resolved.*\n FROM (\n SELECT\n candidate.id,\n false AS is_channel_shared,\n (candidate.owner_id = $1) AS is_owned,\n (candidate.id = mentioned.id) AS is_mentioned,\n candidate.is_snapshot,\n -- The copy's own inbox decides how the requester\n -- holds it, as it decides their capabilities: an\n -- inbox they own that organizes it or is on it.\n COALESCE(\n lower(copy_inbox.email_address) = lower(candidate.organizer_email)\n OR EXISTS (\n SELECT 1\n FROM calendar_event_attendees organizer\n WHERE organizer.event_id = candidate.id\n AND organizer.is_organizer\n AND lower(organizer.email) = lower(copy_inbox.email_address)\n )\n -- A calendar the inbox can write organizes it,\n -- as Google names a secondary calendar.\n OR EXISTS (\n SELECT 1\n FROM calendar_accounts organizer_account\n JOIN calendars organizer_calendar\n ON organizer_calendar.account_id = organizer_account.id\n WHERE organizer_account.email_link_id = copy_inbox.id\n AND organizer_account.sync_status <> 'disabled'\n AND NOT organizer_calendar.is_deleted\n AND organizer_calendar.access_role IN ('owner', 'writer')\n AND lower(organizer_calendar.provider_calendar_id)\n = lower(candidate.organizer_email)\n ),\n false\n ) AS inbox_organizes,\n EXISTS (\n SELECT 1\n FROM calendar_event_attendees guest\n WHERE guest.event_id = candidate.id\n AND lower(guest.email) = lower(copy_inbox.email_address)\n ) AS inbox_attends,\n candidate.title,\n candidate.description,\n candidate.location,\n candidate.organizer_email,\n candidate.organizer_name,\n candidate.recurrence_lines,\n candidate.starts_at,\n candidate.ends_at,\n candidate.start_date,\n candidate.end_date,\n candidate.time_zone,\n candidate.updated_at\n FROM calendar_events candidate\n LEFT JOIN email_links copy_inbox\n ON copy_inbox.id = candidate.source_link_id\n AND copy_inbox.macro_id = $1\n WHERE calendar_meeting_uid(candidate.ical_uid)\n = calendar_meeting_uid(mentioned.ical_uid)\n AND candidate.status <> 'cancelled'\n AND (\n candidate.owner_id = $1\n OR EXISTS (\n SELECT 1\n FROM macro_user_links link\n WHERE link.link_id = candidate.source_link_id\n AND link.primary_macro_id = $1\n )\n )\n UNION ALL\n SELECT\n mentioned.id,\n true,\n false,\n true,\n false,\n false,\n false,\n mentioned.title,\n mentioned.description,\n mentioned.location,\n mentioned.organizer_email,\n mentioned.organizer_name,\n mentioned.recurrence_lines,\n mentioned.starts_at,\n mentioned.ends_at,\n mentioned.start_date,\n mentioned.end_date,\n mentioned.time_zone,\n mentioned.updated_at\n WHERE mentioned.visibility IN ('default', 'public')\n AND EXISTS (\n SELECT 1\n FROM entity_access grant_row\n JOIN comms_channel_participants participant\n ON participant.channel_id::text = grant_row.source_id\n AND participant.user_id = $1\n AND participant.left_at IS NULL\n WHERE grant_row.entity_id = mentioned.id\n AND grant_row.entity_type = 'calendar_event'\n AND grant_row.source_type = 'channel'\n )\n ) resolved\n ORDER BY\n resolved.is_channel_shared,\n resolved.is_owned DESC,\n resolved.is_mentioned DESC,\n resolved.updated_at DESC,\n resolved.id\n LIMIT 1\n ) viewer_event ON true\n LEFT JOIN LATERAL (\n SELECT\n instance.occurrence_key,\n instance.recurrence_id,\n instance.starts_at,\n instance.ends_at,\n instance.start_date,\n instance.end_date\n FROM calendar_event_occurrences instance\n CROSS JOIN LATERAL (\n SELECT COALESCE(\n instance.starts_at,\n instance.start_date::timestamp AT TIME ZONE 'UTC'\n ) AS at\n ) instance_start\n WHERE instance.event_id = viewer_event.id\n AND NOT instance.is_cancelled\n ORDER BY\n (instance.occurrence_key\n IS NOT DISTINCT FROM requested.occurrence_key) DESC,\n (instance_start.at >= $4) DESC,\n CASE WHEN instance_start.at >= $4 THEN instance_start.at END ASC,\n instance_start.at DESC,\n instance.occurrence_key\n LIMIT 1\n ) occurrence ON true\n -- An exception's content replaces the series content for the\n -- previewed occurrence alone, as it does in the event view.\n LEFT JOIN calendar_event_overrides occurrence_override\n ON occurrence_override.event_id = viewer_event.id\n AND occurrence_override.recurrence_id = occurrence.recurrence_id\n LEFT JOIN LATERAL (\n SELECT count(*) AS attendee_count\n FROM calendar_event_attendees attendee\n WHERE attendee.event_id = viewer_event.id\n ) attendees ON true\n ORDER BY requested.ord\n ",+ "describe": {+ "columns": [+ {+ "ordinal": 0,+ "name": "mention_exists!",+ "type_info": "Bool"+ },+ {+ "ordinal": 1,+ "name": "resolved_event_id?",+ "type_info": "Uuid"+ },+ {+ "ordinal": 2,+ "name": "is_channel_shared?",+ "type_info": "Bool"+ },+ {+ "ordinal": 3,+ "name": "is_snapshot?",+ "type_info": "Bool"+ },+ {+ "ordinal": 4,+ "name": "inbox_organizes?",+ "type_info": "Bool"+ },+ {+ "ordinal": 5,+ "name": "inbox_attends?",+ "type_info": "Bool"+ },+ {+ "ordinal": 6,+ "name": "title?",+ "type_info": "Text"+ },+ {+ "ordinal": 7,+ "name": "description?",+ "type_info": "Text"+ },+ {+ "ordinal": 8,+ "name": "location?",+ "type_info": "Text"+ },+ {+ "ordinal": 9,+ "name": "organizer_email?",+ "type_info": "Text"+ },+ {+ "ordinal": 10,+ "name": "organizer_name?",+ "type_info": "Text"+ },+ {+ "ordinal": 11,+ "name": "recurrence_lines?",+ "type_info": "TextArray"+ },+ {+ "ordinal": 12,+ "name": "event_starts_at?",+ "type_info": "Timestamptz"+ },+ {+ "ordinal": 13,+ "name": "event_ends_at?",+ "type_info": "Timestamptz"+ },+ {+ "ordinal": 14,+ "name": "event_start_date?",+ "type_info": "Date"+ },+ {+ "ordinal": 15,+ "name": "event_end_date?",+ "type_info": "Date"+ },+ {+ "ordinal": 16,+ "name": "time_zone?",+ "type_info": "Text"+ },+ {+ "ordinal": 17,+ "name": "updated_at?",+ "type_info": "Timestamptz"+ },+ {+ "ordinal": 18,+ "name": "occurrence_key?",+ "type_info": "Text"+ },+ {+ "ordinal": 19,+ "name": "occurrence_starts_at?",+ "type_info": "Timestamptz"+ },+ {+ "ordinal": 20,+ "name": "occurrence_ends_at?",+ "type_info": "Timestamptz"+ },+ {+ "ordinal": 21,+ "name": "occurrence_start_date?",+ "type_info": "Date"+ },+ {+ "ordinal": 22,+ "name": "occurrence_end_date?",+ "type_info": "Date"+ },+ {+ "ordinal": 23,+ "name": "attendee_count?",+ "type_info": "Int8"+ }+ ],+ "parameters": {+ "Left": [+ "Text",+ "UuidArray",+ "TextArray",+ "Timestamptz",+ "Int4"+ ]+ },+ "nullable": [+ null,+ true,+ true,+ true,+ true,+ true,+ null,+ null,+ null,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ true,+ null+ ]+ },+ "hash": "305988961f4db0ae26c829c3a4185362f1134300cefe919efb569397271b61a6"+}diff --git a/.sqlx/query-4516dcc374f177843056362d6ee78825fcd40ce8c536c97013ca815287a5c5c9.json b/.sqlx/query-4516dcc374f177843056362d6ee78825fcd40ce8c536c97013ca815287a5c5c9.jsondeleted file mode 100644index b931800894..0000000000--- a/.sqlx/query-4516dcc374f177843056362d6ee78825fcd40ce8c536c97013ca815287a5c5c9.json+++ /dev/null@@ -1,164 +0,0 @@-{- "db_name": "PostgreSQL",- "query": "\n SELECT\n (mentioned.id IS NOT NULL) AS \"mention_exists!\",\n viewer_event.id AS \"resolved_event_id?\",\n viewer_event.is_channel_shared AS \"is_channel_shared?\",\n viewer_event.is_snapshot AS \"is_snapshot?\",\n viewer_event.inbox_organizes AS \"inbox_organizes?\",\n viewer_event.inbox_attends AS \"inbox_attends?\",\n COALESCE(occurrence_override.title, viewer_event.title) AS \"title?\",\n left(\n COALESCE(occurrence_override.description, viewer_event.description),\n $5\n ) AS \"description?\",\n COALESCE(occurrence_override.location, viewer_event.location) AS \"location?\",\n viewer_event.organizer_email AS \"organizer_email?\",\n viewer_event.organizer_name AS \"organizer_name?\",\n viewer_event.recurrence_lines AS \"recurrence_lines?\",\n viewer_event.starts_at AS \"event_starts_at?\",\n viewer_event.ends_at AS \"event_ends_at?\",\n viewer_event.start_date AS \"event_start_date?\",\n viewer_event.end_date AS \"event_end_date?\",\n viewer_event.time_zone AS \"time_zone?\",\n viewer_event.updated_at AS \"updated_at?\",\n occurrence.occurrence_key AS \"occurrence_key?\",\n occurrence.starts_at AS \"occurrence_starts_at?\",\n occurrence.ends_at AS \"occurrence_ends_at?\",\n occurrence.start_date AS \"occurrence_start_date?\",\n occurrence.end_date AS \"occurrence_end_date?\",\n attendees.attendee_count AS \"attendee_count?\"\n FROM unnest($2::uuid[], $3::text[])\n WITH ORDINALITY AS requested(event_id, occurrence_key, ord)\n LEFT JOIN calendar_events mentioned\n ON mentioned.id = requested.event_id\n AND mentioned.status <> 'cancelled'\n LEFT JOIN LATERAL (\n SELECT resolved.*\n FROM (\n SELECT\n candidate.id,\n false AS is_channel_shared,\n (candidate.owner_id = $1) AS is_owned,\n (candidate.id = mentioned.id) AS is_mentioned,\n candidate.is_snapshot,\n -- The copy's own inbox decides how the requester\n -- holds it, as it decides their capabilities: an\n -- inbox they own that organizes it or is on it.\n COALESCE(\n lower(copy_inbox.email_address) = lower(candidate.organizer_email)\n OR EXISTS (\n SELECT 1\n FROM calendar_event_attendees organizer\n WHERE organizer.event_id = candidate.id\n AND organizer.is_organizer\n AND lower(organizer.email) = lower(copy_inbox.email_address)\n )\n -- A calendar the inbox can write organizes it,\n -- as Google names a secondary calendar.\n OR EXISTS (\n SELECT 1\n FROM calendar_accounts organizer_account\n JOIN calendars organizer_calendar\n ON organizer_calendar.account_id = organizer_account.id\n WHERE organizer_account.email_link_id = copy_inbox.id\n AND organizer_account.sync_status <> 'disabled'\n AND NOT organizer_calendar.is_deleted\n AND organizer_calendar.access_role IN ('owner', 'writer')\n AND lower(organizer_calendar.provider_calendar_id)\n = lower(candidate.organizer_email)\n ),\n false\n ) AS inbox_organizes,\n EXISTS (\n SELECT 1\n FROM calendar_event_attendees guest\n WHERE guest.event_id = candidate.id\n AND lower(guest.email) = lower(copy_inbox.email_address)\n ) AS inbox_attends,\n candidate.title,\n candidate.description,\n candidate.location,\n candidate.organizer_email,\n candidate.organizer_name,\n candidate.recurrence_lines,\n candidate.starts_at,\n candidate.ends_at,\n candidate.start_date,\n candidate.end_date,\n candidate.time_zone,\n candidate.updated_at\n FROM calendar_events candidate\n LEFT JOIN email_links copy_inbox\n ON copy_inbox.id = candidate.source_link_id\n AND copy_inbox.macro_id = $1\n WHERE calendar_meeting_uid(candidate.ical_uid)\n = calendar_meeting_uid(mentioned.ical_uid)\n AND candidate.status <> 'cancelled'\n AND (\n candidate.owner_id = $1\n OR EXISTS (\n SELECT 1\n FROM macro_user_links link\n WHERE link.link_id = candidate.source_link_id\n AND link.primary_macro_id = $1\n )\n )\n UNION ALL\n SELECT\n mentioned.id,\n true,\n false,\n true,\n false,\n false,\n false,\n mentioned.title,\n mentioned.description,\n mentioned.location,\n mentioned.organizer_email,\n mentioned.organizer_name,\n mentioned.recurrence_lines,\n mentioned.starts_at,\n mentioned.ends_at,\n mentioned.start_date,\n mentioned.end_date,\n mentioned.time_zone,\n mentioned.updated_at\n WHERE mentioned.visibility IN ('default', 'public')\n AND EXISTS (\n SELECT 1\n FROM entity_access grant_row\n JOIN comms_channel_participants participant\n ON participant.channel_id::text = grant_row.source_id\n AND participant.user_id = $1\n AND participant.left_at IS NULL\n WHERE grant_row.entity_id = mentioned.id\n AND grant_row.entity_type = 'calendar_event'\n AND grant_row.source_type = 'channel'\n )\n ) resolved\n ORDER BY\n resolved.is_channel_shared,\n resolved.is_owned DESC,\n resolved.is_mentioned DESC,\n resolved.updated_at DESC,\n resolved.id\n LIMIT 1\n ) viewer_event ON true\n LEFT JOIN LATERAL (\n SELECT\n instance.occurrence_key,\n instance.recurrence_id,\n instance.starts_at,\n instance.ends_at,\n instance.start_date,\n instance.end_date\n FROM calendar_event_occurrences instance\n CROSS JOIN LATERAL (\n SELECT COALESCE(\n instance.starts_at,\n instance.start_date::timestamp AT TIME ZONE 'UTC'\n ) AS at\n ) instance_start\n WHERE instance.event_id = viewer_event.id\n AND NOT instance.is_cancelled\n ORDER BY\n (instance.occurrence_key\n IS NOT DISTINCT FROM requested.occurrence_key) DESC,\n (instance_start.at >= $4) DESC,\n CASE WHEN instance_start.at >= $4 THEN instance_start.at END ASC,\n instance_start.at DESC,\n instance.occurrence_key\n LIMIT 1\n ) occurrence ON true\n -- An exception's content replaces the series content for the\n -- previewed occurrence alone, as it does in the event view.\n LEFT JOIN calendar_event_overrides occurrence_override\n ON occurrence_override.event_id = viewer_event.id\n AND occurrence_override.recurrence_id = occurrence.recurrence_id\n LEFT JOIN LATERAL (\n SELECT count(*) AS attendee_count\n FROM calendar_event_attendees attendee\n WHERE attendee.event_id = viewer_event.id\n ) attendees ON true\n ORDER BY requested.ord\n ",- "describe": {- "columns": [- {- "ordinal": 0,- "name": "mention_exists!",- "type_info": "Bool"- },- {- "ordinal": 1,- "name": "resolved_event_id?",- "type_info": "Uuid"- },- {- "ordinal": 2,- "name": "is_channel_shared?",- "type_info": "Bool"- },- {- "ordinal": 3,- "name": "is_snapshot?",- "type_info": "Bool"- },- {- "ordinal": 4,- "name": "inbox_organizes?",- "type_info": "Bool"- },- {- "ordinal": 5,- "name": "inbox_attends?",- "type_info": "Bool"- },- {- "ordinal": 6,- "name": "title?",- "type_info": "Text"- },- {- "ordinal": 7,- "name": "description?",- "type_info": "Text"- },- {- "ordinal": 8,- "name": "location?",- "type_info": "Text"- },- {- "ordinal": 9,- "name": "organizer_email?",- "type_info": "Text"- },- {- "ordinal": 10,- "name": "organizer_name?",- "type_info": "Text"- },- {- "ordinal": 11,- "name": "recurrence_lines?",- "type_info": "TextArray"- },- {- "ordinal": 12,- "name": "event_starts_at?",- "type_info": "Timestamptz"- },- {- "ordinal": 13,- "name": "event_ends_at?",- "type_info": "Timestamptz"- },- {- "ordinal": 14,- "name": "event_start_date?",- "type_info": "Date"- },- {- "ordinal": 15,- "name": "event_end_date?",- "type_info": "Date"- },- {- "ordinal": 16,- "name": "time_zone?",- "type_info": "Text"- },- {- "ordinal": 17,- "name": "updated_at?",- "type_info": "Timestamptz"- },- {- "ordinal": 18,- "name": "occurrence_key?",- "type_info": "Text"- },- {- "ordinal": 19,- "name": "occurrence_starts_at?",- "type_info": "Timestamptz"- },- {- "ordinal": 20,- "name": "occurrence_ends_at?",- "type_info": "Timestamptz"- },- {- "ordinal": 21,- "name": "occurrence_start_date?",- "type_info": "Date"- },- {- "ordinal": 22,- "name": "occurrence_end_date?",- "type_info": "Date"- },- {- "ordinal": 23,- "name": "attendee_count?",- "type_info": "Int8"- }- ],- "parameters": {- "Left": [- "Text",- "UuidArray",- "TextArray",- "Timestamptz",- "Int4"- ]- },- "nullable": [- null,- true,- true,- true,- true,- true,- null,- true,- null,- true,- true,- true,- true,- true,- true,- true,- true,- true,- true,- true,- true,- true,- true,- null- ]- },- "hash": "4516dcc374f177843056362d6ee78825fcd40ce8c536c97013ca815287a5c5c9"-}diff --git a/crates/calendar_events/AGENTS.md b/crates/calendar_events/AGENTS.mdindex 129809464f..cd8c013894 100644--- a/crates/calendar_events/AGENTS.md+++ b/crates/calendar_events/AGENTS.md@@ -155,8 +155,8 @@ reminder dispatch, team availability, and provider/Postgres persistence.`CalendarSnapshotImporter::import_snapshot`, fed an `EventSnapshot` that`crates/email`'s `invitation_import` builds from the email's saved snapshot.Only the channel-share path strips the Macro call- (`EventSnapshot::without_macro_call`); a forwarded file keeps the join link- it carries.+ (`content_without_macro_call`, behind `EventSnapshot::without_macro_call`);+ a forwarded file keeps the join link it carries.The other direction, a guest forwarding their copy of an event, renders itthrough `CalendarEventForwardSource::event_forward`, which also names theinbox holding that copy (`meeting_copies`), and is `None` for a channel@@ -190,7 +190,14 @@ reminder dispatch, team availability, and provider/Postgres persistence.`calendar`), but `ReadContent` and `ReadMetadata` need document access, whicha channel-shared event never grants. The agent reads a mentioned event with`ReadCalendarEvent` (`src/inbound/toolset/read_calendar_event.rs`), which goes- through `mention_previews`: the hover card's visibility and fields.+ through `mention_previews`: the hover card's visibility and fields. A preview+ that falls back to a channel share loses its Macro call there, in the+ repository so that meeting-note references (`reference_previews`) get the+ same, and before the description cap, since the join line closes the+ description. Whoever resolves to their own copy keeps it: the card's Join+ button reads the link from the preview. Only the generated Macro call goes;+ join text a provider wrote into the body, as a Teams invitation's, stays, as+ it does in a snapshot.- Google names the calendar an event was made on as its organizer, so anevent on a secondary calendar has that calendar's id(`…@group.calendar.google.com`) as `organizer_email`; Google'sdiff --git a/crates/calendar_events/src/domain/ics.rs b/crates/calendar_events/src/domain/ics.rsindex 31141a0fb2..7e7da48179 100644--- a/crates/calendar_events/src/domain/ics.rs+++ b/crates/calendar_events/src/domain/ics.rs@@ -112,34 +112,46 @@ pub struct EventSnapshot {}impl EventSnapshot {- /// The snapshot without the Macro call join link- /// [`attach_macro_call`](super::meeting_links::attach_macro_call) wrote- /// into its description and location: it shares the meeting, not a way- /// into its call. A description holding the link is reduced to plain- /// text to take its join line out; one without it is left as written.+ /// The snapshot without its Macro call ([`content_without_macro_call`]).pub fn without_macro_call(self) -> Self {- let Some(url) = first_macro_call_url(self.location.as_deref(), self.description.as_deref())- else {- return self;- };- let description = self- .description- .as_deref()- .and_then(plain_text)- .unwrap_or_default();- let (description, location) = strip_macro_call(- &description,- self.location.as_deref().unwrap_or_default(),- &url,- );+ let (description, location) = content_without_macro_call(self.description, self.location);Self {- description: (!description.is_empty()).then_some(description),- location: (!location.is_empty()).then_some(location),+ description,+ location,..self}}}+/// A channel share's view of an event's description and location, without the+/// Macro call join link+/// [`attach_macro_call`](super::meeting_links::attach_macro_call) wrote into+/// them: it shares the meeting, not a way into its call. A description holding+/// the link is reduced to plain text to take its join line out; one without it+/// is left as written.+pub fn content_without_macro_call(+ description: Option<String>,+ location: Option<String>,+) -> (Option<String>, Option<String>) {+ let Some(url) = first_macro_call_url(location.as_deref(), description.as_deref()) else {+ return (description, location);+ };+ let holds_link = first_macro_call_url(None, description.as_deref()).is_some();+ let text = description+ .as_deref()+ .and_then(plain_text)+ .unwrap_or_default();+ let (text, location) = strip_macro_call(&text, location.as_deref().unwrap_or_default(), &url);+ (+ if holds_link {+ (!text.is_empty()).then_some(text)+ } else {+ description+ },+ (!location.is_empty()).then_some(location),+ )+}+/// One event rendered as an iCalendar document.#[derive(Clone, Debug, PartialEq, Eq)]pub struct CalendarEventIcs {diff --git a/crates/calendar_events/src/domain/ics/test.rs b/crates/calendar_events/src/domain/ics/test.rsindex 8976efc715..47794fe3c4 100644--- a/crates/calendar_events/src/domain/ics/test.rs+++ b/crates/calendar_events/src/domain/ics/test.rs@@ -2,7 +2,7 @@ use chrono::{NaiveDate, TimeZone, Utc};use super::{CalendarEventExport, CalendarEventExportAccess, ForwardedCopy, IcsParticipant, IcsPurpose,- JoinLink, render_event_ics,+ JoinLink, content_without_macro_call, render_event_ics,};use crate::domain::{meeting_links::attach_macro_call,@@ -193,6 +193,23 @@ fn the_join_line_goes_even_when_an_earlier_call_link_is_found_first() {assert!(!document.contains(CALL_URL), "{lines:?}");}+#[test]+fn only_a_description_holding_the_link_is_reduced_to_plain_text() {+ let rich = "<p>See <a href=\"https://example.com/notes\">the notes</a></p>";+ let (description, location) =+ content_without_macro_call(Some(rich.to_string()), Some(CALL_URL.to_string()));+ assert_eq!(description.as_deref(), Some(rich));+ assert_eq!(location, None);++ // No join line to match here, so only the markup going takes the link.+ let behind_text = format!("<p><a href=\"{CALL_URL}\">Agenda</a></p>");+ let (description, _) = content_without_macro_call(Some(behind_text), None);+ assert!(+ !description.unwrap_or_default().contains("/meet/join/"),+ "the link must not survive in an href"+ );+}+#[test]fn stored_line_breaks_cannot_start_a_new_property() {let mut event = export(EventTime::Timed {diff --git a/crates/calendar_events/src/outbound/pg.rs b/crates/calendar_events/src/outbound/pg.rsindex 4e7246cf74..bea7ce7396 100644--- a/crates/calendar_events/src/outbound/pg.rs+++ b/crates/calendar_events/src/outbound/pg.rs@@ -24,7 +24,7 @@ use uuid::Uuid;use crate::domain::{changes::CalendarChangeOp,- ics::CalendarEventExport,+ ics::{CalendarEventExport, content_without_macro_call},models::{ActorInboxes, AlignedGuestCopy, AppliedGoogleGrant, AttendeeResponseStatus,CALENDAR_SYNC_FAILURE_BADGE_THRESHOLD, CalendarAttendee, CalendarBackfillClaim,@@ -410,7 +410,7 @@ struct OccurrenceJoinRow {/// A preview batch carries up to 100 events, so each description is capped/// well above what the hover card shows; clients sanitize what arrives.-const MENTION_PREVIEW_DESCRIPTION_MAX_CHARS: i32 = 4000;+const MENTION_PREVIEW_DESCRIPTION_MAX_CHARS: u16 = 4000;struct MentionPreviewRow {mention_exists: bool,@@ -1345,7 +1345,11 @@ impl CalendarRepository for PgCalendarRepository {super::pg_team::list_team_out_of_office(&self.pool, requester_id, range, limit).await}- #[tracing::instrument(skip(self, requester_id, items), err)]+ #[tracing::instrument(+ skip(self, requester_id, items),+ fields(channel_shared_count = tracing::field::Empty),+ err+ )]async fn mention_previews(&self,requester_id: &str,@@ -1375,10 +1379,16 @@ impl CalendarRepository for PgCalendarRepository {viewer_event.inbox_organizes AS "inbox_organizes?",viewer_event.inbox_attends AS "inbox_attends?",COALESCE(occurrence_override.title, viewer_event.title) AS "title?",- left(- COALESCE(occurrence_override.description, viewer_event.description),- $5- ) AS "description?",+ -- A channel share is capped after its Macro call comes out,+ -- since the join line closes the description.+ CASE+ WHEN viewer_event.is_channel_shared+ THEN COALESCE(occurrence_override.description, viewer_event.description)+ ELSE left(+ COALESCE(occurrence_override.description, viewer_event.description),+ $5+ )+ END AS "description?",COALESCE(occurrence_override.location, viewer_event.location) AS "location?",viewer_event.organizer_email AS "organizer_email?",viewer_event.organizer_name AS "organizer_name?",@@ -1555,12 +1565,18 @@ impl CalendarRepository for PgCalendarRepository {&event_ids,&occurrence_keys as &[Option<String>],now,- MENTION_PREVIEW_DESCRIPTION_MAX_CHARS,+ i32::from(MENTION_PREVIEW_DESCRIPTION_MAX_CHARS),).fetch_all(&self.pool).await.map_err(report)?;+ tracing::Span::current().record(+ "channel_shared_count",+ rows.iter()+ .filter(|row| row.is_channel_shared == Some(true))+ .count(),+ );rows.into_iter().map(mention_preview_from_row).collect()}@@ -4854,6 +4870,18 @@ fn mention_preview_from_row(row: MentionPreviewRow) -> Result<CalendarMentionPrereturn Ok(CalendarMentionPreview::NoAccess);};let is_channel_shared = row.is_channel_shared.unwrap_or_default();+ let (description, location) = if is_channel_shared {+ let (description, location) = content_without_macro_call(row.description, row.location);+ let description = description.map(|description| {+ description+ .chars()+ .take(usize::from(MENTION_PREVIEW_DESCRIPTION_MAX_CHARS))+ .collect()+ });+ (description, location)+ } else {+ (row.description, row.location)+ };let time = if row.occurrence_key.is_some() {row_time(row.occurrence_starts_at,@@ -4884,13 +4912,11 @@ fn mention_preview_from_row(row: MentionPreviewRow) -> Result<CalendarMentionPre)}),title: row.title.unwrap_or_default(),- description: row- .description- .filter(|description| !description.trim().is_empty()),+ description: description.filter(|description| !description.trim().is_empty()),time,occurrence_key: row.occurrence_key,is_recurring: !row.recurrence_lines.unwrap_or_default().is_empty(),- location: row.location,+ location,organizer_email: row.organizer_email,organizer_name: row.organizer_name,attendee_count: usize::try_from(row.attendee_count.unwrap_or_default())diff --git a/crates/calendar_events/src/outbound/pg/test.rs b/crates/calendar_events/src/outbound/pg/test.rsindex 03b208c43e..4a818d1b84 100644--- a/crates/calendar_events/src/outbound/pg/test.rs+++ b/crates/calendar_events/src/outbound/pg/test.rs@@ -7264,6 +7264,7 @@ mod invitations;mod join_requests;mod meeting_copies;mod meeting_uid;+mod mention_join_link;#[cfg(feature = "notes")]mod notes;mod organizer_calendar;diff --git a/crates/calendar_events/src/outbound/pg/test/mention_join_link.rs b/crates/calendar_events/src/outbound/pg/test/mention_join_link.rsnew file mode 100644index 0000000000..43d4fc71ad--- /dev/null+++ b/crates/calendar_events/src/outbound/pg/test/mention_join_link.rs@@ -0,0 +1,208 @@+use super::*;+use crate::domain::meeting_links::attach_macro_call;++const CALL_URL: &str = "https://macro.com/app/meet/join/abcdefghijklmnop";++async fn preview(+ repo: &PgCalendarRepository,+ viewer_id: &str,+ event_id: Uuid,+ occurrence_key: Option<String>,+) -> CalendarMentionEvent {+ let previews = repo+ .mention_previews(+ viewer_id,+ vec![CalendarMentionRequestItem {+ event_id,+ occurrence_key,+ }],+ Utc.with_ymd_and_hms(2026, 7, 23, 0, 0, 0).unwrap(),+ )+ .await+ .unwrap();+ match previews.into_iter().next() {+ Some(CalendarMentionPreview::Accessible(event)) => *event,+ other => panic!("{viewer_id} should see the event: {other:?}"),+ }+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn a_channel_share_previews_the_meeting_without_its_macro_call(pool: PgPool) {+ let organizer_id = "macro|[email protected]";+ let guest_id = "macro|[email protected]";+ let member_id = "macro|[email protected]";+ let organizer_link = insert_link(&pool, organizer_id).await;+ let guest_link = insert_link(&pool, guest_id).await;+ let repo = PgCalendarRepository::new(pool.clone());+ let organizer_provider = provider_ids(&repo, organizer_link).await;+ let guest_provider = provider_ids(&repo, guest_link).await;+ let (description, location) =+ attach_macro_call(Some("<p>Bring the budget draft</p>"), None, CALL_URL);++ let mut organizer_copy = timed_upsert(+ organizer_id,+ organizer_link,+ organizer_provider,+ "[email protected]",+ "Budget review",+ 1,+ );+ organizer_copy.event.description = Some(description.clone());+ organizer_copy.event.location = Some(location.clone());+ let organizer_event_id = organizer_copy.event.id;+ repo.upsert_event_fixture(organizer_copy).await.unwrap();+ let mut guest_copy = timed_upsert(+ guest_id,+ guest_link,+ guest_provider,+ "[email protected]",+ "Budget review",+ 1,+ );+ guest_copy.event.description = Some(description.clone());+ guest_copy.event.location = Some(location.clone());+ let guest_event_id = guest_copy.event.id;+ repo.upsert_event_fixture(guest_copy).await.unwrap();++ let channel_id =+ insert_channel(&pool, organizer_id, &[organizer_id, guest_id, member_id]).await;+ share_with_channel(&pool, organizer_event_id, channel_id).await;++ let shared = preview(&repo, member_id, organizer_event_id, None).await;+ assert_eq!(shared.viewer_event_id, None);+ assert_eq!(+ shared.description.as_deref(),+ Some("Bring the budget draft")+ );+ assert_eq!(shared.location, None);++ // The web's Join button reads the link from a holder's preview, so anyone+ // resolving to their own copy keeps it, whichever copy was mentioned.+ let organizer = preview(&repo, organizer_id, organizer_event_id, None).await;+ assert_eq!(organizer.viewer_event_id, Some(organizer_event_id));+ assert_eq!(organizer.description, Some(description.clone()));+ assert_eq!(organizer.location, Some(location.clone()));+ let guest = preview(&repo, guest_id, organizer_event_id, None).await;+ assert_eq!(guest.viewer_event_id, Some(guest_event_id));+ assert_eq!(guest.description, Some(description));+ assert_eq!(guest.location, Some(location));+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn a_channel_share_keeps_a_room_beside_the_macro_call(pool: PgPool) {+ let organizer_id = "macro|[email protected]";+ let member_id = "macro|[email protected]";+ let organizer_link = insert_link(&pool, organizer_id).await;+ let repo = PgCalendarRepository::new(pool.clone());+ let provider = provider_ids(&repo, organizer_link).await;+ let (description, location) = attach_macro_call(None, Some("Room 4"), CALL_URL);+ let mut upsert = timed_upsert(+ organizer_id,+ organizer_link,+ provider,+ "[email protected]",+ "Budget review",+ 1,+ );+ upsert.event.description = Some(description);+ upsert.event.location = Some(location);+ let event_id = upsert.event.id;+ repo.upsert_event_fixture(upsert).await.unwrap();+ let channel_id = insert_channel(&pool, organizer_id, &[organizer_id, member_id]).await;+ share_with_channel(&pool, event_id, channel_id).await;++ let shared = preview(&repo, member_id, event_id, None).await;+ assert_eq!(shared.description, None);+ assert_eq!(shared.location.as_deref(), Some("Room 4"));+}++#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn a_channel_share_previews_an_occurrence_without_its_macro_call(pool: PgPool) {+ let organizer_id = "macro|[email protected]";+ let member_id = "macro|[email protected]";+ let organizer_link = insert_link(&pool, organizer_id).await;+ let repo = PgCalendarRepository::new(pool.clone());+ let provider = provider_ids(&repo, organizer_link).await;+ let mut upsert = timed_upsert(+ organizer_id,+ organizer_link,+ provider,+ "[email protected]",+ "Budget review",+ 1,+ );+ upsert.event.description = Some("Series agenda".to_string());+ let (description, location) = attach_macro_call(Some("<p>Only this one</p>"), None, CALL_URL);+ let edited_start = Utc.with_ymd_and_hms(2026, 7, 25, 14, 0, 0).unwrap();+ let recurrence_id = edited_start.to_rfc3339();+ upsert.occurrences[1].recurrence_id = Some(recurrence_id.clone());+ upsert.overrides = vec![CalendarEventOverride {+ reminders: None,+ automatic_decline: None,+ visibility: None,+ transparency: None,+ sequence: None,+ source_updated_at: None,+ recurrence_id: recurrence_id.clone(),+ original_time: EventStart::Timed(edited_start),+ time: EventTime::Timed {+ starts_at: edited_start,+ ends_at: edited_start + Duration::hours(1),+ time_zone: Some("UTC".to_string()),+ },+ title: None,+ description: Some(description.clone()),+ location: Some(location.clone()),+ status: None,+ attendees: None,+ }];+ let event_id = upsert.event.id;+ repo.upsert_event_fixture(upsert).await.unwrap();+ let channel_id = insert_channel(&pool, organizer_id, &[organizer_id, member_id]).await;+ share_with_channel(&pool, event_id, channel_id).await;++ let shared = preview(&repo, member_id, event_id, Some(recurrence_id.clone())).await;+ assert_eq!(shared.description.as_deref(), Some("Only this one"));+ assert_eq!(shared.location, None);++ let organizer = preview(&repo, organizer_id, event_id, Some(recurrence_id)).await;+ assert_eq!(organizer.description, Some(description));+ assert_eq!(organizer.location, Some(location));+}++/// The join line closes the description, so a long body puts the preview's+/// cut inside it: past its link, inside its link, and before it.+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn the_macro_call_leaves_a_shared_description_whole_before_the_cap(pool: PgPool) {+ let organizer_id = "macro|[email protected]";+ let member_id = "macro|[email protected]";+ let organizer_link = insert_link(&pool, organizer_id).await;+ let repo = PgCalendarRepository::new(pool.clone());+ let provider = provider_ids(&repo, organizer_link).await;+ let channel_id = insert_channel(&pool, organizer_id, &[organizer_id, member_id]).await;++ for (body_chars, previewed_chars) in [(3_900, 3_900), (3_925, 3_925), (4_100, 4_000)] {+ let body = "a".repeat(body_chars);+ let (description, location) = attach_macro_call(Some(&body), Some("Room 4"), CALL_URL);+ let mut upsert = timed_upsert(+ organizer_id,+ organizer_link,+ provider,+ &format!("cap-{body_chars}@example.com"),+ "Budget review",+ 1,+ );+ upsert.event.description = Some(description);+ upsert.event.location = Some(location);+ let event_id = upsert.event.id;+ repo.upsert_event_fixture(upsert).await.unwrap();+ share_with_channel(&pool, event_id, channel_id).await;++ let shared = preview(&repo, member_id, event_id, None).await;+ assert_eq!(+ shared.description,+ Some("a".repeat(previewed_chars)),+ "{body_chars} characters of body"+ );+ }+}