Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions connectors/google-calendar/src/google-api.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -527,3 +527,20 @@ export function containsHtml(text: string | null | undefined): boolean {
if (!text) return false;
return /<[a-z][\s\S]*>/i.test(text);
}

/**
* Short stable hash of a string for use in note keys. Used to detect
* description-content changes across syncs: same content -> same key
* (idempotent upsert), different content -> different key (new note,
* preserving the prior version as history).
*/
export async function hashContent(content: string): Promise<string> {
const data = new TextEncoder().encode(content);
const buf = await crypto.subtle.digest("SHA-256", data);
const bytes = new Uint8Array(buf);
let hex = "";
for (let i = 0; i < 8; i++) {
hex += bytes[i].toString(16).padStart(2, "0");
}
return hex;
}
96 changes: 70 additions & 26 deletions connectors/google-calendar/src/google-calendar.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
type SyncState,
containsHtml,
extractConferencingLinks,
hashContent,
syncGoogleCalendar,
transformGoogleEvent,
} from "./google-api";
Expand DownExpand Up@@ -309,6 +310,21 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
await this.stopSync(channel.id);
}

/**
* Stamp the first time the connector observes some opaque key, and
* reuse that timestamp on every subsequent observation. Used for note
* `created` timestamps where Google doesn't tell us when something
* actually happened (cancellation date, description-edit date) and we
* don't want re-syncs to bump the note forward in the activity feed.
*/
private async firstSeenAt(storeKey: string): Promise<Date> {
const existing = await this.get<string>(storeKey);
if (existing) return new Date(existing);
const now = new Date();
await this.set(storeKey, now.toISOString());
return now;
}

private async getApi(calendarId: string): Promise<GoogleApi> {
// Get token for the syncable (calendar) from integrations
const token = await this.tools.integrations.get(calendarId);
Expand DownExpand Up@@ -966,16 +982,18 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Create cancellation note
const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
// Google doesn't tell us who cancelled or when, so stamp the
// note with the time we first noticed the cancellation and
// reuse that on every subsequent sync (instead of letting
// event.updated drag the note forward on unrelated edits).
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${canonicalUrl}`
);
const cancelNote = {
key: "cancellation" as const,
content: cancelledBy
? `${cancelledBy} cancelled this event.`
: "This event was cancelled.",
content: "This event was cancelled.",
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

// Convert to link with cancellation note
Expand DownExpand Up@@ -1100,19 +1118,37 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
// so using it converges cross-user threads for the same event.
const canonicalUrl = `google-calendar:${event.iCalUID ?? event.id}`;

// Build description note if available
const descriptionNote = hasDescription
? {
key: "description",
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: event.created ? new Date(event.created) : undefined,
...(authorContact ? { author: authorContact } : {}),
}
// Build description note if available. The key embeds a hash of
// the description content so each distinct version produces a
// separate note: re-syncing the same description is an
// idempotent no-op upsert (same key + same content), while an
// edited description gets a new key and a fresh note —
// preserving the prior versions as history on the thread.
// Stamp `created` with the first time we observed each hash
// and reuse that timestamp on subsequent syncs, so an
// unrelated event update (which bumps event.updated) doesn't
// drag the description note forward in the activity feed.
const descHash = hasDescription
? await hashContent(description)
: null;
const descFirstSeen = descHash
? await this.firstSeenAt(
`desc_seen:${canonicalUrl}:${descHash}`
)
: undefined;
const descriptionNote =
hasDescription && descHash
? {
key: `description-${descHash}`,
content: description,
contentType:
description && containsHtml(description)
? ("html" as const)
: ("text" as const),
created: descFirstSeen,
...(authorContact ? { author: authorContact } : {}),
}
: null;

// Build attendee contacts for link-level access control
const attendeeMentions: NewContact[] = [];
Expand DownExpand Up@@ -1328,8 +1364,6 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
return null;
}

const cancelledBy =
event.organizer?.displayName || event.organizer?.email;
const isAllDay = !event.originalStartTime?.dateTime;
const formattedDate = new Date(originalStartTime).toLocaleDateString(
"en-US",
Expand All@@ -1338,15 +1372,25 @@ export class GoogleCalendar extends Connector<GoogleCalendar> {
...(isAllDay ? { timeZone: "UTC" } : {}),
}
);
// Google doesn't tell us when (or by whom) an occurrence was
// cancelled — event.created is the series creation time and
// event.updated drifts forward on unrelated edits (e.g. a "this
// and future occurrences" change re-emits old cancellations with
// a fresh updated timestamp, which would bump the thread to the
// top of activity). Instead, stamp the note with the time we
// first noticed the cancellation, persist that in connector
// storage, and reuse it on every subsequent sync.
const occurrenceIso = new Date(originalStartTime).toISOString();
const cancelFirstSeen = await this.firstSeenAt(
`cancel_seen:${masterCanonicalUrl}:${occurrenceIso}`
);
const cancelNote = {
// Unique key per occurrence so multiple instance cancellations on the
// same recurring event don't overwrite each other's notes.
key: `cancellation-${new Date(originalStartTime).toISOString()}`,
content: cancelledBy
? `${cancelledBy} cancelled the ${formattedDate} occurrence.`
: `The ${formattedDate} occurrence was cancelled.`,
key: `cancellation-${occurrenceIso}`,
content: `The ${formattedDate} occurrence was cancelled.`,
contentType: "text" as const,
created: event.updated ? new Date(event.updated) : new Date(),
created: cancelFirstSeen,
};

return {
Expand Down
Loading