From 2ffd41accc0d0125b6dde0f901fba874bf4f30ff Mon Sep 17 00:00:00 2001 From: "noz.am" Date: Sat, 26 Sep 2026 16:29:23 +0200 Subject: [PATCH] 2.0 update --- .gitignore | 5 +- PRIVACY.md | 102 + README.md | 49 +- branding/README.md | 33 + branding/extension-icons/icon128.png | Bin 0 -> 9046 bytes branding/extension-icons/icon16.png | Bin 0 -> 6300 bytes branding/extension-icons/icon32.png | Bin 0 -> 6765 bytes branding/extension-icons/icon48.png | Bin 0 -> 7105 bytes branding/png/bskyplus-lockup-white.png | Bin 0 -> 40424 bytes branding/png/bskyplus-lockup.png | Bin 0 -> 46657 bytes branding/png/bskyplus-symbol-1024.png | Bin 0 -> 38612 bytes branding/png/bskyplus-symbol-128.png | Bin 0 -> 9046 bytes branding/png/bskyplus-symbol-16.png | Bin 0 -> 6300 bytes branding/png/bskyplus-symbol-24.png | Bin 0 -> 6537 bytes branding/png/bskyplus-symbol-256.png | Bin 0 -> 12092 bytes branding/png/bskyplus-symbol-32.png | Bin 0 -> 6765 bytes branding/png/bskyplus-symbol-48.png | Bin 0 -> 7105 bytes branding/png/bskyplus-symbol-512.png | Bin 0 -> 20625 bytes branding/png/bskyplus-symbol-64.png | Bin 0 -> 7498 bytes branding/png/bskyplus-wordmark-white.png | Bin 0 -> 29084 bytes branding/png/bskyplus-wordmark.png | Bin 0 -> 35243 bytes branding/svg/bskyplus-lockup-white.svg | 1 + branding/svg/bskyplus-lockup.svg | 1 + branding/svg/bskyplus-symbol-small.svg | 1 + branding/svg/bskyplus-symbol.svg | 1 + branding/svg/bskyplus-wordmark-white.svg | 1 + branding/svg/bskyplus-wordmark.svg | 1 + extension/chrome/background.js | 6 +- extension/chrome/content.css | 6 +- extension/chrome/content.js | 228 +- extension/chrome/icons/icon128.png | Bin 7567 -> 9046 bytes extension/chrome/icons/icon16.png | Bin 732 -> 6300 bytes extension/chrome/icons/icon48.png | Bin 2741 -> 7105 bytes extension/chrome/manifest.json | 31 +- extension/chrome/popup/popup.css | 443 +++- extension/chrome/popup/popup.html | 87 +- extension/chrome/popup/popup.js | 157 +- extension/chrome/shared/account-age.js | 22 +- extension/chrome/shared/cdn-background.js | 10 +- extension/chrome/shared/cdn-config.js | 3 +- extension/chrome/shared/cdn-settings.js | 123 +- extension/chrome/shared/composer.js | 29 +- extension/chrome/shared/dom-utils.js | 100 +- extension/chrome/shared/downloader.js | 48 +- extension/chrome/shared/emoji-picker.js | 12 +- extension/chrome/shared/feature-flags.js | 14 +- extension/chrome/shared/features.css | 366 +-- extension/chrome/shared/feed-width.js | 166 +- .../shared/integrated-settings-rules.json | 24 + .../chrome/shared/integrated-settings.css | 49 + .../chrome/shared/integrated-settings.js | 194 +- extension/chrome/shared/llm-settings.css | 164 +- extension/chrome/shared/llm-settings.js | 332 ++- extension/chrome/shared/llm.js | 126 +- extension/chrome/shared/media-viewer.js | 352 ++- extension/chrome/shared/settings-frame.css | 24 +- extension/chrome/shared/settings-frame.html | 1 + extension/chrome/shared/settings-frame.js | 29 +- extension/chrome/shared/thread-unroll.js | 769 ++----- extension/firefox/background.js | 6 +- extension/firefox/content.js | 117 +- extension/firefox/icons/icon128.png | Bin 7567 -> 9046 bytes extension/firefox/icons/icon16.png | Bin 732 -> 6300 bytes extension/firefox/icons/icon48.png | Bin 2741 -> 7105 bytes .../firefox/integrated-settings-route.js | 6 + extension/firefox/manifest.json | 42 +- extension/firefox/popup/popup.css | 443 +++- extension/firefox/popup/popup.html | 87 +- extension/firefox/popup/popup.js | 157 +- extension/firefox/shared/account-age.js | 22 +- extension/firefox/shared/cdn-background.js | 10 +- extension/firefox/shared/cdn-config.js | 3 +- extension/firefox/shared/cdn-settings.js | 123 +- extension/firefox/shared/composer.js | 29 +- extension/firefox/shared/dom-utils.js | 100 +- extension/firefox/shared/downloader.js | 48 +- extension/firefox/shared/emoji-picker.js | 12 +- extension/firefox/shared/feature-flags.js | 14 +- extension/firefox/shared/features.css | 366 +-- extension/firefox/shared/feed-width.js | 166 +- .../shared/integrated-settings-rules.json | 24 + .../firefox/shared/integrated-settings.css | 49 + .../firefox/shared/integrated-settings.js | 194 +- extension/firefox/shared/llm-settings.css | 164 +- extension/firefox/shared/llm-settings.js | 332 ++- extension/firefox/shared/llm.js | 126 +- extension/firefox/shared/media-viewer.js | 352 ++- extension/firefox/shared/settings-frame.css | 24 +- extension/firefox/shared/settings-frame.html | 1 + extension/firefox/shared/settings-frame.js | 29 +- extension/firefox/shared/thread-unroll.js | 769 ++----- extension/safari/background.js | 6 +- extension/safari/content.js | 133 +- extension/safari/icons/icon128.png | Bin 7567 -> 9046 bytes extension/safari/icons/icon16.png | Bin 732 -> 6300 bytes extension/safari/icons/icon48.png | Bin 2741 -> 7105 bytes extension/safari/manifest.json | 31 +- extension/safari/popup/popup.css | 443 +++- extension/safari/popup/popup.html | 87 +- extension/safari/popup/popup.js | 157 +- extension/safari/shared/account-age.js | 22 +- extension/safari/shared/cdn-background.js | 10 +- extension/safari/shared/cdn-config.js | 3 +- extension/safari/shared/cdn-settings.js | 123 +- extension/safari/shared/composer.js | 29 +- extension/safari/shared/dom-utils.js | 100 +- extension/safari/shared/downloader.js | 48 +- extension/safari/shared/emoji-picker.js | 12 +- extension/safari/shared/feature-flags.js | 14 +- extension/safari/shared/features.css | 366 +-- extension/safari/shared/feed-width.js | 166 +- .../shared/integrated-settings-rules.json | 24 + .../safari/shared/integrated-settings.css | 49 + .../safari/shared/integrated-settings.js | 194 +- extension/safari/shared/llm-settings.css | 164 +- extension/safari/shared/llm-settings.js | 332 ++- extension/safari/shared/llm.js | 126 +- extension/safari/shared/media-viewer.js | 352 ++- extension/safari/shared/settings-frame.css | 24 +- extension/safari/shared/settings-frame.html | 1 + extension/safari/shared/settings-frame.js | 29 +- extension/safari/shared/thread-unroll.js | 769 ++----- extension/shared/account-age.js | 22 +- extension/shared/appview-config.js | 42 + extension/shared/appview-page.js | 130 ++ extension/shared/appview-settings.js | 168 ++ extension/shared/appview.js | 88 + extension/shared/bookmarks-page.js | 1197 ++++++++++ extension/shared/bookmarks-settings.js | 134 ++ extension/shared/bookmarks.css | 355 +++ extension/shared/bookmarks.js | 45 + extension/shared/cdn-background.js | 10 +- extension/shared/cdn-config.js | 3 +- extension/shared/cdn-permissions.html | 28 + extension/shared/cdn-permissions.js | 101 + extension/shared/cdn-settings.js | 123 +- extension/shared/composer.js | 29 +- extension/shared/dom-utils.js | 100 +- extension/shared/downloader.js | 48 +- extension/shared/edit-post-page.js | 497 ++++ extension/shared/edit-post.css | 221 ++ extension/shared/edit-post.js | 30 + extension/shared/emoji-picker.js | 12 +- extension/shared/feature-flags.js | 14 +- extension/shared/features.css | 366 +-- extension/shared/feed-width.js | 166 +- extension/shared/hide-liked-by.js | 39 + .../shared/integrated-settings-rules.json | 24 + extension/shared/integrated-settings.css | 49 + extension/shared/integrated-settings.js | 194 +- extension/shared/llm-permissions.html | 27 + extension/shared/llm-permissions.js | 119 + extension/shared/llm-settings.css | 164 +- extension/shared/llm-settings.js | 332 ++- extension/shared/llm.js | 126 +- extension/shared/media-viewer.js | 352 ++- extension/shared/popup-theme.js | 249 ++ extension/shared/settings-frame.css | 24 +- extension/shared/settings-frame.html | 1 + extension/shared/settings-frame.js | 29 +- extension/shared/theme-editor.css | 450 ++++ extension/shared/theme-editor.js | 805 +++++++ extension/shared/theme-model.js | 540 +++++ extension/shared/theme-runtime.js | 407 ++++ extension/shared/thread-unroll.css | 137 ++ extension/shared/thread-unroll.js | 769 ++----- package-lock.json | 4 +- package.json | 13 +- pnpm-lock.yaml | 2043 +++++++++++++++++ pnpm-workspace.yaml | 3 + scripts/package_firefox.mjs | 1 + scripts/sync_shared.mjs | 1 + site/assets/bskyplus-symbol-512.png | Bin 0 -> 20625 bytes site/assets/bskyplus-symbol-small.svg | 1 + site/assets/og-card.png | Bin 0 -> 29209 bytes site/assets/shot-emoji.webp | Bin 0 -> 30138 bytes site/index.html | 225 ++ test/test_appview.mjs | 208 ++ test/test_bookmarks.mjs | 603 +++++ test/test_bookmarks_session_fallback.mjs | 116 + test/test_cdn.mjs | 24 +- test/test_cdn_permissions.mjs | 116 + test/test_cdn_settings.mjs | 62 +- test/test_default_feed_width.mjs | 16 +- test/test_dom_utils.mjs | 99 + test/test_e2e_all_features.mjs | 276 +++ test/test_edit_post.mjs | 427 ++++ test/test_extension_composer.mjs | 34 +- test/test_extension_llm_visibility.mjs | 18 +- test/test_extension_settings.mjs | 247 +- test/test_fetch_interceptors.mjs | 96 + test/test_firefox_accent.mjs | 169 -- test/test_firefox_build.mjs | 3 +- test/test_integrated_settings.mjs | 77 +- test/test_llm.mjs | 211 +- test/test_llm_permissions.mjs | 155 ++ test/test_llm_settings_save.mjs | 185 +- test/test_modal_ocr.mjs | 42 + test/test_new_features.mjs | 139 +- test/test_notification_width.mjs | 124 + test/test_popup_bookmarks.mjs | 66 + test/test_popup_flags.mjs | 19 +- test/test_popup_themes.mjs | 186 ++ test/test_settings_frame.mjs | 200 ++ test/test_settings_theme.mjs | 193 ++ test/test_theme_editor.mjs | 919 ++++++++ test/test_theme_model.mjs | 375 +++ test/test_theme_runtime.mjs | 317 +++ test/test_thread_unroll.mjs | 232 ++ test/test_video_controls.mjs | 278 ++- 210 files changed, 22575 insertions(+), 6453 deletions(-) create mode 100644 PRIVACY.md create mode 100644 branding/README.md create mode 100644 branding/extension-icons/icon128.png create mode 100644 branding/extension-icons/icon16.png create mode 100644 branding/extension-icons/icon32.png create mode 100644 branding/extension-icons/icon48.png create mode 100644 branding/png/bskyplus-lockup-white.png create mode 100644 branding/png/bskyplus-lockup.png create mode 100644 branding/png/bskyplus-symbol-1024.png create mode 100644 branding/png/bskyplus-symbol-128.png create mode 100644 branding/png/bskyplus-symbol-16.png create mode 100644 branding/png/bskyplus-symbol-24.png create mode 100644 branding/png/bskyplus-symbol-256.png create mode 100644 branding/png/bskyplus-symbol-32.png create mode 100644 branding/png/bskyplus-symbol-48.png create mode 100644 branding/png/bskyplus-symbol-512.png create mode 100644 branding/png/bskyplus-symbol-64.png create mode 100644 branding/png/bskyplus-wordmark-white.png create mode 100644 branding/png/bskyplus-wordmark.png create mode 100644 branding/svg/bskyplus-lockup-white.svg create mode 100644 branding/svg/bskyplus-lockup.svg create mode 100644 branding/svg/bskyplus-symbol-small.svg create mode 100644 branding/svg/bskyplus-symbol.svg create mode 100644 branding/svg/bskyplus-wordmark-white.svg create mode 100644 branding/svg/bskyplus-wordmark.svg create mode 100644 extension/shared/appview-config.js create mode 100644 extension/shared/appview-page.js create mode 100644 extension/shared/appview-settings.js create mode 100644 extension/shared/appview.js create mode 100644 extension/shared/bookmarks-page.js create mode 100644 extension/shared/bookmarks-settings.js create mode 100644 extension/shared/bookmarks.css create mode 100644 extension/shared/bookmarks.js create mode 100644 extension/shared/cdn-permissions.html create mode 100644 extension/shared/cdn-permissions.js create mode 100644 extension/shared/edit-post-page.js create mode 100644 extension/shared/edit-post.css create mode 100644 extension/shared/edit-post.js create mode 100644 extension/shared/hide-liked-by.js create mode 100644 extension/shared/llm-permissions.html create mode 100644 extension/shared/llm-permissions.js create mode 100644 extension/shared/popup-theme.js create mode 100644 extension/shared/theme-editor.css create mode 100644 extension/shared/theme-editor.js create mode 100644 extension/shared/theme-model.js create mode 100644 extension/shared/theme-runtime.js create mode 100644 extension/shared/thread-unroll.css create mode 100644 pnpm-lock.yaml create mode 100644 pnpm-workspace.yaml create mode 100644 site/assets/bskyplus-symbol-512.png create mode 100644 site/assets/bskyplus-symbol-small.svg create mode 100644 site/assets/og-card.png create mode 100644 site/assets/shot-emoji.webp create mode 100644 site/index.html create mode 100644 test/test_appview.mjs create mode 100644 test/test_bookmarks.mjs create mode 100644 test/test_bookmarks_session_fallback.mjs create mode 100644 test/test_cdn_permissions.mjs create mode 100644 test/test_dom_utils.mjs create mode 100644 test/test_edit_post.mjs create mode 100644 test/test_fetch_interceptors.mjs delete mode 100644 test/test_firefox_accent.mjs create mode 100644 test/test_llm_permissions.mjs create mode 100644 test/test_modal_ocr.mjs create mode 100644 test/test_popup_bookmarks.mjs create mode 100644 test/test_popup_themes.mjs create mode 100644 test/test_settings_frame.mjs create mode 100644 test/test_settings_theme.mjs create mode 100644 test/test_theme_editor.mjs create mode 100644 test/test_theme_model.mjs create mode 100644 test/test_theme_runtime.mjs create mode 100644 test/test_thread_unroll.mjs diff --git a/.gitignore b/.gitignore index 22acae2..e1b5ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,7 @@ test/artifacts/* test/fixtures/test_ocr_blank.png dist/ -PRIVACY.md + +extension/chrome +extension/firefox +extension/safari diff --git a/PRIVACY.md b/PRIVACY.md new file mode 100644 index 0000000..4d318ba --- /dev/null +++ b/PRIVACY.md @@ -0,0 +1,102 @@ +# Bsky+ — Privacy Practices & Permission Justifications + +Bsky+ adds browser-side features to Bluesky. Its preferences are kept in the +browser profile, except local bookmark snapshots, which are kept in the +`bsky.app` site database. Some optional features make network requests to +Bluesky, a destination the user selects, or a public repository the user asks +to import. Those requests expose ordinary connection and request metadata to +the contacted service; Bsky+ does not anonymize or proxy general network +traffic. + +## Data stored and sent + +- **Extension settings and themes:** Feature preferences, display settings, + selected AppView/CDN, theme library, and LLM endpoint settings are stored with + the browser extension's `storage.local` API. This storage is local to the + browser profile and is not browser-synced. LLM settings can include an + endpoint URL, model name, API key, and custom prompt. Clearing the endpoint + and saving disables +LLM, but retains the model, key, and prompt. Clear each + field separately and save to remove it. Clearing the endpoint also does not + revoke a previously granted site permission; remove that in browser settings + if desired. +- **Local OCR:** OCR uses the bundled Tesseract.js worker and WebAssembly in the + browser. Bsky+ does not send the image to an OCR provider. The browser may + still retrieve the image from its existing Bluesky image URL. +- **Optional +LLM:** After an endpoint is saved and the user clicks +LLM for an + image, Bsky+ sends that selected image and the active system or custom prompt + to the saved OpenAI-compatible chat/completions URL. If configured, the model + name is included in the request and the API key is sent in an Authorization + header. The request does not add composer post text or other attached images. + HTTP and HTTPS endpoints are accepted; use HTTPS for non-local endpoints. + The endpoint operator may process or retain the request under its own + practices. A localhost endpoint can keep model processing local. +- **Local bookmarks:** When enabled, Bsky+ downloads saved-post views through + the signed-in Bluesky session and stores them in the `bskyplus-bookmarks` + IndexedDB database on the `bsky.app` origin. Snapshots are keyed by account + DID and bookmark AppView. They can include post text, author and embed data, + image descriptions, and media URLs; media files and session credentials are + not persisted. The data is local to that browser profile, is visible to code + running on the `bsky.app` origin, and is not browser-synced. Disabling local + bookmarks disables local caching and clears all account and AppView snapshots + in that browser profile, including caches created with previously selected providers. + Clearing `bsky.app` site data removes the database. +- **AppView and image CDN:** An alternative AppView receives the feed and social + API traffic routed to it. Authenticated requests remain addressed to the + account's PDS with an `atproto-proxy` header naming the selected AppView; + public GET requests to a known AppView may be sent directly to that host + without browser credentials. Bsky+ does not redirect account settings, + posting, chat, or video-upload requests to an alternative AppView. The + optional image CDN redirects only Bluesky feed-thumbnail, full-size, and + avatar image URLs to the selected HTTPS hostname. Operators of the PDS, + AppView, original CDN, or selected CDN receive ordinary metadata for requests + they handle. +- **WitchSky theme import and post editing:** Importing a public WitchSky theme + resolves the DID (`plc.directory` for `did:plc`, or the named host for + `did:web`) and fetches its public theme record from the repository's PDS. + These requests omit browser credentials and the referrer. The imported theme + is saved locally. When the user saves an edited post, Bsky+ uses the current + Bluesky page session to read the record and submit the changed record to the + signed-in account's PDS. It does not store a copy of the session token. +- **Page features:** Features such as theme rendering and thread unrolling + change the Bluesky page in the browser. Bsky+ has no analytics endpoint or + developer-operated data collection server. Its JavaScript and OCR code are + packaged with the extension; responses from LLMs and public theme services + are handled as data, not executed as remote code. + +## Chrome permission justifications + +The Chrome manifest explicitly declares `https://bsky.app/*` in +`host_permissions`. Its content scripts separately match `*://bsky.app/*` and +`*://*.bsky.app/*` so the page features can run on Bluesky hosts. These scripts +add composer and settings controls, apply page preferences, and support +bookmarks, post editing, AppView routing, and display features. + +- **`storage`:** Saves extension settings and preferences in `storage.local`. +- **`offscreen`:** Hosts the bundled Tesseract OCR worker when the user runs + local OCR; it does not provide a remote OCR service. +- **`declarativeNetRequestWithHostAccess`:** Applies packaged settings-page + redirects and the optional image-CDN redirect rule. The CDN rule is limited + to the listed Bluesky image URL paths and runs only while the user-selected + source and destination host permissions are granted. +- **Optional HTTP/HTTPS hosts:** The manifest allows Bsky+ to ask for access to + a user-configured LLM endpoint or image CDN when needed. The LLM request goes + to the saved URL; the CDN feature asks for the Bluesky image host and chosen + CDN host. Public theme import can also contact the domains named by the + imported DID and PDS record. + +## Firefox permission justifications + +The Firefox manifest has the same explicit `https://bsky.app/*` host permission +and the same separate content-script match patterns as Chrome. It declares +`storage`, `webRequest`, and `webRequestBlocking`. The two `webRequest` +permissions support the optional image-CDN redirect; its listener is limited to +the feed-thumbnail, full-size, and avatar paths on `cdn.bsky.app`. The manifest +also declares optional HTTP/HTTPS host permissions for user-selected network +destinations such as an LLM endpoint or image CDN. + +Firefox declares no required data-collection types and the optional types +`websiteContent` and `authenticationInfo`. On Firefox desktop 140+ and Android +142+, saving an LLM endpoint requests `websiteContent` consent, plus +`authenticationInfo` if an API key is saved. Bsky+ checks the applicable +consents and endpoint host access before sending each request. Older Firefox +versions request endpoint host access without the built-in data-consent prompt. diff --git a/README.md b/README.md index 452a3c7..8aa0d0a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Bsky+ Browser Extension -> Enhanced features for Bluesky (bsky.app) including Local OCR Alt Text, Custom Accent Colors, AI Image Descriptions, Media Downloader, Video Controls, Quick Emoji, Feed Width Slider, Fresh Account Badges, and Thread Reader View. +> Enhanced features for Bluesky (bsky.app) including Local OCR Alt Text, AI Image Descriptions, Media Downloader, Video Controls, Quick Emoji, Feed Width Slider, and Fresh Account Badges. Supports **Google Chrome**, **Mozilla Firefox**, and **Apple Safari**. @@ -16,6 +16,7 @@ Supports **Google Chrome**, **Mozilla Firefox**, and **Apple Safari**. ### 2. Enhanced Media Viewer - Video playback speed controller toolbar (`0.5x`, `1x`, `1.25x`, `1.5x`, `2x`). +- Each new video starts at `1x`; speed choices apply only to the current video. - Native Picture-in-Picture (PiP) toggle for watching videos while scrolling feeds. - Persistent volume and mute memory saved in browser storage across video plays. @@ -35,21 +36,13 @@ Supports **Google Chrome**, **Mozilla Firefox**, and **Apple Safari**. - Efficiently cached in browser **IndexedDB** to avoid repetitive network requests. - Paced and batched background requests (up to 25 accounts per request) with exponential backoff to respect Bluesky rate limits. -### 6. Thread Unroll & Reader View -- **3-Dot Post Menu Integration**: Opens directly from the standard "•••" more options menu on any post in feeds, searches, profile timelines, or thread pages via **📖 Unroll Thread**. -- Also available as a direct **📖 Unroll** action button in thread headers. -- Concatenates the author's connected skeets into a distraction-free reader modal with reading time estimates, full-resolution media, and post numbers. -- One-click **Export to Markdown (`.md`)** with full post hierarchy, links, and alt-text citations. -- Clean **Export to PDF** triggered via `window.print()` with dedicated `@media print` styling that hides distraction elements. -- **Copy Markdown** directly to clipboard. - -### 7. In-Browser Local OCR for Alt Text +### 6. In-Browser Local OCR for Alt Text - Adds **+OCR** beside **+ALT** on each image preview in the post composer. It reads the selected image and saves its alt text directly, without opening the editor. - The existing **"Add with OCR"** action is also available inside the Alt Text modal. - **100% Client-Side / Local**: Runs offline in the browser using Tesseract.js WebAssembly with zero external server calls. - **Toast Notifications**: If an uploaded image contains no text (e.g. blank image or graphic), it immediately displays a floating toast: `"There was no text in the image"`. -### 8. Case-Preserving Skeet Mode +### 7. Case-Preserving Skeet Mode - Automatically replaces all occurrences of the word `"post"` / `"posts"` with `"skeet"` / `"skeets"`. - Strictly maintains character casing: - `POST` → `SKEET` @@ -60,20 +53,28 @@ Supports **Google Chrome**, **Mozilla Firefox**, and **Apple Safari**. - `POSTS` → `SKEETS` - When toggled off, reverts seamlessly without page reload. -### 9. Custom Accent Color & Pride Flag Palette -- Allows overriding Bluesky's official blue accent color (`#1083fe` / `rgb(16, 131, 254)`) across buttons, links, icons, borders, and highlights. -- **7 Predefined Pride Flag Colors** (in exact rainbow order): - 1. `#FF69B4` (Pink) - 2. `#FF0018` (Red) - 3. `#FFA52C` (Orange) - 4. `#FFFF41` (Yellow) - 5. `#008018` (Green) - 6. `#004CFF` (Blue) - 7. `#750787` (Violet) -- Full custom color support via HTML5 color picker and hex input field. +### 8. Theme editor +- Open **Bsky+ settings → Theme editor** (`/bskyplus/theme`) to create a theme from a light, dim, or dark starting palette. +- Customize surfaces, text and icons, borders and focus, links and primary controls, status and reactions, overlays and shadows. +- Changes appear in the preview. Save themes locally, use **Save & apply** to apply one across Bluesky tabs, or restore **Use Bluesky default**. +- Export or import a theme as versioned JSON. Imports are validated and loaded into the preview for review before saving or applying. Theme files contain only the name, ID, base, and colors. +- Import public `app.witchsky.theme.colors` AT records by URI. The base palette and every named variant are saved as separate themes. +- Enable **Preview changes on this page** to try the current draft across the open Bluesky page without saving or applying it. +- Palette mapping covers recognized Bluesky CSS, inline styles, SVGs, and single-color fades. Images, multicolor artwork gradients, and unrecognized colors retain their originals. +- See [the source audit and color groups](docs/theme-color-audit.md) for coverage and limitations. + +### 9. Inline thread unroll +- On a numbered thread beginning with **Post 1 of X**, select **Unroll thread** beside **Thread options** to read its posts together. +- Repeated author details and extra post controls are hidden. Each post keeps its native reply, repost, and like controls in a compact row, along with its text and attachments. +- Select **Restore thread** to return to the normal layout. Unrolling applies only to the current thread. + +### 10. Edit recent posts +- **Edit post** appears automatically in the options menu for your eligible posts; no settings toggle is required. +- Posts can be edited once, within 10 minutes of posting. Eligibility is checked again when saving. +- Existing attachments and the original text are preserved in the replacement record. -### 10. Feature Flags & Release Configuration -All features are governed by a centralized feature flag system in [`extension/shared/feature-flags.js`](file:///Users/david/bskyplus/extension/shared/feature-flags.js): +### 11. Feature Flags & Release Configuration +Configurable features use a centralized feature flag system in [`extension/shared/feature-flags.js`](extension/shared/feature-flags.js): - **Feature Stages**: - `'release'`: Production-ready, visible in settings, enabled by default. - `'alpha'`: In active development. Hidden from regular users on release builds. Accessible only when developer/alpha mode is enabled. diff --git a/branding/README.md b/branding/README.md new file mode 100644 index 0000000..5ccf887 --- /dev/null +++ b/branding/README.md @@ -0,0 +1,33 @@ +# Bsky+ logo + +Symbol: a white cloud with a red plus, on a blue rounded tile ("Cloud+"). + +## Files + +- `svg/bskyplus-symbol.svg`: the main symbol. Use it at 48 px and above. +- `svg/bskyplus-symbol-small.svg`: a variant with a bigger plus and a tighter cloud, for 32 px and below (toolbar, favicon). +- `svg/bskyplus-lockup.svg` / `-white.svg`: symbol + wordmark, for light / dark backgrounds. +- `svg/bskyplus-wordmark.svg` / `-white.svg`: the wordmark on its own. +- `png/`: the same, rendered (symbol from 16 to 1024 px, lockups and wordmarks at 2x). +- `extension-icons/icon16.png`, `icon32.png`, `icon48.png`, `icon128.png`: the same names as `extension/*/icons/`, so they can replace the current icons directly. + +All text in the SVGs is outlined, so no font is needed to display them. + +`npm run sync:shared` and the browser packaging commands copy `extension-icons/` into each browser build. The popup and settings use the 32 px icon. + +## Colours + +| Name | Hex | Use | +|--------|-----------|-----------------------------| +| Blue | `#1185FE` | Tile | +| Red | `#FF2727` | The plus | +| Ink | `#0B1220` | Wordmark on light surfaces | +| White | `#FFFFFF` | Cloud; wordmark on dark | + +## Type + +Wordmark: Inter Black (900), tracking −1.2%. The "+" is always red. + +## Spacing + +In the lockup the symbol is as tall as the font size, the gap is 0.29× the symbol height, and the wordmark's cap height is centred on the symbol. diff --git a/branding/extension-icons/icon128.png b/branding/extension-icons/icon128.png new file mode 100644 index 0000000000000000000000000000000000000000..573fb1f64740f9e84b837668ecf231df4050d9fb GIT binary patch literal 9046 zcme7R@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_T;>XH+kB0zLjX>Jk&1A|;v zX>LlgQ9&YuAcH^y1H&o?i`j+DU;zdOu?VOtcZjN7R8^%#c~&5mRz_(irfEjW2D-+k zX%@OBi77_9iH37$lO7iZhtQS0yS+p1TnCuxZcJ z=7UEW7#MPrlk$reXQm`urR5jpCYEGo<|d}6>KEjtXJzIUmn7yTr+T_n=v3quSY>9W zSeY7HCZ?vQBRKeHnHgJ{B^jrh80QqF<|Kk0n~_}bxC4OQF!ypB8beCzSe3Xv%c42&~Dj$V`w zRot{F4Z_L>dp*A(H7_+Kt01u`F*mg&wWxSuHX<~N8y6*)7Ufjv7N_Q&%ETE(v;McuM7+fCqN;} zz`)>uJBC3)sh5&ik_eCBsy`13|6X2HzvOGwHdgD|$)L;$ir}Tmi8<+M#Tki4re?_n zi7CDy9dHbdlg|gYc^um>*PND9=W%D}lWHHUx$F0?+-a-1Z8n#HW=|N{(RmH&dr^cp#k{UV_N;ap7Z24>ac;{N4-Sa|UL_T5FU7pbux5Ex%t|lRK;fV}t zEYH;7EeBQjj?dYpl)ChgiQ&nUKjuIB@R)t|zMz6nFB}|8l5-L>bK}!f^HPfvOY)22 zGxO5&7lYGIz9TFjE4XFmq!y=_r51sbPO71vfu2EjaY1Tw7*xba&qU9FfkD6mntC*# zsizn-^}r*Pfq_AQ1C)F&wL~%rEn-xYP>f{aGH7CAGiYM$UBJx5$iyV#@N@y!yF->2 z_U&l?#pc9nn;t66V8F%3q1EPb&X$Fl*}&6K+(49#Ih2JJMf{c4j9AmKjxC z*{1^}SVgXy>~&gd8SV1&#@*|ietNwTzp#Com^Pzvc}n@;JEv@1nM*XD>RHv++INYW zgwA_byWdNEule@Liz5ue4EWfXLuL6H8UM4eFf*|?fWt;sm4(lMhmA{{jgf`1`9&NP zqX7>{nJ`EhlL3Q)Jcy^vB4HrbAaXA75lf?AO0@Ei$4Ac3vYT`8ddwl@5NA$jFi2rC zFf5i8na5al>2zq{Ik$(l^SWl|u=%Cc-(uSO$)C|7_0wv58`oQ(U#MLF`qN=&yI&JmC3!8=pVGRTH{hhk>+44GOD5a?j=Iaw(yw#4-^yrRXT^))Um<}H_quZ~ z1eJV|yz}7Y-Y8=<1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU;snlTZF@b-%sr} zsp_vxeJmTMa5m#{6thRC|A|ySxmW>9L;w7g?I*d;XK1)=D@(UGHr4+6DU>gLxxHvm zmG@8YetlY#_R0O7?e{zP_k7;_ z{LW|V{hxO?vCj!y+38#vqf!~8vduQi^&DFpL#so)!u{^w&luE2_?X*S@40>r-SAKJ z_0jqKHNoGi3Y`mAFM8zl*4@rH=c47J7^W{}tMi!6J}8|C{`uj?zonbbukG3_cA(*@ z)iJT^&aN}ZOm@j%S@?_lNL1|RkZtMFk=t1V3g*wty!owG!I(ii+L=c(nfn)u;p=&? zR5z{OJvBwIVXKtB&8fMIq8ck79d=l&R4%(JK~`zj%cGK<3+@-mPF3H<`S6cVe#!^2 z#g1`aGikAFYm38L~zg6t}J2yl{c11x9%+p@ac-AWG+_%VJ)eDX8 z$^COh8g#!2otdKlJ#g>l9YOy49z;K2DPD16&4V>YKRh-*EA~EZe@^&*_e_UVnN5o9 zfqQ$u&f-7Iw869f5}BFt5+x$U=mWLd8F zv}vYui1W2q#9hCB#q?0O{Gn^#r`~_xu$`|WKb@n)`=XcipQWb3Gz0Mil`|1BZL+)ulg)ZN(-q%u>`n&yLuF_Rz5tRogEf1R18C~ybj6W~< z>*#Jh=`tnd1{a<>v)~;swk*&s)Uf5PGmU;B{4vLUqCkVH-}ZQ^NyqXZ9(uUpUsR#~ z#UKV3Cx&h>&ONu^cdT|loV(O9`eLnC~+3iH_G^?A#$-=B6{U+|IO=QS;1 z4DoX~oRzi(*zV9jBPYK_bf(~nIRDL&%1d>h^S2hWxv9@P5YDKQbZ$!KzZ9jP$L8pT_xJTN)MU3! zJi6g0+rw#-?&Q@pc>DLCV|eDxZ;)v4C#%n3L3@t9uH?fG8!kqbdG_7P-PK`_n}z3< zRV7{sThhLqspI&Ai?6H09&a~TRewPYBoa|J)8O3lj=38QUrbq`>%o7X#bA@fGyiX^ zzJ0iCu5?go9%n*erir-wokjjGF^A@vTwGbWqi&73seAjajw9SvN)6iQPucRvFOylz zeXHrq2N#B5+9R9CeG%+^ObgK zH5faa?B|{1F8?-6a(}txZmotywU=*>@A($B{S?pFpXMchRWDrd$<5tDma?1TI3|v=a+GW`jPw)1-_b66=XSIEJ zb;JFAsbY+GTpAwT^YhxZdpXztKeIL@&D!m$5hHp)`uD@Bwt3ewJeGya-HBoHKVO=^ zed_DF-TAiZRgCLrTCmhv-kv+}z*o=XpWh$8{J-s`;@Q{JO+!OBlxoWqXfht)ufOs0 zXCrgsDUlcVt2RG8qF8V~_0XoXH*E{%E$NoOz&>wxpv1-XuQyF}6gA6fD1H6l2xtBK zxgH1BZg;A*JaPQpw_j>IJ|v!fb@amIrL&v227G&c=ftwwNxaetU$g#8%g?D^7x(tY z1ef(TGmI5?ud1&zjNjv^bzNvela#zLgL+k}- z{ipnQz3aH8G~2+xF4}KSL5`==?OOJE>+kK~DDPFjV9oDplb~fwQvUy2p!;Kn*|wD3 z?1!g+=)J|ZRkd%Uvhop_1_VSy=F)X^Go*vrIa+;9}eKa_f4&hedK%%`DbkpZw+h zd!NH$>-o-U6y#()=KpcJ`sUvWi%8g%j_3kNqw1P?CijP#q`jb-czfqo3|~oUH`5$ z=k&IZ2RRl5^Ify@zv+BCXpb<9L+#|tZ~g0?EN8f#NVJ-vsNn1NrTEXg>GhXR{tCRZ zyL;|lJs!q77Zypz9S0_9`e}q~@6v2w-=@W%^LD`+_8E!`+LKu>95!SsXq-~WzkJC= z-Cg;=*C)y5pSU;A$AGDz(bhdkM#g;IYwq*5+wU&iYo|WLgsGr$df9S|io?9I@iP|r zoZ4k`gvrNmz0S=@-rL`|T2}mgYEWNyT>R|(_ftHRe%meAlV7>nrK4((pT>`O+?r{Z zyTuPH_d9rUetG%$&(tXv$HnyX!fSk2S?zh+A+mPMeTJ%vqVI166E5pK?3#FY_rIHS z4YDWy+H3G{-O>-!_J2R)D-!X+`svv`m;Svw@9#8Y=)coGt##kK|Fy-FUp@Y?bH3L3 zcRv4TrI%Y>4`CNjTfWL#XXD!EfA^QZ3#z^I@>G6}*X{ihY8z|i@BElzlpSo)%de31 zR^VFJo);Z*EK1+jzRNJ!B%vq4<~+OpuC4pr0E_wezXdBlV%aCUc1t~TjPwRewtCC3 z%L+%u8oF%6HW;$~|EWDSD4$Vg)${KSH*el=4oFenvZG0RX`rhd*A=Da`7)>TA9#91 zac_7P$?fta*u5<$;A$_s)>91?&IP-I?3gMIEH?AlT}*i%`F;DJ%UPxy7BsRq{{N9T z>7c!fd0ol&IXRERm@3u>`E{sr|J{D-f$;GSYr38=zkS5G>ix9kfxgAj-HJgSYgX*^ zw)3!?Vx+L7eDPL}%^p*NIrfAEpD({9=damtcWRKfuaU6N8i&4u9Ve$nhIrN97M5*m z3B9kK&tW9|!P4jA10!E8qxTx;*2+tEHcMy6&*JnC|R$OnJDF>!+{#^4&aK zwjqlB+C|I)O?M01&P+%(75!AOT=ml0RTWDCt8=_~obhvH$A`-;Cl0NXk~jKOl=)xu zmuB=A%>&Q%Z%Y_G*wA(6^_tuMYKvp9=RZLs7Ie#hNsq@b-udo$-V$)(Az$M6K7<{sC1$!S; td&AvTyPS1i%Rb0A{hD*Sq{hGfKXY7N)2cm}qSQehEKgTImvv4FO#rizX8iyF literal 0 HcmV?d00001 diff --git a/branding/extension-icons/icon16.png b/branding/extension-icons/icon16.png new file mode 100644 index 0000000000000000000000000000000000000000..a645a730ce364dbc328125dbf879c93d751b2b83 GIT binary patch literal 6300 zcme7R@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!u9>XH+kB0zLjX>Jk&1A|;v zX>LlgQ9&YuAcH^y1H&o?i`j+DU;zdOu?VOtcZjN7R8^%#c~&5mR>sCj#^#A;iMpnS z78bfDX32@VmIfx4x|T^sX2~WgX~~90CJYP=%#)$UX+n%kEXJ@@FR{2dwWuUBKd+d9 zfq`KMRD%mxLsEVbvIb$0-FlgM=|!n2nW=dtdS%8SJrc=A#Tl70&Mv3?r=-tR%3rb1 zV(CK$28NvEr2L}AnJLLuY57IDi6xntxryni`UQFES($moC5d^-sh%zsIu*GER+*V8 zRwm{~=85Ks#=0q~W~RC(MybiVmX@YQx@MM^iG~IyMuw@$X*oryIf-D$W@Hv*6eJd< z=9T!TF)%Pbg1Xxgx4RRQ!5a0-jNpzw>i(3;#=g^KgY)iX|K#r}GcYjD1UY(9I#hAf zqBICA8|?M`g4Dd!l&pfpqQu|DGIrXl?oY&WvL3uMX8A;sVNHiMGCq3DVb@RsVQJ>U?Y(gdHvd3ni&`v8bA@eG&wORJ*_w+(a6*+xgasc z7o-D@p>Z!@LH+`FlWC(uRhYQA)3z>aS*(BVZcnxF!N6pGz%~OhSto)g%-nnYav^nAi-O7<(5mGchtTi8wr6!1eBs<%NAant!o5 zvD&7G3NsjRv2kd%d7QIlVP-b)G!!=wWn&Iy;S%P9yH`gcz{%NA&p-zx!7Qu_mr!tq z>ULy+w3j;GlOEA~K z1-Dh22I>&26p*ZflvFSqgEQ0fGV{_6A`OJu*ul=Z^SQbUnZu_Xk4CB{`bx)8&~EMji-86wYBzLVkV*Up4IO6 z65ngSee&W6gD?X=Hs(-Sen!UsEG*1S>m<$YyWku#O zR$V$B+IPc6&yfB*1l>Ss&Y=%acG!NPy$n0P(X%9yltcgVfV)e)zd1K(dxeP%rW(L>Rk#am5k zE4CLFCjOq4&cMLHmgMd3!tfsi7wla=nSp`vxTlL_h(&MjL|>1PM3J`n#d|ZISH`j* zE!cE%k$_;J(-O1D?v9osWe+p%@W9zluD3cAoZEKSZ9AJF;IuoSU;$%cs)%6Fg#8O5 z9`mOKT3VL9&r}SGd(O9S_2-YD?C$@b>;K|n&gqgW!JUjUsr69~Pfq@_{dJVnf!}{>)*G|31xmI^89&b5oUv100;6Qu21Yifs7HqY0 zZa$^--oRlRT*WY2&M$UL6&eNw2thicRFI-?~WJr!L7Sw*D z!*G0$!twqCJA*1>zOXqdu2`*n&DP<|+)r73=i64;oVk+pPugaFLyJ8}o&A+-MkXtd zq#fAyb>;%CYqeH^dwHi+HJ+Pt;O^!_%R^sCUp_KzG4tzax9{;9J9?}2%$?qYlBuVw KpUXO@geCyX$PEnu literal 0 HcmV?d00001 diff --git a/branding/extension-icons/icon32.png b/branding/extension-icons/icon32.png new file mode 100644 index 0000000000000000000000000000000000000000..d0da83c54f135f8fc37609fe6e8b99579fce536c GIT binary patch literal 6765 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 literal 0 HcmV?d00001 diff --git a/branding/extension-icons/icon48.png b/branding/extension-icons/icon48.png new file mode 100644 index 0000000000000000000000000000000000000000..27d455650f13c3d6465d75a7fe1dd8774dca2849 GIT binary patch literal 7105 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 literal 0 HcmV?d00001 diff --git a/branding/png/bskyplus-lockup-white.png b/branding/png/bskyplus-lockup-white.png new file mode 100644 index 0000000000000000000000000000000000000000..6a44e0c4da923964f8b53f3ad5b257bb5eaf30fc GIT binary patch literal 40424 zcme7R@N?(olHy`uVBq!ia0y~yV0+BKz_^ivje&uog6p(91A|yya-vfNh|Vg_O=4hR zkjpB~O-VK?NMsOX5NKdvSjAv5yO0?yz`!6D0afJ=QI(6Tso?fq{W}GSoOth;fO<7?$cK78j=$m1O4U z6*Dj}FzkS8Z~<#b$}d9JAPllwFEcN_C^aQBHLpak%owCcBH5@oWBuM&lb_uC=&EUM z?ea6%|0M$hLr!v1e$nF0lw_;4{G!~%lFZE9#Pn4Cg1q#s%)H`~#JuEGPnQavirfOL z%*+%ki{z9vGYfMI-NaM_V_lOpV@qAjG|LoS<5VNd#3WOrRFmYCoTAj6M6hEsG7B;a z5{pvvO8nCp7#JTx-R+3m-HFLyje2E9a7VMmKX|Tq)~T&ODoC%|siuj6fpI3t(Tmcd ziklXtL0H*fujdz}=B1`&6(klV=BAdU78NhdMubLjJPBedw18K-0<7H32#FdzP$cWu*;dz)8RM6K8!l_@%>;!m7<>|FJUqKb~HGBcMz z-BBT%oS&6v-D$@zI{nJKAx z$*Jk3dD(gS<$2jDsl~}fnFXNWsYr7Mo2URYQK2LwvsfW5GbdFcu|%OHBUPa&wXig` zxI`g8O(9XCv^cd$Au%sSAvdv7AtSLYRUx@3HL)Z$MIpaPAvZrIGc7YU1*{EhL~?#! zNorn6v0iR*ep*R+Vo|DNdTL(D!j!zk+*GL5MTt2%j*z(W%uCKGO-W7p%D}*I0u-VQ z3=9sqV;B^adMSw|iSP(s8uWL6dUZWhwE1S2i50dL3=9knpa@=?oS2iIR-BP&WNMaN zkeK2N(gDZNI61{X_1B%(Z~yU6-Ou*=*N?YdlWs~iRZXbN%MwsNCQ-ozc61)dS!oKn ziFui6sl_E(sTIjNrNyA^)VL_MxFoTtL_#qwCp9mT-O-wOKOEtDMHz|Tfc|0PaH`6dHK#bNx@;f+JAuNaZ z3zBb(^~#K((Rn|;%6!}U#pf<(w*MFDRpj$pVz)n*-&Wg{W5zx6R~iKnb2SN>3r}QF zWB;10JNjeJ62ZK)-Me~I7^iPMmUJTgqr0TU60b*%M$%79l5-L>bK}!f^HPfvOY)22 zGxO5&7lYGIz9TFjE4XFmq!y=_r51sbPO71vfu2EjaY1Tw7*xba&qU9FfkD6mntC*# zsizn-^}r*Pfq_AQ1C)F&wL~%rEn-xYP>f{aGH7CAGiYM$UBJx5$iyV#@N@y!yF->2 z_U&l?#pc9nn;t66V8F%3q1EPb&X$Fl*}&6K+(49#Ih2JJMf{c4j9AmKjxC z*{1^}SVgXy>~&gd8SV1&#@*|ietNwTzp#Com^Pzvc}n@;JEv@1nM*XD>RHv++INYW zgwA_byWdNEule@Liz5ue4EWfXLuL6H8UM4eFf*|?fWt;sm4(lMhmA{{jgf`1`9&NP zqX7>{nJ`EhlL3Q)Jcy^vB4HrbAaXA75lf?AO0@Ei$4Ac3vYT`8ddwl@5NA$jFi2rC zFf5i8na5al>2zq{Ik$(l^SWl|u=%Cc-(uSO$)C|7_0wv58`oQ(U#MLF`qN=&yI&JmC3!8=pVGRTH{hhk>+44GOD5a?j=Iaw(yw#4-^yrRXT^))Um<}H_quZ~ z1eJV|yz}7Y-Y8=<1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU;snlTZBW2$O8Rs z2cD$+JeivL^25Dm_O?$&N6SkR^VN>kY@DIA@5Q^9A358SV@eb@Z7G_2qxWIWyoxOA zmBnStN}|OI9VO1Hm_#u!Ft8(rh+1w*b<2@G zIgKSdbh+oNS=F3%tUou)Nd2g1W{%nOtM<>2?cR^{uO@MhaI^m@ z-G*AFqW3;!Ov^&dJzrUtPl^!{jE|C>wo@05<_M%SyhlcFBV z8QHTl%kO-u`|<8838+JY-e-O{c=y+`^xRvU*(a2R%ND==U#%LtOR4j}Ow6g3=DMBM ztCOMTdhT5~_3+B8)1Lg%oZKEaRd7ASwH5CsUJ1`r{A|yb{NS&-oOu13zKKxPSF^4f z(?sA{x_TZPwy^`0nExS7qj_qBa#{2l( zNzdZCqo)<_&pY|&m5irUbH4MQU(+5xO24WIi-(VwXC&TPGr4FsXF;+sU2wGt(J2gVe-4QD1)F{KKc$(~sP}stNVOl8Y~U6JyfO*v&L|n#aQv^4uec z|L4gI0WuZ0?T=qY1jS_ z6n5u%oIHMCioJunV=O8&ZC)=^Ele-%fF-G)Y9$ipzn9qXd@@P+_;)&&X*65)k>H@e^L{dHjmdw>izRcOYFW)Uf6i!?KbnH zx`?1A_2(ug?oAu1DF0!*!vhPhl;(5vC zW@1KU-Nf(DufStG==csu7Mq@0$2r4Ju3z7?s$}LHv)|_y8b?f;cTp1>Nwy1K>t8zu zic5(T|M?;|-|pA-jN+8kpJ8h8W!@_usH&jt?S;>uENM)wH2d&lo!vT>OqV8$tZTPF zmtK{H#?Y1byR3R<|2@4>m~-C6v&W~X^!mB%EC1%XGrqJP8tz{=zqrPH*2;3e=*;*x z&yu|+9eeXFLd<{f&mTMXSh+yW`4t$>mTv5ShL@e~lly^JcPnf>gTAZ8OlAH!<@P<1 z?IGKt*(hkgRMQ z$^7%i{JBcsx;|*Jxuni`S*Xxv|8ue@|A-l^^tPR}OzifY%$(ZalXmPxIQ-y>?JM`Zp0`j~=7?v|<2BZm2KG_1 ziqH`Jn-rq`IBl=-_P*3gPJe+?H!qnuNf0_ynW-Y!)Dk~3uYA(Jv z^>tV{%*(fXD$%R!tHnieo*S-JuzF5X z3pl2@eUGYL>|D4dri-Q)ItRD;6$q$%>I(h*C+S@jSK0=RqODiG_#db3Qx7C%s)SOl{M6amAzrF&g`gE zf39}gNS|G;zqnszrNaUK{5YxGn^oFYMZ=W&hGnJRF>1Tl)@I1+ zOkOCGR=7_Jd3|kRV?@dA*^j2db4pgT=safg)PfiClR-i9 zH~HF~y!sRG+Z%4nefn+PXf0QC_tOD;_apIYT0xV( zEI4zA^~UyHix>KJbX2caR`Hy4h39m<xt{%A?A?n2tKE;tg1wa0 z_H{|Bo2Oa0Ad|fQrZ22WC!Lzhu$v#8Yi1Z&(>(1<9{_$0LT|AS0Z^!K8)NflqEyg%83Yx!uEmx^f&w|V0EC(o>B&||OT`&01am#d4; z>=TX$po%5RGn+rY+U7}adD=7nhWCv3 zS@*sESpuFK<(2fNNqo~*JpZi0KEpWmu?6P6f8^qwnt$MS&b!L&1f!qVo= zm}#B%t9%YPO-R-ETlFYEVimrl==sX__4!|-zeC+Ug2a89%NXxDr7ykHJG0U+ZJ&m5 z`t@ZH=WY8nJMqq)@+V~n+E{fbEs+y;{@L}4%~Q&~xZyc-`US}|wZ_Kr6K588?FL&A z)cxnIL0-nq3yz|Sla|PdyfJa*9)nK_+r{WR${ePDw<&we~Hwea_p5RXY!H?54SoKU+`P=Ks?A#u1?h(Wv$zQ=<;G4GZ@oTSDfbBKkL0yzV{b3oyt*0U{r5j#8{}nl$TG%fOjWU+ zb@e&VrtH!dm9Hz<+luy|JY$~zY|ASJu+3MjBNflnQ+Z?q?kafN=7|*u z6@;ekTVdq}_Qlt>{d|v&4kgY}$z*-RV6=Fb(o{-ZwKeN&&&2JS<#d71G?uEMD z)+(N7KYV$(wpZ0t*_^jRy}&W;+(>(;zid*v0)Zl%rWplz>kTJ$7e7Vtg z6+CqfMSn!3&6_lnx&P-qh_@!PO}l%V?W*9UCC@kxO)Z>sC3Zcd-OQQI(CTI7Z?+;M zZcv$VcH#y}@0f#%p0Q;HAC8`x69;WZ?aFRY3_s>M$t~sAo6I%QvWlL%Tl7C{Ju@c~ zrXXEGB5J*r)1)gp8+(pk<(+gT$eQ{8+?lIkPJJiQkq}qfqOvm5=;n@Hj+3I^tUNH? zsMrhIoRHexc&0!?-BU_2Jk7>M|@`2WjkS=NlPB$SU@RFi4+m zeS59(>~r?n=i7C!z2UjzmVB+~`i~=r>&oB%EjT*=!6)g5&&}2BcgfX#V&74I^ToXI ztW`eY$2@~31{-~D>e#Un>XWr|PTCaRQuw;!?6bq~x)a*JHod(r`}aYv&N9EY+-t95 z_-kI>*}cYi!tNhdJ3hR6!oI)QV)?!Y*ZDkG8H)cfe=q@BL2W5g3upH@ZJa9fW|zRX zn<_Vwog)ku?|O03cP@*6-1g$V&omF-^?n$=zx8wd)S91OKR(~R+B!*PWoq1vne)3k z^uwVk_V_acKikxx1DC}QZ8qorc00xOw)?krp=^osdlTpPHkZF=y}y&~+~3Ngds7Q; z$FF*=;u++<$KLpSf5-1t&fqw|)MeQd>>rVBT5)jNhfC^g{j(!uFWXLLw_5$XEcS-v znZM`tAAXsya(|!HCM&;5DyBD`9y~q3z8XpM%DLCt!}H{Al9eSgesYEcs~={ZeTZ>3 z+x{J#{~k|zGUxPzd%stoR`CpSmYqK{-R;O*Xg10G$+n95O1&DZ%nr$#FNWu@Ni zE&R=1*#G5+>4Pb?&GYwaRUGy+sIDrVsN$Kmz_elUDo{PF;t6u|a+dqM z{c)bA;#vQC0nG62GRHD~*qH8Z5dL$%JBHU>aG775a2fA8JB=B;y-IskJYN~IhqHs* zu1oemHSk+(maH}B0og4X+UrqYAHG!?>=Y|Ix)~@ze@eJaxtSfB*r^zad_Cl$RvEqm7<>hqd#KtaK zIr-t=->mO%7~8n}O;TZe6DJF)(&Wx1&T)J4A@_l?K1Z6*TD^RHEgz(-!Cxe?Ty&PmT;r2*8*58D!>&E5 z{1D&Hmc83?s*2~|SD9BC!6oBMN502fVi@OJ?S|HYHmLhn9!{JiclG0L zw)Is-rLD)ZHvjx^v$^@|vXJQ>la_F93x$T^s{)DT`#&zq1$iQTMfAK4W^>9C3~rt; z^PKeSJg}PCvo?9~CZd*w^sxVcN0B!h1tm+ONI)K&imf_JI6_qZh3Y&65rb&scP3 zCf{;9b%`&V<0oB775w@Wb2t zTi?e7$0~VdZSMH-{>&e#0+SDB30Z|f_A>(^Y5B3HxPG1ThiR|+j80FpRjvEFdVYBN zi;b2&uan_f|=C3S{t ztsFpU?%2(cUq9WBoSdv4s-E%GqUUw6^?LsHoY>ffS+CEwY`4+1c=l(F-$a$KjU78| zjLRA9*kr=)US^j$w$&reZ(%XtgRGLcoEfHnUS}P?e&%8M+=GYf&s9Hp|DH{*O8c7a zf%vxjbMZ4o}%&lg~oG!n|>&M z@af^}u8tk)N=jf0#4USX8%v*W-G6`IE~mX|A8mf@RzKLTw@z=O%Gb#q7IwzzjO*9s zWon-1)0i~#HG?(7?F*9oayfGt*503!WVPYuhp%Va_tZwF#qs{(*&*_Su^`jsj^W47 zNnt9+><#A`<#G(`{Q5eA<$w65$#Kd=-?%JR&o+=Kq%Zka!?G z`&gRb2GI|fUrm^1*>Z0FTDSN2S2L@8Wos|2P5JJ+;dt9s(O03y%MQ&hF=;<@oP;31wStmT-SnCF4@pnnm6$JctkgGc9orjF0DNbj zzp8J-73n>%m-(|4{8^WKU(`Lh^oH5owLYqzvpfU~W%JIP$jKZl^-S|Se}>uUv%S%0 z^8-^4{BHbPAaLE6yHUAubECA;=Syd7^o-4Q-%X0rHx6gDt`=l6wyf*7?h9(9GGHR@z#1cS(c!nkLnv$(;G~&6z(U1AIQJp=`s1o){xt{o!S2U8EvD_PtMc?6;8hr zCeI)i?!M*5YUM|lMF0Fg&sgpk;?w4P^u@CMKVji>}$l999B*(vp zbBBs?{luC1=gyR_UcAKY#F^(z`fJ~1Z1i_I;vW8mPq0vY?s`k9*(VRYyDFGFVP^A= zO9gB4SoQ_UDy}TI=y}b|p2Ic!%<6Rk!8|N~E(gor^P1!}hdm}(_M#Hs)pN&6X0QF;3O)q{3_^o_ZR`;9ngZJT|YVWSvWc_U& zUq!7jIFk+TmSx_MP}(vmu1LFWT2ugdBc+8212y68*C zv3_53#)f}~lm%nK($LL34Ao5Y8P>_(J9gbW-=d$JTT|gv}wCUEew?2#hv`V zU*N}Gi*H}LYmF|8A3AnUSL^sW#@$QW3ni`>S+C{yj|qrfxNN3K!IQ~hd&{s`6OSWy?qh@^m^cmY#%}dyRq(69hRZw^8 zfzwKlu5166=c&K@@5m3;uf3&>XICrF%Bh&Kv%b{*@LvO^I*|XiTl8e_4Bw&Ux47iT zHG}M^(pHs~_j&ebe4YKOPwYo(sl)n{XC!C-tg>4D;M{^@wwbrm8_sceh^IW;Zd|xayPz=ZQsP1_u2e9I=Z{6m&}_m)41_GL-SQ#-LJk@(enKfE-_PQ z{_j6$;IeqT`GHn#P!3=e428_5A^jnA73w+W5I4V>$2n| zo%z}iuh{C}Qu}dY>AflHp0f(X9~#j$> zAN!>sSXi7^Cs~mvKI_*_JBuD^-teQnXL%3&yec@U>as(rgZ=GX!J2Om9&8F{SAYLf z!Ef)&ncaz->VrKdsRg*)@p!(5wfCI9(xbjt9i3BVPMqn^6#hWLPdh!-D&6X@igEdx zzKO@8)BM=%7}vzzy%aRRuY(~aun z9S>9wKIh{ri)Wc^^UT*a=bhGu&%Z!<)vhGH)S)>xM%G}WQL*xa*$3PkB9B^T%{zKv zyYc7RnLE8odrbQ7alHwUy%;o|(Y@@a;eM_^8&CJ&%)fT}%-L1Svs8@58E%J`o6Ko0 z@jU(1Adl(ocFvmbCmsZ!=ie3^5Uad)53_l3l8)!B0=~y?@0(sVbWWPte(C0<&o7T^ zW^H49PW`nA-u@nLp2+nG+(bTF?WpDDBO+ zm3$cz+gHfUzPyTA<*QkH;p2<~hJT5>&t>hfHD9xCqFeqwtqoh#rMxDoO}ow8cdlRg z(Xv+^AE(UhewlOh=d4#^TZ1k{I+i%5{gT~q>%rj$cK)9Ja`z+8kH0>s{OI_B^T%F) z{Cz}k=1X5|ZAIgBCjZs%GB#8<6t7Z-SeCMQ=ZCY?S=HZ5t}%*;Rqnkj$2UdQQ&`2A zc}C>jivjWL_$2&i?i4TJ+z?vY9hD#cVA7d88?9WV)}FBus&FiI_l{+eF=sqqe2vA% zeYWqy&);{--TqhdZ;#2A%qTP1S^%r~j*jTnP#YgS(0zDlI;d*Wo470eyX(7PP0v{d z#tkR03i5uP`KsaLq?!7x=N5ndsOZ~L+L)jA?BP|#OCG7u+zwQ)wvKwm_Ta+9;=9Lg zM;>so@t<9pcjr`L_o%$+PhEFP3A&&mjHFg7Ya`C(P;%IB%i6h3(FsZ6xF!!IKuc-{ZV zWY;6|jofOFc1E2kek|vl=EwSN)w_%huNy#PabNA)3uBG4rRMxT^gzJ;OrSR}-vQxk z>p-<_=h3T-yrpHO4%<_oG0auG!+BNrRkq{vuleP71P>+VO&)qYr> zpYz~(_UzWf&(CK4{C4Ew--tP4f~P@|12TWZwX6?M4>!HNzE*GIvFpKqB&MtQ_UNu= zmU>|qwaxb22ZeXZ2fVw2m$2^<`Elq27t>1h)MxV!*oT&Hxne0;=ymXOo!|$ZRT~RS z?{w{SefmPRz^$}pNm_w~x!deB&D?Q9InRC;ykfq+_VqcNNlQ347MD6O*V-xNt>}9( z?crMndyn)VieD%FZPZVDw&j(;%ZWzCa&yI7Yu7ISy^f`CO~s>*AKV{qc0JD%Jl`AL z_i*<7Z=kgG-sQ;p)ygWS&G#4d9#s4MK)apw^_sX?CEuR2vR2-cjzy;Vv6ZcSm$Bgg z3ceT9+Ib$u1>RNCJ$~=NPQE8syxac2vl0DJ(D-h*u!VtAo_Qfslqtey|$zEJs z#&T^{U&aPdMlo$aydyBGnyuy=>%o})Q&#t{*==>^iz>V4r60GLXN1aLG?*?jC*F8o zAA4M+tfFn(-p2ElZF8zltZqmTb>DJDQ1IjDQw<$I^a?^#oe%pm&x@12xcJVZqA%~5 z?BZn=S6a#(>pk=;_~9IJme*(3=uK3+mzEtO?lCFq-Gx^TY*rhs7DO9;-g$uYs_Z4N zTl_x?N?WGPoXz+@=m+#wJ5m(x%vU06avE7F~ulm}4YJPb7sw3~j8TCsy+fF-YT~*OPedh5h{!z$vHDC5!yNVWbp5J5(l>TlEo%M8 zVPmiKZZ%(}gG&tamdxl^o!bnI&DZt4FkIIqy?6D;&w-aXEPJFInax_K+il$Cv})_V z+nc>69dk@u$Nwj})ctUbh+sU}d>MvwOkyG1Jr;``SUL0Ol2-y>r=Phay}zulJ@r7M z;K$#uCb$=-l{y@L8!LMuS>{;pz2mnFoaZd*d}@%Vsyl~w`J2~W3YmW+ud+^BGR=xL z{AlkHfe*i4b?E(6PuTv7BeQ22Q+oQc?dvj~c=F%YNaek?mh0>7SRd}LbKLU4+^d4T z&vq6bZp&}Ey=>Rwg>3}}dYK|J$JVx-WG;AB+;nw$*mRGtVr$}J6+E+MpRp0LSg>nx zqMe+eJ=p1YWGpuBa(*?5x3NFeeZ^lR1~4a{-aYFW<1{bVA2x3Q)lKj@`se0oZ&rS zcvUcY>deax=O1)=Y(4$i=yT{*!K}TD8~(0Rj(RcuK)2L}uXD7E-14n9c$d2L7j&Px zXua0TA;{RWr<&(;c&qulC%sCSn3wr9U0oIu?lI|>g0VTvK8N&b^R;{Gdpc&XR^IiX z_rSBOf|o2RzJIu%A9OwSnb-l(tFpQ!`~?9ncfw>h3GL&HiI%;XP+OlDlXi}^Y}LDr z6}KCY&A+L$vhDDW;~)BL@6HRVQVBoqIq8^|u{dKq^Rv+HCTGNz9(@M8{q+UOW1hJt zvOivY2x|(u&Xd2soNt|m9RK=`j`<<(YkE2)nCwFDUQC!L&3>LmE!^GY%1yz-a!`p= zB(a@ocMik(n`?GCy|U$7q3W4DaprBt`^$^>O$xjBzH$Hhz890qnOBFodpynvf3V>d z$JTSd8+=zQN4;nkEOaY9!eP30`}CYguTrdf!o;tIfi9NjBL-;|w@#U-gUv-_S;rsCERiD@{ ziHh3NBOb0tL=P;zD$9Fqdvqw@`VDtC?^?WY-J;LsZ7RK8hj%=^@v-p3l&`C_m)tYC zdX`7UQ+dkF)#=aLU(VV1plij%>TH*q-Bydd@3B@~pZ)8g&4VAWI85(a4ft+wM=Z5kw9rmYFj7`=t|v2IF=RIJGUc!B3s@}6{3cBHqEmin$NEtB9#@w; zJT+T)EnXPLTDGolM#fA_PVgl5J~6@Tp)gxcs9R=E2z#_pODJ37e_v1}l)e88wqo+k+3C-$8?#@oX}P`8V&%&` z)^EKX_e0xDE*k#$-2Uq_LqSey%Pdvn@THr1A5M8SZQ4)W50k{^{{ABRVA-pVwpYiC zAKzJ2RFcPbZgt;;D>ai>GgqBu>~9bK8x|h5aOt|9$xHT4o5^S+SD`g`;q7-jcvH>q zGTJCB)dk63(w%9^Tv1or9`a)6%$){G>(=oFCjYU1u=dd1ui_7O3VwY4YC>LT$I_XV zW*=U?n#Oj^#8}+*Nd78kwF}0pnWbI@3qJhWGwIlw#5>9|TbAzD@a%t@2bvXHo%&2C zL2K@3lV{A*Jn`J^>(!ZxyFcA}SC;U6rIJghp8gDw4*9M&5pmK zu+*J zcNq)+_jH8qTOcPmJ?+_l#^|u^CKv3!oHXFuzCvd0=_sos(?bp<-f@1jOMop#LVfLp zO)al5G7C(PLeaBq00wHzVY0>W+7jBa& z)%6U@|6%`NWvFJz-(Z{h{Rh#AwkQ zE3K0Dq&{mqAa+%jx5WO#%U2wpZy)j><==Su@ha{m_sTEFUS*x6vh~z|25Z+N`Kz6e zUA%XdF^K=Brm^{ozJT{9&&W1DUS%DX#$jOsigU?)!9v>)y|4P(UbVjuo(F1K#`kqd zuToao+J1OPVt3l%Dq~Q#D?ghHHusP~fzXC{mpgH?#&Jf)QX7g(-RFB*X*;cBUB^_% z5##dw=q-6Bd#Qirc@B0PnJji#Iqg+7PG_2bV6n@tx4D8JufFQwEO9G!aDE#sYrqIf zyHS!#bAK&ebQA=&D7gstQazKB|zq@xQfwoR6M=X`+es-W)Y(g$y^3JSl8d0=)R`mB4} z=QA<(O6ykgN%GIMl&|nAb!WcI@#XOMSCiBxfPDG9GH%Wmqjfv4GCx)UEsMM)dF1at ztCXfUk+K(pJkx)C3w==YAYIV#RsJQVM_~^xJzV{nW#;4;JWswYD|Y{TE&0XO!?_b@ zb}KzHzpA)u`b>RBzLoDXX5MGi@9EfQ<*cjp?&O*C%=)YIG8gP^=nrx4nateac~y}2 zODAL~DE7{>q8o0-tGSn?{WyCT?E6c14{SUzuhyi4xuUAn;q)E88itA*mp5X9@B2FD z_oWJKw-MZ^qf{p#=&h6_ouK_-Z^LhulJ@4Ti8H$!f>&8bJ&Ob7;pML;DCLD(TIJfA zpVQTHKYm`-GxoVb-i>3$tGJh>?RazS6_e*Aspr`T(gZ)Q>yTL0H&f%V_UdhG-eq*& zZZKzh?RF$v>CviAzK)Ln-5uANUo);}{FS-FMs8l9?1HG7mXbeI^4M?ZuJ7ycmj8V> z>a}&l>OA+n{xfreWH08<+$psoy40OHR!YzwR5;o3J#IM3yy4%QS6nM4&($V=xOTTm z_FA*&yLVcim%3uO_gE->%X@99(w``7qrXmiA4iVS97@s-^99Uc8)?jcffntwZA^|8%jwApHvB=d&bXLVo30#Gw@>*T{0 z33IO|Ua;rPT$*Dd9`{$|$Ek-0pRVWhyI~qp?N&Nf#nbjF-viweHjVVK<07AWHg5E^ zik>YeA!xhZ+|lKZu;72D9LAcZyOuYmU9_C+U#nqUzHsxc(7T_FAG}|!Ty^AS$-cIX zly58fB-rx;EsMT0&R^L#;fi11f`+Th!^Az#n$(9@yyg3_IGj!Xj{S|AI?#;m(sxYv z_;X|g)m@LouWIhH?2(>*oi9K4)@A(_Zb!BXZnXap_2A#Dd2KiMSvd&n8>cg;GfrL= z9rYy4%3SYGtn4LjrAJv0s;|oOURhQA*r<3y8K1=Q+v2}}obmL0d?rz5L)PoE)@f?j zu6P!l2>Y;B*~)n*>$)kERlZKY-B8Zlt@LQC;K$>y7RYUMEp=$Ft*OvHajc```{hc- z%{AI**=}yLa!|G7u~}!e$W^E!(&f)Ct0l+3d_MK(;w>%X>#O@-EV}z*&7o^2=ETV= ztlTSejB&MP&*WW63RccLz5gj%yvuyJAbQf3vhd3{-3ppJDw6f{R3mc!zG`UOC0XHI zdL+Z;hUa1TJFP;Zp2Pam$l{$#;bbWdvmVXYY z3$s_|*h2%qSKD4T7kuga@K?EcZmp!>q$_&g8RxTqTfSNL>29S**B&j4+q%GN!NPyK zN_p%0B-VEPu=^l$XH!wC&N-j&Q(g$q+$s3s-mAW8Kh-uYv05bVdgSea`p|Nd0PSt1 zXU;76ymyt`vojqLVX}%~KV4P}7x#F(<(`kl_X!V<+-+W2H_vm@tZa@Sc5{t4UhC|5 z?s_ErPh#y)qhc$A<+~OyJhzHZV)aAOqT^xZUsj}+gk6nuNZ)-ZG`rYD(5P6efNw)o zsdsk_x6GUCk3@@BpPG2P_{W;9%c_kw13oxdjix59qhAk7o>L+~3*po9lMS`f`k+#O_F;<$=c-q8FZoveN2=gock}eQvuj>&ziK*3*G z9{WDO^rNS?D?M6wYl++E*8LYVZ+APaXVGI0TgfNM&KYz3KHr@>&Ocg8e>8&`Ql1$% zECv-urGg*#zUqh*7d&nB`SO9+tD~jT@@0;FT@22m^AB4*Shw^lYf$|RTUopBhaS8Y zS6%)mA2g#LV^R~#^XI_k`@6EjN*$cHzDhPwT6gZucZTEP+j|bauRJlKx1Hyn(xZ8& z48HC=6VrT-d(S$Nck}$+kF>8+mU>bmbFBA@-GSMwmEE+B%~{35%T3PM9!OuUtg?0f zVT%|^b>AhPjOuTs&dg%V-)peCSjF@2TY05Nr(ShTn-wQ}Az*bldrxycYn*dFe?~rI z-RB9fpO=K4iW3zq4{2Mu)5y3XxN+<1=%^<~4^F)5Q0weCZT#8&fbi;Qsg&1eVlF(; zJryfzUNryvG8<3fgNZT)yANAr9@<;Rexvg5gT>R;rr+fVzr*5u?wN{bR(IxAM&7Ht z-r6cZ+IHrTK|xO8sa~6kyxYp*J1h$>SNw2)F!QRQZV`LIglLccQ!_1kq&peDG5M|L zlT>XlR4xY%hW~qD!1v?t+k*E-Gpttba(SiiAH(qfC_)o)>b`7M7-vrl&H$elAk`q%0+cVsHU zOWnIwK3wY9vB+x4LOa$y(h_UP*hL#k=y@^O*lJ{NdX%?HvE} z{jC4=mGbnmaxBd7DnjJ4cf^?>TN30LH0j`99} zdY13;k~qUsp*;!Q6$ix*9=(3BQ(X1_|Jc&0Dl3nseSAmgfMj0vnv$3lTy1s|~#wx2tu6j&; ztNSt;Gv8m$C#kr7h0M$)pLZ&H3Li?mvmySc^4u$v=k3v}`MKc%w|%>L z{DeC&6*Ff`Z>upIKVy$aU^*+#cfIbKu_&;g9X5P5D;k@gSyGv6|->u}!*s->OpV>X6y(HMBX3;K3DgK#~C2WP+VcWNy zkXCwReN|AmSdH(o+oR5zJIh>5o~l%XBE`CK*&J6(*@&%HPPS)@v*f*9{CRTNS20%| z{k(03-h?fi`0g*;T>5lRC}<%}RS0v*yEt3s9eT$8C(rP9&sLiy?cIO(w9)4kuQ)ul zpJpW7f7K!O)5itW_%RbKH2l#0s*jB`;ry$PsS{`N-w|0hwcO8T$K>WEoKFq-B21*? zwl`aQdiZX7%LHnXM6C{;?lEbL)8@wO4B@HIDrer*k3RF|an^y4AMTxr36fQO87Mn- z=JAwg9}jq5HPkI){ZM{YP`3;;`1B@NcEhA^ENLO`CTCt=Wt{Y@|FFda+4CIBb|o&q zVgX)L!~JY`MEs;Hzu8{Qd0Ob0R%dNozK%~S{a)rBS;jdNW~QeVb05@b~f~c5zg}h3{mk^>)R{la&&&yvRrY-Rq@&|U zWvR<-*CX#6yH{CDrI>A~Ej`ke@{D0ae5w24Ia1(3h5ujv8oYZUdv{(?)-Lrmyz+Hn z57IZQtW5mIpm*|&v2pR)S2Of>^F>6-UNkCh{LXYeN4MA zvDJdaZ|nFfc&wSSL)}eI2o!{swk-K~<@(_rd(E2G{w-47dT6s8zkZ!lX{(B-ve)+m=|bibiadRzx&jXMeExO*H^E4ow3BM^0(Z{hs=|TC%=k7=Tr@!BKc&XNU+rIkij4pwS zTGwu@i#5z@+AF==eAA!x8DCgS6DVkEX_=Ihw?6E_g%YwXI&KZ zUXU2``b!6&z{F2lZ`rrVUT>7W*0)YTbHmNe4}U&?xb^yj!~BVdSY}v@Ta`3i4R7x? zYkIq_`K%eUce=s7g|dHsGCbbBJ>zx0py0{1>ke?gtKF z|9+}o!_S__!_Tw!SCEpDQs6Dd{j6oh-zT5RaVZIC-D0E{#-6bK+41MkcK}R99yE?91u1x#({zb>6s-`F3Gw0ghGGd=_Fi|E-^mSCYyA9bnjrol@D_pjdVx*O;cm84d%WTtN)pQg33v{%vNo-Jn@FEVml@@&xz(Eg)s<>0cU>7netK8EhtOp6dC( zlW)ST2;m#-7P2o`_b~XxUJ0B2Zk;}tYl@@2+2-&?%1{1(?czHzk$Dlb*dkr6=sdZb zHlO`nyq1+5-m&(2i{ELt@D7m!*6$DOd>*z>_vxh`S#JB^l4s^dU%bp~k#xFbvWtt0 z(SzFulHc94v|7?Sua9rSuFT^~+jg<2?fT9A?%s_(SD)Iw+n1HHqNC+!`^?NAlXbUG zS`#*9>1{jh{q;M4YaLhz3g8Jdd%OAs1U2s(s3+v+WoyH%G)|RL@t#b*nhXS_r(OU3a+{C!DVwB)*bk$5*=&D)KmJs|L$MA^8Hut z_LqKN`*{oR>W(e9HXqPmto-EktnJ);&37rQOL>H~rXM`$aQj7v%u7L81tlg`nPYGF ztlKw7d}Y-BI)jpo+PKy3{1SG17A?=)thQ!b%_&+jJ)9RII!mQo$imUbYp^PET^&>Cty~KEL^$fc@8JTZ`xITDfSs)P}#eUOwyS=twy+ z?ZD!9^S%ZL<#+QNg^MXTAP~)b-I%n$$@9&{qA?X(sB#f8s zTW^`b;4?q&V(|7j=hca>E=w+KV|-WmU1xq*jr6TmL0ahtjvWX*ka}RT%JU0*U%tD( z`?uh`eMK1yJ9JLArhO|YY0;TC^DOf(xAG@PRvp;hB>j!uipBhi=lK^5f)meA&63!D z@zhCmOTm?g4l~YQoOY&R`TTV+Rz~q^D=DdNkiPKZ-OQTR*=foRiWg;rG;%$*W!X+m zxnX_nZhXo2{kwi2JiD6BMdjY!14}OoUQ(Kx>mKaK&a!{swiP)$ub+MM^aTgVj%^_Eb{e2NkxuKd{ue7BsJv8$GL&Bcj{3YLm@7A8Z zVKVX3FAj^7XSNtwv7dRv`{3$}zBwG$=I8F-o-k*-mhNK3%^fLTE87ZJuNR0_m{csR ze(1+X!}WjfRg2o@>dw_rQc`;QvAW#e#wy8BsxkATV35>l#`}!x*xh#hE`C?HaCg1( z4(}y8X^i)cH*;Q8yrk88k znK#ql{nLNY^FmBhmU&xt-JgSZ?<@U0v~&8*UOru6&2{r<-1NREcqz+#a*p<@?^WK{ z*lw`D5dUxslnUROZZ5nisHDWLb<;p^^6`w0C&#a>+*$qhTkgW%gEhH*N=i4&H_!ZQ zVzo&1POWN!WJ0avllcM+&~pJE>=&!ZVaRbU+OhXYgy4(U?{?3)Ip@WU))>w|EVU=q zH*Qn-x#?$8dA-aF-Y@2xB{xPYwHEH3`L&~O!ZqW~8{hpi_;CNCu4Ms(;o%+4%yGu+ zzr3E%k>a;<+sc?Y?G%?)#`$r2@w!w}W zHmMDkADkDc8=#>`%Zy#99rncse%YKuFd{_dZ6dA$A(PnGv^s+PM0 zKY2%oZac&HF7CSZzq@<2PxcmUDoJi+U##rnA{Mr4{fgVuvt$=^baZ&|7*`)Z^Di|` zefCW?2k{3<4;J6p6l8h&?)Tolh!%Ty_70sxUI+9WzTe$DfA@OO;4Mswbp49@0ur5W}aor z>wb5lllk?ZDyd^z=Y&;sd8kc&)qFIC_pytMi_4)IGiTpSF#augQnGkDv(@sIW&gN; z)Rr7k`XhD0y7=U-SP!=2>v#VaylALoS=6=ry{N2W=u1)A3Bv4GUbo(oYPOC0y>ged`U`R8&b>72sw6U9^<|4cPAR>-uatdTBWi;PN2 z-NCC8@2psPkyS}aNokXU@$VyN{FuHmwy{1J35=ek@2YE+qIkD~f3dPlRHFWao6n4& znsxOFp4{QvxOtKC60N<9nTrUcY;18GnJD?6zU5XlaEydIk`J2E%@vk_5p)o^ovW4(L%6Nj_yg$Ei{ zR)0u&S>?js(V^qHvaRs*tb`Ts`azC9X=1!v$Ubu6Le8Fj|_VdidkNLMhoIH1-@Pl5%4;Pp0O6lr2!F1+LS$RHF z-qM!$k=ajb%KtB)dA5)5=bV{mi@zr~Om7TbRPCa5LCk{v#`U}W`EkBVO7TBt@3zlL z`xP?PemiqGv$jin%AM^iFG^OQ-7WPdzB^kyVDZdMdlSKvTQ1dZ{CLCQd3)^Uvbwz; zS1w)44*9f3zizICsp!0467Q<7SEfjunKeCXR!4_UwMwm^LOi&R*m! zmXfA?=WoS>IInHR?INePH;CW;%YHU`LzhPq?}PpW=NCCIDLs?3YxjLt8Tq@D3af(` zC(3M){;*Xlc6Y{>Nx?2g>r3Rz=KqR#eyr2u^_rbZGCNhj{F-O@#pm&=<{sTGhr(Qz z=$&~p|3K(PS=ORyyVKvDGcm4a*kQ2Cd5PC*hVQ$7uiyOR{!EVr^1FZgT@(xwvWb6=pSjoBCmk{wdv@@;gZSLV69&x(+dFE{3<@vX;@OEI>!&TOT zf|*MNLE=32yEkWg}D(Ttn(8?+Z&yR5pxwu5I!=<^eufA+I2sQx^ydXj!~gWyF$ z$?v7*_m{X`zhCH^_|+CF9as`+~CR$ooStRjpdHa-HFWA%WECW z@AKTSc>7xHg3p5bl9mn+?##pT;rd1cyRGpWO+*z&H8v(cTu*BOV{Z$_gMeQ z+zk}?z4Q0=#mZtw&&d2REQl`Y_Tc))E?4qhbg{FG(WCx%`|3(swnUwO(IDedE5R-k z)0{09SZ_RAL{?GhlF(9_V`t}Zm+z5`RaA1_^r`5>`olfi{06tS_pTEZ)Li4;aPgub z>jefGVcCrqX=d^kj62kKxvH@4X8xX~pw8sL{$Tw@!An+Y-{fxT)ntAv`o3j<@>Q{^ zpnZ%EE=!hrS@tl$__}G^Dv^m_=Kj%@s93YHYuj28LC?7}&pNDre5oj?mjfef*CYFEGLP&M5AGwoaP z1D^$&yWE#}?PlsVjj&XlCx=B%v-!aR=Hl?{4>T`aAJ(c zSN6u!^Dn)!5M0^oYjya*2<}a!Xp4|W5 z*u7ZU#VA2`L3ByWmN_$P+3rZ+omjYgNyXZ~!F$32EiYJGIk_w`^|I}${uo^G=kNy53P zqFmqapXPIT$FHhGXSO__+400{WqTn*ea)fFOH7u6D<|e&Yk0>lEhej^6r^*WY4IXu zt_1h;cvY)KOV7NKOpt!C?SSf=<{Nu3jxgU~X^Y{PXw(;hwi=s+Ot)J$+Wxt&dg+9J|}4R>+QMR+G`kA zujiA_@*hzplf>YhEXxMu+SoX06n;_q%?7J5YFFs>AaK zDig2$TD{voCGFNX-&1RpPp*G>+@<}*rI|Oq-~E%?5L)8x7HZm4{5`etZcvuyCU8|d z^@72=o4V@{HqJiaINN1<$Cd-^@(%Ou3X)60a z;ZKC*59xxEk`9jzi|_tTGv2LlIx}KYqI=_}pJdT51eh$y$Q$`)#pANDY+)UkYzwW|~8EahDTym|J z%H6^d?y@B7?DJ`R90w`2u=@hmv0T5!qJpe!eJ`mKUgiQl@?t2LIXO-kI*;h~o)v3G| z(*8E)Gqp3EXIJmkIeYM3+>C`gJVeixeb-&2yu`K2l|ALgxv4fM@9yV&aqX^Z^_4Sj zF76#2Azp`fxbFC)`Qp1a;OFcX#hdIbh^aUVi;<_sw#115GQX#k<0O zy#H`-<#ZAMeo!ATD??&C2j85^`Nl5aqdc~3zt>cJzIEBM7ebL2ZfyK8dH#VnH$~$g zozVUIGss1Sb@L)-uB6E?8lsFhyPwTbPf%Z=ZlJu)@1oj%Qi2d%#1**yEQ&KNJy(qXTCCyBtLVuU?;$7RGsqg-M>_C-imSz_?i(b7X{dcK^xh&uAqm|+6 zlRRwC&SW;fClRaYZCr2n=kt6~``Y%c!8wA0n#-RqX69P5W%@fdfmbVjUar4_SOjZy7awYfLm7Rr3N}*ATRtp@$`uRH2(mu~-FHUF3 zX8z4|eeuCLSFV4&$fzWlc%by%Jv%FxX)DAZTojbNa`kTX=f?Qv=c=zk!zq*4cppb) z+$pixaB=7NyDx+^TifNj^d?N3Wh?#f@B6NKyITDmL9Q|T+v~9^!;gjFe&bzgDq#S8| zSGRlS%WE&*WU-X>_nla<&cT~+=6$ZaB3o7XXWd-!q9Y)UxiJ6ae(%(4Q=iyYMt)_s z>+U;Y^4)xqu*2aUVcA8X%4T-*Lw$BB*{>U;FPRmo_{^1xRb2ZqE;T)D{Z+%Ke1a1{ z-PEvJ;P7R45ckZRF$o2qAD5q9J;O}(r_h7X$IA{FB~F}FzI$QfoDrTV zOD~&E72Wk&_r}-x=O)X$PWO1&BO@8Bu+}um#nnIiKHId+$wl2A9-cdXuTqI-@U)uN z&39t;GhN;LCY#-itq-3mV+~{c#!%^nw68-*)z)+ z%H7LTE^O2NQ)#82_fc&^j-Z}W5Qo&U(1(*XKirL;^I5Ji?QHkDiHBwwsqS)!%KlZ7 zk+tf@O4(aW?bDb=@C zBj?<`6T3a9v*u>}-B|O7DdFp1H1PbocB#(k^ZKv5uP#(w4;|{7xFtg(T$O!Yz1+6< z@9z9_`*d6>G;{I!yE~Jo*=QNW@6YJy2+3OiqM_-c!MbB-a`HZN?Yez-&Fq=7IceF9 z*^KNA&liN2OnTvBv_o{F{u;g*Az8)luNogbOI(iCoV|NJ?$r64Y`LQQRF>Xf6y(z7 zdU(f_8Y5Oe=?8CWCma8G{6gyF*1jtFY1XpVVKzOpSFXS1;-a-wxAxN3oDzq~nKw0z zt52NKyRKywdEgl+JC&^3{a!{^F+MfT_kiw2S;;M1q_wwb<$a7Z2My4=xLjJ27;`F4 zlDGX!A>Z4_JT>8~}hxGdW5IJAN`ce4c)3HbeA;nwQr_Z-_-GFA5CWoLJJ};a1CR!Th7Rq@!l$%)L+F z=}-70r_y{YIl%k1C-u=Gco;rQ)iQ(}8Yazi_)uao6?cn8lcBkM|!f3|=26<<&j^$C@hdhq4)!!?^P^-ubu zv)^V;k(aA~Zjr<%PteHt(d)bss#c2@nDl6C8qen6bMMa%&I5PD8TawNVV2=oBP0_(G9uBk?9mU9{?S**)@LZ(!=(REw7tTbHUce z`>yUM!tb#6^!J^Zuzrs8^LN?IuUWS|aeNQT4N(^j{Fb!2`8S8Vh5kq}-ti?UqVj3T zY!%h&cbxV=9FO|fKd{XW)Kt0@^lqQl1>wErYnOW6-#BH~?)7iqRqy)Uf9G#e`To;) z?=z$^$TRgbTxW7`ZwotlCeC;>x5u_yx28YoHkxZ3QEhcv|Nk>4_gObR9)zpxH}lx# zSN=WU)%}F{tnDuQOm`_e@6vg6{%z#@jyVTuE8g^EGRwehQyUTpgH>cU=Y zo$WDIjzN3%VjrB+p4^zpI!or)-ibw%J3JhBR8PX@`oW9DMvHwD9--`Uw+!>LRXWC|^sZZc}rso_z=h~#U z!k^{KX4>VGEJ=wE^i}x3Uo1f=KPnRVN?(DTK;NMVO;>|gwDs|58 z^^e|J@B01m-M{Mc_qS~dX7kjr?Qz(2^v==)A05IIj)v_ya_(K+isI{Ma@Ne8>s`bb z=D+I3+*mR1+ab?xpG_-!>s0?P=)vQT8BMpve%yb-@v~{>UWON9SB|K?+xOx7`rR#4 zQf}*PSrp{L<#*U(qSR~)VX63)pOm6=S-0Pt#nYtHCMi>`V`6s5OFOi5<$nH)<)KPS z-jCmDGx9V1cG*6~-Q)SpX_pCv@%QnzQZ0e3Q*H5B&UkUbEHvPVDLzo1Z>= z(a;mo$68iV@V)QAvqH<6rQ2uv_JATNKhP>3X3H}v z>{ij~l+s78;*P&t%jagzeQwuyaF=+POG@XRTIUCu3F}`>n=~UYZSrE}OAp?i-u>I` zY_!+B=kLsS{!S>DXZB&5$Nr0HKYJf@8N;ise-HHE*}LJesB!g#C-0yCzNpK(sQBln zm&OkYjHB=TEU0Z<{^~}sm~7*I7xxp>zp$j^pQwc@WSgQg{~as5sV zQ1P~#$#mVGfBE}}r>(cPG(PTYeqS%o#@E8g{9x(ygnjq!FUvbBn)v%nrblP`m}JYMWZ$CK{0z2d(Lr-i$&aV=UF^Z&(! zD8tSCcWUD&CH|Uq(Ux_?j>Nu{aN&YAGix{On4ggL?p^wXoch($OD>l#+5O#YbM<0p zmNRdH%j;C#DpFxP8%^_ZezHnyuW-( z{DXJpGa?h;pEKOtf9J2nBz;-aj1_%tg+GfOKWkl7HQGG=?p}7*yZg*;*x&hEXuSF% zdva#0n@LZz{`#KP-^|`By-H2nbvnj{%m1*&M5~!r(sfnqi+^8q`^)Jx4fJ>FbjN z=ie6}dwI`CaN_^x@1mKOGc9L0&Hj8!?Af-$clR7N9m;*|YGcN5>*}km#&62s)ye_zg#?lOlaNW6*)8*eYsc%cWx_V}B>G$r&)7jHQqtbU*+Z$J#S}l2VCTH31`;MRL z)}OJ9m)x#-tE)D#`K(TO^s;VHKiFcTmG$$)<)^dUu5VrBy(CVr{#50Uzc081Csw@M zCskl@QryUz{rL&;RdUC6{=Odhq@2ZwAiMzAtOAnub z;7akg5A}o6H$OkfS#B}kuUBtkmBbIen13N9tsNdb<@xX5S?~B=`R<>I0oM*e-bb5K zw#@8Z^Ni_To!AG?4;CjIUgkV7nDkc7v?F>;_uaib<;U!WWhW%hpOWx3MbM&P)6Bi0 zCnulH;X4_2cGAAsiwqjt^H}UU`Z%`nY|xWBrki6`Pz@T`-J2nyE|hR3#9~XoaavSK z=aoys@`qM3%iQhKRC0a(?%BK7yMEt$S2t_-|GRhF8G;)W52&id+r8ME{_T%-YxbTQ zhfGf`GcG7CagpWe<~y8Om9##$;n+SzvDN9@oRC}Am?9A zYm20grQTnBAU}B5wa5earhJw;8xhqS36FRn>lRL{lv8rm(E$$gNL(1#LYY&EW zzP|I<)mZ!0%T1@<*`Lg4E4*30Xy#e}$4+VAw(XARo-^^-*C*b6<=^Ad%rvZ)oH_Hx zx%@x>$!`l&OJz>_=1%%Cp(Kw>Snwq8-Mv~uZ!WLgP|pASS@>e_B~hE7AO6{Ik$!Kz z)%$>6CtCQDt&Dm2M7~kE~v|8eJt&i`-#{NajDJw78vF?#J(0iKgwMl68 z?%mm}^?Q!JXh?{5VNdZ{|4i4%)y2#Cu*F248K(Sx`_KQpx%b?WnHNoiI>X%$@3Wor z?!5c-j*gBkHy&%&aenggx~{qSY-9A@+L}-MhFMpBLS!)lK;QqHoSD);)5vii&v*aXoz+D?ZBaANOPxx+I_2hv>&qX`zHW8h zu6x^35y6RjW-{KHf9>d*H_i)IJfC;6)H)7y%u5dkT3oA>p9u;S}$H+)Xnl> z>cxU@&VJKZ&$YLC=rc<+Rz*oEXd?R=oww!U{7Y;08vU~SuwwUmA=x0_^8fk|zP#v@ zxh&bEnwHkwXuZgqD~taD`$a+3?*;~1R!&a7%#77p%VXSJ7BnUN*=r&Fuc& z-wgY^@+KN=zxJTbKyYHr1p_}7^;t6Wtt)ISTkBrHd zgv-5O!<%fct;h^)fKGdV50 z<2hqQ?glx`ZR~EmyvW&Wjk?sasgdB0kcQN;&L>yi{QU6j#*>K|KTo{)pqtSD_4MY@ ze>eFpi=VlNgI2@1`M&co+no8%PQb$GZT9pK>j(S?F21Yln|U>)#hD+}AGjpkeKCRQ*TUWAvu@Teaz1t9%)OHD(;M^MwtL*=Wt|5aQ0!df z`wldB?sDqsEvdNO{=DmB!(tn%@BS?;|KGPe{gv^Y-TKepi8HKUnSwbOMLRI;9&sS=;${i{y8HrY9H=FNyn(iKZ=R2bpCsPi`pUnwd8-L_X+m7Fx5AbcR)BQPV+kx$~3Z4SWUP-_N`$dr?u(E8cOP;AQGlROX zi!vqDm6Vi}f@*{tR=@sH70y`u`bX8K6y6N$lWVHC9(!)-)i?8|MEQP}9Xh*~E?8Ig z-TiD%QHjUQ88>Ch_w)WJEa|=yBX2xgQdUt($TuD0W|8};X=Ypd)?c6h#K%xDbLP8? zjFT$E8Q;6Qi(Hv?;QeA{uT|kC4Od*j9@V*E;0H=mOKu!vyngjF>)9N+la@A0n@TP> zMlVuUxqT*wub`~Nz47mvyIc1b&7FC3^8xFNvO&T5vu=I{#Yp6W#5o?EXLDD5=zM#7 z`K^mur*(oaUY40*ZGTrpP;la$okz|rW8ITi{$O*%b|7$DF zsb#JHG5NLz-dmR*y%xKD(eltg*R_m_RM%r{>Idwe0t!PnqN8%I$7)yI`fyUSyrZMz$>ER(Z(ekynKQn3bMHvGur=*l zW=YGF{+Yfkb;5T86Ydv(Z(gkI^^9-QcfBAP;fCLfm0esmxg55bD3n!HQ61CjZ};Iq zNOaVa;`AG3x4Y*3Iwmm}l=haE)P?PPV!nCjfy@^Y;S*VV9ap<8wK8W|@8&LY!~RZf z>x+&}2Af|Vn0rxn(yDt0qnCDfr1XIz=7m%F-%ElQl@;c08d^DO+A z>D_(5uf2b>WAnKtzqwjfuO=*{$b%S7H2AEpoy&nXZnM)5ZtZFIJ9vA@X4H3yz5l{7m6)?jDM0IG`>l_t6J9$52&L$I^(`)z}@vkL!Ai+1Xl+i=Ni zr77cvuh$A5_lENRl9S*{UcUT>3io9LKNl5iJJvpf%`tn{n{W0!aPh#M7h)5wq&Vj! zq}`h77L=Z5+`zranrn?PXjZk;#Esn}6cW#&&9AvbCtjLm#$L5AtRY6UB1_V(~)@)}o*{ctX6_n2!kk>}Ad*LIJE zUm4ll-9>I}1g+b4@%*A%S+D%ln5{y?%E?7#wUktXS4m69k)6*h)4%P}(%Opj)tR+&Z_VXiK8LB_7Bp8JowM=F=X=v)#lGF*-c{bd`(4xA@^w~=PcFQz zu(oS8GuZ0)ImWwntri8Hz5P{|*+%}ZQjqg@hWf6)2}K5*r(Y1O-?~MxAg;v4^Tqwg zHLpZv6_h5W=E@$^dHT9YP;$ETOVBrqf}+n|suQa$#Vur36r2`{>?*$dH_W)&+G@!IITknOY|sJ;+w8P_(2BN{ z$mqkz8;%t!rJ5z{{dp6&{J-I}ck9{aTB~c{|8`6J>}tJhFET$!ukBjR|M}xZP9-JP zZ{o(G@y5FYA1?~3E?BGeIa%z2J}42rmb&wm z&DTZfx&5m>KQc>PQ}wDZNq%uGajmrAeY{B8#l`DI{(+en1-B-p@iVtGZeASivdVzz z#_cmjzt%-{EvR&TwtlfS*E@aCQu9S8&b$$QaP5Vr8y(Xbg$+dH-#2uScZ{%v99lH!>5 z&Fq5huEhsZzKXzxflWBoYcf8051 zNn6P`&%z(xxIH&=m%HAfHy@29WkEgn0(qw0GjIOAs2F(WO zb7}9;IhNn}@uDE>HP#=gB`ycQcJWP6-DL^tVd+aToRN;};S-$r=4T4mo9m}{K0f@WT1n8Cf}vtPd7*WvN@4u4K|n!bCxi}B{?4RaZC|EfopNN*_r ze2RCXkJ08%6=utobMNo?&2~|c)eN-CRVwuE&Zdt7&)#)hX2*^8CCPMt}cc;}D8&C8$>P8EMC2CK6VD-*&Bx;s)L z9&2xS{Po=3eD(WwS1xa{{P6qu-2D4b_N+Q9XuQBt{)wy0C3CSG_s^U&z5MEN>&%C4<_x;ZZ`?EUtmN}`!|=U<+A(bshQ{@wnLK8+2>UNHRZdg<^V)EBnN zWcaaS_Sr)cLbA$AH_fV~<`hle{N4B5;=@_?Q)U~Aud5Z?SGut_G#^SVMOb&Y=u{O~SuKlt~^-Ez>-gPX(erzwZq4@?HNH7hTF`z-Hs zrzJg1>Qu#o;)MQ=Cl~IhRlH%Yc+;H1b3HTi#+Kqw5yh+#JDV@=J1cHqe@jNf{_xKV zA)dJtY@VIr@0xziP+n%Pg3_eo!wsL$y!rNG!XD$zCl7eOvt!sHSKBx7%U$+AH^3QX z$%~{16$x`+OlZntSXcgiU7DG`)iRGWZ<5RFC#96`Ir3^{aj>gP)cgPKg)*6+cUJuS zo1o6}t;2)SXCCYM+DSG-RsCTi?|A=r<_QR%T>0|A{6_DsyVPRS%9ii8=lvu6!>^=Y zw(RWBwmy=rYMyePB75>yEHONsqq-riQd z$jQY;<+qFpXgXDvJ&%2x!R9=vBUjsI_L^;OZgjp7Srjz)w&%79R~7ua-lREL$6dK5 zf4BDUiw>q;vNObF1B;r^Kt^tCvUWd^-;#gax%ioZaD?6pcNdpUuQ#8R{+tDBZTVRk z2)sy3(|12UrFAB6$#=&C`3><5Z<{8o*w14PdEx9Ws-~wW z&pBUSQQ|Ri#?6xQ{n8eCyOtgS)k`{uKF^31mK8i!>r~RTrAPOVdf2WdFU{sCDSc`k zna#{MN1wLn5N155__HWB>v>jryrR{j1U5$HMao{Q=Cc(lDNX%-${_F2DjSX-{tQ9E ziEln_J9ikAJS9y;cQF2F11(6J#54sOj9RBY)m2UDO`@!q9vUM|S#bi|`35GK{gX$`u z^8aZiE(bF-Lh9c$I)l2|pK>O$f0g3BJ~3yjvXYV$^EG`?XfQ8h+S~ZI!S~D?Bjec; zcU0CUqO{n|R=S1MitPT*k9O#;c~8wWkE=ZoLfZ4T%4gowH@$ z%)RV3;&%g$Y_}}k+~H9w_S5ab=Fe|+AFQ<6-qGPt)s&u&DQv(({BsV60p8y%-@-oGp?R_b6?uE z6{4m`Q_`Hzy!oy2{MQ`r8i_e7Q)jdMk-c%_44>g<_SxsfgeESv=AI!f8(1)X=kKVC zf~=RsXUNJ13h~dp*#Ro9_C&uic(*xpr|^$0eY#3YlN|eA$^;5(HuE<~H#j$(ODo$j z^X`J;rKb*`ahrKF^?=&}#{+jWw#LYvVfw|~&YV5trexZ(##J8LGjB#8_-~+0rv$&4nF$6+V1SLq;K1;wsmxPd^x+%bGt7f|BTn6diQt=~Kn0-z=WOYZb9^|xepRa>89-WRr9PEhcq$o}N4 z?QFFQ;uH7GX4u1J!^^`s?_!sEX6Lhdf2l^d@_6PSb_FUMxV?9649rSoJNdKsJLC5m zH)lMMn|R1@bLYE%)(>92nAY@r_HO%in{|Q<<0T zs=rqq?db5>X2EOjX5P`UWiWBlD<-WF>ee+&g*~FQ5mpjf0IdsNt_D%aU zIpqnalNR3L&B*>A^=rnH_a7&!Xg}b~y=NEJY%%fHPQD6Tt3?mYn9lY0X)qbjX8+Rt zPGg50XtRoIqW5pk)p75#&&+;(xPh`-R{0nfqPKMefM_*#GUF?TL4r_r3q|eD|cB4HI>xb5=C+9TOJk z*y*^_BGu}GLE0rpGlO8ZAsoqJk))BG3!^9Z1JUHm_g(be4y*tY~8dZ27 z&I;1F(9|W%!)K)69d%zfd+Ysw8(&Ao^rXIgV^@7{Uz~CJxsPvt&Ds99z3$fEfAgN7 zJpZ%!-HX!i$&+g8N{;vZx*z)W#YI7e&5z{T3q6Z29c8~i39FT8HMpHR%yGtpJ{sc zuSm#w@yY7U(7mZ8EC<$DtVz6c&HLBC*}MO1o#b47hxx#-4c})Zzsj%so?3ePg#g2h zvb(ialjcWO{`qq1^Wowd_WfrYZcnaJJt@vtS+jCgo@^BB0iPG|WIgrd?iwbGO}5#x zYM-$cOG22;H~#wDdUiivd7WLK#Le*9rF4JU`_|cUw!4@a(n8DgeLn?zp7SX>#&5H% z(Dc+no%tWXeN_oxYjgkSk7K8H+A$au-u?SQC%)S3l&@a)!@r?ldq5%gWP^SXe}!{? zY|NYW({;lb((dL)2Q9CE-}LL<3ju~39lNTdCtaRAXWG;G`{m|5xia-R`?@{%rln+0 zN)9)CnlMRv^PbcYz zn~;Bh){|)}-rE0bswX+0Pq{OF_qp6X8&~DU?JZ)MG3Q;K=cM~mcMX;IO@E>oTAEP8 zaX@Eh`RVP?tMhJ8`{$$DAH7tL;n=QJ?^islA2Bd6%n-X<8#O6=@|oVenT+{sS55Ef zW0+z3{T-8OymxV|zSpJIlbH_$+bb=g#h}EMZ|_V329#@8O%lIDh>r{oX!?8LsYIN~#O<-W~NU^WVYR z(75ZhsrlO#wu`M97#JRK)TERg;Q6ulA|u1*R~>DIAeq>&n>>#*7@P^^?%r7fF>&E~ z)t$K|M?`ijpRAXXWi(jb_aoqPYxvWN zS|y1gA~|;bo`;Km9ecsUz`$T3b+0L z+~aOA{rs{P<~^SSk)D0BvW83bZk>v}->2@y z(aSF6dj4|@y=!2_l5ov8CpBi$l2!b2E1s+G%v$uG`@oWz-4Uh#UT}bt(FE=!f$}Bm z3_6%2q$kTBQ{7p(@7uZ1T>ni5FTb-rSRvzawGtGoi=9F7ol*L|d-9*v7iELre7eZU zAbs>md!gs1bobh|LFYY-3QX_GH&m|=+P^K|y|$=?oq>VjwSW2l&F}8ryBqDk{m$ff zcFT6_`+k~sQ8)O_Y)?BoE2f0SGv3TBw14oV`}fkhb)U29*ciUA*>!*G_d~wt$9w=gS>Im>FfcG&TmEjJ&dJYwpKq`C{j^eL{@G7lyYxfWo;y1qltt53e?C>| zkMBKyV}V^n=<}XFh8rH&p6N~6{(YnR-8=H0&rfE5s$@_(`EKb_tJiJauU=hLWME)e z<9~Or=E-#`%jF(M-ZI^wo5ZIdJ5-9@ZyddQ zJ1$gSN|tfM#5Ff3y<^|AaJyX08|}?Cj;sl#cTKK;y<#hV?YUb!0|Uc`y3+6WJwJ)B z{&>xE-`uAM@BCBQzRu?UyeHdKzIzrqP5P}~nK6l7{pKbv*_!>UC(nrt^#+B)B-6X` zKbKtp-dVfBKI-J-YoCf4&1T%LTKVtaA=j_z;N%f;f7fqc&$`+Y_Uvb^pxUjSRz<1KkAHohZAM{v$<<;WP|;^0bNBBFi6glx?@cQ~W=l^M)dnc5q_Yu~fC-}dFQ zrKczTT6$5FAvoiE%=OFPV{6$4qZDf4w=4PpvW~w6+%H5z~K3zYpEo zpMU&LvG(6tAbrnX`G)!%flB2E9CIdr{jl5d+M#-oN3v^U3RYLWXPy1b`s*GQcDLsY zK8^nJE397slKoom4vIR1sdL1)8|tX-tSDhQ;I`eatx#J`Z^dcruUk}hyKiS$6MpsY zy4vX1n&$5{>cf~A7z);xelPT#XSJ)@^y9i!w=6;VO}akqPJh8C>0gR_Z@l;Y)N)am z;q{4setVN1HdWmQC+B71<@U-aMHgE~lx|nI+`MX?tSr-pi)&X;EiAwFyX)6$Vg4(V zSO1P(9L;d8GyD0jf9o7&Km}XDyB7@Cj@;&b#Bi;>bf?j~0QLRr{yT>M->q`nZ979x zz)4Z|RsT-)vIzhcZLl)v3bEio5kWnufM5w zu(iCq-oL1zg#Uolk1xws%{K*wa>AjUK+E6zCOw(ESeaqR>5w%&)>pQ5|4v{1ds9eV zUJ3UBtsSN-ufO}c5>8Q^Rhby9RomM)!}; z*^`>-zC3Q~lNlE+8H6wX3|Jbs;k#42HZuc*LFL`Q9V+p%cMq=m^>@{;rxyhoYWBaB zIkwi~=hnZIZ(hlN{Y2btJA+K?+?7=)_sM>}56+GTyLbH-^^CLM)f~E6{p8|Ruc{Y2 zGyJFvw(Z${*>nBtw=3(SCtY^m&cKw-_Ktyp?XjneW5^wDZqL1S_pkjai;MW}ejMcF z+q-@Td!CcJdvMjysjGhRFIHywk!Wn#<2|W;&(inRr*kVkFX?+1J$fP6ApiJT$^X~Q z-NpI43io~M>tkeKNcdLzeWm9*ZzJaTy_12*9Ci+9h}e|}$V9U*G2_H*W{U1=cwx6bfB zephlz`nMxHzs}xG!Ozt#>q_`HEPT82%hK7#-}CpCJJyz$fT~<+|MGf;lix1NuIZ`| z34Jdo%Xr}K?3;;q=K9TeKlypzN$yL3v!~h=l<;pT4Egl+-LJR5^`3o-{apI`g&YF| zgW0loc6uk@sT}XkOMJ9$#j5n)K86R!Xa7vRGgr>+{`Z}Q-t%UEv48($aWcFeYaKi=jI!$Wf>S64(|GWN9Dcr-GfKodVRVax-}i-_IquT$7Ej}>Hck49QkXx z=ii_?+UzoW{XV_)`}^=x!TG3=zOJoesQuI@`Kp$gB~k{0zk_#b-HrEqwr|R* z>BiIbZ&nF0Ff?RdziT~tj^(cA&K;H~C$D-{-^<7N;GSWRHP`puOZ;!{nc|+Nm#$J- z@b%Kll~n;&{9Z*hlXA81@6!Dje>iHl=E)@WZcnjQ#kH5Jv-GNWJzwYl>1@fmncn+0 zK5u&C70UmPm4Tt5^VK_dm7lL(@Tnzfp4`0Z)!)U=3_HH_bTBY5FeI>*e%GF~r>=xu z_~Yx)ub`6L!l-yLGf1u>wD8>v2DL|T*$NphpFL#(5}RRow>E3i>qlvSGRrF`J)i#A zlwsMdZbOjNnR&&J%Ihz`+v|DGyn}g0o!$wMs6q9%e!d4Q{ybNC9(wiQMMVY~+uI?a zM&1FQm+u}=dgE7g=Y?3`iT%ExR)=miv0`aBxxt7Jq%rOEO~a1aVfiao)h7zD8$_G+ zgM}H?PKiyu{5)aO^suY9-P#!pDz~j<0X1GFFWxQoEK{v~@Is95wy)>E#L(J;5)Ovd zhoKIawU=++ky%tasd&|^|2=$+312OY!6v31w_MC@kt6T*$)ee!;byu7s7=PO`SG2L zjCU6Q^^BYHRJ8E7+i`{szjA^(K`t|1uv>oOlQS1(|3t)l7sZ9v7M5@@WFLpx!@F%o z%zi$#O7BU>rH(M>*n}Np1hrCgDvrHis9UmL#d7~DJ8LVJ2E(ipkYNl3CA)rKQMrE9 zFXHvdwVrjxC#6@tI`Be*;n+q{dSANZA&Dg(0C zXZz-40rOMSC+*QYSsX7N$6;nQc z;?swBB0cBLcp~_5_d(}c(>L4H+_p61Y=}&Q#OjjW{r;a;=5c8|&$J`cuNYhuY`)eT%Xtv9GInJEceRhO9?X z?4<0;HP$EBsa$`uj`5E9>a0u$afUzjkdQnO`1;-C$u=4%IX$m6~_o^Q1 zsfm}DQD9(T$VpDhFIt?Ll5CZhUzD3zl9`#Cn4YR%ke8m7nO9trn3tUD=~AInky~Ju znVDi`VrXiaXl7)hYiyd9s%v7JWT9(emSUotl$es5oML2XZft0oQdiGLac1LGs8yB%@6J24roQLoGh?&!P(*5(B_?rl`u%q$goC@z43fpI3t(Tmcd ziklXtL0H*fujdz}=B1`&6(klV=BAdU78NhdMubLjJPBedw18K-0<7H32#lrkzlKk)CG+2R6@efRq9Qr>ynx1Z_O=&X9Zrd3hrNYoOj zJ1S(8^K=AR^8u zCFdaLFmO2liqy)7s=i+9SKVJ+Q{s}c-Y%@5sodX<@pE&hpv*_hqY!g737HE| zWKd&!(zZ_8Q|qE0;J#7BeS7E6_fH#hbBy*py2kxnY0YJ^3nj@piJ7_a>8W|CMTsT( zMe&(=Y59x6X(!(imX8(OGILUk)5}teKuIUnP|rZmAiKCAH8~6_Vx(uHXTZQ9U;#}% z8qm~JjG21i5z4^8Aix1iK9^b|nS>TGs!1qDGI1F+F|ipmG4?KCW@2Pw5^;FCfa~2M z%M1H~G9plMX4#Nc_o>NImHS=`S~RZ&W;9h;=D#?1{Mb9h88Bqre;y%yhauV z76xX9mSC=d3vR144b&l4DIi$|DXCyK24|+{W#*+DL>dUQv4fq@#0d2VGb1~*69dbP zDz5C)0TQetS55XhEwzkxd3odR^-Vv$-iTk=zD!J;(YQRN{O_GpHm=Mi8c+4CYHRJg z#7sixJ*(aCCBD~u`{czD24Mz#Y|Npu{EUqMSy-5v*c-rMBdf~7XTZb8rOn33!r1&G zj)~EL2c%3Gq>Rac!9X6wQ)ZDc5Ni-Q7x;*!(Jv)h`N!iU=V#f?Ie0zh5ORn!r!yF& zFc}yY%Zkinth#hMwC|kTL)&>>vvb(|(&}$9ZT;lW=#ctpwY`n&t`d?%lMT2WR^{xz zm~XZaCZt&{a{Ge6mTE}E}%V_7`Unk~8)!9#_hQNcIK z65rFs)_u9=HMuWjmR)F?`;ONJo@+10GCaG};=SMCXSt2ylm;lvcqo%MqOW}7r4l)#k zlb&WtTrZvaetJ|@=b3YpP3%ERZ!7)W`s}1>bN;s9i;_XAK-jRzuqS)}sp`opdt)|n ztB5YDW_WNuXY!w0ZO5LRDxH3d`Jy3687QcCPJNje^ZWMR^#Pvi3pN)Y72tEol{WlY zE&W{eea(ljW>T`uP^B}ZXUZJYjd{6t>aj1Sdb?wSf=l=rd=CEAt3G_p{8iP=$`T%^ z%7n7iY>D#4;$Ex21f9J9Y@O>xO9lhx`_tb%T4;WA{bFaRGKS6S#)o(Gt^WJK<)7hn zzRo->%y9<>n7l+;2h6wi3E6)t_mYSEC zz1lh{UUj9R6+6ST3vVawEqLKuR$amYH7?;@kIW@JO4 z?5(=rEl6lCGlS`q>6uySIlro3_rneIiTz=)?(f@sGeiEc&73E9mx;kNt5(Z8`||8J z))y6FX07CmZM{}E^}E{2|KiOS3>6`FJO9j{d;NzivXW@Y>tD_6*ChRWul82#Dg#4g z^0W8ycc#TGnmWyGJJciwx#$xH>mKLU?V4Hd7gT)YGqc0CpS;ewC%eCD-Ij`l<&=t& zV!NK#dv2Yd^e1?d)bn3E85P{~GG}Z^UmKmNjIeX=?8}KU&#%_4doq8@6@%&Lxfv>- zT>8I6xa`xjsb&&);ijdWjIj-Te)ZoeS?xy>M;IMMXOu)NyqKRC{qpWbU8u_%+|AUr zA6u>aC_eMIx=H(CdxjOt`{$Wh=l$s2rf3Drl^+T=+x2M2K0aUkU0Ovn?e|WG1$}>w zeBbQw&EK#Po+=K^Kl93KYv1;tFW>#MH0)q*xLH;(>DTq$_h05B9B)5!YhuiG(|;+( z|L0gJ^D#U-^)U13{x#pLgAvJLcckR8t?^Iyihf`3ku|UPI6H%lQMv4O%Smy|r=F9X z3w3$`^QyXy+dz@1@=spvZP?r6Yz%Lhwu_gTEPLMvn)Cpx3#kU>kV#$l6T zG>U;?^Ybg0u2$uiz#`+yY{|8gUhFy6KjHUx7132!m>Fi+3O_45^I-N{cX&7l=r6PF ziT>1o&&KTC{-VtHS!|39X;*KZYLVSixs=zf9qM-n+Zo@?rY?T`aw^Xw28H5jCMLh! z7b`<07sUBwr^Xz&{-dz^hrg<6*iLo^1NAp^7MkBoU#tyPqws#&KBIST`YNLTcYxAZ z+fR1y_g_>mibCZlln2WloBHk=tDdZpv>`)-<>i-?|4n=W%lRjEYvu+=M!n?TbMXC? z%A9|Zr|K~FK2!?ED9U;%(`@HM@d|jYO@8y3Bk|bx3B&3?ggw2Jh3`f?%3A- zcYmLG`##N>jltmgE@|mY^&Nds2Q=)t^)xYN(z0-`S?1lk3=Ir<-yWUY{&V6*S*U^u z?z>CUV!oU1^FR8R&y#oa9cBiOgiGhy)ZZAa-D0wf6{_r0%Ji^fp;PvSf&yxLjMb9G zfzRE_p^^^wY@VIkv2JzEev^;4O-=6S+U%_5*4-UkglcvF6QF%L92Jve4fAmxbN(LKeYYbV@?(X zeRvr1vcPKL!nRX;9!`9BGLe@jr!#}Cq3Zgri`84i|4ez&rz3UuLc!84S=lA*3=9mL z5}#{7zW3gD?%}%mOInMkGc&AUJUlsV@8SF{ycZQu%$v6E)8@0K!6ocQ>9d!VPO??- zuGin*?o+p4r_y8Iz4(dm^i9m}7=Lq&lXof9CzidEZq$tI9X6{j~b*?CX4N-yrqpn=5|pg=uvQf5$9iV907ctrxfB z(*3=8OM6|mGaQ(oIk{xRN&acxYSWi5^Kx$PTKeg|>VD@<_fNb@e>Qb~FVDT-^^>$N zUIa(Uf_=7+z?H=FmGait4H+6{1sc_tArS4rfdrH zRNqn3WD{DrdE1JRfAW*-@89`fT=C+beD_rFvIK^NX{!A{;x>z)DP(6@@a;>u}9y0Q@z8QuRZrf93Ij^0&uZ$(jM9Za=s{jFu2 zCT-Hnm$^YRtK{Z=ac}9mFmNh71X>o}K>Emz4hV z*|odVbi4Y%Nr$0Wd7_H<+lChc3=V2rN=-VYEf^Bie2)KedHVcp>{E63<={YUxcR+3 zS4&<#ijm<&&ylZ7Ua&EoXtWi6S*^Qt9`_n;83<>%lDAvm5_0%yE_BJrlYad z?&b^*aWlVMc{J_VdJpYqu8?M6!%Xixy@@gm30)DPybPO9`)QQ*)&&Wrmw+2=6AC*c zB-t5eC`~Tw&SPk}Q#?0T=j%V`5=d`n#>^v2gGyK!6r%6sd6A7*A)c4X-_khJn=-HqqV%f4-e1;WZ? z33i4VeLpWUG6bZ5yO%Y!-_;!wJS(#&ToI9F3^{#h(UvW-QMWe!wf~-BTx#mQRBYuH zovrUBAk#QyHvE>M_bI3{mr)82WGOe*0GP1 z`F~%%=J|5_>!sFmlj=TCc>Vml_x?Y7w`?`q`V4SD%#c*_)8*-WmASIA;K*Sp^K~v^*kJsb>(a)(mrnkk;TNH%o7b&Z zmEz0#@}&2+{d-?&F5AfYvYPqQ_OPA%%9d|Q)Y&D#!0_Y@ceK@SJ8QEozp|kT<-tb7 z9%o<886`gJzr6YDyZqhfjN9(l)=hJJ`DE|X$=}WPzLvbif6c@E@3F5}t(W>nFM7?u z;2<|+>HFznHQu|Dqf5BK@lsL3^Eg1bEPrZT!GbT7)MriG=6*fI-+5DQ>HUp+Z?hNw zuiRepRzLRs`{_2IIw2)8Kl}QP({5%jnqls^XxQVtLb-ZLxJ+8ruOiKpKRH8uc`v>E z?YaDY`mg<^m-hd;Qu_GqrE4carThd}z5R<=WdU1&$1H%cK>xXn_?NPCU6h1aq zZG|(8)m|>yyEIzQp!UtpWzFUNdR^N$XzYFX;;r*e?S9j(=^uJ*7#IYOFS%Y;GQ}F& zU_Wrqu;=g`i+%pT{@tHp_q*mYWA~!$EdRoJUtS$vIzK*T*ALC0V8vY=3=AnQw_P5I zyFe52++>ON$gOKsYCl;n)1Q+Xbx`1)VX2vSzU8@++pfzt^YyG_WMH_NAl|)s0XX%n zh~#-}pgl`^>2|sFUl&jNEPpQ^JK45cZ-U(ypUb}Kv!_j6l+D24(EB=5_v;)vS+E`k zImyEoA$NnPd)?oE;7hsxM5&)VvnMW}x>WvO@5@b#msIA&axyTK9ZFr_l?M((hW?&F z&Q;4w=Y44m_Kmllel_Oml`9IdWm8^8>zlpZZm^4uf#J%E#o{_K+ia{LN%4 zb-ihMl`CJ)X;$g(JGt`sd$ro{s>{OV^;G|;GBY&nH<;-+Px3CrihojvEzWo(U3%R= z<=^L;u)}9tm$AJ(mF#OiC-YTSC&<@ZkK8#2b5MP6qRg_jYdv?p+qukKCO7MWai-tg z4L-l_u`Y8KbDz$@&>&Tmke&Im3)+VNP|y=#psOwBxqaW2l2>*YRljBz&i=Bs*!Q`d z2&iM5<^Ji<3y8}<6!1JYNIm||>wn?AmD`PXvH0>{`t5JJ_pi%i8A}F+1tE1cC6L5X zVbNANW7227X?Fjaf}?{=IRD)_%|CUW?cpnTBtV8L&HOUu-MiY`up}|xpy#mO?ne=q zfBQYG*%4KGYu}~tb7rMy`t=wY7z)=U+T5*jDS@;-eh44as_;>J`AXPly`{}Amj0)n z)n4~4?r(|CF5zTg;7GPIvx3CsAI`%THmjO)?I*ukba;{XhSlHRPW$&)=CWK)04sw- zZIP`mlEODrJgdHYE-U8i(mNRP_O5E}*O;&qj0^$G`9#)#2Aj7+^3R06xmB+}E)%y^ z+{JYH>UGW9mpZ{KEqAdnFr3*qjg|ZNG+3egR^r%0!PvqzFQ@wVtvlfJcE883Ly^m_ zRbEtOU`WtgI`!1!#nRx&Jy6E;_(S+P`-rNu4=;+Yn5Om?bz9+&#iHFy{O#IBLn=$}9lSJGdI|qum0c_hA3W~7 zxptBF@A{s16(&bppWdCS#(v^5vx;oWrHguBUCSS?SKXwFWX=SY(lgWTzQzPk+gxUhfBicR< zA>GpzjB6U3geL#{S`wU}Uc#9ceQ-&?-R&(~Yq`pj!(|W~K|ERv4;lP@Y z7Z3i+@8#o_dH!yB*VH1#n(WrKT95?5I7c%4c$C!A{yFEkR#ugs3|{)4-@`saIF^aw z#O93)P5&#toPG4%r|hXO))tw%nqTccvPO3oSZmtk_q*ROopev;uHdqu%C5ChUuVDI zu`z2aEPXTA-&|MQHC(|f=@PrYvFuO7>mRPYkYaE+7wXo|_HW_VEni;eo%~v4t7x@C zZppHrkXSG{Jxk^4``!*--qsf^Z=~7^OJA*!d-Gu0EGF)k# zc(D5YglY0|Z)W|Napzp`yOY-CZG}HKCB=DvfA+3PDq4G1j&XRqcIM_QQL*>3f_AIS zTys|V|KszOdfDE8&eyLsocXUpd)n?}XSW^|k}m!(IJtMn&45=^FCO7mUa9K*xH(FF z?W1qt(Wn_}ZH1*Pb_V`h9_%wmg3WW+1A&*z?t9tq)8ECy5Fj6xD|>gr=V$A!~OgJ_{;xqwtw%HGHI#TlvNRvmV8q4Uc#E?nslk!-^}*y<8`@HL18}k z!^DG)+R@&&&o=Gv?>niTKKs*iWD1A z(sfCa2v7g^Zcu%v&Z#6O1)QpKjczZ znG!6wV@qO5!Gn{hUYFlcIC^eg@tHSkFUrn*wyQQJWrewGMZ9hIPn|S>$EE*%+I6R=`F>y5$H)3AcH`!nmEPw& z-<{C^|Lw+uS=sX69SC{PGe)+pM{;z&9A;!@9_R@VXdVGxkKYzi( zu(dHUM%Hqlzg1#n32Rnp^yDvXi+!ipG|xW4z)-B^yY}H9m&yC5ToIL>te$pD>h6T_ z+`F~Ecl!N>tFq~QX@nC3n?6Ge?q0_1w z6JxgOL|(dcDb#N7*42OXj|Nqi&RSN!>-TR}`_LdmD}DE>*s_J*=0EnFWbayf?{?I# zs(V*%UELgCA~B(Q_uH^7CO>_<)n&Jl`+PFdgt?BYT56O(5l~-y5_@#o%`Ob+duV+^xQCYp_BZE+qdt$o!_xacSIq;I|NPH30!uE_cO>UP<;--~%4$Cvy(5o7jr(r>}J zb8FvTl&pOCDc#*XC3e<}TQArcwl*im$ZE_e`5DL)u_621jrgdI8oQVn0@}6ms)9>g z)`|RC_@aeJYfH(uIZ6^+evY1Q zypSyG6UXe8&v#CW6S_Mw`q_Lr={NshEUr7#%-{F!$Gm3AjcuJvifT$+?PM-#Y`j#^ zCMR|K!q=}aI3P~3sI||W|Lz4>ifhuP|J7QDqZtm|k-ly4A=EQ_k@crT+kB0BZo8gc znp(Ye+9~bsrSlk#f6uyeZt50=UEJ1N*YAv-n^EMuG2~y^#?8-VbR#dx$g-vc7H9qx znqI52OZj-6?Jbj!pJIQVIC68-;OXC1V*GRyeObZ6_x?k>AeJ=FjehFS?|{GhV){4coZ-`RY!szk0En zlG>mtx9v8hkA@{Pgd$INeQ`X6PHA3rS85xS# zZ#4RO^F>?DhOLt>z395NB`I#>>hFJ&R@UrZ`cHJ{T(y+~v8|G?C%xqDRJ$&+yJ}z5 zn^)F~Rvarzb(em+f4an{#NDql>)$2c+3$9zbJeSvZudVQ6?k`p>e{)d!(75s=Is2P zc~S6Yn!PkQ+jB8&ZB2|h7kgxth0ohU-W{(`2fq6@H)-XcTJMslCw?_XFK%v#x^VO6^?heA zpZCt{$ve67eIL))c+0u=7JKTx#vTp&S+8Qd^OWz`qkmL9-*=rmvFgZ|9JfQpo6c@C zy(b{cxZs;X&+5d_T$dEPmnu*5>W|Kd3Y#=-`Zj*gvc9PWE9QOXH>-VO7T3tg@GMO0 zf9FYwV`m$7-WR{pe3$a_cbjv0(>+)Dd}loKH#qN@L0(#)*3@bG5;8GcEv-~0&-wf)?S=N?!{uxH z`xpYMC5~O4!7S#ft~0q$YxcZNE?Lj)Oj&N#U;JjwUSC&V!pX2;o`}s(YtuZonVjBl z#V_(s?24^bKXJL-+e%{>tLc%Fp2}a7lUDvY8q#`w)`hlQ*jj)-{(HsoB|-+*yJGh~ zKmB*ki@rItJZx$oemJqJ)VOlOlAxUnFWvaiUt}7py@t;;Z{x{i)ml|6mF%e9Ro{xQ z@4F})`Rv_wH*yl-eR>|Ycy*lWy2(ck@=nDZTeV|m zWkOEI+3kyz8Lli-v05-s_PToQL!HZS#b>XxoaiW%b=mm)RH+~JTnq8Yi`i=>S@b+yuumCRjo@&ymW)=uv?#b;FJZrNV)x!X71 z=5$HT{E!DT%&%-%C-!p1ycb*y4zjC`x5i%mH2Fot&MgTKH$6Ri?o+w%KS58~i?%1` z)CPO+i`SWYfA!Js=tap5H!t0~`CDu{U;n!k>icWA6#hAsW%uYtz<+ZU+laHr*Em;i zoi^>AyzE3(-MiJg(@HW*+^5Z)<7m||H%Y?0-S4jZuZOM6&fDEDIq~R)RKoSS8|{UY z84k=zmN1W9H+!-0Gp~)CpU*jY>WO}emD(=WnbSO~d{0+AULR#$)!*00xN7a%&EGZ5 z_v`FZUfy=LWSLw|!Io3~)|xNdwCvOF7T)x{$QwB+WKw$eZ!0FBW>0&$n;V{OzbMO) zC4P8^Wx%@$cK?|!e?4yu?$giMmHtLob&m`)!x=?$Ul;R~kSt-|`+a>gN}qoEleF@W z-OSosDQhoUo?thQe%EW$WZ=OD#h>?_*(`ik7M>h}JaGmkg#)ATdfj+XmJCI+*r zyR)ZsNAat`?|0B;Q}tOwK@OniB4! zb0urE{$1X7ZmGM=a)!%SgI?_oxWv84y69x->lbZ}=4by2-~77yzsydv{F0(KH(qq; z+*o!hbJ8={@|0;e_vhZR*kEYI?2wx*Va|QdDqz=B)n%gHi@Y0NS?=qv)na5QUK|p2 zPc729#9eJ>y`5F!HWBZq(>;EzTC(kh*cI;RNl~BfCWXJRyr_C0L^onb&d!tfh3`%b z=C4>-)VFQ^YqQ-_C3~N2{%=z`t)uvHS>x;*i;CRd+?isdXYB66}z^=&`XB#yI!^~+kDf2-SX-T5C0p=pq36lSLe6hyb~(dc`tHq zR?wVwYJS1XQ!fOrm=?c0m9+9t;Y$IwLn|teUiy`-A}e-xqW`yD4;TKEKl9Rfm!0YK z^V6O8=HA`AXIqVk?%bE1Nfq|FYPCT@s=JsS-X=?gv+myR6>ojL+6F z4$RrWyqMc4W42UDZi&lO)uTZ_lPAT=$TGe8Fe&N!ulmW;%w5|Vtb=vF&eOR0zx&;Z zmD29)?Dx#C`&(UFr|4k`Qk;#8qYibRCg`xTC;TZ_vUB2 zG^|)|bWZM?T`J6Mc}3!LTdw@{BM+HEpM4Sxt~&PM!K$-?yw6y-t(r4)c_wJatRw2m zwVTx~OYSbVHah*~#tn+FZ@W_`<;yzc{3u=xE`f$r0ECfwTjgn?m(>(QW}EZ`R0 z=gT|o_NSR`opLIC#&7LK)(yuCf(kd+PBeZJpdGclD*olNbl37Hfs39rO*~j#FMQL$ zX3MYkN$2^RdFbJIV%yad&v`?5O)Y_wYqQhE2_hcSKB0J>o4+-&n_A zntlJ>3nm7KxUKKDmE%j zrms1bleK@YS@P_~q&<2dV9>7+|9`qmg3pL6}qee~SDpFU`_U?}cRyrcK(?UZ}vT-r?y z^ZG!+DrY)lzyF%9*@tH1S=`numSq#e1c;-CNG&6~&9OwV+JX6+_@ z@!Yuez0QWy?&fR$m6aS-))b4%FZtlKL}<{3t9 zg}WChPPF?cbGd2R3n7Jjk61yeWlyH&*SHtUE-$v;bmYl=iRk+G=NDP0t=hV!r1eR- zYdOQ!gmtOWYd>v#!FPrAbLSV~NoDI;xnUT! zXNK-ZRZ*e(Z4%G?C)bzPWPIIwQIug*d*U6vikk~B9o%z-RmD@akCmMvBrrPteP9}> zMbuNNFmp|en5<#)(@!dcL*n>mH+B%s<0)zQ!p1TzOH}vZQ?Rq|c$R zqtEY*m}p#k_NeaXzP`Q{oae-*UVio~rG%*=CrRSFgqY}3@BSxlf)Dtgi7vTTc~O+1 z!6qaBes*Nm%l#*h{$mbK__Y7_p31igCC7cX=3HAkDa@su;p(%z_gNrCCG4M8ZY{pa zI4M^4?nLLuUZu}2TzKVsQL#U@WW)d4liq=vS-b4b*R9PxuQyX(^6tdI+3vH|KNX}I zH!$!#mOFggKc(91f&NA-J_du}&$p+4^EDCKrx{sZ;yrE0mwe^s?0q744TI0ddVe!{ zdFcgT!ZZ_qwbuTwxBCNfyT!Nf2+b4G?pl4m8Cjqz^jZx)3tJMZS65^;CF^z?Jt zHOo?XFUm%yT;kpJ|KG+Jd<-{_7`zLViJdlYbA1VGK(#~wGeg>kKCo^BIHT-?$_p4Ozn~REeX(e@gFPQ=`Zsej2vfmjBH6RW1ZyO%z5 z`F4+6y1P`9wWi&=32x@|&0P5`=zOs1T+zFXXRQ4HZ(N%zANGHd)~wxC^B!M1y~w)g zg?h4c@A~e(8LKApX4h%|%)KZZ8Jg+ws(kgSqutSWN|H+4-0qs%S$vrMf`j4aQG-17 zz6dSb)b%g87MPiCoXNm%Mr7|KAsVSq3lXCjGX% z!uoohNzPuST}(Hx-`SdS{>a};-U`OZGn6gsoLb1xpqcUVjb-I(wg1zesDcW-`so20i;{*Nh3*1ec8$5VCg-qgnj97;}#ityq;fIJs$t4yj6G6;Pa&=MUf@U2FIn;rKRo($u_>xDx0c5 zxg@5<{oRavHdYoN&c5iGd1FuI+XYL1xs|xPiFVI^yW&L$1MAHBLb4MB@5{)?Y&C;f zEN<87$^0Q>Tj(Ng1_o1|%$IL0moB~X`|y=Z@+aP!Y?R8|RX4xtlaB3=2N@+Erd!Is zzEL;VV_5ia$NmjV7eD8`D0yPuw0BF}Pi!^XrCfeyzuB(D2eKC>uTD@)T74?>^W??c z&!V!!&tFz~taCZj;HLUwX@(T}!#nn0xTG<6n|}#w!0l~*ZsH6KS-zlIsig3qvPXk{ z+8O`eb+W%B@6?W7uhLULF1)Hax6SQ;vq8$^XqNd7|sq>CXF6+}>WlUD0YuRh`+x%=5gU0bEbE zx90n6Gw(x&HfL(5eLM4_O{eJld9T$L^92v|820?;PM15O=XD@i60`*3NtC<$&g7(d zrlH%yy23ofL}OB?pGtdGx-$Hd@ZGCNS1*g)Xjy2TTT$@Uf3fqb%sbod!h^g^*acPu zXuMGJobJ}X;M>+|Rr8;J5_c_sazXppwe>$MOI)ssa?KB#Wz;jfO~rGb-pj)mWs4Vr zhcQF@-kn&|bYqc_L#RQ|Z{ywDz1+XLgfnc-KO9lQ$nd29q`t z7_uCWXQaN#@#KlxVCZs+ZsrThwoW@0e&Xwv7kzUiSB3oHSsQCDCu=l&Pr%MNq2;^%V>jN|`u4<& zj+@u+?YnMtlCR_43AyfCqA$Tr@(d~N3!j_La~cPXa_mD{JEUS|6DqT=S8OMd}w)*H!>wJUOLwNgF^{>!=D6+?auMbw}e-hum=3TmeZxjz@Q)=RJ^;Y zq~O67@brIjn(t1V_)CEoB}-4K@_O#_zZ5&^ug|(@)!*m({{QMxbS2$8LneCX%SuOm?tRf``M55&#L4XD$&0L;dv&#ztLsMSouA1f&@NtO zZIinG1(SmGwVWQ1)vs&z?mj0kD|O;8>!C*lMN6ibxtCvQWLLTSDy>{)owe=N*u`sw z%iq4*mLn_sv@e(UWYOv+)wAC)nA=8va#q!yarcc?YF*!vn|?ng=X(B9+n`nQ+Cc53Po1ZN7g-yt-%HI;&Skf}P<2PmTH3Q$HU!XV;6%8kt`bUd&x|s(ek+ z@3xrxQg?6s&(4kK{H`9nqcQ98vBus>dAC1)V{d&H^z%Yf$)!H)SNyXIP0KbgKijVV z_V%Wi_pV-4?FfIPwLfCr=Ec@U&+erxdfB>ayYZE4>tw@M{!#VR@AW%5OXZ@mO0CMS zWV0p0FJG#OF0$Tq+)npzj?ykBhkYA-pYomFy@0D0PcYYPmPdhFyY<%q2{_DQ!u8sf0f1P%WDGfQs&R%C@WU-;Bq~Jk9 z<)@01_ZDmR{@h^fImuu}8_1cHU)Nrg-I;U?HbLON+-1X+8>@<>gevpS_ZnM9hxoO3 zuUBOVJ#LWKzSsLAtAp8{e*qiB8|5-CHa( zqm0b9JPSSiI{d!rb;iZctN)jmZ1`WQ+xjRj?VFb8SL2X*yvvrmt1HAfJ1hR|xxu$> z)t$GGKxIPpoBlJ)C-(leH|PxA9{l7I=cTU7i?Ua@6+G+;^E~cap3;Bc%<9Vj*Dtsj zejYaP3vyQaTH+SYaI@etw=Zb<$B($6#=EhM3>7BdPrh+o+{~>0^sCGy_sh4gZthn( z*F9UYxb~(L_wOFQuluwA{<3agTzzfr?&Opd=l|?((Q4nPy*Bcky?FMf6Wiitp5ExN z3VWlo|ElV_!c}UY{rh>p)tgu;&+z_LQsTn4b!%C_ovGELTgSAMmwU{TzdO-1ZI{_D zMh82?p2=IDGp(GspEF^)&ihGvbzNV+e)cKfbE@R&#$~p*7OiGrSfP11@87eFthdrj zoc}LhlzeE(G09}($3?MrMkWQvPBeeNa_=5X_VvDgKHfjhs}3A{ZQJhV zuHcsK{{Es-tkm6!#{1=RXH`^|xaiJU^JD9*xo^9R&&H~|n}^Ka?E17MXLGLa{Qf?M z3I06`RCF`C^cXf}1_oAreR%17eB!SMnV~YOvo`EKZnkD;6f<-5qGqK^ zrM5!jgtYbdHg3)IjSrBO-}8Lm#e@GYpZSt?QhjmtCY6b@Vs{&MUca|*%VpvHaksaB zaxKltSrKyX!r$-xuI*QvbZ1}tvir~eMb<{gr*1BO%$GUklX=1%=J<8jjnx^?*tHc- z>e_i*RBA@FFYC)U$Gz|GPWT;=XQ=&@f#GZF;=zH{?((nd4Xjp}{b0Pv zD*3H*BJW@Mj=mXP6M326PygvT>CpB|XL!ClFA_HRuEu?`T~)XD-3dYev+=t!FV}u| zX}>aUNnQ9e|ND<;d!PQ+)wg0=Qs&{pNmh%jHyyjXzBi9yLOjo7m90iS%&U|(zIEO? z|KHk|zW&B+cNrS?yq^C0)3K1J7Y~|FzxE`oY2ux#MZ!i|8w@Oe{(8~zQsQpG`|=>e z3AaNuO39H(#?;bJyZ)XTl$To)n>J;kxYPa(DBP?wL0h z6}@^VFCF!H?F$ZupGOV+cpf)oW#>(at8V$SnA_LAP?C>fg8uE8Z>r_?xg`Y&?=LQF zEYAavgROGY?c+P4H2v@8XJ@n77h5mOt|>U%pYpQ!#-^g_Z*Je+t6%MPrIVF=y6*H# z-(AX|oGEu_yS}EUZ-r}f^J+8iU*BK!z483CY3*Y0?8(gJUsINNm9RDZNs>^{taC15 zoZw%*)!Te-?ygrA!NT$B3=MC*Vt-AX88_GG%sTb?PGH zO&Y#`f4yj%DFq4%l~}pEfs3^!{ZhUACQV*$``V)~6wb6h^_{w~3Ex znD!%XPw=~QVN-)sJ_(o4**Y!r?9xw@RilOOPBiT-i7jDnsCoQp$CAQ#H(AnrlP+n` z*O9%SZuQ=KUA0m5d~=2c=W-^0aW?+H{mP};$FAKkuP+IhwuS%pqmxZKyOf*X-QHA~ zpkTE~%8mW{p5+l*^A%n$c`=P)<&xhj(W%eMcmKXSPh~aNyK>%qjdjyN;{Y8yLv=#e zO?=IHQP$FEV#TjR4=0AcUgVs0^Tvf)`J&!W?|a@d-lgg+wxx_m&TdoS{eHfgokzap zRF=4I+wo=bLtf_p;&&Mp?n@l=l)5Pu%kbp>V==G$RTEz>HQ%|i#WsAg_|RPJ>vGw-+lG#zW;se7#XhEUSFHH z>*|vECd+<(Jl30S@q4Y;CAQKCso060JAcXC*_7#9pS|)=-t=`Hc{3aDpWJfl&ik_M zq0@fcohSBAPB$-l>DKJyiysHvj*6bHU*a35y)kGyTq~1sf7n(v}S+`!@i%FqVpd1RWdlt zS&~q1y=UM5b1(XAyn^zd?f$bxr-N_BHaGu&g|nBgpL9j=?k9~lm1y0cSu?}Dze)f9 z58Cn>Q@R(l<U|cGl!>*P0k_m9>rL5qGG+Ejt75zT_CX60rl%Mg&!1U*@BDFP{*7Pe zeAa4BOS5}kvwu>ojN4b~w{N|x%*$CWhIROz`6Jl%c8&8N=XlR>zM6}>7R^~QNn339 z#UI52Z!+%&xs`EWe{ZlhX1Yc=$NVm7?TgWs!E%D4%(`j&?6)c_DScuU4Jn*@DrUv|Z(m=&$$44!`cb&kN8iU&O1X4|AM{Rqsxo)! zyyv>S;UT)W?;PkYKXJLj<(1U_RjZCimH+Tq&*Aq-=#r&?4vR&PG_#<7iAuxjwa!I{ zRJDp1d|u1lp&?<>!@OY^yTlnLVdrbAE(bR~H+j(Y*exvQX4T7D&%^;yjlC43-X(9zWJ%~BdGS4-h|XuyF!jezFML8 z)#==(&PbiNZ*pGVyCNvFBT&&L$@tmISN?0QYg|~X+*U1qYx;UZk&3hE^_MMY&NGBW zZJ#o6aX{PQ9R+{+E(j~hx^1X)3$w25m=DO2&QwcZ^~+EKhR#^M%f z>k8lU_KC0L3*w8rLz%L(Yv+vNZu8xkH9HV=8&%a{s;+>zQv4C$vsn&yIkMfx+ST9U>`M{#3CFi|1 zcHg-*JFaM|eOSEUj>eOaA2|}+56(CIl^A2bz?(5r>q6?PbJFu(Z0dUWaOvK?tF6sS z9qRvCbskf_qif&(V%;^_eG4m8=K9new_5zBQ;((P@Q#b!*Id%y+`hf@(fn(Q$qNtt zeRRyj`Q{s^*BnY*d>|KZJGs5YB_;R%%L8-g3*Y&s_2DhM$m^P|8Nz~sQzvFB#}~C| zH9XY06Yul^ zn(HQ+$o(o_P^tgmX5#BfHJ+tg_C9ly_AhNPTQ8Kq#o(v}rLzOu}8mDCZM$%qLi0_icKVu&?w`#)~^U z>lq7Xl)86vf15XBmH*2-J7e-ny+h7VG{5(wxsVMu;%ZR+@ZVL<>LAN#m7^_&94=v zT6O;4z;|+aN&0KkYrHP3O44kF!E2psp6t1I?wb2r9vtoChg z>c+`?x%!@aufG_aajH~l`?Qmfyst9Eyyno#ytBM4+r=v>;dKQ2lrG`2jd}`;E?Sj- zpSV=}_2Fx(E-o&!pD+|jgoy8877p9F@rQnPcKM7<*-)QX9y4pU1ztK=lKk=iwmyYL zYm1Y6|1&>Wd`;G_DA{V}kENw8_rH{@%wzhntJGamFz|W7>yC>vO#>C&qr#^MH{RJ& z_xI71Qg%UB?)E~4S&I%>{{Hw+a8c1E8{QqSLk?~ed@ZD;v`Dv$=|_~BNY&xB**gxe z&E`5HWV}dd$8tvQCzm{Q{@K3fQ2J%?BgUKodM-eD?Y#%}yD$Fu`7q*7J>%bvrTzVT z#Q1i`Z|M7=d(i21%cezDTS^aQv@E{&kRfZ0^{LLqM)!9$b~LpgwqUTgbTXL8T_!Yj z?#{#)|GQg7UmFB@s{@q)p{vmVfp^ptRA<*e!G@@Efxr(ebrRq0*$XPY78PwjUUp#Wan2v{#)5)V z#Vvhoo@bih+Hm3SvcgrRzIMDNTh}oee~Wcq3j=tp}EeBO9cc2<^C#7 z&Dnd>N=bl)dyViZPmZD~rH7|oagpX{*s!+LUGn1ID^y0&($ryJo)41KsIm1-k>m6?KR3ZS<uV|rz=X>eroI6~e-uSb2|K`^9ft@E@ z7PJ>We{=qMM#rBg?(Lju$JS_fbaWIMNghbeTk}!V{ML@ur9O5YS*uH(8Q$<5{W-6q zzilzE_uYs;uL?~5rIr`flrzK}ncZ>f;H@<&ek@}Ak?kzUZf(tE*dCQWW#ThXxe(!= z)7S9(Xm97Etk*0`TW9yZS?2HP^R5>b4BUAsjbmQtkw@Z7Cw0m*d|1<6q&h*Y z&RtJVa3*WQG!DOZhCH2n><=Ox=C!>zt#$8oZRow#5nET?-!-)(qb2Rg8Vf|3)~Ob1M_DZYR1CS4wyF}c)T@}*xm|6kF$*Cbs;LK`FE$idr__#*<>eXN6ue%hywr;n5bnMYuh8_Q3WLQ{msao^|Uwr&CDEo^` zf$hDT&F6PDcQk2FIJ{#O*MrB_k>LVAeX6ZLT%ONVewVc(c}HjcS*Zt`PB+;9<^1t! zdgEn3W~axu^`0N%=YAKv>cQO~E-oR@_zEY~-dme(rF!?`rv;^FW^~$c*O}{?Dl!za z7_lGVIwdws*&ekx-Bm2u3&=Jg>2EH z#!`>SfcG9fIbVZ=w8c6eRP4JVwO7XgTy*G8s6JL(!e@}VsFZbLzs)y^4XP!R+O)o?wy}6YZP|%T#Nd_!2^d7Z7yz$s^rHwyA^K|OUe7C$j@axx3(`y@DLcUE4JM`10 z;&_{;x=0kqKe?VsSHiEGzDteWxN+6VUfzH=d3OWdrh!Uda317-V(@OV^=HMrMSFI> zHG8mTv)i|p)9ugaNk?uf`uVAF?lbM*ANCh3DShe{U=iPa@ds1FJ(kxqE@tJ&U*dis z`kGH_`bj2RhemzI9cP5!U#!dDaJ={E{gPx}{v8{C=-=IS?0oy{bQ9*y6}y!Md)@49 z=3KdX^HQ#?P>Jp9=xJOZmXx~h6u7#0t+bg~(U*z_?xy}(r{vcPcXTjq_eu3=U`~q& z7x;PPZaK4f%!J>U3ubRl<1IKQd4SiP;qtPlC0&2h7<>a4v`T*#5}X*%VfX&nrOT`5 z?mV6^Q8Lv=^yl&w@6zr%R&JM7xXoz6vr75*#iK@t9cncH)vi1p_TePAQq}AS_LpNj z#n%{Tv@DNMX!^Ux`cxyc4C{m6*JR%Z$ea(nlacA>992~PPcZNU%e#|1?rvkwTD?ZQ zqvpZa>y7z!#{ZjlY+oDAUh{SJfe!_K?c5E**EtcGu{uAwcc23pn2^R&< zSKryy*tJY(cI2x|y{2}L-K52KZTxXFFZOcc#1m^YLD5#T>euTM_oT*B_PyCkbEFx* zM3+xtX8oo)^?kgl>Fw)|UmRZdeR_E3`t^I;j_qpd&?q>(gWohlT;QjJ8uOfTIRlfB z8?X2L(kl4*)Kb3gh|WDVHy4+ETegQ=ekm{as)>F*VeLnODv=s3truC0xosy_GUzo| z@xN#}V`VOuU!44L_nlooj^=H7xcS|aV|PzwN`@&(ZC?J%O8I}XtmFHwi90V?ueCna zvUuvu!)ufo4$Kay)KO@ReybDC^gin~o05`3!{Hr&(?1-pTvWLGqg%quOOIk+zgpcW zs$FDN^8IZ??j4)&prqY4cj8s{tgLP8H}l<`^zYm>QHFWj-YuA9!hFDep@qEC^#d2h z??hNVJ@#n*j?&)iJ2tizD^GsRemrTjT4cM>#T}(7wsV+t^gi63Gle_!>E*7)VN$=3 zb+$iVD}BntT`Tfrqp{%BmIJ(x%d|S#Pj#M(FysF7uKeikdmjuwEVqAJvV!48dR1L< zM@NTO`YzkV&wUgO-EamB{L&iKMqkBIgQ%f6OwyUYGS_jTW<2PXnI{L?ADwPgbrpLwo^ z{&l9)Y-^P}Iv8H(E4YfSV_EibpVy*~l`j+%-rjl?_xaoH#uBUL&gHkK`5zV%oVfn& zJWk7cSDUy^yOpX}?BI-9HK|CQA&uEWvT454T=w645Biyl#mjUaUEg&?%72bYX4M(1 zNgZa+1&&rXtM-?&!MEi|yR}yACd2wmI-V zPCM#$@1)>Gi#z!r>{hMkulVzE4&T$u8(dsO7}$5(Msx_(uDm@zW?xW)`daG~;Z6)? zVGq2y_G(54Zamj}Y<_9-$M}}Ty~mSonbdiBhH$yO_bFG=+jefjT4CO&+hlwNR?4MT zRvs7D3$(1#|6aP)Hec4!<;%7N-p5{5?!1ePJ{}QHExr44YvnryB_%Ci^|sei`*LMB zT5=Vv^wL@)z*5a*;qH=O&aSp)cPVdqOLA{K*LCxpbXj+i0M2xcVyho1C6OMbdiAUa zy06KmI{JR^<#znCxb3>Wxr~u;peN@QgS@OGyBb!UDJ^4q`_}Aw-Q(Ule6x?qx^{GE zD7ZXjpSY{dKdL;(OJj26iVIUp*;(C8L;3_?gg!c%WiIwVe8;+vOy;+~Fupce)F2Vy zZh!Um?p=qiT8=r1M~P2iX8g8x<;{Cf%Km%A9zNJ`B|2s|5AW%Kqg$^Dy0}QM-oU4^ z>;%herbR~Ev!>qN8ovJA%MDWh%KcrQE_P>FY%RCVr?FGw=4>UV1(z(^&CUl-{W*Er znHq4v^O~Xb>z9#JOOij@Gg;i;)ym|~@J4r4wey$uJe_}9BHV$EtS`TIZeR1bqvn-% z?c3b*k?t36c%&XRwVJb6qGs)OQ^mDwY-@PXD`)@Y$DSu*ST<4`K93EYM;l|QydhySXNxf(Pl6*~fsbAyb1cM&o ziOJoyXN#V${BT}TNz1ZP>e$X2r?!k5qnVrbl$~JQbkk;=fFNs3`S-4Ky!AW94g|md z|J$_mqwMBY>>N)V7}yzR#GbL6wD(TLeb<*N`|@HpZ3MM9@?!s_Y1k#-bz)IqIguD( zdq#Fffn?IhpOOA`mKUzxN|SX9ITq*Rd&trwDm`EwOT-F>_QL3L5x04J^ls(ufA~xC z><0n;YhO>@*|qQ7jlB-5OW6f4RT$% zG?f)rx+XYf_Z5}BvJTI~>XmY(=iS**ZK(gEqNv7jefYf;!4GdXl(Gt5{LPvrF7>i##pfKE{xUZ(zSf&B?6CgOmdwQ06MDavZna%MA$qNK zhncSy!<;7?^LUO+$#-8dtr23ZKJR1VR~q;9!_jMkCVZVo8W_wY)2Flw^yxi&D)PV} zZ;J>wsJ1mz4anEoW!a;wq@=WI$=988KeKWP=NE?1omYF0#`hhO^561KQA@rmZOOie%GX4v?A9r1EOoXNn7X*DbnUHM zvT014yf>~3e>TsreA~VhSx1*GnvGJ&zVe9WYNjhGDJk7*`ts{Y^vk{@KjpNZF-0^e zz1u0MbMNNEUv0K)wav^f>|MmVYX7Ep3Q|kwidIdQ?zIuD`ghE_>3h>V*9e|yBaz=Iy%g* z&5zlpHP>g3-lF!E2|G*s|9iAn6tOaF)Vmq6E9*x!L)2R94maNqf`RWf&BgW?UYas< z^P1uguRAf@^@`V(vOM*36^k^VVz*L)>)~P7UDu9x7th^ft}^pXFQ`PAExaP}PWJ1y z+#stmf`epp`CC&T$uX?kp7(KKtykX6z2^7dFh4o{KzL$E9LoXEn>pW7&86(+9a>8T z0#63TSZvxNH&t1`+m*rQb>F1tFBi7%JF>*{a&p7F@E5Ot9GPET9bO*cE+Clex1g=? zv{l2wHK1OTpkS_7_3ugdN{l{AI_&4GW0(>?ugacnmiAg}vuS?Y?(v`aA6YK&bOBdW z_uYs;GYkIqq`j6{BosQAv$ZZ+)^Vrgi>%z{NAIu6F74D|F?zpW>FLX)9wZS)@}mo(Q`lhPy0_rzP>{N>yF=kl&* z4foxh>i)Y*KX&i57rUq?E7@r}FGbeTvS`BvtA#voLSoHpe>cTBKDp5}@4kK5^2wd- zpz3m)N<9DM7^yW!mlxPu3MBM zBzVy+=;XE8${X4I8>K7E3+h(9+TIwspM4r{)b<>e#RYb{C+zqaoU>}nc(a75>+{`= zXCKy>)fFvRz4h#_julfhzD%F2e*FFWSC4kDDw@3R#ePehn9`jNO4oFko^gDt$iTJb zcwDjSg~F7?b8n5iS{Zi8NeNEfa-ep@$L&wM^i8H;`S;Z&Bw=^%?9+ko|5B|&CFHp ziyRK`@QD5GxXNg!!1Hg??fykVfs!0|X5V$cy(3>nu=i}4=>gB(4BU3A5mkK;HuZCr zJrmyM;^KO7dd^?lhSO`T|2Qc;PkLlh*D|btA zb@{*9>e`0+rR+}+a26ieSlTZ7>d2}hpM~e%s&oBJ&v$=R`kGH^(OS+s2J7-ADw0}D zSp}zRmot6%dAITSK7}1GQ%-(dX|1Fr)m>s#DA%xjjde{@oW-qzEu}}6EwL7|XM7U$ znr~4dm*aRF(dp z-<4Q=>EyM~EWfH>^DVNmIN6)}uj}RI)oYzQypF8PThr_vI!&IxD|?Ny*W9$d&Yx?~ z&D!;&k0I^(?>%-`>bLSKo@(a*THRb; zq~OlNz!A<-mniF)eEIghPi#A4eu!~?Q9kiKea)hnMMWY<9tur$39)0c>|t(TJzu=i zOX<{p<8LhQeymy0cREZ+@ag^8`QI2%Er0yU$$z`vjZLY|E6*KS9`g12HC30&4-4(` zALQvpda|r|@S`C1&*N*dCT5FvUD&no$k96|d*x5uKAE&xjq!$l{PWKnw}rUhRt6P~ zi$!lF-to?EWS(5zkyRGr===h@^YgwS$koTHTeg6WYn+%9UAL5 z#b{~jhb+};D`c49rIz<4#GYxv*siH61&^7+;?o zd9SUIt3YDAX_x!1-Qh)Njg_>t8|98M9_W_~tf+D5>)=ZHp4+J1FWOPcAvm%Bi~8+( zOdF2vT6~A|OEaj)7+KyER=??Orx*Wj<{c+@wPwh;h9b8Pp8s(4K?q`em(NxMR z`19sQYo_=cr*}1VoCvpJ_#WZ@!{Nm06*h;gl5}?M5{iA9@+hTa&aw+rO8Eo(vScsX zGwzA+X3Br>Ve(J)HHXwzo(AbP%3hHkn;+L%`GxkKa_^q6X(C#7XnSP2fM9RvgZ4s( z4~N}F-qv0db$OC*Z{f1xvB+yKC8hrXFYMP!|8bD1Ik8Jo{AJ&@R>k8txhJHrjqWH~ z+`g-{cX?E}KxFX2qYr<{E{iO`@M6W`rH8g3X?~Wx(n~LJrzq3&V_#p3e_p1eq-8C7 zjdAIM&GJ9~Id`4zf7sg@lC~-G!BO$X>2XX^(T(f$7Hr>MaQ*cwtvfrnr)6+hd_Hq% z?*2tg9WD(kgBxcWH}3t;CiQ8%(UBuu4<;$I9FIL+TG-j~>7by^!avHTcSLSn-=!G7 z_w8D52GF|fI=)x2TpoK%g)h!n@$b;xWgqu_*%hYu+s)C;bI*mP40gG)PSMw|-}^R4 zx_duMLip=xK`MPc`4Zy&;S1T>pK2c8F7p(WP3Kwk+ z;5E)2J#&Tn%wjHIzgafDl%uyzhv`fDHBnX1joBu*LT=x@d1>zHhk5*bYy#(sr{33j z`!?qxm!wO`v>$Gz%&Z09?sjeeF~NB1rWBza511a@NOo^4bd)?2nVHF0_bd28hjK$J zxBEO7ndRK}IvgJrW0V%voN(B9#_ABe)5L=Xn@f*WEDbt+ZTY0!_z?H+Vh=c9%Plgr zu#CCBWqT>hL{q_^rpx?F*IH+YXl>xQ&{OKx$;I3G&baUKPM4=)D_+#})bx0}gp^tI z-1cyn|8R7_#-=~YbG~>iD`ZNcHh;^LH!uwEmd9JZdATWY7qgIkxw_eK>=Cea~eJEyMbM#vhLAGrfI# zP4(cnFP9ITRA)Xtz5lgI{N3sO#{>nRp8WA{f&xPWgLRbolbO@Kw%wcLr}iyi>SG3* zTv?Ybs#+FiG54R$UT6`xF67G|kDO!YuE}mGT@;aUH(-^>4g2YjSG``A&)=~9UEa;+ zzbBt+gIZQaM-%U;#eC8zc&vR*)J6JEt@($!?>}Vj2-*l4QG0dOa(+_(+lI>9Pd0XT zXl!UHU-_ib=~1g&&P`>g_@311 zef5z(!>%>fULnRsKgw@7K3&L~@liA|Cikv`i;0}fvD_vmi|2YrC-1r5v}W%wtq*7O zndYU(I!Q-w=lgLgyy4)%IsS#0^lIuoT}gb&}n&%v31(Jj7o#4K5w2g{$`xP zzu>$@=L=gA3%j7}2h^218k+A!{3&_OajVNE$zj3vi1aBdB0_VWYtFc@l$-QlB>tt} z&YAn8+yw-C+1m?e8_r<$+Z(!Z&EZ`wOxYP67Vq~={J-?l<`m9?o2i!abx+oSyPZ>> z7f4K3zwNfzck4C5qZj7;*v#}(J2#`F>#azU*pBrwQ~3fYPI|?cXlPal-l#1?Hw8kGFQ1?v+b7%>WwxR2{zifX1V^&U%N|;Htt@0&QYQ= zYTadv?k2yFksoZW1R0K$I6V`3&2ekfy>ru!Gweyc8`u@HrBcVf{?e3XHyNb3rab26 znh6^9F^Q{LxL@@3L`V?_!c-of-@7*Ir{aiE3^>aR2|j%L}cG#aWaV6$Y}3|2ZojSQlQk-e=e1rw2of zK0Ylm+9(@R#$2GMP_Ai`D(k-QnSqM~;@ zU)HE!=ddIG&a+H6+4oVexj>e8|1tF7XIy@N*^hGvn~J~5AJ)}#NnXfh^K(flYwuBT zaby1MaM=o72X4W@4QICSecel^jECR-?MZ3-l^N&rfan7iJWL(W9{W@7IKj%VfE}Y zyC+MRw|-i-;;hh}+n`}$tHV=H$OhbfwcnfZI!}W9YYt~~CXXohDJECL*9bH4JwA3O z_(6NWhS+-MfA2F6s_c8atR{M|)Qh)U*Dcssp}gI8^>W`+#q5HCAI@yz`@r4$VfUpK zw$^uUcOGZ3VSDhKK}%_)WO1m|*?`*$fVDn|x~O;vxYCzQ-L54u%(l_sSd) zyr#J&GjzqCN`aa2j2zM1rwEDWvK3qot6%h3_SEga=Kc)_^aC~5@Bf$mx-DpV@$zUa9#eM8=Ddqfm?$y<6tR`XF;m=BL91$>3obp^u zX;DLmOPVjEz}9ykxC7U2%hO1n8B%ogQHlHOLnTIqW$~N79w<1mR@k49?aOO{oni-0 zGqkOBUg^_OzM+&Uu+#ER?=kyaS;yJaeDq#7KG44=tLnb-`ir_nhyOk@Td#aIuo9G} z1NVJ6xuY=RDs#;vtE1DuvF-aU=qUO>Gsy1Cmk99-5lb&OJZC(2<9$9yIFs{DCKExy zpL5I&iyKyyw)S&Ok36&d>ud4l41bajUuQczb>fX*mJS)|4$oI+7>CSa%t@c(xiss^ z$sGa=`@B@DWA7TEZb5(&v zc)@wT<&(6m`h3-eFJHNs$*j`ao8D;{PF|h7d0GBT^_JJ^Z}=L#Tl4#lt7>(gi2tDzK5xw{#&f%3 z3y3RL!J=ev>@{;q8{cis_0#fe^gw(#x&1P7` zSa5&0{i)?In*3bKnLaEkWe?O0JUV?^<$+`W}+b`_@s8A#;a(@G#rYfJ&ZiX9g zCIs2E`yb7{clzbJBix`)#m^&&G4u9*5G%N|wX0dGLH~{Fj~6luN6vR<=txsU14hhB=yhhy0|b3be_B8I`L_+@{?pxz(nvQ7&gql|L@|hTatn2SI&6e zd7bBKTE}MN1)mQju6ke5cV<(bf|g?+^G>0RJhpjHb9+_Yu0$^=u;{7gpUeK>-r0Y# z4;1QBc4R93Xf9Ly!np9!+{C*N%(>Rz-_^J+?{J)Ff9{W436uRVzGY2_UhH#~ zU5AiGb`OqCN?$(t$IeoYz2RCrABCD<`@o}69l3o9-^}ex_iG+#boJKMca~VQ;~prP z+_&h_-Z1s@p=AQ?Tjsar*cy}MP-f& z3iig@#I?%(om1L&za!zmuEwIH%U{%V9ky6>_R{DUx*)^|S3r+wrrRr(~$_qgjw@Pn6E4_sdD&Q^Rmt08tf>$6(+++RL4n(8uJoUiqXIfGr6tkZi{XXooL zTTab)G`zTLsmmLl1B@T?r9&!S$*5d-BtDh7blo;T1tl#OzQ;X#Zd!jTeILZ|{`WKM z%tt2z`l`=P-7ha|wkiL?jJNyk1^SsgUFLOby!W$UTyg3x+h_4>A6m@?FGjd5_TB3I zVPERqhwk$}o!pTSVRPkr>vKk%{TKP$?qpm(r*(6$?8LpIH_8t$IA_?kMDRA#*{OHL zyE8WTty`DI``hAkFB4~-0(#0RPS{C6sQdlYxc$@HJH?H=?$`;})$wky zoBLc&NlCu=^(;Q-52mmA?gzcx;P*jtc~+6lyKAPhVx7nS8yl6TMe44-b$j*PAb0y|!3K_k zk4F!v+cBz4uFPLt`0GP^ne=~G zcFbW|aLeNCb*&Vp@1L~m5BHt&eEDS6)vFt4#+Og9WplV;bt-+I*t+~3%hvCGYx!EB z>h>eWt8LOQA3|SGx}@;=-hbu3G<%+P0XsGS-}`rp@e%#!u9=2ZY1xPiBI*N z%N0|pT5v1Vp}xNEutxdkXN=S1tc(oKHZDKVyZ*_}&W;o7m-%v6Gtb=5v0-m%*Z$P- zXz?klZrzf+_|VJ5GH!)u=xm0$?1g1)C43WB2J#DNFjSVmp8oxA@#B^AI*jCwiL&4H96J>&_v9{h(FJ{{;V&Z ze!k_%;ZO!U4ux!4XXzFv?gy1J#~2&_{hnN?RHcxA{%`rB8K5?5h{vAYGgchPs}+4A ze?IH_?sr@|5e!F?Dzg_A-pDn7z+W$MQ(w=We=Ec4>Q6UZT%JU4R@=oqwO%x#{h*h{coytoEj=Q$=l$pKR=I>LL8sW9=9M>>vIqt$ zf@5dy-vfulk5x{JEoaT!k(eUjV&>9tzD_J+hd_th@zPcCwkOZ8>gd?EY+ISzmEN>> zj86<+Pg7WNh3me(Bxq%0+w0lix?CPFZ%OVI-&M-neJA3Nr@7es4_ex{Wgl>^&!jMrbL&Nu&SzWuJO zQ2UVmxfdQ+uPO>Gy<1}E8t)adZlj-uASfli|Fc`N`|K>16MoYiRbT1fy{l~n>NIk7 z>c8vkdSLFa>32Waz|f>`@|hWoG3Bxaf4?5cuVXIxWa@SC%_i;-z4;8k-x$9O{+liO zLE?R@s?x1RplP2pr*m@|%C_Wjc9f*2dv7mwiSwEJYFG2s%||ER)Ux94y2&+D`NB=- z58DL!m8*9+etb7;($R$n#2No^I4oNst~aT~s4zeDZBMN%`}fWhI!Yy|-mcmK(ov{>{%`-7C%0#XYXzES$$hA^fB3Y&g6{r53*T(?b6K}pMm?{P<0LMVU1)yoI2+gY3wZgo2F+>U)t0aL+o z*#mF4GoQC*PuXcwckk*I2KiqXPT0TZuQPc5_o3M`hJD`+=65M8-J0aF=Hn5bFJ25W z^LJ)EDSh2!*m-=l(%prTk?O{`Kc;N!I2SbarofqF2HV=1HNMPs6<%5r=08WQ(^PK0 z*S32}vOyZ4;(nFdaejVIIra^6OZ|5ihnQKOSvct#jPd~yrz3_ zv3|7ppWV++t-AHqx)RQm)Q(+)wQg%`K3ZODW*RWG}mzZw_Qf#i#0=DYybCf z=@(uqN|PVY4`b(VY;G&$47HFsHdXp)`K7s?YxgC-dYx5$uh%q=cZL4+^;=aQ{gnz{ zZr8IloBPMH8E(F%iY`p{J;D=jzW-xtaPRh(TK5n!h6l0FT%J_R91|4ve6R2!zFaHM z&h^vp%0OS<4e$3U$G3j#ufM_jSWCO{|4;eZ+0PIDGAVd?zvlN&X~DpASy|7nR13H5 z(U=A%V09#&zR3_AsUeXq;xWq>ers=cV+zU()}-A z=j=UfwPZq2Z0G*n8-MsR_-)M7OqY~>WU#KM^ngh{%EUw$*ZJ9MI`?BCOqM+>GL-ch(h=GnZ$ z)D%zEIhPIEmd6EWPhVfWxYxezg(~YCF13rF@0{#4U$#3cev2RHp3v351iSBZEoeA> zXNsNZ8McO5yMDy@?-cocOypNYzI$|~?o2gDSG0WcIWVpSG!)`ZeNnL?fJ=^M)T+pGoE_} z+^d8aa@GFc9?ksk_qrR(GTDEe;x~OQzoywbD9 z@(WX#|E8p;C!N_J|MJ`i{ksvrxEY>_DCizo;w1b2I)fdHygqk~-jTyjrA@Xy%m%^^ zCxYLk%LX+)i)I%P6y?7DL0xOpL7opkqeb(-MNJPdyz|kj;N;?KqAo6BX})XLb-#ao z?dX2d&ZF|zAHI=l{Nvd0ckSsHviV=j*F@RQ69%nUl3g3IR8CIp#d`)zf7av7GuV$F zu_^u4b>R2MC7zd?3)24xUt@gg)e!pO_vOj|7Vyn64mv5i{#n_NM~b08tLi3mFt8LQ zSX>kM!WiJ`QL6e+(V@GveIsY+R$gP4Q;Bz~m#z+|+zhH_HWo;@rzH65fB2X!njL&i zHN>NT3sd~A*h+0RLDt3)_t|MXN{#t=-5;m7F6P}|l>AZsZp5Pvrq6;AB+1|8*k&34NwaHq!9oV}?w&u?sKUvlx- zoquW*yp@8}^OEm61~6QYaF5__opVz899%|u5j<8 zX~8U)v({v5+0lNjq4WHME+p<@U>c0QcuUlC3&Gm z!~*u{^qfo9)wQ`_>O+1A?v}Usb)v%m;=O%KuJ<0D-ca4#JCiBgXO_|DoAbV&uHCtN zP1P&5AIaAX1q1mWd(E-Bm&vf{r$zXx#cxf`#s2FyZ2nwmcdO&U6_41%O(E{Lov&#+ znq9biO{&lIPp|@e)b<&HHGB>ytQNOyS$0eK@jlI-jumr0ybD!I&i}^L9=CSKGuPKb zQtJ=ufc9ZLzjM}6Mo@5SYw60qZPz~+sa;L~R5b5FXWHhQw-;Yr7WI09Q^1Ro*KI{l z8986G-P&YusPZoBo=b~hV0Rm&G`zQ3!j=;Nd40}sQs*VWwG)zZ{tj$X1$|vEm(7{Z?z^e46|?`a3G26w?=*s$Yu|p=k9H6E__b86j{U^u zYqE7JP5IZa94+7Sj$>0wQ6zuE?X}h`RBUW6>|J!!s;Ohe4Uk6-Utc~D{w|>AMSqv| z^a73WRaI<_@iu&KK1LtSpU*UXsfyB~qRZj3T=(a$pUhjbee0@K`rmD}#YAP~`?kij zpP7|$cM|_3-dfQ+((2**jOY2H-6wFK542>D*`@nmMA-I$SA%tARM1t{YrG*$F3+OX z1q34>81$`h*}IGH$Dg%bd)Ed0d8YYb?UYhM#sl2>jL+{bpHaT^QG36}F19t@9UUFV z{1m^hiQjK=e!bqD-=C`YJrF#>`S8XE$VA`v9{12(XJwZ7&F?hAwGP=zFt6FZ`Ke*+ zy{x+ry}O$4W*kmmW8Ac6{pPoI4B2a}PxLtjC#wHRf6b?)#4U47aOw^h@q&l=T`;jg~ck=vi7{QB}Lz$1_0LDcdo+JR3E^d5+aK4*Hd`P~QAgQ=#b#jn;H zGwE=@*m_Mc#P)7@`qVDi`8}Wc?{-nyzYfvj8@4blc4bVvu~jEO4fo?wfC+eMI;DTe* zp+uR$nNnw%y07=v^h*3a@nW(yGyC!8%_09PziYN_0@WBUs*4rMRo2Jvw|IK&Q8|N! z=Kbe^Z&)bLJaocP%}$*9N>=&GB2%!#DnS z_H|umII|(|qcrQj0O7eCH*7CHYQHwRNn>iv#v5z9?fH+&UDFLI@%}wI*B`VVC=xUb z;^N}s!nmmK^X)@(qj!7>`FB=$qV?U3KMxDGyp))7t9r-F%c~EU^4>q0wpaY1}a2Xh|=_o)}DUWmz*6^iI;y~dg1P++>_hkzh!MCRU!pv7TIi=3)ft>3#e z;dkKIt?lnwF9fdm%s%VEVWoSr6C-L?O83r>54B!=(&#v7pGdU$|7o|wFKTJoGfh`N z%YD4qqGxgW66@RRm_Mv2ZMQ$Em$&8d{u_ zV~^5zZ~PH^;)R!n9+Sb=3)gukq~xb_Pk+CtccoPoAH#X8Bhy*#Z{4?1aYaz}^!3dT z;$HJcd4-_xb7@@g_NCOFkQdLdZ8}iHZn1hp_(I;Y@PzUe2V~cs zQjn_WY!Y7>v50S)#VcLc)Th6$+m36H)rVE#>c4?7`tFX@>=T^7A)XSaY`@L`wRgG z^(T1ni2Snpd-BNSJe_|c4Yl00y0>P8IBZaFuvKi(SWp1oe0PU=LtMiatz8O>xYozJ zYzpXPkYY4oJdna5Jn`a&%@0+Qer0osoiD7*zw4m7%4uI~Po0p%+R`q5S046DCOA=7FW3_lEKllX6Ibrq6Co~qH1+5% zvEDA`gja2LL@Ka56&fr!%kYdTgGGQ!e4J9Eu_<>QT9<@J ziwg)&<>GtX!L%Y@<2ZA6)~8#BYLnHTmfSe-;e%Dd#r7^y06`FyX4?!m1^I~+~smD}! zfUz=Haw{|cnU@Kwc0EGl$5W3 zAu{#<)^{JY8|$=Wa&4~dQueqcTDzU;#nyKV_Pl!We#M^KpbCFVfrPt=!#t+-YtMgt zu(gKO)2nRlGEYW|cp@oCUY7nh|ShbBEtDf(g{CIbCI*aS7#cvZC)?SmH!rt`!a_rigqUjwkYC*YS1^aa7 zn=$swtp9v?^j5a~-A;$xT)%d^okB03F5+-;5s_In?~i+Yb+o6Q_`Tb^cQHG7zDagZ zSz#~21)324*}iHH_k#1g4$oi0#J7&g-dbBsbn5Fh${BxHinfBfx|&4{71sn^LTcvz zJ+MEl_c4q8PtJhw>D%Y|T73z4@MLna-Jg3)Rlf%`%>N*-Cm7fncs2fe>9%``cQ>lO z>^s85_%G+KV~X3;-L|i%>u)}%@c+g8oJd8j{TtqW*jNkdYecxSv<543ANW4&X`V-$ z*81(B@pMVKxjDQ!-9WJW@hb{Q1sK zvt#LeoiF}xFMl3bbggvXar^trt)k1Xy>l>NdfBju=@d^7ci&@HSBd9R4(|>KUY}T) z@})}F#nq$9Op9ZYhDOH;hYpK1r`~ON+^|V=kwSvUrO>G@Z4=h5id(hndey$~{S6A) zlh(b8zZ(4hx@E23v~$7vPJZE~we#=4Z?{UiWc$>zEapX@?nR;38lE#R$T~2XPvd&| zzOB#UlSq2c9Hq?I7kx{Ner}I`u3zQ*qA$&0!^-Ndp5NQv9oSaF|Wj0!!g7@W?X1I>!6A2bPp-6yN$VGF1g%KWNJ9l6?03%ipjx3y89CUyVZwUqoS59?wgdi+c#=o z%&pq*;r8!yf0bnZ|GTvK{M2>3ysDmCtIrYKeWlcT^&>S#^CAX^f`3nw>}o4tba8fc z8@u&S`EvV$qQlu4|5ndAU8h~bHp_XZ`S0pZ-G5m}&%~J*JE*t3%V2va_`gqjLS;?h z3pR!o>AHHkHB+~rW>mTJ{e4;O6WwLkhH0|spyI&X2%J1EK=`g={_I0n?+Mt~} zXXj|X-O&8y*LCmwy3Z})2lrl3<@e;bi@fUnXz7lkg~ALAX6}5m`f1Ix-3zVN)+}HC z=5x8#l}A_hPAcP?%N#QGbzjiFx05IB2ufHq z`h7Lw-=DME_rKlWKP$X8(qDAx`b}DSMKiv)`7ty+OHH5h`Q?#0+r!?)-oI>Beo?Wj zWckUows(xH4*xef`qtp3;JKSemuT6}y?4WG{b!Mxe!O=l1q9!H8{_%A)3I8&*L#=C zC2^{5#V(qJ(Cz5umJ&&P5tu#z? z{=cLb9a-AnQ{_!u|GQr*cpsqCV{FUp|UvkSfJqyv=QtN-|@j`2%H+OSoyY0oS zls+bHi^)|u92`5nwU42pN_^*MCf);S-ub1r7ld~u-JVmn{PnkY7evn<7R}|l%fR6K z;!KcTvCoT+D9xvr&AqKcmQB2%dw^w)|I(oMy5HC3UkJbI(dO=Uw|X!{YZr^er2h6i#%)tP?@qmO@9zEm zb-6FZ9z>@7V=XLpKD*;heEPZfcl1l#C*7Pft-I1T;C+p==KOuOC9Di4O&NzbnyGBG z;yX}$?b%ZPxJOl+&V`@2yD99~2hnvCyfFR2f?hSXR%3ot(khk%4aSUM%3!ic;e~12DURfrac*E(nXYQWoy*n}C*~U7J zx5la^9zmk!>uRGm&2}z-@O0)DC!zPJ7!HVasCYix&wYn+!MQ(`lS?kRuCu@X@??Ve z|G-}-MAs$0o5-EGq};=%v(4TB%GaTKN0djhy3W>5Ow_ReF2?X71|_eoeOo%AUSe8INIrh8GhvpIvq;trLQHdP8G z91XuVCpuVtP`Z9zo-_8-oQYjqzKC6ao?prUk=vtF*g{QS)x?-xBw zw9b9YRuy$Bf1rBT^v3KsQ7a|}DOVNGyrfi_hUpv`@rh-;qhSQaY@^0lXm=S)56X)o_xFl2ajJJ|K*iq$di_Z}#Hee2f#-vM%y z&+YWT^;_op_xBTzRb+39Gw5M%c(v=0Tl6=br>Tgii7w7R-`t&agKy)$n47nEXBm{R zFqlkwaZ`TB?YD}~3?_Z{Hmb6PGqdl1j`{zyA!Nm;+ll?(z0~hLyY-lT-P7$mt4?3t zYp156x@{#(!z+y)Z(ao16}y0|&KYijrsczH`(tT@?^{@AWpy$&~^IP){6zimca(Ps}s-At{$yPOqCg)o<_Ruj@X?zPC7E`mHv|{=V9^#p+zgZ|}Mw$Z+Au z8@7I}>S>=}es-E}vS?w{v)TBT^?kuz%AJoQw2y|}`>GWC=JXwKy!f8pY_IWVS@pBEVe6OtWUOW|S+Fr; z*V^b^YpXv?`axCx<;ZtM3V8I-2}?#(%34 zCI%BD^R>Nq{4}0j4sXfJENOKr-@l}O=FN>SqRRh9813tKoO+XYkzE#e&De;-a^L^>&+|O3;r)2KGpnLY*Qqf0uLKtpj z)k_|G$+7yylT-Stzbg*NF>qe6*SWht@$>PtJ#OAy-(Q$7lxA4qIMwHuU*<7R^>ncWxf}E7cZ8YWTG6v&#<8G>F@aU_HBI( z4Qvme?b0iIuk}4uo=5hw&Z*WfrBNFmeB1U>GJfi7?n%p9@|+Iu(4Qu6J>~p8Su2(q zEbC762j+Z#&1#;xIO|rF(p<%t8!jkzZYoSZX(bk`d)?i6xruJSKF?f+JuUZ7y?Jv% z@ZgT;PU;D#Z*bQq-qZZ}v`AJ?iH#xP{GUsQHeH#xP&?p$l(iMV>GjZs)(so}gl)fa zsc7Br?F+qU-8}PcZh865nUiD%cCnV~Ca)9jYCV&hb!hL^+qcB)JwIJ`E;m^ud2!3l zy?a-)IhXsmL{~rO@|@3ccVdd%O~t48zHD7+J!#3>$KI$&Co^{0`^Vf^)E0=@$ zWSJOxUmPuWIQs1}gDgXX)pN1C61x}~Ud=fDr>cL^_GzDPemCskUOyxLdxqxx+W03I z?Kj9u$DMfUI@wR_?6uilt!I{I9deXeAoja!N#g}c&$NyI6L!D-HbZikvZvS1cehp7 z^54DK<5MTuY{77&Oke7l=(fwfld71vFfhEDzI{g?pDZIoX~u;mpM5^g_TKqsQc?c* z_fG5&*Yk?)s*gRF{@+n-um2_Ih1CLg8hn;-?Fknv>{Ff<`|{-%H&E+nVuAH^?W5~k z`#feuESuljm*FPbsjJ19z!bN~=v{{N<-h%I@MY8vU zI>kjl&s^O7v$Ve@?~u0k(_Q(xPmQZjf6<@xFXVum8KYWn$~ZvGBRKyKeAv45SlNWL@Iih<#L zN6PfpJcb4<1C8(Vy~+}HPPn@^wa^*YUcL`8@{qt@0OolQvafF*`r+n zd%}4bgg;HvXZhs)Hqf)&w}_izfnDXBT}CA=3@kwt|Aft~U1WN7+lG)6b$h1x-&eZV zlTi|L9u9b+u^?`0@yyk# zcSUw7KfHI#YW?TS3za7wITPNNm!VXcqq&WZwSlwh=I)|1Z|9ukVPv?nw))q!XtNR) z2A@Tf&a5xLd2!{(k8izyzWMF7^NUy56_v{YcE$OY^Z%vyZ`mAk+}o=??~vK+$t7V+ zAFbDaYQ#SM(@bgAqYD=|xFvM;Pc;z(6{saqum8*yYkTL>m9eI%(?@xs^{gYl&Of)l zc6MiQSX_NGF{aM?uT#)@m2C_RuO^(fa2IiSH1kUCrOJ0@1)1BPO)t8s`n2Yk&AF*r za!>EQnY`5L*_I%?&sOFC)r(`#X63CjQH;> zcK^31aX)l+o5k0;7X&>G4K^sgUnlKUZo)iyEyrC32G0+leuv8ECL3873q><9d`(|s zw9MPdoxx%1&LziHVqbjn57pY|Z8-nt)*0tzV)d4+4^}glu@Z1R`qb&${_fT@?7@$x zvKswvIkP_9AUr&2`rl)z?*752n~LnJe+1}NPua1(2Xa`bcEU&}8D zb|xmRK6UG~c>3?H3zZoZIHTfTn&*Z*|0Ob4A@iNeR|bYxUH@w~Xg`uJV(8UVf7!3L z-@5GX?Vy!+4tJU7bf*8CyJpIkO}V?z$?9yYFZ-^n@^^3C%VTa=oNmT!KbB@5(Y;R7 ze(pUD&!-nc9h$y;U$1@UO+?M4-TxIzybsM?DOYybL@kH}R3X zt*C8K)idAf1SPN8M*g0^7A}!LH|y&yzWGL9Z70b;xWukf$QF>B;=9XpQ*`>0sQsJi)#O$oP@d$#-Yh0k_rm9Pt?M+7+rIj&o- zy4Lt}>BdE0KULJG?8~b%Nsi5bzv|$Dxfy-=xK>B!@VC74SmEyV^UOR@3~I)eN~n8&_FGpIy-EMN6&pi<`<;LJi96>CTQT>h zek=tv^-8Ma@+Ow+Lr+Q|# zc<#gR$(#l{Kj-^Y1?2IE`SA1k%GY|>+RFT7W0`JBtV z3@e&+|2@lpcXI0bnQK4M_#UHo}{|61J=b_NDd)B1nXX;U9PGUN!pO&CIpC&d$)VYPMba^Vp!38NIWft4*I} zeBJb@)3XZ~WEm!?ME_AS{ckeg)b8EtUfnPTg_mv1PKep>J!96!$H=fi^6cE(mgOP) zB9^rp=}uU5{nX>P%A2nryTr6JKY!UyquHw0w@57uQQ@5tQjqCz>GGs`Q&t~Wst%I- z9VO#ZP`AFUCay&Ii0r4&doA4tJaa4C+oX$=fs?C)mM}}<-(V_iEXw0 zJ#*uu$cbxIB6U1BX5UcyeR^h3-s9F2Yh|ME+)vxgZkAiM#Ny|FTLy-lz1zOI9{2io z_kt|v#}du^8y9~$5b;8Q!DG_e=zVveUc94Ox85^kG1-54M5E)Ko5p-PfHIpI3hR@1v+A3=B=Lr27}WZ|MW6W=MGbbL&EGsrj}6 zT1(`)Vi_4cxA=N*Kfd?{_aw8>ovaK36L!xv*>R<4p*2|fjVQJKh9%C6jW4?{lx9#^ zxh+$|e8-idyl+pljx#VcMP4>vSL_72WqpHg*U!@WX(l4O7B}|ZdNBoDI0xl^Ubw7Q zJ!9$YytQdO3<@IFZn0)kyTBLfHspp(+@e_GvbYE_2D#+cv&1=PVm8)#1=W8oVqlnj zuCz9B=3N0RaOgB}YPIrZM6Ba>R%dXSl>6JjFX(>J>0LMLL$ui#3|@L|y#3r6;+O!| zVkdT!70XYxzBvoZ^e5F!dL}Q~x3p}cPk4wj8-u~gJALo%FJ4+`4EE-X8P|O$XC}Vr zYDR<)gA93>P%KR^G5%sn_k?4z|G{Q112Ph0;?;-#qSA z&fst~v-b2`zmxl-*1l$B$U2^K{L8$I)lTJ5Etj9`MCrUdaY43MqYPXLo?Vc2 z*uqmw=jzHy>sCH9Wn>5~FRhz7S03srtqmck&P_A1E%9KMnzii3B~TlmXO&gYRS>OM1u1gB#uWltUioo?l01UW8Y(XCt7`xD;X=eT=u!=11eKZb_1#I3suexIzH za5{g&lvP)g85p+BIoWqkfAeRke_r{&-g9oT>g!Bj-@l=tvi^eY`keliYh{md9 zr*C`Vq$_n^PpjXR`K*;^XZWz`-7MoY_Ox9&79|`YpDp;erL06QY2E7hXWM_DEp30Y z-9>k0G@DuJ`gvD&q;EMFzh!$;blN3$Q_lC9YP0)~hrN_Jm0O`y!pUILeapUZ=j}bg zkETwl-SVuTm7!wc*5tI`V$*LeyPya%yW!WBYxgP}m-y#BT)uvK$@V3`lYZ`X-u%`v z)yQ<`&&{R({J53#EzjJwS9_VewW4QP%C2=&PRqzxF*D3M`Q(mk(KP?r;a{Ym-pUV> z<7ZItoc-v=x3~5eueCwq_jlFbRb#GwMmfqM3$#)kgfrgzf$TD2;QOouG{^xQ{Sn8epXGJMyn%R?e zFV)VL1-CDmtFkxj(iEwZ2bFiWY@2iXjhZIkT_%RJOHwzsFxA&&}RUXP%t@v+nwf#*d$rZq7^+ zU}u<|7c{+6yl;D5@6E3Y}%+TO!usCR(EzRU* zwchvA$ooHL$fjIkp8WR)!-RsxdEXWuGTN;Oi~O^1BEG13?rwc|AZ6qHC!e#~oWdC# zjJb*!UL{Qby6jkvz42YSM;{p#8r|-^?bx^UTQ@Xjk3HC^%XzoK(^zWvT+nFPtk4OG zb5wF)ZF=-2Fk0z)??NdC1x2sG9QhZ~dDmMY5oW??eD&2Hiz||o*UM;?tmnSV$Z+;l z+~44=H#+mp@(uPmY~pYCV{BmCqFMCYA#dkhc`FuB=v=T!)4NexEx+1kWrO+ax6ful5mL2Ro~XBiv~M;`{iX*E*tMelN7+})-II2CyYs(z zvjqdkYP)#_XKnWDTz$I9-%E;nE;9q~gL#IVYpbWccQ_I@7-ncjE9rs-(hSIbnsmGs8U*31=d9F$c4@mO@!>xTj zwgExeFZiz9DR9-j&mqgmu;Osy9F?d0lcb;Z+^l<6m-s@AVTJH(Pe9OwJn{BMD|z5k^<7jzi}nmogMXa2nnD$Mf0g_+47XvT4F zU$Crb<;RbA*+9L}b_NEi1POJ|;{8wOiv2#Xve&qTo55$1;`F%(vLIFO)-$uVpWdC+ z{hsS?<1M4>>D{eo`ay-A+3M4|TJbC1vz!)rcDt^~J~T+RgrC8usX8dF{;&cc$cq8K z8$)j_GWz((|ESY5^@Z9D4CgaDrWT$z|DN(+x_H0Cvi-bwnHWq1roDOHdi}Mv)uA0f zLE0DsLUZ5FU9Iv~Y!~y^-tx<-#K+V3wIcSbT4?7R$8*pu*_C$7qe+fU7_amzY#BZ7!Jf|pGmx9d~5%^YK^Dq zyT07Jpvz#uxH_dQCvoLpBS_9r*m>(&X`Sn`VCV7$X+>tLTdNBn-&zg|_J2{%{Ez3E zzMs9%fIE+dpwxZkgv#|Q{BxNYDmEVBc|6Z__vzcw%Z|)1zqxTzTI)N;hUbz~Yg|uH zd67N4Z}W1e;~-NQX1QnoUbNWf+x&&r0m95vBdU47ry7BhxxQ}U;T`F@-*fLTG!m14 zzscV-i~BC~f|XBw>ioJFZJr;OChZJ0!av&m`PL#`&by6L2ESc2r^iWJF*AJlBxK!F zeeI22e*dypn~VO>@#J>;&X6Iewzh2h`|}dlyXNU>x4#1ig~`fR?&#ZX%kw5(k+NdF zntCbpXw9dQ0dU$A8m%8vLHzhlwo-_u@&8zrwV z19`+DV6E)j_8G5VU65U|YhFgq8{Ot+|0hoE3=DCRmw6t~%RhH=U-^sahl4ZQQ_ zNRi&(vml@7UcPd8$Mf6kPN(;6&*;>#i`c}ha+d!t%Yt`LRQKQ1-Bsw-op-Bbj;$!v zE#XGl_w?R(>F(1mVPEy?TaaDxf+b!r1Q-rXOO*H?w997JhGc#d?9D8q;r4nPAWVLs(>4G zj~nE9$GlrvS%2-_wME-2W%kFWtd``ciS*JaA!a zvTNJ7bD@*UxbHT07FS+;^dffYzAy65+ZhG|GLm?->xmImt3E9{PyV_ z_MK%DuBc_cGoEi1{wJ1sa&Ew-9o~;8{W^11yYigU(>sgfJR^4+O`LL0H@N?dO@Tf* z5JOE@FaF%S@%6?FvMai7__j|io|z4b%x!YaN?-*H3XO>TC-ujBY0bCYphDxe8ka0Y z0mFh{XG%O?u!S6rZ>OlswhzFXq(f+t7Xcy9EmbUU3)n-Xq@1y&NrzzLp#f%B4;(N_o0wF|8` z@cJwlEuMMaqsw_Y1H-Czsq2et!O5=JYUtHClRU!ca0wAkJk}~DjB%}*F6-7$DZ05?rSgRggTq_H9&p!# zfk7xC%>B7^^7Xuh)*rh5t?BC1`I`Dqz>0;zpz_8tA&5gg8Z5-3L$0mwN=cuxtp6RT zte?fN4fmqK<%Mr5Bl`dNZ@js@t?1=%r|Ap~hc;Y*1`>l>+OwwE?cX<^nw+G*rYfjx zbN-E8W<^KH!5fR^KUr=Od_;t{1D#WD@%F#PEY|X8BrRKSIVeqVJufNaR zH2Kutm#h#Ucu!Wgn4;MUgn2Rr$s^zL*cbv4W?VaZayOVkzOBc!W=0xpQE8$^SP*{)# zi)Du5XK!rsbyDR`Znmr3k2lIYGJl7m=k^nCE?wF(asKM%%Vn%M7%o&GQq|>q|90Ix zZ1zvilikbeLd@>AyetLLo$pFEdj}^kwwITwQ4$B~xPj1No_@}6ci+;ed&!?_Rrfky zl0I79e15v=&$B@##jApLuH9cBt5_nypkP^Xh!ql0v(DVvIk)(@(%!pEx4W;aO}TY> zsh?-yi*23{CWW0W-GB1^=8%%x;O316gF_KKwJ7LDT)1X+Z`X|fCrGeEtb8!_Mo*ut__ia#;>Rbx zfAp@~ciZGM+oxwYKH*N?7Q3MF?u;esvD@xF@%MN&amvIktAaj;9{ziC%@PX-aR!F^ zgRp#gpylkmy~)*ggx&@OnpjUdYm}L{refR4w4Elmeb!Do6H`3@ukpKCdY60B>!P-t zJ#2dPow8Wu&zbS>w@1|Ky)R#Bull~&_hocSdy8Uo0y)eUyzrcm6=yul9-pA>giIUQ;}O>m6@4hWo(*k zWNDFRqHAVik)~^6n3SlSWMP!3Yn*IqVwz}TYLuL4l2eqLlL&TfMrJ`qL1IyAUWtDi z0|VnDsJk6;yE`!%tWmGb2=3_2Xr{%}rx`z)U;n~1ezIf|0|VnskfRr+LlrkIN`tVn z!CucVNX<)4$tp-JO3Y0yNi8Z~n2iXH;>JbErA0Xvy2YtEY04n?q}hUXAwpOm%tvU^ zD>F{XNG#5XP+*bQ@waIe=6Gasx+~FoiH$##70dVI-Rf`8H);k38(v-lbw`D4a(=E} zVqQr`QGP*YvR-mdVrfdMUO`cQS!N2V(<^rf25qCgEO#d^8L z`DrEPiAAZ7>8W`o3sdqEb5o&K7bWK8I6~seGcP%(G$l3VD+2?=2~dbKFfcgaj$u$x z>ZK%>B*G(j*`AYE)3o>4RNq^0@VIzNBm)CO11N%*CMV{krxj-;8kw3U7bK?mf^@(! zG)_tv9S)D=eZIn>NMl=spjLb)8~2x4+EHceMdnusz1Y4B?C3m@v(glD6Z10DQj1Hn zQY(^kN{d0+sc}(iaY4{jXROlgs1m}-!iWT=~HmTIYM zVrgNfn`mxgp=)4lYLsT4mS|~|np^~p@_0l-Z>C{ZfEcZXn>y;Tn zqjP@qbWzUlyN>hs2rW|%cDpQZDPkPkZ*joH^IliwzuCP@SyahglAM#6nH!&;nwMIXSdw29pP84IzZjf$ z@*QFMSivnbC$%`eEVT%fbW#oV4D<}Liwjbd!=NHYdM0`X3=9Gm(A1*=O+Ce!sRtgR z3=9kc9H8WLsU?z0Xc42DgkmHUmq8N~n?Vy}?*e8fMkXc^ho=j;-W{^Muy056FE%Gu z+w@Rj1_LfO4y`tibG9tZ%m$u@;s&B@%%Ln?!hCS|>L>&_IUDL3=zt`cg;n7a3eJ!m zuHamhnv$AVl9`xOtPqr+U!vgbXdoxfYh-3%VPI}(VPb4*7A4MWWMN=oU}k6u<{G%* zwo21L9b%ONl2wqB3T9()W_n&`Ub;b~fiN38*!fJ1P=7EpvNJm|u*|69%03++!76gq zWUtdw%V?LEH|}2F^waB&_=WAu#IzZW%Tvn#-Z^FC%3PxHRL`om*1k*3By`@h+WlVQ zd(F2`UL0W%X28eB94gDt$oQXyg_()H0US26sw{j4JZxOrY>X_7%`f7Z7!7zp%7j76 zm<$*Ue^{*>0$ya6XQUSBtgUozSDchp^emVTYX{Z>ZnIxAiT{|X6wxYwO?A*kewi`kMzIJFS(h`*J%&{lT%U63IocsuOOn^ROv+%6Y$zDYy2lVj>??;rqgX zQi;!;A679iFt8*^8KfuHs@_B)1S?~|9-a3$=Tm)>YvYv z=PY=j_WH%GjcaCmU7Px3!mKr(XDh5E{onTa+v`0xovC4(tQr|Nd8y|#mB@)HU-aCg zXQnJU`JR~};a!dP$$7hL>bxgKdw-g%vODY3-6i*CJ!zYC=Z5d|V?o8vk|%qEPnsXI z`uU1?_NT2jD}78o`I%R2;bZula5N?Mw&dAk6aCDV&FF30ie@^oT|8!D2{dTRh(|&`5MwOLY*X**B zwpNYKD)L!=`EE$|%_)<5SKgfQa`hJmhA-3dCh1Rq^4avOytmc=0B^h4{PWApeW%5) zJ?ywXkinotEiO1b)qmTv$!k~MojkdyXp-*Cc~$%j2NHgKzfz;Mv~JP0bLyuu>(>`ssV={EYj3^R%~>hglX`oT85u4dGY|UQ8T9J-<(D-k+n=t_ zo29dT3m+@DE8~F&GuA9#?Y4QX3cv2sYPXKl~2yU zU*P*Q>ve!Zya>aWwWX6wf6lv@<9$+c<<~P)=FCjlQ>w?n@axuowXe=g%j~x7o^1d7 z+SRAWt~DmC(_nZZEv^1~QuMJRKd*s$~v-t1* z`Sj`RwV4TKA`D-q9FC8le(%@ZITzoSocBKE>gks=my?0v-O-Rq`&Vi1H=ecU_C3Zg z%&ZJ&b?2{neO&D6rjpl7H7%`APP#UefgwR`STl zuP(dRdFia{(rfC=o;0Z>gB)={=7rkN2+zvuvgh0HrcH=j#E@`s&8+M$exz z$^FOzd4`6AW!YZ;3^eoi|NK^CFgex#wF8eiE5qkk7f$YaQ@yy-$9J!mYQN8>6{Ttn z3>gnrFTHYq<<`&JX0O+*zi-8J*pu&hAbP8syqE6&J=y;EzyaTJa0x@g{xx^w_-A^p z^LkZ0N#?ECP1^{$@wU1N(fhojZ~tH#sPN-jjuEA2To<5cugAbl>vo+dc25g-<)b zmCw08m|;WsYqi&(R&I<546au?`El)Mkh<5)p8cIW<#pbkZGTE%8+=h`W%$0KtlBnZ zRayLupgNV4F0XAE7!J(M`n3GzG}+y8k^dHziv8+lYIr~UM%?x(CGj!A>pV8CD3xPi zNO+%hvfXXhQz>Jn8JesNk;Soh@95qQUou5IDcPQZ;f40rC(fEr)ywxTs@YU3RyCU` zp`-Wx8fowCzq^*$XtVueV7PF8m*&sCD_0ivo@Kfz&3Zs!R)w#vQSjaDNuSQBEC#uk zp*XEP>+jpVw|idAUau3MA=`Fu5rc%%>iS)B^H#p|&epY`lu`(G@t&QwEB_~#toghu z|4+)#^Vbqz@NzXMZm4mOH4odZ?{|uOvQF+?b_RwBgZr8**YD1BO;3-D$jg>(+a|)$ zoU=(!O8#`Q_p4IRuq}Pe3=CTWC!N0eIiY(-+FJ9%z`gV_)2qpnAQN%dSN- zFf_;oer~@z@zbLGeT)8Nzt+&PVLi|wc|X!$^X{)>D(TzLF)=WFS#sNZW&XRKl689@ zrap~cdw4^E2m^D{(Y{@2I(O%<+G?Yp_mZ7~;mz&+*Qcy5kDYtpLvw4X#IyNK3-0e- zsWx zVe#?vBfS4ERmlb$!4~BEYJK0kcYA(FPkwrP?O}s*5r*2NtEHvE%deO(e=>3HW(EcZ z=ZD;L^D58vuGf*zl5N?!kl{t?&;Gnx>m@*(6BHl__g)2ZzXkarkyMb zer+Hl!Ro+2yQ1`Nl>4h_?@trJ0l4tn)u_{-%VMMdrN35qW6$cKKWk05n%nO6UYh#8 zM%S$P7#JKTO}X;_qU75>AKIo*&EIKyLsxz}>zqaJ9eed(B0b~xtyQAXXy8e4# z-uiU$n&S*vRtJ8``*G{FR_>qjWC29M;dzsG{atoXZhH5|JZ6Mp`6*{k*HmRm~27#JG<7C7rZjoiIX z?|rsx%kO0j87YrbVn3bT_%0Fm>H8@5hx1}8;}TYHzn*?A%3iR!o`E6ZLylhX*JR<_ zuP=k7&oD%2^ih8gu=!}IRlt#ky{g_8|@88HS;z zjNZIqH0Te@Uw>Y6Y2Aqj@(c_TN$uC7{@2u0*9N{;IDC$$p>jjsCcXQ{*J`7K=3N0B zaDK&CbH1o+KPRsL6FAJ3^S6o*RMX_Tk@)UQcfnw6${w^?!Tou{cV-&&!pE1 zhus(r+QVYQ~b^V<33*y_{AqthkTzA?;Der)~fvi00wjS_#D z85r&?pOo|B+OLV7Z@->gyO~Fr^+4mQt!wVtnMP*)-Kx?Zb)1ob;e~Mb{0mkm6apE}960jz ztET2xThD1*K&6R+irCet`s%OWex14I$kxh~ARqRA#d*J#?>&refi0LIxpHN`?EZcK zB3>&rJ1`c=t8Kgf{A$#Fp?W_C28Oj$f?i3hZS&u|taL(MdctmT;oGlIPx{4OxY`9& zngzs}ZLED|y7H<-uKmyE-Qug)&;Rv)>y-IfbD0?!8g{SF-&a}wymF?_-D{q|dYK-q z%hDCL-ktBIdp=*5m4TsQ@5=W(D$Acs&eW-nQh%w=)v$ZU4a2XW+5R&yFw{Q$o_{Y^ z?|jP6y`>ZC68Rhc8*Qx3YCmYtz~FFyM@iC}ecJgelh-zX;WlQN)RVt{z0S(@d0=aA zYM!jln>CL!!Sa9|&tIN~kFQ^I^Zo-BcEP@K_8V9HOS>2A9+m#G)Y+Cfp~k(|ZROWo z$xrs|3=9o*;aPvb&i+<1@8vs&YV$3|3~Jl1FP|E9UkV&q`@+2|fBlH~9v-~f@Ln8G zDx<-^#c{K)#Gjt<4`e)Bpl9W?BYp4AZ#{Q$b=x}0$h~{##RvaaIQa;iT4q!)y<&c^ z^@t&0@eXmcMpF4MPIFBpihN?~L)^xx6?|Jqb*n$Xyt;_ygSeJe3b~O7-*5>`3 z_o81#9D7yG19DuOpXSQ^*u9(WHkD3@Gq}O(ur~Ek+q>xOPaWXYo{_Ys?DhM;_iL7K z;k$IpL7ZWAc}e`#DXXKNGcYhLSSh+R`hUgKb5%L76?A#u$T0|CzrK9QmGZQP`hErm zhBK$0m%rCbuc_Wtv$u4D7+X<+&A!F+g0ucUR_O*;5ev$%JjoZ+*Lq&}cIi{=wVQRe zG)6OR__nL6X64uK$shO`7!KT>^5o$5`*HQ!lS{XhPHQy_U_G$w;Zef z>YA(Y;=A!#vPlbh{TKtXZ-R=JNy6aLZNc%WpWb|Y{knf^-^K}SY5WbHZ@(_}tj&Eb z!@$7srFZ3&qK{|8r+?qhw@H9)5rf42xbwOz>nEkWxK_Zxz);|jr@3@a-Q}xK<)hhW z=GVqEtl76uZld4c{ae#&!7=k?>G^ASpKghroErXG;q%J<-x(^rWmhl#Hw}~;8Q35E zFp9cAwfy?TYmU!?-K$ zU`YcDuTz`zcP-nqwY2Z&h3TvZj;wxtt>?;qzfDWPUS>O$yL3u%{;pj$Yf2~VyjJeb zVCHvCRdVh79Y$H$+~lTF@MmB)GD$GKe_OI|NedTh_Y zz)*Ev+|BLu-~5WmpJA^RjIS0OGn@*k^#SeJhE-ZgnK*O9-REzPn z>1hl-dawRDK}^+uUABDR($bEZFFKhLzzw#Yd%&S^gMWI@`xXBAvPto`^cgFHV{JaJ z{l)LumkTOR8NOXM&({5Zzclw}&})V2%Qb8Vj%@#wZ1{tnfnmY^wOUKJPiHcj%ebLt z(>i(S)&J+Dgq{Xv4+HhA%3EizPb=TnSC~KR9D{`H>vxd!)x7A6x!(Q2>Z0b~X{-l+ zoU8Kk{JAjfIjEql+)x(ycHg$rj_S*67&PwwIyMa~{4*f9F5_(J*FD!P->o~zQ1kWM zuO%w!+bzsNrNs8U<^MiCT)*Bs`uUF4tojUm^|i54!Sz)O&vP>{FmS)P@xEqzb?$3{ z@~sb84{Xmr>pdwa=EY|w28IJoT2IxFgX+lSJBg0@%sbv~{rbRm_v`1AWwuOs4ys7p z?CL(h`*gu)THb2~ZY$=5tn%+q!TwIDm}6x)OFmatDe{0MLw5ZxIjgP9>+C%JbDKaT zL!aL~v)z6A?>^JWybQ^tgJ}#tZ(r^+0;d#MP+ z+wJ*^K1VTJxpGoP`Ew;GC%w@BIyHOyb!V|(Yd(iD_~fjQ4*J~k z)5;Fyww0pQS>JcH+P&N(%Ak5zJiRf`n1g|V;qQ_upL#mOudn5cxmSAGc>m+63tJR{SuS7)wS z{JHdxr6#z2>s@p)Mh29;+OB*QUc9qrAD^8%>w%Dy#*=%_9Noykz>ttp`s(zv*L@7^ zaST4!{5)%)$)qqcFf=?2+gzHIE@vv=ZufvG;cLV>|4kncEC!{Sm0wdo7v5mjW7xIw z{Jd@j(89J!Pu_IOe(l+5_kvNB;q~_GysA4Z)*S*V_RRWwa;M!BMp1^{ljXgP%*;Ve z%ZC3&7ms|~m8!?T<3Fpz+NDeEviU%rB!81y`zm#>@ewwj0xb z?YXk+e)W&LiPzXA=C662x~5L|w2M(=z`Vo}ZsubF1gfebO+O*F1EC_|60|9^Sg3Bn+^ZVnHsH_2a_{QLLk%`r>?^SA6*2MP0?Sorw0}9z0 z!Rl*nMao;;mY;P~sNvGy0#GNFp`p_7(%W-YVh7G}HAIPk)Lqc_s`R=SbUf{|@^2l6 zu(JL`_D5aJWh$7^kfb*A1kQX+`6<>tAF;($?rEa>`2vlt`b>xU?SMr z;X(6FE1RqlCv|f1gWdsV6k{-f|~!GY;cRw z=WJ*3bdbMiWN*E^H%0CI?cY2NM=LWXP29-^S_6HiIZAHw_A47}ZFAqV9tio~W628^ zZvPk>e?Ibe)ulM@hNv!(?-+g^IB{a%bjCZ?j0TbJlWi*2F*7nSFch!9R+O2g`~B;j zYF&n~-n8gRPd`rrEwrAI?cVqP#NYR?Ilo6SOcA>LpOJxK!TLMjjT)-;87|en_|pQ? z{>;7dOKokr{%i&@koOtBOq^s>P_wD;{oCK)H5iVSU+eYcn}0q4l$7R3Yc8(dFZ;lj ztHIBlf98D~kYJ6*+;@k+f7@Fv!mzdMeerb%Py^QdYMy0z{{7w4Z5d9T{45C$a&=Yp z^)uFFzkeJ3U5CMI+qr5`R!*>+veC8j#@^b;>|70<*ROYChwpfYs^|I;{grauRn799Hpj)HvkH9Pmom3`O0m&@PqZd$7sGbjrC^G-&V z|G#yYi=iBpVjA{^@8;k0d-^*ahAdsrGhm^*>ze$#j!%DAvEh~J%_%8Qo7g}>{4DM) zvvFj7!nOb3?KQ7n1z8~>pna|H$&TH14}Y^dET5e$ZU-tV4dj=3)g?$Cn0uMg>h5AO z8(vT$sh{=pU@yb|c!n!cX1Xr6gTmUV#ZKy2vx)i55NDXE-u->|_`*?**LGn>asLrnNg(s|4v0b2n^F zj+}0t4hkLy<|lpDj3wWCQfgltfFkM7ij#((mtOir{s#q0^QtK?3+tDwWkrB4`mKUExS@B=|CnoKS?Z71P6qk?b9(uvg~7Y-hOTV}bC;_~TWy^I(#g=gMorqv z6I6CH9AMBs+2-dNwuKMmf;01Hy=(KElnT|7<-AIgL?}{yMt%|NmMv@yUY!v%1SKL>QSF{jI1u`DJ~#+p_+tD);Zsy<=zkx8nNu zW%YM$r`Du@|MK|#oq2b*sqcJw?PdS${I&P%Yc7{hmfm0e{QJJ$)rtRP7#ijo8qG>s zQp&~f!u+xKq~6CT4{A^1Jw3Viv8wd($&1w{C5Nk@exBHPchg4e(+$>KO~1pw{hE7w z*`)P#+CMLyJtEzi+|PoJ9e>5HHqP${O^0%{rx)2zuxxe_1Tj&&oVH4 zS$zA{k#BkC-%C3g7}^f}nDnHj^yIeY$&as3o3laBveJ1|$(qtl_craej%E7uwqEW3 zm)=?D?@g%rwEE=reRr)S88-0Wy(saA*&xNu`s6j`^~&@&vYVxL*urZz)uGb zPrA(KzfCr%=$GKhQ%BbZ^KOeSSFiuS^~w5ub87zV_iCJ-pF5X}p=~x3Lqp@{6cfwG zC!Xv{_BwaZqIT=9cdhnLKj6M^M$M1-?0=u`FMA)sz@Q_;%D}*!__(6z+_EQ$ z(%y1~Xa2l7bpFoId-I+=j`#cbsM}QjPt2#A(oyP64F{JqFf7p5mGt$qO{zLj|FE!p zjpy?C+QRTp6ZL(>ndJXXe{y^Kc0U$|W_Lyghx-vWv*zs9+?i5*GWosvkL{17!?wTm z{P(E)WVLg`)0r3==54M}vHbqxrQ`p_{oY|WHqQ6CANioZR`cgu|Eo10=1;!84CKOpix?Od zq~H1f;K`|6Rey_P8}2P;08RHq%&|$$F1osHlJNEIeuou)f4M$+`~Tdt`G5CDb1@x|6=7gF zv->N%>iG(XPs;pylJS?Ucn?3hyR*IER z4}0~^%b3fS_WtyJpSb@QXO;hp-Q+IFaDXA0fnh`ZJBc6h#bqZqW=Ab=Wd6QWda`*< zNtN4yDdp}AJPND~44Z={#T3MR>e}qREiYp(+p~M=`5tkf_h;YxE?LdOU=RUv%?-=h zlfvglZ+iRSnrFhlzmKm^p8wO^m4TtznUUduo$Z4QDaR{S`7QU93Pn`Ze|`F77XQ_n zPpj8XW;oCo$iT26oL%2Pt}N{2)Z5Fh|2e#2mFKzFck22 zyG=^BOQ@Rrzw7AQ%MR~sr3vDzuK7?8dOf6l%6E}e7en-6W2T!)c<*}uX_DY=2`oiy`@47 zH_TZX4orwPvf6v@|Ig*B%GZ7#Ui0>)TK;dBqQCB0`--byn=ouB=VEA3EIT&wq_li& z(V17*JQw`0%?$taSboLNZv8EOObp-s7#R#&!gM{=&g<@cHRXtF{fy}Me|obVS4#1x>-IsPN}B6uh)>V)v-|aCl6rpbTo#7936cy9&Pj(qJxSNo zsC@Hr?c@U=eoQ{EuKzRPY{qIpE+y4vNdUlFGPi*!& zXR)bNh@ovN6GOs*p0Y{P=T6=8-$6-D7Pb~()ui6XYcDgDm;N~Qq}E^iW@X*UMH8=O zGDw(BV_@K!u=v>I_?=6h9Bkj}$Moj3`uvHw?I~S$gbzFOyp*ZvFr6+g&^(t>hdM@AM z$9!Nxp*TZ>-KLtrPu=~xJ72V1^KAI}?cjOU^M9LX<=3q*6=Gm(m1JP3ee`4N$@%t| zAIP^IZ9T49|LM!5$Je%iED2y>_|mx9Tupw@swXq9uAR)l{c?xtNqPIdPtGikQfEvM z&|qMwx)Z!j?ft$zDOV?5^K1}1HeF@^?YC z^-g~7YZV83i^SMZ%k4upRmQ$nVfez$%HY6nQR)22J$#zXrbVSf3+At}*ZBEY+Y3|< zur$;yU|`62GsSt*|4P@Bw^G+mX84DlQ0>{XwlBbhswMMA~<_@r{XjZYQ{gG?9KWMB}xA?)XMuP*ZBqlq8`wq&SO-d?IY zeeM-2PKLd1j0_tZdK1^LZnc+ec6GKAZ+L$?io(X&N#oe>wJYXxkE2&EDz$(?XlNmN#5Mf{_&RAo- z_wl!9rE4cMyt(@^d-DAqYf>g!PiEi|Wo0-ZqX|kms?T$B=CUN*KWC%$^QQaMYlaLF z4qOZkmY+6l_MW$AYbjU5%<5MsPkNurn9J1Ax`=^c2J`f}Q}%p0b4`;W?Y-#pDKYz& zmU1zOH8C+fV3=E&@`<}&*KnfP3-@xJc&qB<*D4HWK*cDdMP2TvKJ_U&+a`)#I1Wn4 z-*!w&z7EPOH9-svZN|&2t4`s z+BQEXgYv$}xqmLXPBUTT(PCvdP*?F$@}%qW?S6~~-{oreKVedvHg`MXxEpfwB(2HfszyzW(bp6vK&Z*ag$_2*S@FK`9XuyY9m!;FPT z7oS`oAGRqi^0f-X=lrD1Pv1^^P3zg_$8;bjkb&XMh1YsIH_HlMi!gAfzixZN+i&)i zGa*2Ofg$a|s@#*o{&{nm5+26xQ{8#!wfq5x00xFPhc61B{PsD9k-6=9w!VgCTIp*M z1{n=jh6A+{uT}OJd7gCaj#6jLNWXdGOZLMV<$VmbXHQ!ksNL~v&Lno3TUM+N)yrij z?Rny}c_G8EnM@1``hNCGmH#r=1~Yu=6Q4hEPG!hz5r#MVtPBVCMr>87{CreZS+9(- zCVsif{+hs(KPFxCWVj*E#n4dwakKa|nT@MTxf<>j-#GPzxBpTf(-&n{h68tF3X4Ad z5RP8X@FI44j^Df;peRlAW@IQ3Z(r+EHt+o@u><@5oMBaMUjs@8Hv z17z6tqQXyA-i!>tx|kRq><6{9Ry>Yc&hSEBTxNDmjniuphBH%`7!*#vT6(hYbIeJm z8Edb{Jy^%U@YjivVZxJNpS`ZhUa?|z_#asx@aew%ItSJl>|6{9FXrww+*y6 z>&)Aeip@X~yHA6mVd1tCoyy0Hy<>JW-KbYR`C3mS(&&~IC&PDFMh2d(+2=KHTHFH} zXPs91X>$6?U`9~kA`zvY?=kQ5gKL@$Y{x(Q`uNNZ&&r)x5b$;7TrCbdMi@zOva`8JzL-k??hPHE$E~Z@4UCr?9?APa0 zb>uSVGBxZDW?*oB&bnO9eO=aEri6lAneE599Q1=27@VI@5Ix!LSN>H#Vc*^_XD0EU zj$Y32V4VoVfqG7Crm(2!l;YZ8 zh5~k01_P70&nG7Jbq6wVFAJXZTJB-1_=0dyh=AHT&V2cEnG$~3d^z#tq5F0}Mu$ZV z3~dgcpFVAlZDh)LdaHeEg(zEwKO+Oro^C%6zk3&~SPy)-RrcYFj}F7FAO;5JwZY5s zU0EHXug^)A7i+jC!f?Q$`cLOc&(|OaANhJRxgTV~4o!xJM$<>H>>d0okKRmUWZ1HV zfr0JX)9A^ds*mx2Y+t;!tuc3l8A!j>YZd*%uks6??|HLkQs8?B##tXeaq}!u&-FFy z+wRAB;I8autDR?b7#h?>7!DlJ^qg0}YW07Hy{}l8Ppz2B7E!^)knmtm{hKdV!3?n}H@IbSy+l7WHyXmo0Vf=>LDn4N1&xfs%3OD*&eJ+dy`LMJsNZ1$!|5x_a6FqZHo;0k>#&2Da;yEmeI z&u2I@ck(s$wQFhnTHvpG=NlyEd7DXN%Fsy|1T=&6udV_;PrLTt!CFrM5}J*Hw?NpSzEVpMm|6 z^>+2y_d`Cvy&bL2C=rv!z)-#Q-GY|~|NZ6n^RwRbWQ+2oqj9DTGuYX6z4Y$R+4J~) z6iD5@Q_T0xZ+XgNPiLH(ujKXXs6WccjL$l(0$g6PTC&L zy6jE484~O?7!o|zL{78GD=vEZ?B&)!Y=0TPEK<+&tb29%D*I-XZL5_eFmi zBf}X}RtBC4lg(AmTW@`G3DQSn*ibK5z5j{2+vMBdw)ioDx;q98e%4Br7hkIO+g!{2 z&G4dLTTGq*{*;;r#cL-s@QAT8d|7$XujuErCqI`@mD#_oREl9n^z=Nvp9h}nFf+{X z=3;nZJaXO7&#_+_+DR`8~z@L7vamk@h}kVf6FEevr8mA`BOt zy(VdIS6yEdadKAb+RF?M)%_OBo*e$4CCP9g=EW912A|s|6Zbstnq+Qw>w!GOyMlWc z*9tT6@EJ2K*m%+J(_wy}b+r*EH*LI@$*^F%%_|PrI)|&D!v`^T7}{7SssQ6hv_+f|E}|cOw7@d_V)W+uYQ0rnBf3Z zgxRz`PajQ+uZ{uLh?xuv{?AF5WH`XMnT6rm&5Ob(Z|iGYUW}?|xRIZppEH+X!GBGL z1i88OKA)y}$9!dPU@m?1E9L2leux}|tgJsd7T~A{DwJeiDU#l<}%#f?8FuLXWtt48V@rD01h66Gd>B*lCuIBm2 zm|&+X?d?|-F5B>T8AAi}mzK$s%I$ZiJbiS{lOf^5O?HNa|C$UB7-F{Sf?5N~|5Ows-+U?0Aa=?53@LmbWq84w#=!7Ko|WOvVNhHB%M78z z^$ag~XJ1!U{+G-)!<3cbPP=ixSKY&nWxv@Q;x?t2+_bm|s>=fz4#dgqH~ZOp+Doh# z)UCdAw-b~{XE8CnJKFa2(oAV;9fnoD9hKAjdR@3%8=2UfGlQoxx z;l^y?>yh)>4WhXic69rB-Yd&I$;=PxUGLC$zsbyya7~1vKwRH?^^-%OwhP0z)W;RC zSs4DhGcx>t+LSz5eEvl%Rt5uMZSmuAwhWt>Ff^zfU*mVLX5;O@j1Kmer|N7OHZNjG zc%dupeXnk&?0?1u_hm9A84j$`V34TFuLwDrwq1y+Vc%i~h8eP~49;&oqbI57WzJ<{ zxFPSpZc`aQXel$#+QVUL>noR-^D$gl-)F?kkPs%qz_ZlPv+n1jNrkWfF)qlz$s&+Y z1`?cKkx}$4aBVOH1N$QmR){@TxB2|ys-~^{&v4;AUlh2X#I&GZgF!-T@!Ti8{d$t0 z&E*-`4$VqkE6nhP|FA;aDQV7#0m;lbLdNqase zg0)70{A$R`!2DkQyiOShTLYu%#*mZz2EkkmY_|%tC&||ZycS_NP_vPRA>o+_1J9PX z&!_hMjOJrtKCRZkV4R+Dry?bwqSo!2xO8p856vx7bUB0D^{_^Uia z+e}q(oGi#+8#l}5*AI}QX*!GyGb~vdYF}@fJn5)1C}4GGGJ-w$>zb#J$KTI(Q7IS0g01gC$?lj4!FnNr zj0~&{2XZtRURbxU^N=fv0C`7$$IolGte70`2QXYHmn+@BB$5wn zu`?{w1c#qPe5A>wIi;Z9jKg|R2M*-JqF)n1{iEd!3{^*c%@|ogDX;cv&E@}$4ZC+- zbn-pVur54*EMI85ssP&+_!k! zagCFqA?{QDeNZ{SAGAkdxoqBFdxipaR)zy_z)3Z}VUR*otIMh44aoSEOH|YI*u{oECgW=6>-|cGkzx2W5{>$h4FWYmP^#@}b!-dOz5jR0$svoBB zt9O4=%)X^hPT%*r_p#jc{g2%*BbgX(FgM7Rf9L`^x~}BNswbl9(`#P+RQ>;1Q+0Zd zpWEKgtZj278NO^W^^R6&VE7feT;+L=*SVV}w%QNQ)(3z7w%->tBAdd%?a%M!AHDa= zuX=`rJeiGIRi6*k*EpU$_Zd7&B6#3X5W|JbYSXs*F);AV6761|ul(cW|FBQHxV`zd zJ`s=*;$o<}mF3OA&``Ol!ld#U^CW+p?J2)2RkLF&7}(}8HOx!nXJAO!rz__>@Arf! z`SZg+tt$2o)6JaAkx-|>@FMdcGaG~0sZAT7xGwiU&rxxVd6HnXAS1IIql16+8#_^k z15D9-O@7|w_Wt)~rs{I}i&ne`?gTPixD2Y+7#Mg~ua%x;zh~2va6L`SBW{fc7y=kB zTt4=Pmz6hr`Y_R^71_6uc;43ZO;lZFf0&X6EkPe!$8&giqw;atD~1Q z-TS4*HgVJD$|ru70wU-_vRtGea%N9n!%J3=FnuFC#Yn-81R_{zXp$s+k#T zT|m>1zaO4iJgMJq`IC?8pf;c}C^X)!yvF(9|K{@Ng+Wuk?>oNVfAblIQyV&^y?MHK zJYCT#@Tk!H$qboh6+M?nc_CjaZ11Vu+ac&GYksuj&`RSoiDPjo`A{*DIehG9=vJ_0+?^ z=KRZv#dG;yq|9YwnB~sc;ISG!b7}aY`SFtN>l2zB7%sYjM6UfOA0~jbvmTgUoI28^jX}h z^z=qQW`_SRj13--K@-CQ;s4D%sy-VnudBS~$)Ml>vS$S-{SVX{6O^8?N-y2n8uyd+(yO4$ z9SlY-uM6`h6$wt9dOPse4`cOrlb9J8ZmwAoR8`&k8o3UFuvGhZ`V` zrM^LlJ4-yo+n@4UJV_;Co@jF=5*xy@r>Se-QHiuP#3<{t8Uh2nIHG$22Q+Utt(v|Kx zyPigw(0%ICx>PV%!4vdUfnatgy6lNHmye2Q4UC+4*Z!>ukRhKZLA74O!I zUH-?&z~FM$uy)DG=bK#=1j0oaI_9kQo75(k1By$A>d)($m$bWY^b!_u7h&j_!ffSf zZ`=AG6yh#7E025FTOPGyZMe3G!C^_v-_Vx{YSS4R7&`Xc_Aj?8Us1}%u-1{W;lztu zk-HKt!a-|?9v$%f^|yR3+xJa=ObeE3FbGKgH|$vr+B;BK1TIzP6j?{9GhPr9Vd!XS zE?V+m;uvV@O2ZDzUkNYg<$tu~>i}hyL#gT=rm2h!3`wtEt@i?@2F8SX4Tgku$xc$` zMr#cj7#!yO{dRwDm3+cnCWm4ThJ<(3?%uV#!7=Jk{l(5<*LNMgR}6t}j10xs3%|-U zFeoU;RLm*)rtn&X;alrZtHdl9`s!4=8;|A;NkMAwn z&e!x-R!$$gvs7#SEg@NeCEsfqQ{o12&RR9?EZbyEKGzUwZA1h_% zbL#Axn-k<`y#9J1=CueznL8tcaplfSo22LND%s@6#K7=@_2d$h`h6y~yQa+74-IeM zy?-%)Qoi4jRIIZ*+pUtCbl)JLzZHb?0gT_LJhMAV(*0R@+gEH@l zs;^%!P0_q`q%$aTX6Y=4^Ybq4D7^b0697EWX%@(c_&s$c8AynTP#yZ!c7>i>f#JpK2(IVXQ_>fB|%LVmlxnz&Un1v)V@2tSuU z{GSKZE!aJsRi~_cU+3P}yIWKI!PdkiVtMAq;x-TGs_5km3V{p<4t(!h#>&RPkQo-J z`1ghTr7J71dEUx@74mY^=_QwfUaRO%D!5dt{`n_=2NM^=lBttR^bY@LWN@&`y&<5p zdV4}+>7*+^eC z4!26qr^-e!Fic?M<-PRvx_9>VD0R>Ii36o$dF@$3uD6;%f}uomET)1 zFbHh>{cf_D?k2y9b=_i~-|y$oT@<;vf11?=Mus#CS?61G{;BqTV_;B7F;4RcUKX)@ z!{xYI$F5j>{cXrA3*lU{KIztySSc8;I?w=quWiJDRf=>O< zZjBOpvsBlXbW)A?N^yRVjmbI|Db!y5!#x z>I@7Fk}KEwRlU-DEpqYe5#gZRwWVFQJnv7xUD&|N#nAHZ0`t;)>=B?EL-OTO@#dTV zHPrFxM!lU(tJBdJOXdqGP6-GwOm z{ILDfx3||cA1&S$HOu_G)logZQxp4Mq|IeIp(nz?ag}lIlDIXXx;ZHKUCe8ikHQD% z-<)0*q0X?0o0Y-o>V9kI-3$y49M8^g_Y<(^7K>27;r!p`HH$;pLI#Hw7Au$;8m4IL zPrtTiqo1HXE9=4YdQQJSMhbdpb1}4ZHCr(-cjkE0H>h4k|h1~%R3L&<;FT7%6Xb?&MQGZ)hBtrcL z>tt8vm#&Nr0fhnV3=EpzZ>C@4e3bn;?KR8p7biIw6hQ4kExuO_3<^)T6MlIayE=X=P$qXtiQ9s8KkfFe__~@R9J` zwWUq50SpXa+n$zy8_Y(2v2#nCeso1K9!PhE*cBDaz%Zf6*Y_IdBkd&n-F!L{tV={$ z8Jt`}9Rvo3iw=wp0pRtC3=SqBAI$|XGGtH?g3t^nm_!&jLSq+$tY%3MF;)hr(8~#+TA2YEXHN6H}FU-Io#LD0l7L$u46%A@CGk|Ro&~gLC zE7bbvZPl+q3uGA>0vQxivQL9j2Ll6x3Kv65j_*t)N32~x<<+b;puP_Sg9d}ZDm8u4 zB5ANeGZr&Aya<~H>J2k6Fa$6tl+4dbQw2+HaARz^Q2PgJ4g)KL)Akp}orYk!gl;B= zh1#npc4%W6A$I zircPwp5Eqlx@)QH?7d<+6T+q%EEhFmW@Wha=<=rpv2SmmwE~6WhJ0uXf9_F-%HAyr z$p))T_d7(zW=RQV7+-&UPbF3C(xZoge#!md_E}Q?i-6ZGAGam7mNwncUNz-jobujX zhh8^3t?V?`I>IuUK`A$__S8gB2jt^*d;eXpR9;S%x6=LVznuNw*_Th0*90^Ec4utZ za#DZ7tJ#nMS$TQ+>XNh9mu%N72esRm2_Cdzb`S|{NY6*WgMA1WuJKnoq`z%*A zxBC0c+K;(9N}Z|9m9b&VtesuALE${%W|6g5_#BP1^3T7V`RS)Fn>Uw(BY;6+ZQ8md zPEiI1hLrY}$!@Z$duv-S&p&Qe`&8hy%ZV}(29MRgx0kd^Lu`3j`fK8)HLK^yNx!|K zf8L6BlPD|0rMy={$3QkH{8pJ$a&Y6pwT$I+UtZa|xl}1dnu}q{-TBkKOV@zXYJ<+y z+kv|>TfQ7L^-Jg9%Wrg4Xh67h7*QXnSmZ>M?&uMzfBrpAT%H@Mryhb3`o{dx2 zy#;ALcdYx|H*s0qlPkK%tvDa`F)=**S1q>~6jBY(=2$sYeHB`67rS<{!Z{6wguG*1 znZ7e2F1@v{sN>78rGD+QDRWs0T^SjQedDSs>>xV-O5O;r`kLg$u!WbEK`HUnql8e9 zi413@Zv@Z!=bXpx@H&t|LFkp#()juV;G$%KD%;mdadNMxOwXRnQs~6kaAL-nja$|o z0<}IE1o)4CnW#4Zyij9?B^QH>n{&{w^*eh&l@CMIt9W(~{{Et(YmNfkA`BfXzC2>NgG>N}LeQ)|CFiT5x*mVKJolVz)?B7QcgBVjGk1Dbm4oJc z85k7o<}A5ie?7B6|FsIZOM2<;&$wRC*PuNa4mC12B0+ueJAKzY1wus_I+jdTy>wX~ zG%U`*@aXA_=B3s9j!tQ~0U8Oow*Fbg)a&5dmf_J;XcwSSV-bTx%G9eK!uL|0KykBR zYu)enetY>h_%*Ho4N}PvT zhNsUJ=-4+$MpIwE;>$bTukZDFB@|>!rd_8mIH-gkB-8EF~a?-Wk~HH#La=%-5=fb){UOPIuDdAI?kuXwR`K z-{8l@;LxQy`O=@Cm%h9Vs@oS5n>&}|L|p7{FJ*VH#qQpR+r2w~+&7KAtx;RMC_Hd! zsZhjX28T6&-V0uun_i^Nz@XrK<+`_Vx|hF=qNqs3a>fn2|NUL+tv69`Pr$27N3DE! z`$TKSTF(vMpX1Kh5aDT&`Rl0P@-N##_F7-L?j5|$Ls;D_HT7C1!yA8`eFB}M^)}p_ zye@hFe{H({?bmCb3=A2Ix8Iwz?{DtQf4?n%vOik1M(4-ezu&eu-+w6KWubPJjg=v3 z#RjKcKYiKOF)$=O+kAe>>vfa!c6r{~a?*;oVcU%@nm=Usz1#Jm+$wFKafH>&g4ZIT zW^2T(T`se>oB+kO?v(lRJ{sTdRbTUDSaPWPz2{;#&-HuL<}SIKCv{MxA;*oe;l{3~ z`f>9M_=Oo1PDx2Ev3@@#Z%^Q=Rh#^n6{c>>pPskR@`r4G#sbenEO!dw;ytC~L>OD?(|d|$^CQ?loZ?R6_wod5=f zZ)s~L{Ciys${;m)cdcGt@?QG&_1eh{9?QSJZcb(5=2|oPO?aMr=9$84nhA|e43ZBU zE#ubffU2PrRnlfG&W*_y))oySH&D6?C)`9BPH@Cssz37~YRgS4P6mbSsnfl$$0&=6 zN2@a?tlVLt!Kh@Xeqh4AODEkUmOJbUWKc-HV&*k{|C6m-K?{TwUYnSBT#wgZ8=F0s z#X&?w)YJTqz|X6UdKS|H8E&>QF-WG?F8$JMUl|HohQN?A720!PRPYkho%C-1eJj_^ zZt}XN3z$!6i7=e7=r;2f_y4>q8`P;i!3FIXz0I@yZtC2m`RAlE<}$o=VQlF6cERT5b$L)hlCos~AJ z4!Z&v6dvETzWw_DSx{YbLgVY#OU?XI%NYdJQ92X~u^J2$MBi0jfBn6Fs~;o735oNz z;yRyM8FaTMIvZ#vu*|h;sASm0%F3|mSnTFK^ZwniVr5YH_UhG=W*VT1EV877unVhLol4&pfyPIjUXN z9>?IYL^ncVZFD+Fov5fM_hNIEuiEWJ{0?Ryd#nEBU+PbNwFO&0S^j{9&+?5t=c14CdCq_4r`pjPpG?g?GaiZcg=k{OKTSs6Cn z+nv3%e*T-S8&83f+a`pdhqREWVr~V%6khe!SB-eT*y>7!sC$D#|=7^;(3%$kWlWAg6Oeod|u=cvlJBt}pT_ZW_HmPjnSD$QH`@Q09^Aul zdV7>QBg2g7otLZ_8+^88O)YJT{qiblE<@sC28LN1m-+m9791xm&Zf-Fz!2H>@IS+$ z0D-k9msiOqK$Lu2ye@E;?)}%7GUHNBLH4QH{XPRWs&X^Ps1z25V~ZIWqB5Roy}Y8n z=b0GDx+QnTu642sGEgGLj+cf4_AxVJ;iP1T(?eE2SOUG~m4# zg&YwE2W{28UtT!9lsM6QfGTVTg$ooe%)69lB~!x>t0w|rbw~Pir(T>jSwL|C1A|l8CTFSteb>X~KURHG zUO7#Pf#K2f3(jkW8BVweYBQXQ_-OJtkbxm{Q|9cF&$Hv=f9}1`Tx`o8!O$_;5i~Y% z!lju#TK$Hr=6ru+IaY=VX{y#s*q?cU)aCw+bDesvlY!y4X-Y>a6T?i6q~l_G0jYLe z30d6r*?Q^C*0^>#jo3f>mzJtqd_BL}kB#Anyls^SGrJcn>ore?lrG2SreyDy zHR&l?$C6nX1Qcg)_ul`{!Rlk;`u9GcX6-QeA;qA;)W*LZlwEkF)8;1d-|PhUl;3_zQPG;ofBIKh zy*v?LU05{Z<_uwc>2p@%!3#rP5FOo~OHxo~##Jz`&5SW}Ro%euIiPHYxHKeXU*=y!_!jhwbYW zwy%@ezE3Iok;~rj&H8^07X!oF@`J1(mv6aY#dxVPm`UMq&KfQ`N<+F3J`l6tzA8xgw_`{w&%Spi>Oc@U3wee2g_eB*n(4xZdXjOgv z%O{i92ER%CD7Nl@Ix`o80=LTEkO)DWf1S-X4H?#}wwt_DN3N zj$BQh&U$=O$IsVnpn^6G)Wx5;WtEH8>WzLI#l_<^zP?PJ%j6*Q^_A$!hyS0N205-Q zFg(Y9F2IYNuw|UNfMG3>MGoZtu7?iT}5?$;k z#uas%Bs7$AF%(`}KmW^N`KaYLR)6nSs#@cE3N$#-aH6WZx3sDD#TCz8Khs`|Fg$va zZr^?9QoZ$4@d$NLMaIC;a3U&HY3=G8|3CZm$Y{Nhwn*(-cCkRfP;ltbLSQZ9zTvI~xv?v_U{zp?y8-xengh?=tzk`Jqce}9>H4AlKq zIQ4E%u+?u77WIO#%0pCT=fSyrpJ!Y1iKu z_hPHwY)pt_V7R&3U;gDu^`&up*Gx9a4)rX^aV=X2>O^fc$PDCJ7xMM3w(b9#5B>}{ zpKmz4Q{Ez?g%M0AUjDUFb(}g_} zaXY0fgQ}j2zU(nxGnv7o)%e_mv@;X-{f>RDvi94B_~Z&6*HZzY{pb-tGbVp|mi1aB zx8O$NrN#YT{I)8xbvsI>7;+1LJUsaR!{UCn{g(|tAA9vcqU+7msynlnFflPOY%KDT z&pg*ZN9dfDr}R~LFQMlstJ3;(|I9lUnQtOi7N@^9$({7&(oFv<-Fr!MS*C%*K*!eX z*2|{kwZU70YxkNIFZ*&tILNWFRElBu>-+J$o(R1>#JyB6cFpB2r?)J9>{zvG$HZ}Y;x%xoU+vZ}K6d#n@Wx`2115GdBaniL8844}HCjevAwk zjY~T%eje8Y2j`o+)82=k*;C2z!QQLP~1R-B8#rw^n|xw`byRQ+nxLPj13G0&>Z zJ0_(&jQT9Qyvr z=;e0#DDb!g14Bd46V=%NtFG_PUOSn=q2iwYl)M=akIqov!UFa~1h41IPt*7O+X(9B zEV;KS>E)&AdtS|2Gg$!=E^fEu^#4Bak7M=eVO3}rnd0@__v5NHTm70Wz_~{L)TtCU^Z4|Xt0P5R_m?0mi@WxwMvIF zXrg_B>9#QM#q&S^O6e{YV#wI*zs=*h&$B1;x!|DM!O| zehWX?)mB%(UOK8@wRg`MD^7+t_fMZ*VyIscdNoqr@eVkVt_iuW68pL9`rY?cs*w)T z4lI?P{AVYxn|m&(-lMng8pvg9-ux-pyXMC0kMAu(W85qZjjyU+{*sJazjljXlg}a0 zIPZk7pRRj=n%P01CBREmk6tpL|LBSQO0fGBGD}yQe9~Os$=y7Wks;xszxR^O^FKz# zX3b@p*#Ro59~77RUdsI$H{JL1ty4a?87^gHZ!LLgvi^1aS5UHT_5mla4YRL@dmdJ+ zvi%I&oOUzeSJ6x9{_4H^PFZmp$%6cPATH#Zmwnyg>^C9n7kRxlVK52|TxwFb>iX3B zZ{UXF%?9x3)~t_VjV9G|ukV<=bhdvXcv(Tij@7wS)bysv{W-9D*F7uVO`M<+e1>m} zw;4w0eUR?2_Knt3ovA9|Ag!|3BzL7r&7$jf-xq!A{{pTSG8TTFdTHzBy?&KWxOYj+3=AHvd6t*H_fM?*61x2HuZZO*6P(+l)H}9|YOfJaS#x#irO)## zeB)H6UX57J_zk?KNT6wQ{{%gYYnfjz2F+i0Ez^jH)!}yl!;+A~ttPcQO>$RWKh%3I zv*8&ijWD#VXrAmRsW8|2%F8v4LH})DyGS-LEvVICxV3f#^6HawD+Gk^EM;S05Ll$9 ze>PJ6Y^3-cMV@!6y)r6utqx?~5DeUD?Fyd`3y|%pt?stc*>58)nau zdCl^1>g?>f3F2RSuW>fKaRLQ?L)umMwG1yV9kp_-ab3&MajTm9L;*PPGQwi7th@B> zP3ByMeN|sK`EB6lVgSt-g3iKPv&!l<%Wg|hXX~Tr#`&?SYax?ypygVTsixOB%Zgtt zyat->Vs&_OFWR9EoYNdOdzDA1-#EL#5i}q7A>lR4ZjGf3441%F0>jy^JD#^DD1vp_ zTf2cL)j&;-wA?iy=P&M`HfOV+p#3>d=k}=OH;%S><;yaHMvWL47&5N?>gt%g zv@15`s%t?Vr@~=yK3fnOcd1M0waD(5cOtDm`@9zU_;GE%r={gJ&9aSaEGqIDJ>CMsd=6O{gge`|WPZ9L(N&xXm;E*QC;}7q9QfTm4LV zEm9q^N3{t_*|Yo&ejCI=9gn2BO271W>->mxJrlq9$2=w@(5Vy*4BxUtJ43>f=O*cc zhHft(w{k5(>2oOj1}E%<{d<K@zgWzAg_xn5`bEC~jNh|EQxQov!gPqfrW;~jo; zm$=JM-S;Q;waUxO`}cqOaQNVNIZ*dwFLTN^H;A`S9qPUGY3()5Z;PwTUv50!RLN)* zJKyfoWPh){RgvnM*H%q>u(u;B<0%7!{B6)30n7({f}Miqf~SIxoL=H;xMR}o?d!k% z`Fzmc_-bOi=VbNckE&}vEtc4m-f-raF333~mo`@6eK?f(Tz86UIq{M{?5>^n>3XZ62w zud0{)+>buFF&f?Cdj@ij!|XMyC#0?0TYvGj_EOW-YnluvGToixOu>gy3i$J%?S44*?nLFK;c*ksSsb?VJUzFt%_O<) z%iZ@;>X}>H|4AMG&M~2JPq?qsxy#2v2U7Xk-BQ`R^OlvXv`pEIFE18fa_0AJm(QD< zcAwAQ=ERQ|iyfcMs7x;XAjg<+-tw(SMP_#?=(wXJ*Y(q@RUcPP{QhS1QuF&$@^<^a zx_Q~^to_$Fk||Z6&nhJIsP6r;+On`VnL$!xr7Y)iaHEppR!-!`FQ1HFi@d$Cb92eh zrm)_2wey>vf#Fd?!W2co>RnFWp!wiyYIhFxBQvD z26S$m!ahVtW!Y`ij>_S?@z>WK+`|H$w{h9=+q?Oe+soI&d%LvOPG$x%a+zg z&nR?hjuEEw`|*ZtT21)t=j)j`Wg_dG3|@+|hX$%5UblLSITJ-fxd zwZpwyTY~~8h6E{vhOzbUIv;-H+)2)9QfE$2uKLc`_KhEDrfb`M_YSiV&%^3fkd<%T z&+`iRzW>^8deYb&w20=`+c%DvrWi^Za53bXm94rS&3a9f;mx^|z1~wyGFC5HQVKdd z@5udV)=S;qYl07)x}y5%iG0Vpt`@Z&Zl0;286$=Xl6j}UYw=ayvvKi1$(Q-(_8C1k zm(ZYFyNbImo?Ye%sdo<=XVzMpu6U7*nS_L5C4DwfkD za_54kvS%(`=eg^dD0m)AVA|WSmqhieubP1tFY2scJL|zDPERkjqo8&+!;(9%f?l4Q zzIWCRhdG6l;-t*)W|yuk6=L}PG(^Xf)AQAXBVc7MkLLO>jX%4P@r23uv)`(kH*+ZH zaVS{{kn{~Ob(}imR@?!+A!zyBrcxI zpc1dS()0TMS6|;ny;jLs|DAiObXtYsGUg8c!lfX+dT9zwng4(P0X3^@7 z(Yo5x^lDG8UU$-pv*DUY)!NBrnhY~QCwMVDyanqc$%tFCF1=J4yhjVv+sZIq9_!9f zF+C!4Iw(ADE<*H`E(B$tT2eg!v(~z8eoPB|rOKokA4qLIp#wTvYtyM~uO75a5>ohe zZHnjOd0%gxnexyfW@@-kf#@Z1u7*zwqtrV6Ku3XPZrmCr^>@y7_2@N|6XNY|D$O;X zIk{fpn%(~Y@xLC)FeJxJUQ#b{1e9o}X|3b)Gf1z^n#;0#cC^Oa-#Ul?HSQ>$fB(P! zTPw~5b3WI5*MrVdOWFLY>g6Nxy`Zini}l_;K2o2X!b9hl3NgH$I^}*fdFuM8eX9T+;VH0d zuKN7bU3=yJ&kNoz^V;R+(p_=8>e{Ynui<4&5nFC*{eQ>lmvxzw!@O=y`v#hwKJXmT z{Zgsc(VVvLr-=H02Q{yX+E4cN_nzjf?O3v;|FSG7ZTwhtb?K!O%lD}1@wl-m*wjZU z&HdYR{Z-Iw6$Yn(FspmHcYf+u^ZfYk!@|M9(7>@Gds5!%@4IqlT@OoJ}t{EAG7h8hXu> zq2;vx&qw>;1~QbqSaS0vH)!F_oA}hVUmlz9Ip+6OYtbxC`v z6hmUMmx(>of+u3zPkOGtEDl;elQDBU*OK-AJkz+>tlRD=lRbGB9T@_C!DyxDpwcJm&)n@Mw78YY@PEmvWy z{m3o*{o9&0wzIFUc*e{(oNoHn#uwB=0AsIXl3II9`#u5xgsL$7R>!-aD)J-kDm7+QV}YvG}?B z^t%@Z54+=Ue^!U`WRfMzJBp*>fJ|X zZ$53UwcYuf<^J8$PpXrwTIPZBoJTXCpH*r@$-98%o7ueneqJNI)hBT2mv2%puZqUW zi+K62sbN@9+4{6xW#5+H;({k)*{%uD9QHo5of9o*DBS19QE zxr5oOUN3D+*`O0&>1*H^AK4qS%lTG-s%U71XsB1K=%rs?x8L(Ss1^MWs%y{wY1A-D z<$Y}b@0x{6>JpEFa{_~AaH!pluU90lZ}}asGOKoGaoi_kr*23$FX;H|!+Yoc@&2vN zpt92?sp^$5DDg2ggnZ`Qe*O3VrD7rsskUF&E$Nz~1~F{q^Q+&O93ICs&#Bj5+6ZbF zF*vL;Ez7!Kr~c`FJ)?rBXC5d^F)%2c+Vkb(HO{=>`~K}qWp!{rJ0)cPDsVHML1F8h z@9)jNf7jJwIF(;IHE!12Ssq}M6t3>^-*fTK{p~p{4NF??T=@oS2{AA*DBcLWxP*Up zwNp1YgK5U9C9}T4T=R6vcGH8V)vxQixf?cduJiI+zttYJIfsG4L-+f$fAcPW5@eXP z=g#I_eu%3MP54rkU4K3^lri9@maZy3MYTEYzGGrgMeV%S^fXpgI9AmZ2I_a{iLvMR-naiprxI! zPBnk2^PYF(6_dlHJ;mp@KP`oLZfV*}``B3Tc{i3ZIrvRh`DwNn;?gB8ldG35J)axQ z7*IGnTK(nTZF`^+F15+chjbZKPFj9%-?k4TxFx#oDogmaOX}NqGH9&6u06?Y+gH%- z_6!UQ-tM_`<(kd@v#bqjJKWU&yUdOURXGd{w^p4iz3}DQo&|4N8R+n%w$)nf2^S1|wN)|x{Q4^H4(EB#M@>t==tD(~+qzr72p4jC9SHbz}v za6RhxqB3y?(efSTs=Ar)%fQ|{@UQaa*G-)3R&8CMUCt=*=B}^LNr;TYW}#e(fAV|u zSYsBedET1Wl?%3^p?1}~E0OEBKW)|2WH_a^L+kmU$t!O_JbA-f{r{tB{~xcq{pr?~ zJ4_0mCyz8Id4g&f28KhAh5NUEU8B$8rya};)gl9dtW&5zsLYZOC=eT$Koo<2-wq{_s zxpocrU+hJ5`eh_?gKLf+d zr}gom1h8)JOmT)uA$BhP6`76T6ZjbzE-hKLQL#4s|I!W-2C2uhVkYm73TiF|k9RQ~ zdba2H(QTaTRObHfabr|i`Nwa2#HalmLH8{%FgTpJHl_6P`%8N-pAcb~bY-jeqdZSm za6grSfupzF{#yO6T_x|$f>;l<&EFw4zvQ~dC-A)<3=AHo&rMd>?3tao@x6yA!=#Xp z#oy;WQICEO_PoN;Sv8A)-w(6yk6~2s?A7}y{5&LQF4+4GQwsl0O!#LlJyC~Y+ue6w zlZ(t@np{swzZNc!X6r~{RPYqtzWd~-U)@j--a38y?$mdw|I5U0GC54DVK?^+nhKLj ztaQz{&5~8R#OiP~H*fCr-6x?Tmit85^ZR_M=Td8$U3M`{Skh&E=WJ_Ul+0w2n+$#cn1ZQO}?MUd&VBJ)0R?!l(gH!eKQl>>p24btOR5^3sSgB#9yRB%Y z_!I>Njhl0dorDys&;6|bt+3R{q%mjH?)$}+`{&J7w|+m@(!Xy0&%giK85n#H9$C^I zyh&N^qA>G;WwX?C_6G;0YzK$whT=c_&L+prkNwy&Pl7>ZW!zVD(Za$qa2JNb`k{31 zs{IpWKW5k(Gk9E*^VhOVc=_!OsHM-qAa{J)rZ3f-mE~41XKT1W=Z)^B`-&?k-vt+6 z2g+Kf=f^xOy(!s$HJG_UjtUgUZT_T3OTnDes2F zqx;N~jrT-YY^?V{DawQnXIzkC_wB5~2> z9>4M+9!)Taj59NQHb1r8X5u_~hLSzeeEVZBxs-t$V+k7~cI}G$s(Mq_dhvI52G6gB z_jP~EKB@)T$2z3OIkm?V|_Z?k%5tBox?7V_mP!-842U4Oh){HtaSE>bRRue*^UuDwZl*{c0) z44%@*{;pQ4X<4%NCV1GYVc+JZ8~Ov!PQIxae6<|pnd5)=PPjk!F1XBmp`W^u^Ia(#~RAAB{57`Qg!uz($3}c zuY<$t%(5Me0>2*Lti9~?0Um})A?ttDxW-I@x~gcQ{MlU5$Waj^P{6WyUxHm#ftY1C?u=TeHQY(e-^Y|kb$9O?#T)Fw-sI~Pignreo&f0 zejt+nGfTpJ!?jBypKVZg)NHzT(-*H&bRFWB9ONDzyIKCrzl|B8%61 z?_U^MY;2ukX24+Mwf9xORZ=Q6%^u6`JJf#dcx`#viJU}+ik@E;sjW)q&Op-MnHiqq zbmTb+Ml-euTQ`*mLYy2;HK(_0{hgYAHC;k5C zI{_4^1`1Y_{x1srD!$3tsDL@a{Y^%XXua~$)|=pA&4#;T+x#W29NvF~;lqzN8C$x9 zm+a7iq}vUzb>_#&e|EhoJF|i%Aw5QN>cjcd=ZF7z3)Q*uQ^ev|rZ+`z?qJ+tJZ;D2 z8~Y=)j!uP1c7)3O+n&g9Bhvd$=9aFd)7G7XM4^qL^)<6qQ$N1x%R9(mAZqG=Ejn&d z$N6;7wlM~VvNL^Kzg~Q_ObU@@3)gQ-|7fWxo2}RNULbn9$a96506gTHy`4lG1C z0|%f(d8hWXZGTVoYX9keGpX*dGQ&x+HC_9+JbJHs_AEG0Hn`-TeB8V0{3*Vd;XDkn z3IA4AWG?(MY02MB(V*0wuQ{~{WtDsT;QFvs&di2Pp_9g*aZsy21Y?~v#5WQJ6F9wttZK1!*rpwE&P~aQH(}r z93+0uH0Vyce|N>Nt~V1L4>4R=DmGW}ymt2vr%TB=a!Trc|Wv z@#^bV{aXhygi+vE)d_X8<9|=T5wS63Yq0y=^Ev6=wDwc{-v1^n@hSs#%o_eBzy4=b zQ?&V&_vYvgpCuT6U1>7?C{+IF@}@XQf?v=d5x!Nu_R+Fg>YIWMOnDgo=H%LBK3uj* z>Qj-YGbBi=ZuNIxI&HS*!`7RMH%xgLm=h{OWi*aPd9H_~std(Zg6mAbUsEsL6MfV0 zMkx;ib4o?3jM{P5Np#y({xDsej#OFUa`jR-Re!w27e_O*zPoi zevGo#3wY5AiP=jz8z0^I6?arh_w%(k5@&eW7(BMl*j(W8p6h6qXZNOJP!c~gi~a46 z3O|w6@7Mn_ziBull851kz5m*yhfW1lc0Ea*^epW=NZAa-$w4*S7A-Oh{91d{aE2@o z!;kuTo2HXC?oXC&zIl|PK~~Dnc-~UK$f-4J zV380TcIsEs&5tjRiT-mf<0&#=c)+P^r93Y@?2$5;tmZyY|HVOHGqrZ3Qon!C&-9yy zCyplaS?6AyRS~(oCv;jIBzP04y zUQ_!Svd!;~Ff`mX+oUxwY?Y1Ow!c{i{=AU`-M$eJv1{d&>t_5Ho<=?LE92iK&CIau z>>pFZm=?c|j?`)2PQC+`dA~xem*|UsbAO$@&(NA}Z!;sq<@I9KIue%x!*r&9+4BZ8 zPQJkZj_y&>RU-2blIDZFJgHZW{7@1-*I2N>yyRF<6cq_J9pjjSFK-`8oR0T%1#e%)UmJ+$Ba{Z(U~J3pUyJVPzs4j3pQ@gnzSC|CVFFCVYx(<%Xxt&Q&Xa%wuL?NVuLm z?TfNzUVzB`-fjCXuh}_Mmh}x6pWBP<>iM$2w?$X=hU^Ra zqw2tmyl0=k2-7W8x8|C`$HO3@QGNZ9=49upookzAKDu-1K9dEtA(%B))=nw{QeqT>t7~e5G=u9@Ih>C&+>9EUAMQztLl0VDOpUwq*9x9e^DT zytC-S*{R#|V&gwQdt;DbX2`&B+ps9?ji{`x{Ss#Hsprdouul4ReOqFKJ7^AMmw)iW z(rxc_WM7LMo$I>r_SK8IUkmTgm1QqsW@AXuvJ-XoUz@$(^3uPH7ymu{WI1h~-p`kl z=4rmnoYXc+n~{Oxm#_Q6uUcE;mey$=w^|($-u7V-kj|X PDu_H?{an^LB{Ts5TMC>H literal 0 HcmV?d00001 diff --git a/branding/png/bskyplus-symbol-128.png b/branding/png/bskyplus-symbol-128.png new file mode 100644 index 0000000000000000000000000000000000000000..19f43ed6ad3de88f47420960a1af1a04982cc1aa GIT binary patch literal 9046 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 literal 0 HcmV?d00001 diff --git a/branding/png/bskyplus-symbol-16.png b/branding/png/bskyplus-symbol-16.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a21da80be319ca9577fc378c7ec7fbc9ec659f GIT binary patch literal 6300 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 I>zopr0DLkE1poj5 literal 0 HcmV?d00001 diff --git a/branding/png/bskyplus-symbol-24.png b/branding/png/bskyplus-symbol-24.png new file mode 100644 index 0000000000000000000000000000000000000000..304a958a68e39833eb1f939cb8716d7b32ec24c4 GIT binary patch literal 6537 zcme7R@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuLq>XH+kB0zLjX>Jk&1A|;v zX>LlgQ9&YuAcH^y1H&o?i`j+DU;zdOu?VOtcZjN7R8^%#c~&5mRwgNiDP}2Y$+|`s zMkcx@$;oNDiAENdy2)uN<_4B2W~P>wAiJ0+Lygmf7?)U#VX0nXadB!33 zVqjp%NlwZyTAZ1ZY?YQ@l$%(RnVFlIo~mDvm!6fGS6q^qmz?V9QlV3kTVR!$nPO#` zl9X(kYMH8QYL;ZAYm$F-Q*+XkLGDSj1?xhDus)cN z(4tpnoRX1PoDreGvcGw^zr(VKJs&G>-v7P$hepNkDHFwt;`f&&{LVPMamNy=AHn%C%W8dPV3=9knpa@=?oS2iIR-BP&WNMaNkeK2N z(gDZNIQbhk_k#L#gKu5eSlg2BeRK3|f0vS!bN6Z6)Y#UrW551@9i0bqR+>U?VqRui zYH>+cYDIERX)!1}H7-gmE=epZkx)#_NzF?y$&eK5Vqjph18HDjU{DA9!zeiiIfsGE z0Z^o7=0egb6F<6hGmA6R^Abx+i&86mky08sY3Y+xK!COA!HvV3DGkyLQq4>(Q+18a zEK+q%(kxPSEzC>|bPZAsEKSprl1)qv5{sZw9*;=q%{0sk5Tmt_{0`1l2+JY$PwS=K-OB`M&b|MbBLHo;D*_?c~#WJK`+*rWE~$n5#+1TzDdb8vFHD z_~MpF0h=FqsvOihZ=JnM>&}s?Slz9!KEE?Okmt0#BsnKBGdDgxH7~U&u_V7JJ~J;Z ze=#`iPHJ&_S!xj|>7*L!8R!{g7Z;=^he1V*^i1>&7#IXBps7a#ntF;c zQx7~s85kG@I6%qgQcEP0&>}`P3B^bzE`uf}HiIU{-UZA|j7&@-4o??wy*p%iVc(AC zUu;gSw&|h533#-B< z6r3SBT*0|0H6=B#Br`FmSRp7szeK^=(Lhd|*T~Gk!ob|n!o=9rEJ~c$$il$Fz|7DR z%r$VqZIz~hI>agkBL70kxq%=Em>ymW&|17S9Hu=AN1q5fcIWM_6_V3|?Hm3=xu zf>q?I$zG?WmeDRRZ`{4U>8IBl@eA9RiD@$$m#38fy>rUOmAORYsh(ABt$ml6N$9+1 zwfnuq_nL2?yg0%j%z%%LIaHRPk?}tZ3o{dY12}ACRay89c-XkK*%(w{gAo`Gv~$uRk5;HisT#GAM|T zx%)M7Rg%{-{VA=hc>_*ryuNM}zhtuQ@2I={Ed4r%`>l-DbymCx{uL7VaIZV(LQu&U z$vY2T?u{}=Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1O_k!zC}3nPnT!e_*|I7TV(lWHT?b{ zcv2~8a?ajfmcC^S3=C{Z-tI08|3PrU-sO`S7?`$rx;Tb-bgrG^?GX|valHP1shjL^ z_TW{qmgmufwf}E${#Rf9~hL_cDwpG6FeIhyCqx%4&#p;F*0{ z>Vu$a?&a()7nOFUY+2Ewy80DkmwBd?%c|sEn$NZ@*;RX8 zCZ5Cp!Wp&8Zwvm<*lBs7Pb5Qc@`rbg4SPyn*lY8|i_FPfSij~}qlbVr!&~*1IR?k- zRF64%)rd5lNx89E)u@;u_Ta%a8VqIGPo6Q%YFHk%!dk%U+#`9JyV9};);~M!^fT|r zgVyT5T_+p9#o8a7mASbs{LgejEt~5rqhCGU>3xAoYd>GbFTQxjj^4({I~%TN`>b1c=#C8QZQ-9Axs-z$85rIx z-FeAuaDKYlG1fKbzAAEa8?e9lHNW9!Wt8``g*JT)Pg=yx?E-9pf9uRu-w!q)DqOL) zwX^d<q zX(i2*Gftmkn%;fTP@p~fzo&z))5{{wE8^Uo|GFas86Q7BwqrTFk?}>*65hkD;iu9a zEBck}gAT0SUa;MNq6qt9-v4FMzRMqd)mZbxAtA(h`s|6bem@O%i}u$`TEcuFul-7h z-Fb;;3|6O<8ThupH$1U2!*ROT0?mA(UAq>n=rA`^SD(MuJazwFwW-G>qo+LEP{0@X zyfJ6d3eQlzDepwwmWlAUe^|TbqvyhTDz~=WPUhY8gH6J2BD z6boGw^E3lpOGD!nUDH(4)Fd-gO9P`cLk0#0=E+dwG$F<%7Gqedmsnh!T2zvmpI6Ml zz`(Ers=)=UAt}EIS%WahZoSOB^rF<1%+$ORy)t8v9*Jb5;tXldfEQM-PA8t%ilwY(sGbPz7Ex#x?u_QAyH!(d`zaTF?D>JXSBrz{J)zhUyry{q&Dl;?1 z%G|;<+1%VPNjEXsBuUrA*xW)lDcQhS*U;R=&>$tzC^5;*D5oejClTz}jLd?Jg2bZK zyb}L31_s7QP)K)QDSatNorB?!fZrn6gMtPE-lKb&@E2QNmB;7C(RbD3lYNl zU_L^NUYT)9Mq+VBgu-2y_gk!@B@cbDzRt15pmFJmu6f_*9=-8Y{`hIOSvl7^mO$N6 zA)B0^tCyHpl2MdjkeRHPoRe6ZlB!owlwX#ag6gyic~qtOMVaZDdAiB@d1;v`sd>q% z>7{wudHLme*(s^T$wiq3px~)Ua|WBJ05egcBqOs}AuTf}RUxrNp(G~xhOTUBsE1LzepiBKP59QGc^UQ4QxbmeqKpx zUP-ZDZgGBENqJ&Xs$+U;Udh6gyu{p8sMSS@IXRAyxbn5@)Xx;>h%mY-aJcK?X+5x`^FYo@Q^-xs z%S=lxF3C!*NX{uO24$zlMXALliA5z6ifK8idFdq?l44y93`}+)4Gatn>R^8uCFdaL zFmO2liqy?0SjpA(SW9& zV$9S7k5C2%1_2IG^10L!$t1LhQB6WIl8MWpiHXgiiLrM9GZP~dlZeC91zhhASzg$; zqxlz`6RT}{s4#;87aNCGo5wj@7G`DxPeXA7Q8wmK7A|2vxO;UJ0-T%;^$c`C63oJ? za0vxxNDfzUE=o;F%`3@F%qdm~%Fi!RaCS716X!KDGq5l)H?%M@HZ_Y9=QXl0urM$) zv;=bvTyR^ZX`l|VN&(3#NJ#~=F*q|lFEcOQAksjXjUDWKCPt_~m>JobofueVRB>gW z4v=6KxoWc4X{lwj%gY;guW$P4^+x={_GMz)jK<|D<$v#-vT@Ii0~Eg~`CM zSXN{nW7Vb8p?&Av9@@_9nw`VumsWp^Y3nC{Mu*f-tL<%EZ+(8Da{cR1hq=w6$CwNX z;$!Z9O6X>uTPBlNztD8^te~Z2LRvEml` zliL1#=04WRB~TYhW{YAVDIwD3=9(Ko-U3d6?5L+t)3%OI`jR<^TEcG ze@~d{Bjmx<#=*J0pi|(6j)EHpllF$)Y6@NsF4JZ!?bh#~;S|Qi05m%9DQIqVcIy=%q46Xgss&r5mN%H+$*^P5TE&@S;*vKFwmNlUZu*}bFo z?$U3&FR*@9oz8e+%boONg*NhUOcHWlRJpLd*nj8EFTv;?Z?7KRrdeWWd(xM|B<|hf zPD}Cc=NW#ttaDd!d@ZxzZdLEPtldZcN$i@D%gWync)BJgRwlmZX6u0$7ru5Z$>`pB zpXXxuZLyoD7j`!`FdEdYe1FID&-R3P2Dg?~&MFPMY5#Kj7wymg-?f%I(&HOr!QAVn zTM8N~e{uC!{Km!j^TYctLS{hzb*KgZiYN}jh(57pn>aHij@>S!m6!{MO+ ziyq%+%$gK2zhjU8-ktwbz69A@ot(;N#UM4kYV*VJh1!3WGNlC{mQQ25qM96FoqIUQ z{_uzQ{AIREm-J^F&c40x!aKP)U2JD&n;8mo>}_)=U+~feeo*i&8{6OD>%LM+wG$H0oODg zGL87({!y|t-=zI1`d6{-g7XX-y;hfe?37qPE^OodxT#3|-bc*?SM9bW?zK-e$i0x- z=@EA4Y+AX_7WUs!1?}z(ywW>dtoM67oUt?hbZOl6>rH#v94-sZPk9&bxlK>--*0qG1bdcX_9REy&0)?tGBn`7iZ|5{yXE0p2v1A!INFP<8R$ges9mzVJV*Bu~|Xz zIr7;Z za>^=hRJo`)Z`<14&*-A_O_5EWCw5{-%5fVzK837RiTn%93T%}oX<9QWyfXU67u(g5 zl9%+?D8EZ5Y5j$%9UkAZ5~@<9AhO*r~S{^*S*7g{?!7{uPo&wTbzc%@(7Zg&am z)^*Mx`%7-%j}ZUoX(`M;qkIV=6%L$VJ9+ruA3c5<+s>w%UPBDbUu^9gp<4l zU*jd*{rF-%t>kJr^?u!7w_c!l-2(PGN6QYGR6N)`b@yjxnXT3~Uo0O#sdWlhvR=e+ zA|RF}es1oX8QFVzj;++O=52ldck0HPKEowyC8n2z=Q5?FJP#~5z2{HO{P|mt$F=(3 zeYfVW#4e$m)A|^U40bZUv)fx$Uf0m9e(033?&rXsP03shQ{Gz3y|Z-AuhC$A=>JTb z{f*2np_j`TJT5+zZ>WAIz57Mo>GB?F&hoi=XKv}1s4{UiTzO+Imp3c>3O{eG=f5lb zt%X7?GV48>9KyESkHgG zvVmNTd&3@TFbJ7!Syqy<+JEb(xAz##&tJA^3=m=9-1X+gtADHV7x2yFsQ)kcy4ulm z4wHhS{B7ZLmMSHpM@#=Deh|Ox6dqVB!oYc>RDH)c7w7qj%;^WV+vWY8bw7a3pV7dB zEv9(UMGKn})uY!9c-C3P8O~B=J)m%QuAl4utJAkGUUne=T7E4oxat12 zbLy6-#XWOP8nlGD8XPn1ybjk~HmFmHDO%EG%FWflcq^G_PHn*pEv@U8?Ni)BympB& zFqeGPS?nesv~p$dgYL~=n3nr88Zb;QYpT5L93J@7&zhl3T6S00sbvfj4f^LUUAU@q z#kJtzLMtwh$xI98AM0zl%+C|+`qiS?ZRPKcOBO5qO}}KGr*h^N?>9;I;Mrd0UrczK zFCI>Ka{KRO^E}3KiDlus#)q>WuK(WpTAn-BGj-Lg?Vox$4a)Zib-&$v{NnR~ds#D1 zn)mzNy}#q1;n~>PZL7E&el09`=2-Bn@z|D)3s+AplCcr|mgBUSJvhLW@q&fSxw)Bt z&MN*=(O*>gTk>@M!o>|sLjSlrFx&04w<%ip@u~8b&*E24R=2NPU=;dA@Bq8C_x6`^ zyRu(+rEFN%+sgTMLt5<%FD>t*a*Q=K`a9n1y!|uv3CG>inLE0;8%`v=G(5Jy)@k#n zuvyCL*#QBUv|foMc<{!2E_^KfyLFw*r3IDZlfn(%8Jx2cj>f$GGc~7(c~+%nqNpGP zTTE$_VS4|CsUEjXo>pzrQev1UlU!5u|3avT*fK2!q0k=;7M1cA|1Vq!^$7cxbE)-! zil`OCGLu90^B0)AnBLs1S;9JX=?2Dx1N-N!IH|n4_ZNrS>J5wqzZ^3r_=`%Js(_>? zFkY~T+52SGR3?SUR-T5>X;Qw*PT`7*8Vr*{cQCAwU!^wZYR;5(KUG#0Fcv&>+_f}Z zMYEN=;WFQao%N=-H&}wq2w*fwcFMfuw=zz8Tg$oyn?$r2p1oV{|37OvgGbmxri5=( zE{J+$a5bcesxchvZP{D$BmQgLeTiL7r-EiM%-9-z|MNHRr`3MJ&FZTR7#DQcGkvI8 zy^PI2D3K{)RUWhGgRQ&^wO8o0ayIa1DRD67Szq1p`SP)w?AZ|oLR`WOzO%Uf8g8vH zvHdYs-ni~FYw}COV|t67!b4+PIT@Dj&B! z7xC#?UaI&Z6a0BXot6(n$Cszfiyt1JZ?x}Q;Nr0NZ#IcMOTD#1Fd?Yz#DmZEY}@B& z?aJQ5)5^)f%Q*F)MHbhc-;&9f{1$4T+}|R^7=5wzrwg*A(SdGF{8gYkVZbXmdZTW6q>Gv(3b&oi~)Tzi&~l zc11Le-@`re-%tPbys?cTla>iCRrv98X4uuUZd}3)U!~X;G-ntx%2}MY$jf@+bx6a7 zp+|;^+iuP5Mip7*_9;=P&#yg{?bFK9pf9^_eX&ZcDckjV5w-42JNX+nDqmrD*c2!| zbzknPW$U?%0J%7l0nS#XA17(I=T0pU&KzK zcf0xPK1)|ToqFlMx^L6V%MV{Het08!;krHklbXvkWlQURUlhqc*BQglVpXWW z&`~1;?eIgNo^D7x+c$l-0i&3X2CJjwt$Qua>pphLH_dw;+)#OW>t}EMM-tQYTD$dL zRX=aPWF#INQspP}edmuE4-Nh=V0m?B=N&eOTo(7Ya=W-ru6=qs@o3jS`~0I_mx@mt z{6BE&Kf|e91{sruS2!b{)P}8-xpD4(?$NGGR=+lU-*IYwuhn+Of*b1=YEOuH^`>Qg zeeH+WJO32jxb&T~ZmE3hGc$%|nNkHWPoA3k;kZ3to$dO4T=u^s=Xal-6LRzY;X7;x zu4wIZbS_)aGk06g_j|XWD^0Ci9FWJHu&C{ym;byPqsyhfYy9(yE2rFMxNx`r(&DY0 z_r&9l?Q#qK(fZ;JTf;KO>2kS#1yb{ku9>u=_QS%iS{`}K4|=ydg)0R8 zERtr>oeg8{&*hA5^muwYm%--iu60ZuOLVt?X0-X!enGTj$`;)>wI&It)hcqC*Tix6 zuP=O8z41!*0*xYTd52t<^RYQSVfE%WuidLw-@WhZ>dCS4N3-lE-41S8Yq+Myu0&Mn zZ}^gD%9eV(dB5hz$j#}PvXtYjdyy=|{y(;RE{N^ont1SJ@#l##>))B z{h9JkK8A+d^IGngx2$tY`S9sRjmme%3zCN~v6qS{OjXQ3>s}|kirSB#>AeqM35Dp`n!bJUiYqqMC@YKYP7O=K!@Y8QetIM_F+4aU`N9AA za|N@dHc!pot`K3(u?y-5ZpbrV*CcN*yo>8)aQ*DEkS-=OdCd?8hM0=&n^$$+3vM;J zuuOL9B8Ri?T;dG*Wrs5D3u;Yggg58j3e@DfRI{Xjk>SHHH;b2P&sAF;_NiRmvN%X& z!A}oGW`+k(OA8+Pp8LFZq4vabxI`i|!-J{j4{k`$o&R62M3qV9_Ljv#Pxk!uSjfz< z;IXd7Q?uvM``PS|Yt;6c}_RH-Fj?JVnkwX_%*%t{Z5@*h;ZU$(B6<=V>q4rRxl zJ>i>fqxsnMra-~14PD#~dFyiWBa(O#*x#6<@cFkUcDv2IBE@$n3Q%@W)Jbu9Td&@ed z_-AKc7EhcIpBjGk_P)ouJF-phY>kQ+|8o6j`=Lw8zbxk4ev7zK8s5wL!mKb!Q{?xD z7upZ+^@~<>DV)^GUgH`oTl4eu%IiTA@jtnEUhY2owOM~@yjQ*mL(sJJYlkkcpT6R`(SOa!H~ibm!ZA4aeG!u>i*o`hxz|5 z7hiUYVN_uLbou#%rrn=DYKDo###NoI`xW!T>)uj^35>rV1{a)KYbC33{FrXRueay; z=X1rLtkz^m36T3CTk~Z1Ic2H8w^xT|Cw${Q_rKDvMD_i0h6#?v)$ zMWfcmU7TWfUdxmx*F9f%#e%`pC7tKGE!TFNhc&MlEVA9|q!QBJ-W1!BIJNk+@CLi* z%iX2e6;{qP6YKk@P?OQL@w>&1N|7E}!xK}V<;XakUUun@@apS_9%s+_9j9U*{^RsQ zWd_f)n|1G6J6Fy(%;o-US$l0p>eSzoE3+AtLVXw&f{u!yF?McTIwzBlXCvK6=X_Ip7CVgHe8yUdhk+{3O^@Cd=}KG zx!lLICz1E`qw2GsA9jmQJji*sMn&J(I_UYDE}d^h>-Kh~sHJ?KXk+@;W45&J#ONuT zJG)#DnaH1vzT9_Z=YPddGt`~0D_)wcGrRxE#!UBHXBOReD-`!{(Q{d19%&+fGW&Ah z70cDU3kp5=uqlV^51(lF_8!CkqDh4jOp6<~Z_VPJQ=MM-{H=emZ%(y4L!OPyE{Tb< zp1Xc}2+k^7vSxFtjlR@@8L4&KcE`)_QkqzFg+KMcS@*6hTa;5*-=4j=Hj7c|xq9r< zlea%x8ty(}b}e78RB_k4!25}xCoVF7>oNK9{+8UbAIDNZ3R`fV+oquOGj)Dm{q<(I-S;f-*84O32+L!-cV>^A;K>%r_1n!0^S{4;&)Lv-^cv$o`J2;K zl_ERt=0A&h{pR1_+Tg`UT>g9PZqx%^zY&%icy4mROBo`Is*N@ijd0#jG-g5We5)p+U zO`iR`N+$l_TgBV(t@Yc6gZ-Cuya%}(;>gP2a9rtkt81Cj zET0gS?7Xz+TlF{XX4}=|$j;z!n<@Hb-tmRj?5;*BXLGsV?rx5BR$^pWs?2!CkKvm7 zRzJa)6Q%1St2gV)zv&Ws&vs|S5&N8H<;-6_*GIeD$hxsJ_v}fNkDg0qD;@{U=c`jU zQ0@KN9kTN5vu`iAxt6&HY5S-$FuW4~edCtZe&!zqQMUzFDy^L{_s+fxa(+ciJ7bw| z-1~L(+NFD$?#=O&ubH{5YCQbEJ9+lZFX#9*y5bAOTYQtj`&@C zSf4q_(|F>k2ivbCurJyB*}2V~;dWNkJLBZ<(gokRH`Y#^Q*~@3xAiRD&DOciEDQ|Y zwplA4mlW@3N}irj+R?K8OfoQi}Q z?#`O_W66z2`b~40O+aJIhR1@%Zhyads{EGNZRv%l8)euWw#V*&dDwiIdf9s5()@h8Dl&ajp*yYPQ=t%ilwY(sGbPz7Ex#x?u_QAyH!(d`zaTF?D>JXSBrz{J)zhUyry{q&Dl;?1 z%FMzf)zB!#NH@_aHAUCN#KKh9GQ~VeH_g(}%p%1s&DbC%Ij1N!ClTz}jLd?Jg2bZK zyb}L31_s7QPtr*%FItnO$PwSp_|1L^)EyPF z$@#f@iFqX%MfnAp$$H5-iKQv2dId%KWtl0cPOFedRhnOvnVy-ao1CAQmYI^8mz&%ETE(v;McuM7+fCqN;}z`)>u zJBC3)sh5&ik_eCBZJXKOZfSNk`~2W=*}3>-_Zb)%8bA@eG&wORJ*_w+(a6*+xgasc z7o-D@p>cAn?CY7?p%GQj8<*5{Kisk71^3YdwhQ8R<@^mjRcXI@IoQ#8AZMj1X#Nd*L0iyquKteG;^($d_*Ff~!v z+}y-K*CaW`RM*lp(Nfni)iTK<$KL&Jnu5OXyNnF~*3P-Cs* z^4YlK8rjdfPc}-|`?BoLo}l>X%{QHQEzb_@`hQojBsnKBGdDgxH7~U&u_V7JJ~J;Z ze=#`iPHJ&_S!xj|>7*L!8R!{g7Z;=^he1V*^i1>&7#IXBps7a#ntF;c zQx7~s85kG@I6%qgQcEP0&>}`P3B^bzE`uf}HiIU{-UZA|j7&@-4o??wy*p%iVc(AC zUu;gSw&|h533#-B< z6r3SBT*0|0H6=B#Br`FmSRp7szeK^=(Lhd|*T~Gk!ob|n!o=9rEJ~c$$il$Fz|7DR z%r$VqZIz~hI>agkBL70kxq%=Em>ymW&|17S9Hu=AN1q5fcIWM_6_V3|?Hm3=xu zf>q?I$zG?WmeDRRZ`{4U>8IBl@eA9RiD@$$m#38fy>rUOmAORYsh(ABt$ml6N$9+1 zwfnuq_nL2?yg0%j%z%%LIaHRPk?}tZ3o{dY12}ACRay89c-XkK*%(w{gAo`Gv~$uRk5;HisT#GAM|T zx%)M7Rg%{-{VA=hc>_*ryuNM}zhtuQ@2I={Ed4r%`>l-DbymCx{uL7VaIZV(LQu&U z$vY2T?u{}=Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1O_k!zC}2c-*^zqTgu3I zyZnqzKsoU{FLCAZj2wkWaV<%c5ldRb=|CNC9-1W8waJmud=4S0^qA&RBW=O>}^SM02?Nl$2E!{Czcy*>eig`Y-IztFE7U zpg8(Ku;!cJ8t>~*9ylfb;gs^uqyJCq+1tF+jYS9F5x;9$^kNodz7FdvGiAQ%dxK}roB*ePq9>eGm=+4COny+H z;Ox9-%i5WjryHN=xGnYLkJgvEg-`a&eiGo5E;J~$nDg1;v_;1~nbz}aQ?IcVgo;e# zZBO0y{ypc@nboX9oYf9Wjfb12vHdV+6b=kdH)SYznI5cAuQl%;OZ%;sRiPiwbL*?i zzcc$={Q1J?m7ne{Wy(9e^hTNbmr@QRE3V^xjy8E#>tZ*v^YI`4vE%34lAx{S`n9r* zbw7MHU)WCQR(4FhE*rd|_V=O+MT@xxMu$$$xB0pL@zM_=Ocyf>A0<3m9B4C@br1Wr zM~_Nb=kqf)K4N2IdhogMBVfObmM^%)IlqMa`<;14)%9i9N_hBZPg=J5vPi?Ltc<*8 zw==uHIUZ#^!{B-^vF)bC7JjYYX56#0&4c1nx82&$t>+sn%feJsd3DaV(^b literal 0 HcmV?d00001 diff --git a/branding/png/bskyplus-symbol-48.png b/branding/png/bskyplus-symbol-48.png new file mode 100644 index 0000000000000000000000000000000000000000..495369a38e0953645d62d167e5ab5497a958dd37 GIT binary patch literal 7105 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 literal 0 HcmV?d00001 diff --git a/branding/png/bskyplus-symbol-512.png b/branding/png/bskyplus-symbol-512.png new file mode 100644 index 0000000000000000000000000000000000000000..9003e53db0ddc49d39f66638a9e199a9bc91aa51 GIT binary patch literal 20625 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 iXH+kB0zLjX>Jk&1A|;v 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 dNF{K2J!5O}1;GwmN;32F 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/CZI1ByruCV4tXZzVukZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaDWmD2jvUUV4nFbI62KOt6wAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCB63j1FH5WvljwDgDTjqxfLP+v3F40z5RdkyRra++Po6WRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjEZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOmY1OWI4MDdmLTcyZGEtNGNkYi1hYzMyLTlkMDNiZGNiMzBhYy9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmNhYmEyNDgyLTQzMTAtNDdkMy05YzYzLWJkMTRmNjYwZDI2YnJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCB8pSLTL10cZpuM8DObXDfmwbF38JkjUHKu4JXi1dnNW6JjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggFeSg4ckY+MUPhmJEVgtTxgfe/OgWWnAP7197Se9Z52SiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggJYPEqAtQhXMWqtN/QPaHqknOgOR7Ym77P/n5pjfwhe90Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQG51Su1xcaIt3WHx4uKTON9ZfD0tewogXOHIKuavgCqyZZyKbuEZOk5lUsrKZhrS0A9aRdedjub+YRKafeYh6HI=Bsky+ diff --git a/branding/svg/bskyplus-lockup.svg b/branding/svg/bskyplus-lockup.svg new file mode 100644 index 0000000..3636b90 --- /dev/null +++ b/branding/svg/bskyplus-lockup.svg @@ -0,0 +1 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTo0ZWJhNzc1OC1iZTc0LTQwOTEtODVmYS1kYjQ0Y2NlMWFmOWYAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaNahYPIkcSJI33aKK+KhxyQAAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDoyNDRmMTI3Yi1lNjlkLTQzYzMtYmMyNi02YWI5OTg2YzkwMWZscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNoEOnfYPOgNrpWjzKxow62swAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggwvG3MtzpbCzV33f9kOF6ovyGqoQoumNXl1sEDM7hI02kZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaK3rIWOAwB39CvXfxU6FlIoAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCBZQOMuzVfGogdcGnq/UyA0ni2fJ1XMml4MYcdgDOpadmRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjEZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOjRlYmE3NzU4LWJlNzQtNDA5MS04NWZhLWRiNDRjY2UxYWY5Zi9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmM3NWY5NTJmLTkxNmEtNDkwNi1hOTE2LTY2MTM5NDNmODUwNnJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCDC8bcy3OlsLNXfd/2Q4Xqi/IaqhCi6Y1eXWwQMzuEjTaJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggoQzDNNpNys4h8/b0iKL/MqKNic3BTEMCPVeWmUIJyxqiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggv3LiN6efcn0JM0KwlFHuvSvYI0qdMPCMIunjDXG0rWN0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQPzqiHle8yzyAMESKZDP/B7IL0BLV+QKQeEj3uXocRq00Gg9xGs/++YK8a/7UwZyEFpaZlEWQgbY1+m20ks9p90=Bsky+ diff --git a/branding/svg/bskyplus-symbol-small.svg b/branding/svg/bskyplus-symbol-small.svg new file mode 100644 index 0000000..08f8bf1 --- /dev/null +++ b/branding/svg/bskyplus-symbol-small.svg @@ -0,0 +1 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTowOTQyYmJlMi0xMGMzLTQ3ZmYtYWQ3ZS1jYjIxZDFlMzg1MTQAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaHwQ8aigPnZQ0C09scibkekAAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDplMzE0ODQ5Mi01ODI3LTRmMzktOWNjMS0xN2IxZTE0ZDUyZWJscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNoqxBuWA98IZJAnGA2gXT5VwAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggtqonwEIXOPv4aQchUzc7EVW42GOTqqZUqVrw1xK53USkZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaBFYNeh02+V5hZYq/XfbD+wAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCCi6LK17yFbk9BmSvGQ9ULC094/0cprDY/RNbwsmLdkaWRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjJZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOjA5NDJiYmUyLTEwYzMtNDdmZi1hZDdlLWNiMjFkMWUzODUxNC9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmY4MzI3YWU2LWQ0MGItNGY5Ny05OTNhLTA3MTg2M2ExMTZlYXJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCC2qifAQhc4+/hpByFTNzsRVbjYY5OqplSpWvDXErndRKJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggvmZ+TYtoi3pAaP5J2AJj4qNEAy8A8PJOuowtfAb5q+miY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggPG9yd0QPakgE0puo7H8togOACsYrLhpYVCWFKh5UGwt0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQJeGfH4rjl2PIDA3jitUY4TLQe69goa1HPEn3v/wQhASqYIIu5jZkIbCoNFhKh95VdfIKIHBgpWPayEpCK/PHgc=Bsky+ symbol (small sizes) diff --git a/branding/svg/bskyplus-symbol.svg b/branding/svg/bskyplus-symbol.svg new file mode 100644 index 0000000..ff4c508 --- /dev/null +++ b/branding/svg/bskyplus-symbol.svg @@ -0,0 +1 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTozMjVkMzJjZS0xNjExLTRiOTgtOTgzYi1iMjUyMjg2YjdmZWYAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaGBTH63ceIm/EEib/2bXiwgAAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDoxODQ0MjZiZi0wYjY1LTRkMTYtYjdmZC04ZmMzNzkxNTkzMjVscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNoSe75mcG/+B+QW7F+a5HLXwAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggdyFw3JS0L+aQ3/1BfSOdsheaU70yomhyiCOhZVuX4PykZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaMu9jTA/g4BFyx8euJCgwIsAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCB7NNLUf/Kccm3yF6A9i1ut7gqJssokWVYxFG23N54022RuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBi7Zmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOjMyNWQzMmNlLTE2MTEtNGI5OC05ODNiLWIyNTIyODZiN2ZlZi9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmYxMzU0MDg3LTFjODMtNDFkNy1iZWNkLWNiYmE4NjcwMzZmOHJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCB3IXDclLQv5pDf/UF9I52yF5pTvTKiaHKII6FlW5fg/KJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFgg8LgnvylVq6Sbcc7CoIYfKgIajBzSRkClFBfTw2pnUNqiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggOsY8RR/P+IvYbisEYUKZI07X4wbxcxnTR32a9z1HFfB0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQNgM6NPuOUYTZ3lbGyZUmY6une5dB8/pUJdjaEdqH342CJrM18cA5L8IoKUuRrfgSHgoaMkzxUgexRCX4QZo+MY=Bsky+ symbol diff --git a/branding/svg/bskyplus-wordmark-white.svg b/branding/svg/bskyplus-wordmark-white.svg new file mode 100644 index 0000000..30d8bb2 --- /dev/null +++ b/branding/svg/bskyplus-wordmark-white.svg @@ -0,0 +1 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYToyZjI5NzVlMi0zNzIwLTRjMTMtOWY5OS1iZTIyYjJhYThkODkAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaEwYbwHfTfcDtr5/abMGF7EAAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDpjOWZkYjA1YS01MmY1LTRjMzAtOTJjYy0yOGMzZGQ1ODk2ZTRscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNosVbb6m9F+k0hF3jZMnD56gAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggavZUtTzGm8KqcxMHaH6Wxu7TTSZSPwr+hFQodl8zccmkZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaIR3OhhPb22yzP+6N2QJ9LsAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCAQ4Z4Hm/U4VTfJHo8f+03KcLFm5y41V8Gfl/cKPXbN4GRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjEZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOjJmMjk3NWUyLTM3MjAtNGMxMy05Zjk5LWJlMjJiMmFhOGQ4OS9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmUxYzIwYjY4LWU3NmMtNDZjOS04ZDdiLTg4OTBiMmRlMjQzZHJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCBq9lS1PMabwqpzEwdofpbG7tNNJlI/Cv6EVCh2XzNxyaJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggXw8lguc1uq/OiS3OxlSzWY7esrRzKd6/rmes5Cj1+tGiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggKD64OrGTYTJLQPiEAJ1mfcmzhYgF+yr0va23hAH/J5t0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQMdDaEZEuVtyIJJ7XOlhl9pdchpzX/+XcoeU3tRYfaehRGShgdRFBpZW//BWduoxdoQqsZXn5Ik+PaqUk639QEE=Bsky+ diff --git a/branding/svg/bskyplus-wordmark.svg b/branding/svg/bskyplus-wordmark.svg new file mode 100644 index 0000000..c4d1a1f --- /dev/null +++ b/branding/svg/bskyplus-wordmark.svg @@ -0,0 +1 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTozNTc3M2NiZi1mNTJiLTQxMWItYWI2Ny00OTY5ZDJhMGJiYjgAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaDL49PIwOJiheaBhhCBZfJ8AAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDo3MGEzZmNmZi04NDhmLTQ3MDEtODQwNy0zNmMzYTE4NGYwNjlscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNo/QHrFNHySuF5yBtW2VVetgAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggpz7fZvzs9ZVJ/GI1kBBnfpqQbi2CorBUjdBUXaAUvVykZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaBzzCrPJvl8F4ZdTQLQnyn0AAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCCu/5dQ1VzNHrn0gW2TLupGC8wp5VUYzt/TQoVLgYFqUWRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjEZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOjM1NzczY2JmLWY1MmItNDExYi1hYjY3LTQ5NjlkMmEwYmJiOC9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmI1NGRjYjkyLTMzMTktNDc1MS1hYmM5LTIyY2JkMjFiZGFhOHJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCCnPt9m/Oz1lUn8YjWQEGd+mpBuLYKisFSN0FRdoBS9XKJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggEXLqHGpdRxMpsW4sSNsg4eb5rrb9ih1K0Du1wYH932uiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggYFr78xuVpJeKahRHKcIYUDcovdBOBrUOdwUPpXSF67l0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQCrQv5zPvKsGO5zOf5W4j7q3Gk6Q9cD80BUaZVO81tipRXj2YjAHhQMvo/1s1DjNYGYUZIR3/ItPptLVjiH57Pw=Bsky+ diff --git a/extension/chrome/background.js b/extension/chrome/background.js index 19a62af..83df076 100644 --- a/extension/chrome/background.js +++ b/extension/chrome/background.js @@ -12,10 +12,12 @@ chrome.action.onClicked.addListener(tab => { }); const DEFAULT_SETTINGS = { - skeetMode: false, - accentColor: '#1083fe' + skeetMode: false }; +// Remove the obsolete accent-color setting when the background starts. +void chrome.storage.local.remove('accentColor'); + // Initialize default settings on install chrome.runtime.onInstalled.addListener(async () => { const data = await chrome.storage.local.get(null); diff --git a/extension/chrome/content.css b/extension/chrome/content.css index d2527bd..633f3fe 100644 --- a/extension/chrome/content.css +++ b/extension/chrome/content.css @@ -17,7 +17,7 @@ align-items: center !important; justify-content: center !important; gap: 8px !important; - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; color: #ffffff !important; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif !important; font-size: 14px !important; @@ -55,7 +55,7 @@ align-items: center !important; justify-content: center !important; gap: 6px !important; - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; color: #ffffff !important; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif !important; font-size: 13px !important; @@ -100,7 +100,7 @@ } .bskyplus-composer-ocr-btn:hover { - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; transform: translateY(-1px) !important; } diff --git a/extension/chrome/content.js b/extension/chrome/content.js index b5920c2..c22b5b3 100644 --- a/extension/chrome/content.js +++ b/extension/chrome/content.js @@ -3,11 +3,8 @@ (function () { 'use strict'; - const DEFAULT_BLUE = '#1083fe'; - let settings = { skeetMode: false, - accentColor: DEFAULT_BLUE, localOcrEnabled: true }; @@ -176,22 +173,54 @@ } } + const altTextDialogSelector = '[role="dialog"], [aria-modal="true"], :is([aria-label="Add alt text" i], [aria-label="Edit alt text" i], [aria-label="Alt text" i]):not(input):not(textarea):not(button):not(img):not([role="button"])'; + + function ownedDialogElements(dialog, selector) { + return Array.from(dialog.querySelectorAll(selector)).filter(element => + element.closest(altTextDialogSelector) === dialog + ); + } + + function altTextDialogFields(dialog) { + if (dialog.closest('.bskyplus-edit-dialog')) return null; + + const normalizeTitle = value => (value || '').replace(/\s+/g, ' ').trim(); + let title = normalizeTitle(dialog.getAttribute('aria-label')); + if (!title) { + const labelledBy = (dialog.getAttribute('aria-labelledby') || '').split(/\s+/).filter(Boolean); + title = normalizeTitle(labelledBy.map(id => { + const label = document.getElementById(id); + return label && (!dialog.contains(label) || label.closest(altTextDialogSelector) === dialog) + ? label.textContent : ''; + }).join(' ')); + } + if (!title) { + title = normalizeTitle(ownedDialogElements(dialog, 'h1, h2, h3, h4, h5, h6, [role="heading"]')[0]?.textContent); + } + if (!/^(?:Add alt text|Edit alt text|Alt text)$/i.test(title)) return null; + + const textarea = ownedDialogElements(dialog, 'textarea, input[type="text"]')[0]; + const img = ownedDialogElements(dialog, 'img')[0]; + return textarea && img ? { textarea, img } : null; + } + function checkAltTextModal() { if (settings.localOcrEnabled === false) { document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn, .bskyplus-composer-ocr-btn').forEach(btn => btn.remove()); return; } + document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn').forEach(button => { + const dialog = button.closest(altTextDialogSelector); + if (!dialog || !altTextDialogFields(dialog)) button.remove(); + }); + // 1. Check for the Alt text modal - const dialogs = Array.from(document.querySelectorAll('div[role="dialog"], [aria-modal="true"], [aria-label*="alt" i]')); + const dialogs = Array.from(document.querySelectorAll(altTextDialogSelector)); for (const dialog of dialogs) { - const textarea = dialog.querySelector('textarea, input[type="text"]'); - const img = dialog.querySelector('img'); - const buttons = Array.from(dialog.querySelectorAll('button')); - const hasSave = buttons.some(b => b.innerText?.trim() === 'Save' || b.getAttribute('aria-label') === 'Save'); - const ariaLabel = (dialog.getAttribute('aria-label') || '').toLowerCase(); - const isAltModal = ariaLabel.includes('alt') || hasSave || dialog.innerText?.includes('Add alt text') || dialog.innerText?.includes('Alt text'); - - if (textarea && isAltModal) { + const fields = altTextDialogFields(dialog); + if (fields) { + const { textarea } = fields; + const buttons = ownedDialogElements(dialog, 'button'); // A. Inject prominent button above textarea /* if (!dialog.querySelector('#bskyplus-ocr-btn')) { const container = document.createElement('div'); @@ -211,9 +240,8 @@ ocrBtn.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); - const currentImg = dialog.querySelector('img') || img; - const currentTextarea = dialog.querySelector('textarea, input[type="text"]') || textarea; - runOcrOnImage(currentImg, currentTextarea, ocrBtn); + const currentFields = dialog.isConnected && altTextDialogFields(dialog); + if (currentFields) runOcrOnImage(currentFields.img, currentFields.textarea, ocrBtn); }); container.appendChild(ocrBtn); @@ -240,9 +268,8 @@ headerBtn.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); - const currentImg = dialog.querySelector('img') || img; - const currentTextarea = dialog.querySelector('textarea, input[type="text"]') || textarea; - runOcrOnImage(currentImg, currentTextarea, headerBtn); + const currentFields = dialog.isConnected && altTextDialogFields(dialog); + if (currentFields) runOcrOnImage(currentFields.img, currentFields.textarea, headerBtn); }); saveBtn.parentElement.insertAdjacentElement('beforebegin', headerBtn); @@ -365,170 +392,15 @@ } } - // ------------------------------------------------------------- - // Feature 3: Accent Color Customizer - // Comprehensive recoloring for Bluesky official blue across the site - // ------------------------------------------------------------- - const ACCENT_STYLE_ID = 'bskyplus-accent-style'; - - function isBlueskyBlue(str) { - if (!str) return false; - const m = str.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/); - if (!m) return false; - const r = parseInt(m[1], 10); - const g = parseInt(m[2], 10); - const b = parseInt(m[3], 10); - return b > 140 && b > r + 30 && b > g + 20; - } - - function scanAndRecolorBluesky(root = document.body) { - if (!root) return; - if (!settings.accentColor || settings.accentColor.toLowerCase() === DEFAULT_BLUE.toLowerCase()) { - return; - } - - const elements = root.querySelectorAll ? root.querySelectorAll('*') : []; - for (let i = 0; i < elements.length; i++) { - const el = elements[i]; - if (el.classList && el.classList.contains('bskyplus-toast')) continue; - - const cs = window.getComputedStyle(el); - - if (isBlueskyBlue(cs.backgroundColor)) { - el.dataset.bskyplusAccentBg = 'true'; - } - if (isBlueskyBlue(cs.color) && el.children.length === 0) { - el.dataset.bskyplusAccentColor = 'true'; - } - if (isBlueskyBlue(cs.borderColor)) { - el.dataset.bskyplusAccentBorder = 'true'; - } - if (isBlueskyBlue(cs.fill)) { - el.dataset.bskyplusAccentFill = 'true'; - } - if (isBlueskyBlue(cs.stroke)) { - el.dataset.bskyplusAccentStroke = 'true'; - } - } - } - - function cleanAccentAttributes() { - const tagged = document.querySelectorAll('[data-bskyplus-accent-bg], [data-bskyplus-accent-color], [data-bskyplus-accent-border], [data-bskyplus-accent-fill], [data-bskyplus-accent-stroke]'); - for (const el of tagged) { - delete el.dataset.bskyplusAccentBg; - delete el.dataset.bskyplusAccentColor; - delete el.dataset.bskyplusAccentBorder; - delete el.dataset.bskyplusAccentFill; - delete el.dataset.bskyplusAccentStroke; - } - } - - function applyAccentColor(color) { - let style = document.getElementById(ACCENT_STYLE_ID); - if (!color || color.toLowerCase() === DEFAULT_BLUE.toLowerCase()) { - if (style) style.remove(); - cleanAccentAttributes(); - return; - } - - if (!style) { - style = document.createElement('style'); - style.id = ACCENT_STYLE_ID; - document.head.appendChild(style); - } - - style.textContent = ` - :root { - --bskyplus-accent: ${color} !important; - } - /* Backgrounds for Bluesky official blue variants */ - [style*="background-color: rgb(15, 115, 255)"], - [style*="background-color: rgb(16, 131, 254)"], - [style*="background-color: rgb(0, 106, 255)"], - [style*="background-color: rgb(0, 133, 255)"], - [style*="background-color: rgb(18, 126, 241)"], - [style*="background-color: rgb(32, 139, 254)"], - [style*="background-color: rgb(46, 147, 254)"], - [style*="background-color: rgb(25, 118, 210)"], - [style*="background-color: #1083fe"], - [style*="background-color: #0f73ff"], - [style*="background-color: #006aff"], - [data-bskyplus-accent-bg] { - background-color: ${color} !important; - } - - /* Text and Links */ - [style*="color: rgb(77, 151, 255)"], - [style*="color: rgb(15, 115, 255)"], - [style*="color: rgb(16, 131, 254)"], - [style*="color: rgb(0, 106, 255)"], - [style*="color: rgb(0, 133, 255)"], - [style*="color: rgb(18, 126, 241)"], - [style*="color: #1083fe"], - [style*="color: #0f73ff"], - [style*="color: #4d97ff"], - a[href^="/hashtag/"], - [data-bskyplus-accent-color] { - color: ${color} !important; - } - - /* Borders */ - [style*="border-color: rgb(15, 115, 255)"], - [style*="border-color: rgb(16, 131, 254)"], - [style*="border-color: rgb(0, 106, 255)"], - [style*="border-color: rgb(77, 151, 255)"], - [style*="border-color: #1083fe"], - [style*="border-color: #0f73ff"], - [data-bskyplus-accent-border] { - border-color: ${color} !important; - } - - /* SVGs (Icons, Butterfly logo, loaders, strokes) */ - svg [fill="rgb(15, 115, 255)"], - svg [fill="rgb(16, 131, 254)"], - svg [fill="rgb(0, 106, 255)"], - svg [fill="rgb(77, 151, 255)"], - svg [fill="#1083fe"], - svg [fill="#0f73ff"], - svg [fill="#006aff"], - svg [fill="#4d97ff"], - [data-bskyplus-accent-fill] { - fill: ${color} !important; - } - svg [stroke="rgb(15, 115, 255)"], - svg [stroke="rgb(16, 131, 254)"], - svg [stroke="rgb(0, 106, 255)"], - svg [stroke="rgb(25, 118, 210)"], - svg [stroke="#1083fe"], - svg [stroke="#0f73ff"], - [data-bskyplus-accent-stroke] { - stroke: ${color} !important; - } - `; - - scanAndRecolorBluesky(document.body); - } - // ------------------------------------------------------------- // Mutation Observer & Interaction Loop // ------------------------------------------------------------- let isWalking = false; - let accentScanDebounce = null; - const observer = new MutationObserver((mutations) => { if (isWalking) return; checkAltTextModal(); - if (settings.accentColor && settings.accentColor.toLowerCase() !== DEFAULT_BLUE.toLowerCase()) { - if (!accentScanDebounce) { - accentScanDebounce = setTimeout(() => { - accentScanDebounce = null; - scanAndRecolorBluesky(document.body); - }, 80); - } - } - if (settings.skeetMode) { isWalking = true; for (const mutation of mutations) { @@ -551,9 +423,6 @@ setInterval(() => { checkAltTextModal(); - if (settings.accentColor && settings.accentColor.toLowerCase() !== DEFAULT_BLUE.toLowerCase()) { - scanAndRecolorBluesky(document.body); - } }, 500); document.addEventListener('click', () => { @@ -570,10 +439,6 @@ document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn, .bskyplus-composer-ocr-btn').forEach(btn => btn.remove()); } - if (newSettings.accentColor !== undefined) { - applyAccentColor(settings.accentColor); - } - if (settings.skeetMode && !prevSkeet) { walkTextNodes(document.body); } else if (!settings.skeetMode && prevSkeet) { @@ -582,11 +447,10 @@ } // Initial load from storage - chrome.storage.local.get(['skeetMode', 'accentColor', 'localOcrEnabled'], (res) => { + chrome.storage.local.get(['skeetMode', 'localOcrEnabled'], (res) => { if (res) { updateLocalSettings({ skeetMode: !!res.skeetMode, - accentColor: res.accentColor || DEFAULT_BLUE, localOcrEnabled: res.localOcrEnabled !== false }); } diff --git a/extension/chrome/icons/icon128.png b/extension/chrome/icons/icon128.png index fa4e27a5429ec4e59b67d77503cd6eaf8cbbe140..573fb1f64740f9e84b837668ecf231df4050d9fb 100644 GIT binary patch literal 9046 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 literal 7567 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 KpUXO@geCyX$PEnu literal 732 zcme7R@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to7JIrlhE&Yyo$T!qk|=Wg z|MNT5&#kh2AE$7p*&RByX+e|R4y{G5SJVV$v15mOc+~u9%St^@8as=W2T7f>O>g3_eZBCa(FDbrt;Q;*$3K7F zwc!z0cPyjxMS{3p4wS|O`RusWD6gEYIt;qYj;2^ zi_@My&&7orpAsfKTk0Ygb#*%X%DC7M(M6xm^t1f@G{GkCV$+ld4IC$CDwrSiD=T6; zpt9`$r!5+a$9LYHvMBqhh>?nv+PdO7w{y1iMETdI4jfw9iM%eNHKHm@f&(<} zY$|9~l%K~Yu}SClKC8qEuP!4eyXt_eo4O`+$i%sw`P$Lp;9~ad#~V*aJC{ST(^3UK z*am+zi+*6nd)9D=6;lxNrdBa#!=zdz!#9APIG(T9x9-*NJM*kP4^K;7;-Pr9B7JMObjUo=%4>8?IqhV} z>B4qm#=#X#mn?p|e&4%a+j^6;w%^xSyYP(6IJ<4jrb$Hl_|N{Nd(!#jQwb5lqXz}v z^?APZ+0an=_bP0l+XkKEUsHz diff --git a/extension/chrome/icons/icon48.png b/extension/chrome/icons/icon48.png index 3a4e837fcfd43b4620fb0be29e017431b3d50093..27d455650f13c3d6465d75a7fe1dd8774dca2849 100644 GIT binary patch literal 7105 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 literal 2741 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 .section-title .section-collapse-arrow { + transform: rotate(-45deg); +} + +.section-collapsed > :not(.section-title) { + display: none !important; +} + +@media (prefers-reduced-motion: reduce) { + .theme-select-chevron { transition: none; } + + .section-collapse-arrow { + transition: none; + } +} + .section-subtitle { font-size: 11px; color: var(--text-secondary); @@ -151,7 +409,7 @@ body { } .switch:checked { - background-color: var(--accent-default); + background-color: #1083fe; } .switch:checked::before { @@ -203,7 +461,7 @@ body { width: 16px; height: 16px; border-radius: 50%; - background: var(--accent-default); + background: #1083fe; cursor: pointer; box-shadow: 0 0 4px rgba(0,0,0,0.4); } @@ -212,7 +470,7 @@ body { width: 16px; height: 16px; border-radius: 50%; - background: var(--accent-default); + background: #1083fe; cursor: pointer; border: none; } @@ -245,86 +503,6 @@ body { cursor: not-allowed; } -/* Palette */ -.palette-container { - display: flex; - gap: 7px; - justify-content: space-between; - margin-bottom: 12px; -} - -.color-swatch { - width: 32px; - height: 32px; - border-radius: 50%; - border: 2px solid transparent; - cursor: pointer; - transition: transform 0.15s ease, border-color 0.15s ease; - padding: 0; - outline: none; -} - -.color-swatch:hover { - transform: scale(1.15); -} - -.color-swatch.active { - border-color: #ffffff; - box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.4); - transform: scale(1.1); -} - -.custom-color-row { - display: flex; - align-items: center; - justify-content: space-between; - gap: 10px; -} - -.color-input-wrapper { - display: flex; - align-items: center; - gap: 8px; - background-color: var(--bg-secondary); - padding: 4px 8px; - border-radius: 8px; - border: 1px solid var(--border-color); - flex: 1; -} - -#colorPicker { - appearance: none; - -webkit-appearance: none; - border: none; - width: 26px; - height: 26px; - border-radius: 6px; - cursor: pointer; - background: none; - padding: 0; -} - -#colorPicker::-webkit-color-swatch-wrapper { - padding: 0; -} - -#colorPicker::-webkit-color-swatch { - border: 1px solid rgba(255, 255, 255, 0.2); - border-radius: 6px; -} - -#hexInput { - background: transparent; - border: none; - color: var(--text-primary); - font-family: monospace; - font-size: 13px; - font-weight: 600; - width: 75px; - outline: none; - text-transform: uppercase; -} - .secondary-btn { background-color: var(--bg-secondary); color: var(--text-secondary); @@ -360,3 +538,98 @@ body { font-size: 10px; color: var(--text-secondary); } +.header-actions { + display: flex; + align-items: center; + gap: 8px; + flex-shrink: 0; +} + +#moreSettingsButton { + width: auto; + margin: 0; + white-space: nowrap; +} +#featuresSection .bskyplus-popup-feature, +#altTextSection .bskyplus-popup-feature, +#infrastructureSection .bskyplus-popup-feature { + border-radius: 10px; + background: var(--bg-secondary); + margin-bottom: 8px; + overflow-anchor: none; +} + +.bskyplus-popup-feature > .toggle-row { + margin-bottom: 0; + transition: background-color 0.15s ease, padding-bottom 300ms ease; +} + +.bskyplus-controls-reveal { + display: grid; + grid-template-rows: 0fr; + opacity: 0; + transition: grid-template-rows 300ms ease, opacity 180ms ease; +} + +.bskyplus-feature-expanded > .bskyplus-controls-reveal { + grid-template-rows: 1fr; + opacity: 1; +} + +.bskyplus-controls-clip { + min-height: 0; + min-width: 0; + overflow: hidden; +} + +@media (prefers-reduced-motion: reduce) { + .bskyplus-controls-reveal, + .bskyplus-popup-feature > .toggle-row { + transition: none; + } +} + +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 9px; +} + +.bskyplus-popup-controls { + padding: 0 12px 12px; +} + +.bskyplus-popup-controls .bskyplus-llm-field { + gap: 4px; + margin-bottom: 8px; +} + +.bskyplus-popup-controls .bskyplus-llm-label { + padding-inline: 10px; + line-height: 1.4; +} + +.bskyplus-popup-controls [role="status"]:empty { + display: none; +} + +.bskyplus-popup-controls [role="status"], +.bskyplus-popup-controls .bskyplus-llm-notice { + min-height: 0; + margin-top: 4px; +} + +.bskyplus-popup-controls[hidden] { + display: none; +} + +#bookmarksSection .bskyplus-popup-controls { + padding-bottom: 4px; +} + +#bookmarksSection .bskyplus-llm-field { + margin-bottom: 4px; +} + +.bskyplus-popup-controls .bskyplus-llm-actions { + flex-wrap: wrap; + gap: 6px; +} diff --git a/extension/chrome/popup/popup.html b/extension/chrome/popup/popup.html index 046da08..4149d34 100644 --- a/extension/chrome/popup/popup.html +++ b/extension/chrome/popup/popup.html @@ -10,13 +10,16 @@
- Bsky+ Logo + Bsky+ Logo

Bsky+

Power tools for Bluesky
- v1.0.2 +
+ + v2.0.0 +
@@ -35,6 +38,20 @@
+
+
Theme
+
+ Color theme + +
+
+ + +
+

+
+
Features
@@ -49,7 +66,7 @@ @@ -57,7 +74,7 @@ @@ -70,20 +87,12 @@ -
- ', ''); +function fixture({ count = 3, children = true } = {}) { + return `

Thread

+
+
${avatar(1)}Alice
@alice.test
+
${text(1, count)}${media(1)}
+
Everybody can reply
+ + +
${controls(1)}
+
+ ${children ? childMarkup(2, count) + childMarkup(3, count) : ''} +
Unrelated reply
+
`; +} + +async function setup(t, options) { + const browser = await puppeteer.launch({ executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', headless: true }); + t.after(() => browser.close()); + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', request => request.respond({ contentType: 'text/html', body: fixture(options) })); + await page.goto('https://bsky.app/profile/alice.test/post/p1'); + // React creates nested native links programmatically; HTML parsing alone + // would repair those anchors into a different tree. + await page.evaluate(() => { + for (const node of document.querySelectorAll('[role="link"][data-testid]')) { + const link = document.createElement('a'); + for (const attr of node.attributes) link.setAttribute(attr.name, attr.value); + link.append(...node.childNodes); + node.replaceWith(link); + } + }); + await page.addStyleTag({ content: await readFile('extension/shared/thread-unroll.css', 'utf8') }); + await page.addScriptTag({ content: await readFile('extension/shared/thread-unroll.js', 'utf8') }); + return page; +} + +const toggle = '.bskyplus-thread-unroll-toggle'; +const visible = (page, selector) => page.$eval(selector, node => { + const rect = node.getBoundingClientRect(); + return rect.width > 0 && rect.height > 0 && getComputedStyle(node).visibility !== 'hidden'; +}); + +test('inline unroll preserves native interactions and media, then restores the thread', async t => { + const page = await setup(t); + await page.waitForSelector(toggle); + assert.equal(await page.$eval(toggle, node => node.previousElementSibling?.id === 'thread-options' || node.nextElementSibling?.id === 'thread-options'), true); + await page.evaluate(() => { + window.savedLike = document.getElementById('like-2'); + window.clicks = 0; + window.savedLike.addEventListener('click', event => { event.preventDefault(); event.stopPropagation(); window.clicks++; }); + }); + await page.click(toggle); + await page.waitForFunction(() => document.getElementById('author-2').getClientRects().length === 0); + assert.deepEqual(await page.$$eval('[data-bskyplus-unroll-post] [data-word-wrap="1"], [data-bskyplus-unroll-post] [data-word-wrap="1"] a', nodes => nodes.map(node => getComputedStyle(node).fontSize)), Array(6).fill('16.9px')); + for (const selector of ['#author-1', '#text-1', '#text-2', '#text-3', '#media-2', '#alt-2', '#reply-2', '#repost-2', '#like-2', '#unrelated']) assert.equal(await visible(page, selector), true, selector); + for (const selector of ['#avatar-2', '#author-3', '#menu-1', '#menu-2', '#date-1', '#stats-1', '#known-likers', '#reply-prompt']) assert.equal(await visible(page, selector), false, selector); + assert.equal(await page.evaluate(() => document.getElementById('like-2') === window.savedLike), true); + await page.click('#like-2'); + assert.equal(await page.evaluate(() => window.clicks), 1); + assert.equal(await page.$eval('#like-2', node => node.textContent.trim()), '5'); + await page.setViewport({ width: 390, height: 844 }); + await page.evaluate(() => { + const prompt = document.getElementById('reply-prompt').cloneNode(true); + prompt.id = 'mobile-reply-prompt'; + prompt.removeAttribute('data-bskyplus-unroll-chrome'); + const button = document.createElement('div'); + button.setAttribute('role', 'button'); + button.setAttribute('aria-label', 'Compose reply'); + button.textContent = 'Write your reply'; + prompt.replaceChildren(button); + document.querySelector('main').append(prompt); + }); + await page.waitForFunction(() => document.getElementById('mobile-reply-prompt').getClientRects().length === 0); + assert.equal(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth), true); + if (process.env.UNROLL_SCREENSHOT) await page.screenshot({ path: process.env.UNROLL_SCREENSHOT, fullPage: true }); + await page.click(toggle); + await page.waitForFunction(() => document.getElementById('author-2').getClientRects().length > 0); + assert.equal(await page.$eval('#text-2', node => getComputedStyle(node).fontSize), '15px'); + for (const selector of ['#avatar-2', '#menu-1', '#stats-1', '#known-likers', '#reply-prompt', '#mobile-reply-prompt']) assert.equal(await visible(page, selector), true, selector); +}); + +test('unroll requires a first-post marker and resets when leaving the thread', async t => { + const page = await setup(t, { count: 1, children: false }); + assert.equal(await page.$(toggle), null); + await page.$eval('span[aria-label="Post 1 of 1"]', node => node.setAttribute('aria-label', 'Post 1 of 3')); + await page.waitForSelector(toggle); + await page.click(toggle); + await page.evaluate(markup => document.getElementById('unrelated').insertAdjacentHTML('beforebegin', markup), childMarkup(2)); + await page.waitForFunction(() => document.getElementById('author-2').getClientRects().length === 0); + await page.evaluate(() => { history.pushState({}, '', '/'); window.dispatchEvent(new PopStateEvent('popstate')); }); + await page.waitForFunction(() => !document.querySelector('.bskyplus-thread-unroll-toggle')); + assert.equal(await visible(page, '#author-2'), true); +}); + +test('numbered bounds exclude later replies and nested quoted posts', async t => { + const page = await setup(t); + await page.waitForSelector(toggle); + await page.evaluate(markup => { + document.getElementById('thread-list').insertAdjacentHTML('beforeend', markup); + const quote = document.createElement('div'); + quote.dataset.testid = 'postThreadItem-by-quoted.test'; + quote.id = 'quoted-post'; + const badge = document.createElement('span'); + badge.setAttribute('aria-label', 'Post 1 of 9'); + badge.textContent = 'Quoted thread'; + quote.append(badge); + for (const id of ['replyBtn', 'repostBtn', 'likeBtn', 'postDropdownBtn']) { + const control = document.createElement('button'); + control.dataset.testid = id; + control.textContent = 'Quoted control'; + quote.append(control); + } + document.getElementById('media-1').append(quote); + }, childMarkup(4, 4)); + await page.click(toggle); + await page.waitForFunction(() => document.getElementById('post-3').hasAttribute('data-bskyplus-unroll-post')); + assert.deepEqual(await page.$$eval('[data-bskyplus-unroll-post]', nodes => nodes.map(node => node.id)), ['post-1', 'post-2', 'post-3']); + assert.equal(await visible(page, '#author-4'), true); + assert.equal(await visible(page, '#quoted-post'), true); + assert.equal(await visible(page, '#menu-1'), false); + await page.$eval('#text-1 span[aria-label]', node => node.remove()); + await page.waitForFunction(() => !document.querySelector('.bskyplus-thread-unroll-toggle')); + assert.equal(await page.$$eval('[data-bskyplus-unroll-post]', nodes => nodes.length), 0); +}); + +test('opening a middle post keeps its expanded body while hiding its repeated author', async t => { + const page = await setup(t); + await page.waitForSelector(toggle); + await page.evaluate(markup => { + document.getElementById('post-2').parentElement.remove(); + const anchor = document.getElementById('post-1'); + for (const node of [anchor, ...anchor.querySelectorAll('[id]')]) node.id = node.id.replace(/-1$/, '-2'); + anchor.querySelector('span[aria-label="Post 1 of 3"]').setAttribute('aria-label', 'Post 2 of 3'); + anchor.parentElement.insertAdjacentHTML('beforebegin', markup); + history.replaceState({}, '', '/profile/alice.test/post/p2'); + window.dispatchEvent(new PopStateEvent('popstate')); + }, childMarkup(1)); + await page.waitForFunction(() => document.querySelector('.bskyplus-thread-unroll-toggle')?.getAttribute('aria-pressed') === 'false'); + // Let the navigation scan run before making a selection on the new route. + await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))); + await page.click(toggle); + await page.waitForFunction(() => document.getElementById('author-2').getClientRects().length === 0); + for (const selector of ['#text-2', '#media-2', '#reply-2', '#like-2', '#author-1']) assert.equal(await visible(page, selector), true, selector); + assert.deepEqual(await page.$$eval('[data-bskyplus-unroll-post]', nodes => nodes.map(node => node.id)), ['post-1', 'post-2', 'post-3']); +}); + +test('default avatars and role-based header buttons use the same compact layout', async t => { + const page = await setup(t); + await page.waitForSelector(toggle); + await page.evaluate(() => { + for (const avatar of document.querySelectorAll('[id^="avatar-"] img')) { + const placeholder = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + placeholder.setAttribute('width', '40'); + placeholder.setAttribute('height', '40'); + avatar.replaceWith(placeholder); + } + const button = document.getElementById('thread-options'); + const roleButton = document.createElement('div'); + roleButton.setAttribute('role', 'button'); + roleButton.setAttribute('aria-label', 'Thread options'); + roleButton.textContent = 'Thread options'; + button.replaceWith(roleButton); + }); + await page.waitForFunction(() => document.querySelector('.bskyplus-thread-unroll-toggle')?.nextElementSibling?.getAttribute('role') === 'button'); + await page.click(toggle); + await page.waitForFunction(() => document.getElementById('author-2').getClientRects().length === 0); + assert.equal(await visible(page, '#avatar-2'), false); + assert.equal(await visible(page, '#author-1'), true); +}); + +test('unrolled post bodies do not navigate but nested links and controls still work', async t => { + const page = await setup(t); + await page.waitForSelector(toggle); + await page.evaluate(() => { + window.interactions = { posts: 0, links: 0, likes: 0, media: 0 }; + const post = document.getElementById('post-2'); + post.addEventListener('click', event => { + event.preventDefault(); + window.interactions.posts++; + }); + for (const [selector, key] of [['#text-2 a', 'links'], ['#like-2', 'likes'], ['#alt-2', 'media']]) { + document.querySelector(selector).addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + window.interactions[key]++; + }); + } + }); + await page.click(toggle); + await page.click('#text-2', { offset: { x: 10, y: 5 } }); + await page.focus('#post-2'); + await page.keyboard.press('Enter'); + assert.equal(await page.$eval('#post-2', post => post.dispatchEvent(new MouseEvent('auxclick', { bubbles: true, cancelable: true, button: 1 }))), false); + await page.click('#text-2 a'); + await page.click('#like-2'); + await page.click('#alt-2'); + assert.deepEqual(await page.evaluate(() => window.interactions), { posts: 0, links: 1, likes: 1, media: 1 }); + await page.click(toggle); + await page.click('#text-2', { offset: { x: 10, y: 5 } }); + assert.equal(await page.evaluate(() => window.interactions.posts), 1); +}); diff --git a/test/test_video_controls.mjs b/test/test_video_controls.mjs index b361835..6577137 100644 --- a/test/test_video_controls.mjs +++ b/test/test_video_controls.mjs @@ -23,6 +23,7 @@ async function loadMediaViewer(page, { enabled = true } = {}) {
+
+
player overlay
@@ -39,10 +41,14 @@ async function loadMediaViewer(page, { enabled = true } = {}) { await page.evaluate((isEnabled) => { const changedListeners = []; const storageWrites = []; + const storageReads = []; window.chrome = { storage: { local: { - get: (keys, callback) => callback(isEnabled ? {} : { mediaViewerEnabled: false }), + get: (keys, callback) => { + storageReads.push(keys); + callback({ ...(isEnabled ? {} : { mediaViewerEnabled: false }), videoSpeed: 1.5 }); + }, set: values => storageWrites.push(values) }, onChanged: { @@ -54,6 +60,7 @@ async function loadMediaViewer(page, { enabled = true } = {}) { changedListeners.forEach(listener => listener(changes, 'local')); }; window.__storageWrites = storageWrites; + window.__storageReads = storageReads; }, enabled); await page.addScriptTag({ content: scripts[0] }); await page.addScriptTag({ content: scripts[1] }); @@ -72,9 +79,12 @@ test('post figure videos get controls in the Bluesky toolbar while preserving ov figureControls: document.querySelector('#figure-video').hasAttribute('controls'), figureOverlayPresent: !!document.querySelector('#figure-overlay'), galleryControls: document.querySelector('#gallery-video').hasAttribute('controls'), + galleryAltButton: !!document.querySelector('#gallery-alt-button'), postToolbar: !!document.querySelector('#post-controls-row .bskyplus-video-toolbar'), galleryToolbar: !!document.querySelector('#gallery-controls-row .bskyplus-video-toolbar'), postSpeed: !!document.querySelector('#post-controls-row .bskyplus-speed-select'), + postRate: document.querySelector('#post-video').playbackRate, + galleryRate: document.querySelector('#gallery-video').playbackRate, postPip: !!document.querySelector('#post-controls-row .bskyplus-pip-btn'), postToolbarIsThirdControl: document.querySelector('#post-controls-row').children[3] ?.classList.contains('bskyplus-video-toolbar'), @@ -86,9 +96,16 @@ test('post figure videos get controls in the Bluesky toolbar while preserving ov assert.equal(initial.figureControls, false, 'figure video should preserve custom controls'); assert.equal(initial.figureOverlayPresent, true, 'production player overlay should be preserved'); assert.equal(initial.galleryControls, false, 'gallery video should preserve custom controls'); + assert.equal(initial.galleryAltButton, true, 'the ALT action after the figure should remain in place'); + assert.equal(initial.postRate, 1, 'legacy stored speed should not affect a new video'); + assert.equal(initial.galleryRate, 1, 'each new video should start at 1x'); + assert.equal(await page.evaluate(() => window.__storageReads.flat().includes('videoSpeed')), false, + 'legacy videoSpeed storage is ignored'); assert.equal(initial.postToolbar, true, 'toolbar should be added to the Bluesky controls row'); assert.equal(initial.galleryToolbar, true, 'gallery toolbar should be added to the Bluesky controls row'); - assert.equal(initial.postSpeed, true, 'speed select should be added to the Bluesky controls row'); + assert.equal(await page.$eval('#gallery-controls-row .bskyplus-speed-select', trigger => + trigger.value), '1', 'video with an intervening ALT button should still get a speed trigger'); + assert.equal(initial.postSpeed, true, 'speed menu trigger should be added to the Bluesky controls row'); assert.equal(initial.postPip, true, 'PiP button should be added to the Bluesky controls row'); assert.equal(initial.postToolbarIsThirdControl, true, 'toolbar should be the fourth control in the row'); assert.equal(initial.outsideControls, false, 'videos outside posts should be unchanged'); @@ -117,6 +134,18 @@ test('post figure videos get controls in the Bluesky toolbar while preserving ov assert.equal(audioState.galleryMuted, true, 'applyToAllVideos should preserve gallery mute state'); assert.equal(audioState.writes.some(values => 'videoVolume' in values || 'videoMuted' in values), false, 'volume changes should not be persisted'); + const alternateLayoutRate = await page.evaluate(() => { + const video = document.querySelector('#gallery-video'); + video.playbackRate = 1.25; + video.dispatchEvent(new Event('ratechange')); + return { + altButtonPresent: !!document.querySelector('#gallery-alt-button'), + triggerValue: document.querySelector('#gallery-controls-row .bskyplus-speed-select').value, + }; + }); + assert.equal(alternateLayoutRate.altButtonPresent, true, 'speed updates should preserve the intervening ALT action'); + assert.equal(alternateLayoutRate.triggerValue, '1.25', + 'rate changes should update controls after an intervening ALT button'); await page.evaluate(() => { const media = document.querySelector('#post-figure'); @@ -128,83 +157,186 @@ test('post figure videos get controls in the Bluesky toolbar while preserving ov assert.equal(await page.$eval('#unrelated-sibling', element => element.isConnected), true, 'a sibling added after the first scan must survive repeated scans'); - await page.select('#post-controls-row .bskyplus-speed-select', '1.5'); - assert.equal(await page.$eval('#post-video', video => video.playbackRate), 1.5); - const speedWidths = await page.evaluate(() => { - const select = document.querySelector('#post-controls-row .bskyplus-speed-select'); - const widthFor = value => { - select.value = value; - select.dispatchEvent(new Event('change')); - return select.getBoundingClientRect().width; + const speedTrigger = '#post-controls-row .bskyplus-speed-select'; + const menuSelector = await page.$eval(speedTrigger, trigger => `#${trigger.getAttribute('aria-controls')}`); + const openSpeedMenu = async () => { + await page.click(speedTrigger); + await page.waitForFunction((trigger, menu) => + document.querySelector(trigger)?.getAttribute('aria-expanded') === 'true' && + document.querySelector(menu)?.getAttribute('role') === 'menu', {}, speedTrigger, menuSelector); + await page.waitForSelector(`${menuSelector}:not([hidden])`, { visible: true }); + }; + const closeSpeedMenu = async () => { + await page.waitForFunction((trigger, menu) => + document.querySelector(trigger)?.getAttribute('aria-expanded') === 'false' && + !document.querySelector(menu)?.checkVisibility(), {}, speedTrigger, menuSelector); + }; + + await openSpeedMenu(); + if (process.env.SCREENSHOT_PATH) { + await page.screenshot({ path: process.env.SCREENSHOT_PATH, fullPage: true }); + } + const menuAppearance = await page.$eval(menuSelector, menu => { + const style = getComputedStyle(menu); + const rect = menu.getBoundingClientRect(); + const triggerRect = document.querySelector('.bskyplus-speed-select').getBoundingClientRect(); + return { + borderRadius: parseFloat(style.borderTopLeftRadius), + background: style.backgroundColor, + top: rect.top, + right: rect.right, + bottom: rect.bottom, + left: rect.left, + gapBelowTrigger: rect.top - triggerRect.bottom, + gapAboveTrigger: triggerRect.top - rect.bottom, + viewportWidth: innerWidth, + viewportHeight: innerHeight, }; - return { one: widthFor('1'), onePointTwentyFive: widthFor('1.25') }; }); - assert.ok(speedWidths.onePointTwentyFive > speedWidths.one, - 'speed select should expand to fit longer labels'); - await page.select('#post-controls-row .bskyplus-speed-select', '1.5'); - const closedPickerClick = await page.$eval('#post-controls-row .bskyplus-speed-select', select => { + assert.ok(menuAppearance.borderRadius >= 6, + `speed menu has rounded corners (${menuAppearance.borderRadius}px)`); + const menuRgb = menuAppearance.background.match(/\d+/g)?.slice(0, 3).map(Number); + assert.ok(menuRgb && menuRgb.every(channel => channel < 100), + `speed menu uses a dark surface (${menuAppearance.background})`); + assert.ok(menuAppearance.top >= 0 && menuAppearance.left >= 0 && + menuAppearance.bottom <= menuAppearance.viewportHeight && + menuAppearance.right <= menuAppearance.viewportWidth, + 'speed menu stays inside the viewport'); + assert.ok((menuAppearance.gapBelowTrigger >= -1 && menuAppearance.gapBelowTrigger <= 20) || + (menuAppearance.gapAboveTrigger >= -1 && menuAppearance.gapAboveTrigger <= 20), + 'speed menu stays anchored beside its trigger'); + + await page.click(`${menuSelector} [data-speed="1.5"]`); + await closeSpeedMenu(); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), 1.5); + assert.equal(await page.$eval(speedTrigger, trigger => trigger.value), '1.5'); + assert.equal(await page.$eval(`${menuSelector} [data-speed="1.5"]`, option => + option.getAttribute('aria-checked')), 'true'); + assert.equal(await page.evaluate(() => window.__storageWrites.some(values => 'videoSpeed' in values)), false, + 'choosing a playback speed does not persist videoSpeed'); + + await openSpeedMenu(); + await page.keyboard.press('ArrowDown'); + assert.equal(await page.evaluate(() => document.activeElement?.getAttribute('data-speed')), '2', + 'ArrowDown moves focus to the next speed option'); + await page.keyboard.press('Enter'); + await closeSpeedMenu(); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), 2, + 'Enter selects the focused speed'); + assert.equal(await page.$eval(speedTrigger, trigger => + trigger.querySelector('.bskyplus-speed-value')?.textContent), '2x'); + + await openSpeedMenu(); + const rateBeforeEscape = await page.$eval('#post-video', video => video.playbackRate); + await page.keyboard.press('ArrowUp'); + assert.equal(await page.evaluate(() => document.activeElement?.getAttribute('data-speed')), '1.5', + 'ArrowUp moves focus to the previous speed option'); + await page.keyboard.press('Escape'); + await closeSpeedMenu(); + assert.equal(await page.$eval(speedTrigger, trigger => document.activeElement === trigger), true, + 'Escape closes the menu and restores focus to the trigger'); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), rateBeforeEscape, + 'Escape without selection preserves playback speed'); + + await openSpeedMenu(); + await page.click(`${menuSelector} [data-speed="1.5"]`); + await closeSpeedMenu(); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), 1.5, + 'mouse selection changes playback speed'); + const rateBeforeReselect = await page.$eval('#post-video', video => video.playbackRate); + await openSpeedMenu(); + await page.click(`${menuSelector} [data-speed="1.5"]`); + await closeSpeedMenu(); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), rateBeforeReselect, + 'reselecting the current speed preserves playback rate'); + + await page.evaluate(() => { const video = document.querySelector('#post-video'); - select.focus(); - const rateBefore = video.playbackRate; - select.dispatchEvent(new MouseEvent('click', { bubbles: true })); + video.setAttribute('src', 'data:video/mp4;base64,AAAA'); + video.dispatchEvent(new Event('loadstart')); + }); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), 1, + 'reusing a video element for a different source resets playback to 1x'); + assert.equal(await page.$eval(speedTrigger, trigger => trigger.value), '1', + 'the speed control reflects the reset after a source change'); + + await openSpeedMenu(); + await page.click(`${menuSelector} [data-speed="1.5"]`); + await closeSpeedMenu(); + + await openSpeedMenu(); + await page.click('#outside-click-target'); + await closeSpeedMenu(); + assert.equal(await page.$eval(speedTrigger, trigger => trigger.getAttribute('aria-expanded')), 'false', + 'clicking outside closes the speed menu'); + + await page.evaluate(() => { + const dialog = document.createElement('dialog'); + dialog.id = 'native-video-dialog'; + const player = document.querySelector('#post-with-controls'); + dialog.appendChild(player); + document.body.appendChild(dialog); + dialog.showModal(); + }); + await page.waitForFunction(() => document.querySelector('#native-video-dialog')?.open); + await openSpeedMenu(); + const dialogMenuState = await page.$eval(menuSelector, menu => { + const option = menu.querySelector('[data-speed="0.5"]'); + const rect = option.getBoundingClientRect(); return { - blurred: document.activeElement !== select, - rate: video.playbackRate, - rateBefore + inDialog: menu.parentElement?.id === 'native-video-dialog', + topElementIsOption: option.contains(document.elementFromPoint( + rect.left + rect.width / 2, rect.top + rect.height / 2 + )) }; }); - await page.waitForFunction(() => { - const select = document.querySelector('#post-controls-row .bskyplus-speed-select'); - return document.activeElement !== select; - }); - assert.equal(await page.$eval('#post-controls-row .bskyplus-speed-select', - select => document.activeElement !== select), true, - 'clicking the already selected speed should clear focus when the picker is closed'); - assert.equal(closedPickerClick.rate, closedPickerClick.rateBefore, - 'reselecting the current speed should preserve the playback rate'); + assert.equal(dialogMenuState.inDialog, true, + 'speed menu mounts inside its native dialog scope'); + assert.equal(dialogMenuState.topElementIsOption, true, + 'speed option remains the hit target above the modal dialog'); + await page.click(`${menuSelector} [data-speed="0.5"]`); + await closeSpeedMenu(); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), 0.5, + 'choosing an option inside a native dialog changes playback speed'); - await page.click('#post-controls-row .bskyplus-speed-select'); - await page.keyboard.press('Enter'); - await page.waitForFunction(() => { - const select = document.querySelector('#post-controls-row .bskyplus-speed-select'); - return document.activeElement !== select; + await openSpeedMenu(); + await page.evaluate(() => document.querySelector('#native-video-dialog').close()); + await page.waitForFunction(selector => + document.querySelector('.bskyplus-speed-select')?.getAttribute('aria-expanded') === 'false' && + document.querySelector(selector)?.parentElement === document.body, {}, menuSelector); + await page.evaluate(() => { + const player = document.querySelector('#post-with-controls'); + document.body.appendChild(player); + document.querySelector('#native-video-dialog').remove(); + const fullscreenButton = document.querySelector('#post-controls-row button[aria-label="Fullscreen"]'); + fullscreenButton.addEventListener('click', () => player.requestFullscreen()); }); - const actualPickerSelection = await page.$eval('#post-controls-row .bskyplus-speed-select', select => ({ - blurred: document.activeElement !== select, - value: select.value, - rate: document.querySelector('#post-video').playbackRate - })); - assert.equal(actualPickerSelection.blurred, true, - 'choosing the already selected speed through the browser picker should clear focus'); - assert.equal(actualPickerSelection.value, '1.5', - 'choosing the already selected speed should preserve the selected value'); - assert.equal(actualPickerSelection.rate, 1.5, - 'choosing the already selected speed should preserve the playback rate'); - await page.keyboard.press('Escape'); - for (const key of ['Enter', 'Escape']) { - const closedPickerKey = await page.$eval('#post-controls-row .bskyplus-speed-select', - (select, keyName) => { - const video = document.querySelector('#post-video'); - select.focus(); - const rateBefore = video.playbackRate; - select.dispatchEvent(new KeyboardEvent('keyup', { key: keyName, bubbles: true })); - return { - blurred: document.activeElement !== select, - rate: video.playbackRate, - rateBefore - }; - }, key); - await page.waitForFunction(() => { - const select = document.querySelector('#post-controls-row .bskyplus-speed-select'); - return document.activeElement !== select; - }); - assert.equal(await page.$eval('#post-controls-row .bskyplus-speed-select', - select => document.activeElement !== select), true, - `${key} should clear focus when the speed picker is closed`); - assert.equal(closedPickerKey.rate, closedPickerKey.rateBefore, - `${key} should preserve the playback rate`); - } + await page.click('#post-controls-row button[aria-label="Fullscreen"]'); + await page.waitForFunction(() => document.fullscreenElement?.id === 'post-with-controls'); + await openSpeedMenu(); + assert.equal(await page.$eval(menuSelector, menu => + menu.parentElement?.id === 'post-with-controls'), true, + 'speed menu mounts inside the active fullscreen root'); + const fullscreenOptionState = await page.$eval(menuSelector, menu => { + const option = menu.querySelector('[data-speed="1.25"]'); + const rect = option.getBoundingClientRect(); + return option.contains(document.elementFromPoint( + rect.left + rect.width / 2, rect.top + rect.height / 2 + )); + }); + assert.equal(fullscreenOptionState, true, + 'speed option remains the hit target in fullscreen'); + await page.click(`${menuSelector} [data-speed="1.25"]`); + await closeSpeedMenu(); + assert.equal(await page.$eval('#post-video', video => video.playbackRate), 1.25, + 'choosing an option in fullscreen changes playback speed'); + await openSpeedMenu(); + await page.evaluate(() => document.exitFullscreen()); + await page.waitForFunction(() => document.fullscreenElement === null); + await closeSpeedMenu(); + await page.waitForFunction(selector => + document.querySelector(selector)?.parentElement === document.body, {}, menuSelector); await page.evaluate(() => { const row = document.querySelector('#post-controls-row'); @@ -219,10 +351,10 @@ test('post figure videos get controls in the Bluesky toolbar while preserving ov }); await page.waitForSelector('#delayed-controls-row .bskyplus-speed-select'); await page.waitForSelector('#post-controls-row .bskyplus-speed-select'); - assert.equal(await page.$eval('#post-controls-row .bskyplus-speed-select', select => select.value), '1.5', + assert.equal(await page.$eval('#post-controls-row .bskyplus-speed-select', select => select.value), '1.25', 'replacing the controls row should retain the current speed'); - assert.equal(await page.$eval('#figure-video', video => video.playbackRate), 1.5, - 'a player whose controls arrive later should inherit the remembered speed'); + assert.equal(await page.$eval('#figure-video', video => video.playbackRate), 1, + 'a new player whose controls arrive later should start at 1x'); await page.evaluate(() => window.BskyPlusMediaViewer.scanVideos()); assert.equal(await page.$$eval('#post-controls-row .bskyplus-video-toolbar', toolbars => toolbars.length), 1); -- knotmirror 0.0.1
-
Accent Color
-
Pride palette & custom colors
- -
- - - - - - - - -
- -
-
- - +
+
ALT Text
+
+ +
-
- OCR runs 100% locally in your browser +
+
Local Bookmarks
+

Enable local bookmarks to download all your bookmarks into this browser’s IndexedDB for local browsing on Bluesky’s Saved page. Rough estimate: 100 bookmarks use 0.5–2 MB; 1,000 use 5–20 MB, depending on post size. Only post data and media URLs are stored, not media files. Data stays on this device, is accessible to bsky.app, and clearing site data removes it. Search and filters on the Saved page apply to your entire local collection.

+
+
Infrastructure
+
+ + + + + + + + + diff --git a/extension/chrome/popup/popup.js b/extension/chrome/popup/popup.js index 58f4dc4..367e858 100644 --- a/extension/chrome/popup/popup.js +++ b/extension/chrome/popup/popup.js @@ -1,15 +1,65 @@ // Bsky+ Settings Popup +// Section disclosure is independent of feature enablement and shared across settings views. +(() => { + const api = globalThis.browser || globalThis.chrome; + const sections = [ + ['feedLayout', document.querySelector('[data-feature="feedWidth"]')], + ['features', document.getElementById('featuresSection')], + ['altText', document.getElementById('altTextSection')], + ['infrastructure', document.getElementById('infrastructureSection')], + ]; + for (const [name, section] of sections) { + const title = section?.querySelector(':scope > .section-title'); + if (!title) continue; + const key = 'settingsSectionCollapsed_' + name; + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'section-collapse-button'; + button.textContent = title.textContent; + const arrow = document.createElement('span'); + arrow.className = 'section-collapse-arrow'; + arrow.setAttribute('aria-hidden', 'true'); + button.append(arrow); + title.replaceChildren(button); + function render(collapsed) { + section.classList.toggle('section-collapsed', collapsed); + button.setAttribute('aria-expanded', String(!collapsed)); + } + render(false); + button.disabled = true; + api.storage.local.get(key).then(stored => render(stored[key] === true)) + .catch(error => console.error('Could not load section state:', error)) + .finally(() => { button.disabled = false; }); + button.addEventListener('click', async () => { + const collapsed = button.getAttribute('aria-expanded') === 'true'; + render(collapsed); + button.disabled = true; + try { + await api.storage.local.set({ [key]: collapsed }); + } catch (error) { + render(!collapsed); + console.error('Could not save section state:', error); + } finally { + button.disabled = false; + } + }); + api.storage.onChanged.addListener((changes, area) => { + if (area === 'local' && changes[key]) render(changes[key].newValue === true); + }); + } +})(); + + const DEFAULT_SETTINGS = { skeetMode: false, - accentColor: '#1083fe', feedWidth: 600, mediaDownloaderEnabled: true, mediaViewerEnabled: true, quickEmojiEnabled: true, accountAgeEnabled: true, - threadUnrollEnabled: true, localOcrEnabled: true, + hideLikedByEnabled: false, enableAlphaFeatures: false }; @@ -18,18 +68,14 @@ const mediaDownloaderToggle = document.getElementById('mediaDownloaderToggle'); const mediaViewerToggle = document.getElementById('mediaViewerToggle'); const quickEmojiToggle = document.getElementById('quickEmojiToggle'); const accountAgeToggle = document.getElementById('accountAgeToggle'); -const threadUnrollToggle = document.getElementById('threadUnrollToggle'); const localOcrToggle = document.getElementById('localOcrToggle'); +const hideLikedByToggle = document.getElementById('hideLikedByToggle'); const feedWidthSlider = document.getElementById('feedWidthSlider'); const feedWidthVal = document.getElementById('feedWidthVal'); const feedWidthMaxLimit = document.getElementById('feedWidthMaxLimit'); const presetButtons = document.querySelectorAll('.preset-btn'); -const colorPicker = document.getElementById('colorPicker'); -const hexInput = document.getElementById('hexInput'); -const resetColorBtn = document.getElementById('resetColorBtn'); -const pridePalette = document.getElementById('pridePalette'); const versionText = document.getElementById('versionText'); // Set version from manifest @@ -153,8 +199,8 @@ function updateUI() { if (mediaViewerToggle) mediaViewerToggle.checked = !!currentSettings.mediaViewerEnabled; if (quickEmojiToggle) quickEmojiToggle.checked = !!currentSettings.quickEmojiEnabled; if (accountAgeToggle) accountAgeToggle.checked = !!currentSettings.accountAgeEnabled; - if (threadUnrollToggle) threadUnrollToggle.checked = !!currentSettings.threadUnrollEnabled; if (localOcrToggle) localOcrToggle.checked = currentSettings.localOcrEnabled !== false; + if (hideLikedByToggle) hideLikedByToggle.checked = !!currentSettings.hideLikedByEnabled; const w = currentSettings.feedWidth || 600; if (feedWidthSlider) feedWidthSlider.value = String(w); @@ -170,26 +216,6 @@ function updateUI() { } }); - const hex = (currentSettings.accentColor || '#1083fe').toUpperCase(); - if (colorPicker) colorPicker.value = hex; - if (hexInput) hexInput.value = hex; - - // Active swatch - if (pridePalette) { - const swatches = pridePalette.querySelectorAll('.color-swatch'); - swatches.forEach(swatch => { - const swatchColor = swatch.getAttribute('data-color').toUpperCase(); - if (swatchColor === hex) { - swatch.classList.add('active'); - } else { - swatch.classList.remove('active'); - } - }); - } - - // Apply accent color to checked toggles & badges - document.documentElement.style.setProperty('--accent-default', hex); - // Apply feature flag gates applyFeatureFlags(); } @@ -218,6 +244,13 @@ function saveAndNotify() { } // Toggle listeners +if (hideLikedByToggle) { + hideLikedByToggle.addEventListener('change', () => { + currentSettings.hideLikedByEnabled = hideLikedByToggle.checked; + saveAndNotify(); + }); +} + if (skeetModeToggle) { skeetModeToggle.addEventListener('change', () => { currentSettings.skeetMode = skeetModeToggle.checked; @@ -253,13 +286,6 @@ if (accountAgeToggle) { }); } -if (threadUnrollToggle) { - threadUnrollToggle.addEventListener('change', () => { - currentSettings.threadUnrollEnabled = threadUnrollToggle.checked; - saveAndNotify(); - }); -} - if (localOcrToggle) { localOcrToggle.addEventListener('change', () => { currentSettings.localOcrEnabled = localOcrToggle.checked; @@ -302,6 +328,24 @@ if (feedWidthSlider) { }); } +document.getElementById('moreSettingsButton')?.addEventListener('click', async () => { + const api = globalThis.browser || globalThis.chrome; + const button = document.getElementById('moreSettingsButton'); + button.disabled = true; + try { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + if (tab?.url?.startsWith('https://bsky.app/')) { + await api.tabs.update(tab.id, { url: 'https://bsky.app/bskyplus' }); + } else { + await api.tabs.create({ url: 'https://bsky.app/bskyplus' }); + } + window.close(); + } catch { + button.textContent = 'Could not open settings. Try again'; + button.disabled = false; + } +}); + presetButtons.forEach(btn => { btn.addEventListener('click', () => { let w = Number(btn.getAttribute('data-width')); @@ -314,46 +358,3 @@ presetButtons.forEach(btn => { saveAndNotify(); }); }); - -// Color swatch click -if (pridePalette) { - pridePalette.addEventListener('click', (e) => { - const swatch = e.target.closest('.color-swatch'); - if (!swatch) return; - const color = swatch.getAttribute('data-color'); - setAccentColor(color); - }); -} - -// Color picker input -if (colorPicker) { - colorPicker.addEventListener('input', (e) => { - setAccentColor(e.target.value); - }); -} - -// Hex text input -if (hexInput) { - hexInput.addEventListener('change', () => { - let val = hexInput.value.trim(); - if (!val.startsWith('#')) val = '#' + val; - if (/^#[0-9A-F]{6}$/i.test(val)) { - setAccentColor(val); - } else { - hexInput.value = currentSettings.accentColor.toUpperCase(); - } - }); -} - -// Reset color button -if (resetColorBtn) { - resetColorBtn.addEventListener('click', () => { - setAccentColor('#1083fe'); - }); -} - -function setAccentColor(hex) { - currentSettings.accentColor = hex; - updateUI(); - saveAndNotify(); -} diff --git a/extension/chrome/shared/account-age.js b/extension/chrome/shared/account-age.js index 70a87cb..46852cf 100644 --- a/extension/chrome/shared/account-age.js +++ b/extension/chrome/shared/account-age.js @@ -6,7 +6,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const DB_NAME = 'bskyplus_db'; const STORE_NAME = 'account_ages'; @@ -51,7 +51,7 @@ // -------------------------------------------------------------------------- function openDatabase() { if (!dbPromise) { - dbPromise = new Promise((resolve, reject) => { + dbPromise = new Promise(resolve => { if (!window.indexedDB) { return resolve(null); } @@ -140,8 +140,6 @@ rateLimitBackoffUntil = Date.now() + 30000; console.warn('Bsky+ AccountAge: rate limited, backing off 30s'); batch.forEach(h => queue.add(h)); - isProcessing = false; - scheduleQueueProcessing(); return; } @@ -212,7 +210,7 @@ title: `Fresh account! Created on ${formattedDate} (${days} days ago)` }, [ Icons.sprout ? Icons.sprout() : document.createTextNode('🌱'), - document.createTextNode(isBrandNew ? `New (${days}d)` : `New (${days}d)`) + document.createTextNode(`New (${days}d)`) ]); linkEl.insertAdjacentElement('afterend', badge); @@ -265,19 +263,7 @@ links.forEach(link => checkHandleElement(link)); } - const observer = new MutationObserver(() => { - scanHandles(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - }); - } + observeDom(scanHandles); window.BskyPlusAccountAge = { scanHandles, diff --git a/extension/chrome/shared/cdn-background.js b/extension/chrome/shared/cdn-background.js index 0a4a02a..54129c5 100644 --- a/extension/chrome/shared/cdn-background.js +++ b/extension/chrome/shared/cdn-background.js @@ -52,12 +52,18 @@ api.permissions.onAdded.addListener(refresh); api.permissions.onRemoved.addListener(refresh); api.runtime.onMessage.addListener((message, sender, sendResponse) => { - if (message?.action !== 'APPLY_IMAGE_CDN') return; + if (!['APPLY_IMAGE_CDN', 'REQUEST_IMAGE_CDN_ACCESS'].includes(message?.action)) return; if (sender.id !== api.runtime.id || !sender.url?.startsWith(api.runtime.getURL(''))) { sendResponse({ success: false, error: 'Open Bsky+ settings to change the CDN.' }); return false; } - apply().then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); + apply().then(async result => { + if (message.action === 'REQUEST_IMAGE_CDN_ACCESS' && result.hostname && !result.enabled) { + await api.tabs.create({ url: api.runtime.getURL('shared/cdn-permissions.html') }); + return { success: true, opened: true }; + } + return result; + }).then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); return true; }); refresh(); diff --git a/extension/chrome/shared/cdn-config.js b/extension/chrome/shared/cdn-config.js index 6e38532..164efc7 100644 --- a/extension/chrome/shared/cdn-config.js +++ b/extension/chrome/shared/cdn-config.js @@ -2,6 +2,7 @@ 'use strict'; const SOURCE_HOST = 'cdn.bsky.app'; const IMAGE_PATTERN = '^https://cdn\\.bsky\\.app/img/(feed_thumbnail|feed_fullsize|avatar_thumbnail)/plain/'; + const IMAGE_URL = new RegExp(IMAGE_PATTERN); const RULE_ID = 2001; function normalizeHostname(value) { @@ -43,7 +44,7 @@ } function redirectUrl(url, hostname) { - if (!hostname || !new RegExp(IMAGE_PATTERN).test(url)) return undefined; + if (!hostname || !IMAGE_URL.test(url)) return undefined; return `https://${hostname}${url.slice(`https://${SOURCE_HOST}`.length)}`; } diff --git a/extension/chrome/shared/cdn-settings.js b/extension/chrome/shared/cdn-settings.js index e63bfa6..43d8fc9 100644 --- a/extension/chrome/shared/cdn-settings.js +++ b/extension/chrome/shared/cdn-settings.js @@ -19,21 +19,13 @@ }, function () { return {}; }); } - function storageSet(api, value) { + async function storageSet(api, value) { if (!api || !api.storage || !api.storage.local || typeof api.storage.local.set !== 'function') { - return Promise.reject(new Error('Settings storage is unavailable.')); + throw new Error('Settings storage is unavailable.'); } - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') result.then(resolve, reject); - else reject(new Error('Storage did not confirm the write.')); - }); + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + throw new Error('Storage did not confirm the write.'); } function makeField(labelText, input) { @@ -71,7 +63,38 @@ input.placeholder = 'luna.danielmorrisey.com'; input.autocomplete = 'off'; input.spellcheck = false; - section.appendChild(makeField('CDN hostname', input)); + var customField = makeField('CDN hostname', input); + var provider = null; + if (globalThis.BskyPlusFeatureRow) { + provider = document.createElement('select'); + provider.id = 'bskyplusCdnProvider'; + provider.setAttribute('aria-label', 'CDN provider'); + provider.className = 'bskyplus-llm-input'; + [['', 'Bluesky (default)'], ['luna.danielmorrisey.com', 'Luna'], ['custom', 'Custom']].forEach(function (item) { + var option = document.createElement('option'); + option.value = item[0]; + option.textContent = item[1]; + provider.appendChild(option); + }); + provider.addEventListener('change', function () { + customField.hidden = provider.value !== 'custom'; + }); + var providerField = document.createElement('div'); + providerField.className = 'bskyplus-llm-field'; + providerField.appendChild(provider); + section.appendChild(providerField); + customField.hidden = true; + } + section.appendChild(customField); + + function displayHostname(hostname) { + input.value = hostname; + if (provider) { + provider.value = !hostname || hostname === 'luna.danielmorrisey.com' ? hostname : 'custom'; + customField.hidden = provider.value !== 'custom'; + } + if (popupRow) popupRow.setEnabled(!!hostname); + } var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -109,12 +132,27 @@ var before = llmSection || footer; if (before && before.parentElement) before.parentElement.insertBefore(section, before); else document.body.appendChild(section); + var popupRow = globalThis.BskyPlusFeatureRow?.(section, 'Image CDN', 'Choose where images load from', 'cdnEnabledToggle', + document.getElementById('infrastructureSection') ? 'infrastructureSection' : 'featuresSection'); + if (popupRow) { + popupRow.addTooltip(() => notice.textContent); + notice.remove(); + resetButton.hidden = true; + popupRow.toggle.addEventListener('change', function () { + if (!popupRow.toggle.checked) reset(); + }); + } function setStatus(message, isError) { status.textContent = message; status.classList.toggle('bskyplus-llm-status-error', !!isError); } + function showApplied(hostname) { + grantButton.hidden = true; + setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + } + function apply(hostname) { if (!api || !api.runtime || typeof api.runtime.sendMessage !== 'function') { return Promise.reject(new Error('Image CDN could not be applied.')); @@ -135,6 +173,8 @@ function setBusy(value) { saving = value; input.disabled = value; + if (provider) provider.disabled = value; + if (popupRow) popupRow.toggle.disabled = value; saveButton.disabled = value; resetButton.disabled = value; grantButton.disabled = value; @@ -142,7 +182,16 @@ function requestAccess(hostname) { var origins = config.permissionOrigins(hostname); - if (!origins.length || !api || !api.permissions || typeof api.permissions.request !== 'function') return Promise.resolve(true); + if (!origins.length) return Promise.resolve(true); + // Firefox's embedded extension pages cannot use the permissions API. + if (!api || !api.permissions || typeof api.permissions.request !== 'function') { + return Promise.resolve().then(function () { + return api.runtime.sendMessage({ action: 'REQUEST_IMAGE_CDN_ACCESS' }); + }).then(function (response) { + if (!response || !response.success) throw new Error('Could not open the CDN permission page.'); + return response.opened ? null : response.enabled === true && response.hostname === hostname; + }); + } try { return Promise.resolve(api.permissions.request({ origins: origins })); } catch (err) { @@ -166,17 +215,21 @@ var saved = false; storageSet(api, { imageCdnHostname: hostname }).then(function () { saved = true; - input.value = hostname; + displayHostname(hostname); return requestAccess(hostname); }).then(function (granted) { + if (granted === null) { + grantButton.hidden = false; + setStatus('CDN saved. Grant access in the opened tab, then return here.', false); + return; + } if (!granted) { grantButton.hidden = !hostname; setStatus('CDN saved. Access was not granted. Choose Grant access to try again.', true); return; } return apply(hostname).then(function () { - grantButton.hidden = true; - setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + showApplied(hostname); }); }).catch(function (err) { grantButton.hidden = !(saved && hostname); @@ -187,11 +240,15 @@ } function save() { - saveValue(input.value); + if (provider && provider.value === 'custom' && !input.value.trim()) { + setStatus('Enter a CDN hostname.', true); + return; + } + saveValue(provider && provider.value !== 'custom' ? provider.value : input.value); } function reset() { - input.value = ''; + displayHostname(''); saveValue(''); } @@ -199,11 +256,15 @@ if (saving) return; setBusy(true); requestAccess(pendingHostname).then(function (granted) { + if (granted === null) { + setStatus('Grant access in the opened tab, then return here.', false); + return null; + } if (!granted) throw new Error('Access was not granted. Choose Grant access to try again.'); return apply(pendingHostname); - }).then(function () { - grantButton.hidden = true; - setStatus(pendingHostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + }).then(function (response) { + if (response === null) return; + showApplied(pendingHostname); }).catch(function (err) { grantButton.hidden = !pendingHostname; setStatus(err && err.message ? err.message : 'Could not apply image CDN.', true); @@ -215,14 +276,26 @@ saveButton.addEventListener('click', save); resetButton.addEventListener('click', reset); grantButton.addEventListener('click', retry); + function refreshAccess() { + if (saving || !pendingHostname || grantButton.hidden) return; + apply(pendingHostname).then(function () { + showApplied(pendingHostname); + }).catch(function () {}); + } + window.addEventListener('focus', refreshAccess); + if (api && api.runtime && api.runtime.onMessage) { + api.runtime.onMessage.addListener(function (message, sender) { + if (sender.id === api.runtime.id && message.action === 'IMAGE_CDN_ACCESS_GRANTED') refreshAccess(); + }); + } setBusy(true); storageGet(api, STORAGE_KEY).then(function (result) { var value = result && typeof result[STORAGE_KEY] === 'string' ? result[STORAGE_KEY] : ''; try { - input.value = config.normalizeHostname(value); + displayHostname(config.normalizeHostname(value)); pendingHostname = input.value; } catch (err) { - input.value = ''; + displayHostname(''); pendingHostname = ''; } }).catch(function () { diff --git a/extension/chrome/shared/composer.js b/extension/chrome/shared/composer.js index 87b73c5..55863fd 100644 --- a/extension/chrome/shared/composer.js +++ b/extension/chrome/shared/composer.js @@ -154,12 +154,31 @@ button.type = 'button'; button.className = 'bskyplus-preview-action'; button.dataset.method = method; - button.textContent = `+${method}`; button.setAttribute('aria-label', `Generate alt text with ${method}`); - button.innerHTML = ` - -
${method}
- ` + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('width', '10'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('height', '10'); + icon.setAttribute('style', 'color: rgb(255, 255, 255);'); + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('fill', '#FFFFFF'); + path.setAttribute('stroke', 'none'); + path.setAttribute('stroke-width', '0'); + path.setAttribute('stroke-linecap', 'butt'); + path.setAttribute('stroke-linejoin', 'miter'); + path.setAttribute('fill-rule', 'evenodd'); + path.setAttribute('clip-rule', 'evenodd'); + path.setAttribute('d', 'M12 3a1 1 0 0 1 1 1v7h7a1 1 0 1 1 0 2h-7v7a1 1 0 1 1-2 0v-7H4a1 1 0 1 1 0-2h7V4a1 1 0 0 1 1-1Z'); + icon.append(path); + + const label = document.createElement('div'); + label.dir = 'auto'; + label.className = 'css-146c3p1'; + label.setAttribute('style', 'font-size: 12px; letter-spacing: 1px; color: rgb(255, 255, 255); line-height: 16px; font-weight: 600; font-family: InterVariable, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; font-variant: no-contextual unicode;'); + label.textContent = method; + button.append(icon, label); button.addEventListener('click', event => { event.preventDefault(); event.stopPropagation(); diff --git a/extension/chrome/shared/dom-utils.js b/extension/chrome/shared/dom-utils.js index 24e1e5a..d701cb2 100644 --- a/extension/chrome/shared/dom-utils.js +++ b/extension/chrome/shared/dom-utils.js @@ -51,33 +51,30 @@ return el; } + function outlineIcon(children, strokeWidth = 2) { + return svgEl('svg', { + viewBox: '0 0 24 24', + fill: 'none', + stroke: 'currentColor', + 'stroke-width': strokeWidth, + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round' + }, children); + } + // Common SVG Icons const Icons = { download() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4' }), svgEl('polyline', { points: '7 10 12 15 17 10' }), svgEl('line', { x1: '12', y1: '15', x2: '12', y2: '3' }) ]); }, check() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2.5', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '20 6 9 17 4 12' }) - ]); + ], 2.5); }, pip() { // Font Awesome Free v7.3.1 by Fonticons, Inc. https://fontawesome.com/license/free @@ -92,68 +89,33 @@ ]); }, book() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M4 19.5A2.5 2.5 0 0 1 6.5 17H20' }), svgEl('path', { d: 'M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z' }) ]); }, markdown() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '2', y: '4', width: '20', height: '16', rx: '2' }), svgEl('path', { d: 'M6 16V8l3 4 3-4v8' }), svgEl('path', { d: 'M17 12l-2.5 3.5h5L17 12z' }) ]); }, printer() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '6 9 6 2 18 2 18 9' }), svgEl('path', { d: 'M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2' }), svgEl('rect', { x: '6', y: '14', width: '12', height: '8' }) ]); }, copy() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '9', y: '9', width: '13', height: '13', rx: '2', ry: '2' }), svgEl('path', { d: 'M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1' }) ]); }, sprout() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M7 20h10' }), svgEl('path', { d: 'M12 20v-8' }), svgEl('path', { d: 'M12 12a5 5 0 0 1 5-5h3v3a5 5 0 0 1-5 5h-3z' }), @@ -162,6 +124,28 @@ } }; + function observeDom(scan) { + const observer = new MutationObserver(scan); + const start = () => { + observer.observe(document.body, { childList: true, subtree: true }); + scan(); + }; + if (document.body) start(); + else document.addEventListener('DOMContentLoaded', start, { once: true }); + return observer; + } + + function downloadBlob(blob, filename) { + const url = URL.createObjectURL(blob); + const link = createEl('a', { href: url, download: filename, style: 'display: none;' }); + document.body.appendChild(link); + link.click(); + setTimeout(() => { + link.remove(); + URL.revokeObjectURL(url); + }, 1000); + } + // Toast Notification Helper function showToast(message, duration = 3000) { let container = document.getElementById('bskyplus-toast-container'); @@ -186,6 +170,8 @@ createEl, svgEl, Icons, + observeDom, + downloadBlob, showToast }; })(); diff --git a/extension/chrome/shared/downloader.js b/extension/chrome/shared/downloader.js index 48ed18e..aa7191f 100644 --- a/extension/chrome/shared/downloader.js +++ b/extension/chrome/shared/downloader.js @@ -5,7 +5,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const { createEl, Icons, showToast, observeDom, downloadBlob } = utils; let enabled = true; @@ -81,7 +81,7 @@ const res = await fetch(fullUrl, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename); + downloadBlob(blob, filename); } async function downloadHlsVideo(videoEl, filename) { @@ -93,7 +93,7 @@ const res = await fetch(src, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); + downloadBlob(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); return; } @@ -150,32 +150,8 @@ segmentBuffers.push(buf); } - // Calculate total length and concatenate - const totalLength = segmentBuffers.reduce((acc, b) => acc + b.byteLength, 0); - const combined = new Uint8Array(totalLength); - let offset = 0; - for (const buf of segmentBuffers) { - combined.set(new Uint8Array(buf), offset); - offset += buf.byteLength; - } - - const videoBlob = new Blob([combined], { type: 'video/mp4' }); - triggerDownload(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); - } - - function triggerDownload(blob, filename) { - const objectUrl = URL.createObjectURL(blob); - const a = createEl('a', { - href: objectUrl, - download: filename, - style: 'display: none;' - }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(objectUrl); - }, 1000); + const videoBlob = new Blob(segmentBuffers, { type: 'video/mp4' }); + downloadBlob(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); } async function handleMediaDownload(mediaEl, btn) { @@ -278,19 +254,7 @@ } // Observe DOM for newly rendered posts and media - const observer = new MutationObserver(() => { - scanForMedia(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - }); - } + observeDom(scanForMedia); window.BskyPlusDownloader = { scanForMedia, diff --git a/extension/chrome/shared/emoji-picker.js b/extension/chrome/shared/emoji-picker.js index 4794c97..9f31a99 100644 --- a/extension/chrome/shared/emoji-picker.js +++ b/extension/chrome/shared/emoji-picker.js @@ -568,17 +568,11 @@ document.addEventListener('keydown', (e) => { if (!activePicker || activePicker.style.display === 'none' || activeMatches.length === 0) return; - if (e.key === 'ArrowDown') { + if (e.key === 'ArrowDown' || e.key === 'ArrowUp') { e.preventDefault(); e.stopPropagation(); - selectedIndex = (selectedIndex + 1) % activeMatches.length; - renderPickerItems(); - const selectedEl = activePicker.querySelector('.bskyplus-selected'); - if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); - } else if (e.key === 'ArrowUp') { - e.preventDefault(); - e.stopPropagation(); - selectedIndex = (selectedIndex - 1 + activeMatches.length) % activeMatches.length; + const direction = e.key === 'ArrowDown' ? 1 : -1; + selectedIndex = (selectedIndex + direction + activeMatches.length) % activeMatches.length; renderPickerItems(); const selectedEl = activePicker.querySelector('.bskyplus-selected'); if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); diff --git a/extension/chrome/shared/feature-flags.js b/extension/chrome/shared/feature-flags.js index 94bb4b7..9bb56d6 100644 --- a/extension/chrome/shared/feature-flags.js +++ b/extension/chrome/shared/feature-flags.js @@ -25,7 +25,7 @@ enabled: true, stage: 'release', name: 'Quick Emoji Suggestions', - desc: ': (color) & emoji autocomplete like Slack' + desc: ': emoji autocomplete like Slack' }, feedWidth: { enabled: true, @@ -39,24 +39,12 @@ name: 'Fresh Account Badge', desc: 'Spot new accounts <30d, cached in IndexedDB' }, - threadUnroll: { - enabled: true, - stage: 'alpha', - name: 'Thread Unroll & Reader View', - desc: 'Distraction-free reading from 3-dot menu, export Markdown/PDF' - }, skeetMode: { enabled: true, stage: 'release', name: 'Skeet Mode', desc: 'Replaces "post" with "skeet"' }, - accentColor: { - enabled: true, - stage: 'release', - name: 'Custom Accent Color', - desc: 'Pride flag palette & custom hex accent colors' - }, localOcr: { enabled: true, stage: 'release', diff --git a/extension/chrome/shared/features.css b/extension/chrome/shared/features.css index 9f8e3db..94200db 100644 --- a/extension/chrome/shared/features.css +++ b/extension/chrome/shared/features.css @@ -2,8 +2,11 @@ Bsky+ Extended Features Stylesheet ========================================================================== */ -/* Keep embedded media and galleries contained when the feed is widened. */ -div[data-testid="contentHider-post"] > div:last-child { +/* Limit post media without constraining text or text-only quote cards. */ +[data-bskyplus-feed-column] div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] video, +[data-bskyplus-post-media] { max-width: min(100%, 600px) !important; } @@ -39,7 +42,7 @@ div[data-testid="contentHider-post"] > div:last-child { .bskyplus-media-dl-btn:hover { opacity: 1 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; border-color: rgba(255, 255, 255, 0.4) !important; transform: translateY(-1px); } @@ -73,18 +76,112 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-speed-select { - field-sizing: content; + appearance: none !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + gap: 5px !important; min-width: 0 !important; background: transparent !important; color: #fff !important; border: none !important; border-radius: 4px !important; min-height: 28px !important; + padding: 4px 7px !important; + font: inherit !important; + font-size: 12px !important; + cursor: pointer !important; +} + +.bskyplus-speed-select:hover, +.bskyplus-speed-select[aria-expanded="true"] { + background-color: rgba(255, 255, 255, 0.12) !important; +} + +.bskyplus-speed-select:focus-visible { + outline: 2px solid rgba(255, 255, 255, 0.75) !important; + outline-offset: 1px !important; +} + +.bskyplus-speed-chevron { + width: 0 !important; + height: 0 !important; + border-left: 3px solid transparent !important; + border-right: 3px solid transparent !important; + border-top: 4px solid currentColor !important; + opacity: 0.75 !important; +} + +.bskyplus-speed-menu { + position: fixed !important; + inset: auto !important; + z-index: 2147483647 !important; + min-width: 96px !important; + max-height: min(220px, calc(100vh - 16px)) !important; + overflow-y: auto !important; + flex-direction: column !important; + gap: 2px !important; + margin: 0 !important; padding: 4px !important; + background-color: #1e2936 !important; + color: #f1f3f5 !important; + border: 1px solid #2b394a !important; + border-radius: 8px !important; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.42) !important; + box-sizing: border-box !important; +} + +.bskyplus-speed-menu:not([popover]):not([hidden]) { + display: flex !important; +} + +.bskyplus-speed-menu[popover]:popover-open { + display: flex !important; +} + +.bskyplus-speed-menu[hidden] { + display: none !important; +} + +.bskyplus-speed-option { + appearance: none !important; + display: flex !important; + align-items: center !important; + justify-content: space-between !important; + width: 100% !important; + min-height: 30px !important; + margin: 0 !important; + padding: 5px 8px !important; + color: #f1f3f5 !important; + background-color: transparent !important; + border: 0 !important; + border-radius: 5px !important; font: inherit !important; font-size: 12px !important; + text-align: left !important; cursor: pointer !important; - color-scheme: dark; + box-sizing: border-box !important; +} + +.bskyplus-speed-option:hover, +.bskyplus-speed-option:focus-visible, +.bskyplus-speed-option[aria-checked="true"] { + background-color: #263342 !important; +} + +.bskyplus-speed-option:focus-visible { + outline: 2px solid #71859b !important; + outline-offset: -2px !important; +} + +.bskyplus-speed-option-check::before { + content: "✓"; + color: #f1f3f5 !important; + opacity: 0; +} + +.bskyplus-speed-option[aria-checked="true"] .bskyplus-speed-option-check::before { + opacity: 1; } .bskyplus-toolbar-btn { @@ -106,7 +203,7 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-toolbar-btn[aria-pressed="true"] { - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; color: #ffffff !important; } @@ -216,260 +313,3 @@ div[data-testid="contentHider-post"] > div:last-child { color: #fbbf24 !important; border-color: rgba(251, 191, 36, 0.4) !important; } - -/* -------------------------------------------------------------------------- - 6. Thread Unroll / Reader View - -------------------------------------------------------------------------- */ -.bskyplus-unroll-btn { - display: inline-flex !important; - align-items: center !important; - gap: 5px !important; - background: transparent !important; - border: 1px solid rgba(140, 158, 181, 0.3) !important; - color: #8c9eb5 !important; - padding: 3px 8px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - margin-left: 8px !important; - transition: all 0.15s ease !important; - user-select: none !important; -} - -.bskyplus-unroll-btn:hover { - background: rgba(16, 131, 254, 0.12) !important; - color: #1083fe !important; - border-color: #1083fe !important; -} - -.bskyplus-unroll-btn svg { - width: 13px !important; - height: 13px !important; -} - -/* 3-Dot Post Dropdown Menu Item */ -.bskyplus-unroll-menu-item { - display: flex !important; - align-items: center !important; - gap: 12px !important; - padding: 10px 14px !important; - cursor: pointer !important; - border-radius: 6px !important; - font-size: 14px !important; - font-weight: 500 !important; - color: inherit !important; - transition: background-color 0.15s ease !important; - user-select: none !important; - outline: none !important; -} - -.bskyplus-unroll-menu-item:hover, -.bskyplus-unroll-menu-item:focus { - background-color: rgba(128, 128, 128, 0.15) !important; -} - -.bskyplus-unroll-menu-item svg { - width: 18px !important; - height: 18px !important; - flex-shrink: 0 !important; -} - -/* Reader Modal Backdrop */ -.bskyplus-reader-backdrop { - position: fixed !important; - inset: 0 !important; - z-index: 2147483646 !important; - background-color: rgba(0, 0, 0, 0.75) !important; - backdrop-filter: blur(5px) !important; - display: flex !important; - justify-content: center !important; - align-items: flex-start !important; - overflow-y: auto !important; - padding: 40px 16px !important; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif !important; -} - -.bskyplus-reader-modal { - width: 100% !important; - max-width: 680px !important; - background-color: #161e27 !important; - color: #f1f3f5 !important; - border-radius: 14px !important; - border: 1px solid #2b394a !important; - box-shadow: 0 16px 48px rgba(0, 0, 0, 0.7) !important; - overflow: hidden !important; - display: flex !important; - flex-direction: column !important; -} - -.bskyplus-reader-header { - display: flex !important; - align-items: center !important; - justify-content: space-between !important; - padding: 16px 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-title { - font-size: 18px !important; - font-weight: 700 !important; - color: #fff !important; -} - -.bskyplus-reader-meta { - font-size: 12px !important; - color: #8c9eb5 !important; - margin-top: 2px !important; -} - -.bskyplus-reader-close { - background: transparent !important; - border: none !important; - color: #8c9eb5 !important; - font-size: 24px !important; - cursor: pointer !important; - padding: 4px 8px !important; - border-radius: 6px !important; - line-height: 1 !important; -} - -.bskyplus-reader-close:hover { - background-color: #263342 !important; - color: #fff !important; -} - -.bskyplus-reader-actions { - display: flex !important; - gap: 8px !important; - padding: 12px 20px !important; - background-color: #1e2936 !important; - border-bottom: 1px solid #2b394a !important; - flex-wrap: wrap !important; -} - -.bskyplus-reader-action-btn { - display: inline-flex !important; - align-items: center !important; - gap: 6px !important; - background-color: #263342 !important; - border: 1px solid #2b394a !important; - color: #f1f3f5 !important; - padding: 6px 12px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - transition: background-color 0.15s ease !important; -} - -.bskyplus-reader-action-btn:hover { - background-color: #324357 !important; - color: #fff !important; -} - -.bskyplus-reader-action-btn svg { - width: 14px !important; - height: 14px !important; - fill: currentColor !important; -} - -.bskyplus-reader-content { - padding: 24px 20px !important; - max-height: 75vh !important; - overflow-y: auto !important; -} - -.bskyplus-reader-post { - padding-bottom: 20px !important; - margin-bottom: 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-post:last-child { - border-bottom: none !important; - margin-bottom: 0 !important; - padding-bottom: 0 !important; -} - -.bskyplus-reader-post-header { - display: flex !important; - align-items: center !important; - gap: 8px !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-post-num { - font-size: 11px !important; - font-weight: 700 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; - color: #fff !important; - padding: 2px 7px !important; - border-radius: 10px !important; -} - -.bskyplus-reader-post-author { - font-size: 13px !important; - font-weight: 600 !important; - color: #8c9eb5 !important; -} - -.bskyplus-reader-post-text { - font-size: 15px !important; - line-height: 1.55 !important; - color: #f1f3f5 !important; - white-space: pre-wrap !important; - word-break: break-word !important; -} - -.bskyplus-reader-post-media { - margin-top: 12px !important; - border-radius: 8px !important; - overflow: hidden !important; -} - -.bskyplus-reader-img { - max-width: 100% !important; - max-height: 480px !important; - border-radius: 8px !important; - display: block !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-video { - max-width: 100% !important; - border-radius: 8px !important; - display: block !important; -} - -/* Clean Print / PDF Export Styling */ -@media print { - body * { - visibility: hidden !important; - } - .bskyplus-reader-backdrop, - .bskyplus-reader-modal, - .bskyplus-reader-modal * { - visibility: visible !important; - } - .bskyplus-reader-backdrop { - position: absolute !important; - inset: 0 !important; - background: #ffffff !important; - padding: 0 !important; - } - .bskyplus-reader-modal { - box-shadow: none !important; - border: none !important; - background: #ffffff !important; - color: #000000 !important; - max-width: 100% !important; - } - .bskyplus-reader-actions, - .bskyplus-reader-close { - display: none !important; - } - .bskyplus-reader-post-text { - color: #000000 !important; - } -} diff --git a/extension/chrome/shared/feed-width.js b/extension/chrome/shared/feed-width.js index 07b2c56..e6a8244 100644 --- a/extension/chrome/shared/feed-width.js +++ b/extension/chrome/shared/feed-width.js @@ -7,9 +7,68 @@ 'use strict'; const STYLE_ID = 'bskyplus-feed-width-style'; + const TRANSITION_STYLE_ID = 'bskyplus-feed-width-transition-style'; + const TRANSITION_ATTRIBUTE = 'data-bskyplus-feed-width-animating'; + const TRANSITION_DURATION = 800; + const TRANSITION_TARGETS = [ + 'div[style*="max-width: 600px"]', + 'div[style*="max-width:600px"]', + 'div[style*="max-width: 550px"]', + 'div[style*="max-width:550px"]', + '[data-bskyplus-feed-column]', + '[role="tablist"]', + '[data-bskyplus-tablist]', + '[data-bskyplus-center-borders]', + 'div[style*="width: 602px"]', + 'div[style*="width:602px"]', + '[data-bskyplus-left-nav]', + 'div[role="navigation"]:not([style*="bottom:"])', + 'nav[role="navigation"]:not([style*="bottom:"])', + '[data-bskyplus-right-nav]', + 'div[style*="translateX(300px)"]', + 'div[style*="translateX(195px)"]', + '[data-bskyplus-settings-page]' + ].join(', '); let currentConfiguredWidth = 600; let currentEffectiveWidth = 600; let hasLiveWidthUpdate = false; + let transitionTimeout; + + function startWidthTransition() { + if (!isFeatureActive() || window.matchMedia?.('(prefers-reduced-motion: reduce)').matches) return; + + let style = document.getElementById(TRANSITION_STYLE_ID); + if (!style) { + style = document.createElement('style'); + style.id = TRANSITION_STYLE_ID; + style.textContent = ` + @media (prefers-reduced-motion: no-preference) { + html[${TRANSITION_ATTRIBUTE}] :is(${TRANSITION_TARGETS}) { + transition: max-width ${TRANSITION_DURATION}ms ease, + width ${TRANSITION_DURATION}ms ease, + margin-left ${TRANSITION_DURATION}ms ease, + margin-right ${TRANSITION_DURATION}ms ease !important; + } + } + `; + (document.head || document.documentElement).appendChild(style); + } + + const root = document.documentElement; + if (root.getAttribute(TRANSITION_ATTRIBUTE) === null) { + root.setAttribute(TRANSITION_ATTRIBUTE, ''); + // Apply the transition before changing widths, including the first live update. + document.querySelectorAll(TRANSITION_TARGETS).forEach(element => { + window.getComputedStyle(element).transitionDuration; + }); + } + + if (transitionTimeout) window.clearTimeout?.(transitionTimeout); + transitionTimeout = window.setTimeout?.(() => { + root.removeAttribute(TRANSITION_ATTRIBUTE); + transitionTimeout = undefined; + }, TRANSITION_DURATION + 50); + } function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -55,6 +114,17 @@ return document.querySelector('div[role="navigation"]:not([style*="bottom:"]), nav[role="navigation"]:not([style*="bottom:"])'); } + function findFixedAncestor(element) { + let parent = element?.parentElement; + while (parent && parent !== document.body && parent !== document.documentElement) { + const style = parent.getAttribute('style') || ''; + if (style.includes('position: fixed') || style.includes('position:fixed') || style.includes('translateX') || + window.getComputedStyle?.(parent)?.position === 'fixed') return parent; + parent = parent.parentElement; + } + return null; + } + function findRightNav() { // 1. Direct match on Bluesky's desktop fixed right column transform const direct = document.querySelector('div[style*="translateX(300px)"], div[style*="translateX( 300px)"], div[style*="translateX(195px)"], div[style*="translateX( 195px)"]'); @@ -73,50 +143,17 @@ // 2. Check via desktop search input const searchInput = document.querySelector('input[placeholder*="Search" i], input[aria-label*="Search" i]'); - if (searchInput) { - let parent = searchInput.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } + const searchNav = findFixedAncestor(searchInput); + if (searchNav) return searchNav; // 3. Check via desktop right sidebar links (privacy policy, terms, etc.) const privacyLink = document.querySelector('a[href*="privacy-policy"], a[href*="tos"], a[href*="zendesk.com"]'); - if (privacyLink) { - let parent = privacyLink.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } - - return null; + return findFixedAncestor(privacyLink); } function findCenterBorders() { - const borders = document.querySelectorAll('div[style*="602px"], div[style*="602 px"]'); - for (const el of borders) { - return el; - } + const borders = document.querySelector('div[style*="602px"], div[style*="602 px"]'); + if (borders) return borders; const borderCandidates = document.querySelectorAll('div[style*="border-left-width"][style*="border-right-width"], div[style*="translateX(-50%)"]'); for (const el of borderCandidates) { if (el.children.length === 0) { @@ -184,8 +221,11 @@ } function clearLayoutTags() { - const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist]'); + const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist], [data-bskyplus-post-media]'); tagged.forEach(el => { + if (el.dataset && el.dataset.bskyplusPostMedia) { + delete el.dataset.bskyplusPostMedia; + } if (el.dataset && el.dataset.bskyplusLeftNav) { if (el.style && el.style.removeProperty) el.style.removeProperty('margin-left'); delete el.dataset.bskyplusLeftNav; @@ -238,6 +278,30 @@ } } + function setColumnWidth(element, width) { + if (!element.style?.setProperty) return; + element.style.setProperty('max-width', `${width}px`, 'important'); + element.style.setProperty('margin-left', 'auto', 'important'); + element.style.setProperty('margin-right', 'auto', 'important'); + element.style.setProperty('width', '100%', 'important'); + } + + function tagPostMedia() { + document.querySelectorAll('[data-testid="contentHider-post"]').forEach(post => { + for (const child of post.children) { + const hasMedia = !child.querySelector('[data-testid="postText"]') && ( + child.querySelector('video') || + Array.from(child.querySelectorAll('img')).some(image => !image.closest('[data-testid="userAvatarImage"]')) + ); + if (hasMedia) { + child.dataset.bskyplusPostMedia = 'true'; + } else if (child.dataset.bskyplusPostMedia) { + delete child.dataset.bskyplusPostMedia; + } + } + }); + } + function scanAndTagLayout(effectiveWidth) { if (!isFeatureActive() || effectiveWidth === 600) { clearLayoutTags(); @@ -285,12 +349,7 @@ } el.dataset.bskyplusFeedColumn = 'true'; } - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - el.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(el, effectiveWidth); } }); @@ -298,12 +357,7 @@ const tablists = document.querySelectorAll('div[role="tablist"], [role="tablist"]'); tablists.forEach(el => { if (el.dataset) el.dataset.bskyplusTablist = 'true'; - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('width', '100%', 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - } + setColumnWidth(el, effectiveWidth); // Check parent header wrappers and feed column parents let parent = el.parentElement; @@ -312,12 +366,7 @@ const pStyle = parent.getAttribute('style') || ''; if (isTagged || /max-width:\s*(550|600)px/i.test(pStyle)) { if (parent.dataset) parent.dataset.bskyplusFeedColumn = 'true'; - if (parent.style && parent.style.setProperty) { - parent.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - parent.style.setProperty('margin-left', 'auto', 'important'); - parent.style.setProperty('margin-right', 'auto', 'important'); - parent.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(parent, effectiveWidth); } if (parent.getAttribute('data-bskyplus-left-nav') || parent.getAttribute('data-bskyplus-right-nav')) { break; @@ -326,6 +375,8 @@ } }); + tagPostMedia(); + // Child positions differ between feeds and notifications. The column's // width constraint above identifies it without resizing avatar columns. } @@ -403,6 +454,7 @@ function applyLiveFeedWidth(width) { hasLiveWidthUpdate = true; + startWidthTransition(); // A live reset to 600 breaks the layout. Keep the saved default for reloads. updateFeedWidthStyle(width === 600 ? 599 : width); if (isFeatureActive() && width) currentConfiguredWidth = width; diff --git a/extension/chrome/shared/integrated-settings-rules.json b/extension/chrome/shared/integrated-settings-rules.json index 82644b1..9653c25 100644 --- a/extension/chrome/shared/integrated-settings-rules.json +++ b/extension/chrome/shared/integrated-settings-rules.json @@ -10,5 +10,29 @@ "regexFilter": "^https://bsky\\.app/bskyplus/?(\\?.*)?$", "resourceTypes": ["main_frame"] } + }, + { + "id": 3, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=infrastructure" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/infrastructure/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } + }, + { + "id": 2, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=theme" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/theme/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } } ] diff --git a/extension/chrome/shared/integrated-settings.css b/extension/chrome/shared/integrated-settings.css index b397a81..0fd4dcd 100644 --- a/extension/chrome/shared/integrated-settings.css +++ b/extension/chrome/shared/integrated-settings.css @@ -90,6 +90,23 @@ color-scheme: normal; } +[data-bskyplus-theme-link] { + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + min-height: 56px; + padding: 8px 20px; + border-bottom: 1px solid color-mix(in srgb, currentColor 15%, transparent); + color: var(--bskyplus-theme-text, inherit); + font-size: 15px; + text-decoration: none; +} + +[data-bskyplus-theme-link]:hover { + background: color-mix(in srgb, currentColor 6%, transparent); +} + [data-bskyplus-settings-page] header a { display: grid; place-items: center; @@ -106,3 +123,35 @@ outline: 2px solid currentColor; outline-offset: -2px; } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: inherit; + background: #151d28; + box-shadow: 0 12px 48px #0008; + font: 14px/1.5 InterVariable, system-ui, sans-serif; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-dialog h2 { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-dialog p { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } diff --git a/extension/chrome/shared/integrated-settings.js b/extension/chrome/shared/integrated-settings.js index 0863650..ce8d3f8 100644 --- a/extension/chrome/shared/integrated-settings.js +++ b/extension/chrome/shared/integrated-settings.js @@ -8,14 +8,31 @@ let scheduled = false; let settingsFrame; let nativeCenter; + let nativeTitle; let centerObserver; - let bootstrapRequested = location.pathname === '/settings' && - new URLSearchParams(location.search).get('bskyplus') === '1'; + function bootstrapPath() { + const value = new URLSearchParams(location.search).get('bskyplus'); + return value === 'theme' ? '/bskyplus/theme' : ['1', 'infrastructure'].includes(value) ? '/bskyplus' : null; + } + let bootstrapRequested = location.pathname === '/settings' ? bootstrapPath() : null; + + function settingsReference() { + return document.querySelector('a[href="/settings/about"]') || + document.querySelector('a[href="/settings/account"]'); + } + + function navigate(event, path) { + if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; + event.preventDefault(); + history.pushState(history.state, '', path); + update(); + page?.querySelector('h1')?.focus(); + window.scrollTo(0, 0); + } function addSettingsLink() { if (document.querySelector('[data-bskyplus-settings-link]')) return; - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + const reference = settingsReference(); if (!reference) return; const link = document.createElement('a'); @@ -55,15 +72,16 @@ label.dataset.bskyplusSettingsLabel = ''; label.textContent = 'Bsky+'; const nativeLabel = reference.querySelector('[dir="auto"]') || reference; - link.style.color = getComputedStyle(nativeLabel).color; + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(nativeLabel).color})`; const chevron = document.createElement('div'); chevron.dataset.bskyplusSettingsChevron = ''; chevron.setAttribute('aria-hidden', 'true'); const nativeChevron = reference.querySelector('svg:last-child'); const nativeIcons = reference.querySelectorAll('svg'); - chevron.style.color = nativeIcons.length > 1 + const chevronColor = nativeIcons.length > 1 ? getComputedStyle(nativeIcons[nativeIcons.length - 1]).color : getComputedStyle(nativeChevron || nativeLabel).color; + chevron.style.color = `var(--bskyplus-theme-muted, ${chevronColor})`; const arrow = document.createElementNS(svgNamespace, 'svg'); arrow.setAttribute('viewBox', '0 0 24 24'); arrow.setAttribute('width', '18'); @@ -79,32 +97,37 @@ iconWrapper.append(icon); row.append(iconWrapper, label, chevron); link.append(row); - link.addEventListener('click', event => { - if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; - event.preventDefault(); - history.pushState(history.state, '', '/bskyplus'); - update(); - page?.querySelector('h1')?.focus(); - window.scrollTo(0, 0); - }); + link.addEventListener('click', event => navigate(event, '/bskyplus')); const firstRow = Array.from(reference.parentElement.children) .find(element => element.matches('a[href^="/settings/"]')) || reference; firstRow.before(link); } function unmountPage() { + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: null })); centerObserver?.disconnect(); centerObserver = nativeCenter = undefined; host?.removeAttribute('data-bskyplus-settings-host'); page?.remove(); settingsFrame = undefined; - if (previousTitle !== undefined && document.title === 'Bsky+ — Bluesky') { + if (previousTitle !== undefined && ['Bsky+ — Bluesky', 'Theme editor — Bsky+'].includes(document.title)) { document.title = previousTitle; } - host = page = undefined; + host = page = nativeTitle = undefined; previousTitle = undefined; } + function syncSettingsLinkColors() { + const link = document.querySelector('[data-bskyplus-settings-link]'); + const reference = settingsReference(); + if (!link || !reference) return; + const label = reference.querySelector('[dir="auto"]') || reference; + const icons = reference.querySelectorAll('svg'); + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(label).color})`; + const chevron = link.querySelector('[data-bskyplus-settings-chevron]'); + chevron.style.color = `var(--bskyplus-theme-muted, ${getComputedStyle(icons.length > 1 ? icons[icons.length - 1] : label).color})`; + } + function findNativeCenter(reference) { const content = reference?.closest('#content'); let candidate; @@ -133,38 +156,54 @@ syncAlignment(); } - function mountPage() { - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + function mountPage(path) { + const themePage = path === '/bskyplus/theme'; + const pageTitle = themePage ? 'Theme editor' : 'Bsky+'; + const reference = settingsReference(); const screen = reference?.closest('#content')?.parentElement || document.querySelector('[data-testid="notFoundView"]'); if (!screen) return; - if (host !== screen || !page?.isConnected) { + if (host !== screen || !page?.isConnected || page.dataset.bskyplusSettingsPage !== path) { unmountPage(); host = screen; previousTitle = document.title; - const nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); + nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); page = document.createElement('section'); - page.dataset.bskyplusSettingsPage = ''; - page.setAttribute('aria-label', 'Bsky+'); - if (nativeTitle) page.style.color = getComputedStyle(nativeTitle).color; + page.dataset.bskyplusSettingsPage = path; + page.setAttribute('aria-label', pageTitle); + syncPageColor(); const header = document.createElement('header'); const back = document.createElement('a'); - back.href = '/settings'; + back.href = themePage ? '/bskyplus' : '/settings'; + if (themePage) back.addEventListener('click', event => navigate(event, '/bskyplus')); back.textContent = '←'; - back.setAttribute('aria-label', 'Back to Settings'); + back.setAttribute('aria-label', themePage ? 'Back to Bsky+ settings' : 'Back to Settings'); const title = document.createElement('h1'); - title.textContent = 'Bsky+'; + title.textContent = pageTitle; title.tabIndex = -1; header.append(back, title); page.append(header); + if (!themePage) { + const themeLink = document.createElement('a'); + themeLink.href = '/bskyplus/theme'; + themeLink.dataset.bskyplusThemeLink = ''; + const label = document.createElement('span'); + label.textContent = 'Theme editor'; + const arrow = document.createElement('span'); + arrow.textContent = '›'; + arrow.setAttribute('aria-hidden', 'true'); + themeLink.append(label, arrow); + themeLink.addEventListener('click', event => navigate(event, '/bskyplus/theme')); + page.append(themeLink); + } const api = typeof browser !== 'undefined' ? browser : globalThis.chrome; if (api?.runtime?.getURL) { settingsFrame = document.createElement('iframe'); settingsFrame.dataset.bskyplusSettingsFrame = ''; - settingsFrame.title = 'Bsky+ settings'; - settingsFrame.src = api.runtime.getURL('shared/settings-frame.html'); + settingsFrame.title = themePage ? 'Bsky+ ' + pageTitle : 'Bsky+ settings'; + settingsFrame.src = api.runtime.getURL('shared/settings-frame.html') + + (themePage ? '?section=theme' : ''); settingsFrame.referrerPolicy = 'no-referrer'; settingsFrame.addEventListener('load', sendTheme); page.append(settingsFrame); @@ -173,11 +212,22 @@ host.append(page); } trackNativeCenter(findNativeCenter(reference) || screen.firstElementChild); - if (document.title !== 'Bsky+ — Bluesky') document.title = 'Bsky+ — Bluesky'; + const title = themePage ? pageTitle + ' — Bsky+' : 'Bsky+ — Bluesky'; + if (document.title !== title) document.title = title; + } + + function syncPageColor() { + if (!page) return; + // The sampled heading may already be themed. Use the palette variable so + // the runtime cannot translate that resolved color a second time. + const fallback = nativeTitle?.isConnected ? getComputedStyle(nativeTitle).color : 'inherit'; + const color = `var(--bskyplus-theme-text, ${fallback})`; + if (page.style.color !== color) page.style.color = color; } function sendTheme() { if (!settingsFrame?.contentWindow || !page) return; + syncPageColor(); let background = 'rgb(255, 255, 255)'; for (let element = page; element; element = element.parentElement) { const value = getComputedStyle(element).backgroundColor; @@ -191,27 +241,81 @@ }, '*'); } + function showAppviewRestartPrompt() { + if (document.querySelector('dialog[data-bskyplus-appview-restart]')) return; + const dialog = document.createElement('dialog'); + dialog.className = 'bskyplus-appview-restart-dialog'; + dialog.dataset.bskyplusAppviewRestart = ''; + dialog.setAttribute('aria-labelledby', 'bskyplusAppviewRestartTitle'); + const form = document.createElement('form'); + form.method = 'dialog'; + const title = document.createElement('h2'); + title.id = 'bskyplusAppviewRestartTitle'; + title.textContent = 'Restart Bluesky'; + const message = document.createElement('p'); + message.textContent = 'The AppView changed. Bluesky needs to restart to use the new provider.'; + const actions = document.createElement('div'); + actions.className = 'bskyplus-appview-restart-actions'; + const confirm = document.createElement('button'); + confirm.type = 'submit'; + confirm.value = 'ok'; + confirm.textContent = 'OK'; + actions.append(confirm); + form.append(title, message, actions); + dialog.append(form); + dialog.addEventListener('cancel', event => event.preventDefault()); + dialog.addEventListener('close', () => { + const confirmed = dialog.returnValue === 'ok'; + dialog.remove(); + if (confirmed) window.location.reload(); + }, { once: true }); + const foreground = page ? getComputedStyle(page).color : ''; + if (foreground) dialog.style.color = foreground; + for (let node = page; node; node = node.parentElement) { + const background = getComputedStyle(node).backgroundColor; + if (background && background !== 'transparent' && background !== 'rgba(0, 0, 0, 0)') { + dialog.style.backgroundColor = background; + break; + } + } + document.body.append(dialog); + dialog.showModal(); + confirm.focus(); + } + window.addEventListener('message', event => { - if (!settingsFrame || event.source !== settingsFrame.contentWindow || - event.data?.type !== 'BSKYPLUS_SETTINGS_HEIGHT') return; - const height = event.data.height; - if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { - settingsFrame.style.height = `${Math.ceil(height)}px`; + if (!settingsFrame || event.source !== settingsFrame.contentWindow) return; + if (event.data?.type === 'BSKYPLUS_SETTINGS_HEIGHT') { + const height = event.data.height; + if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { + settingsFrame.style.height = `${Math.ceil(height)}px`; + } + } else if (event.data?.type === 'BSKYPLUS_APPVIEW_RESTART') { + showAppviewRestartPrompt(); + } else if (event.data?.type === 'BSKYPLUS_THEME_PREVIEW') { + const model = globalThis.BskyPlusThemes; + if (!model) return; + let theme = null; + if (event.data.theme !== null) { + try { theme = model.validateTheme(event.data.theme); } + catch { return; } + } + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: theme })); } }); function update() { scheduled = false; const path = location.pathname.replace(/\/$/, ''); - const bootstrap = path === '/settings' && (bootstrapRequested || - new URLSearchParams(location.search).get('bskyplus') === '1'); - if (path === '/bskyplus' || bootstrap) { - mountPage(); + const bootstrap = path === '/settings' && (bootstrapRequested || bootstrapPath()); + if (path === '/bskyplus' || path === '/bskyplus/theme' || path === '/bskyplus/infrastructure' || bootstrap) { + const targetPath = path === '/bskyplus/infrastructure' ? '/bskyplus' : bootstrap || path; + mountPage(targetPath); // Let Bluesky mount its Settings screen before claiming the URL. A // request rule bootstraps hard loads because the server rejects /bskyplus. - if (bootstrap && page?.isConnected) { - bootstrapRequested = false; - history.replaceState(history.state, '', '/bskyplus'); + if ((bootstrap || path === '/bskyplus/infrastructure') && page?.isConnected) { + bootstrapRequested = null; + history.replaceState(history.state, '', targetPath); } } else { @@ -231,8 +335,12 @@ childList: true, subtree: true, }); - window.addEventListener('popstate', scheduleUpdate); + window.addEventListener('popstate', update); window.addEventListener('pageshow', scheduleUpdate); window.addEventListener('resize', scheduleUpdate); + window.addEventListener('bskyplus:theme-changed', () => { + syncSettingsLinkColors(); + sendTheme(); + }); scheduleUpdate(); })(); diff --git a/extension/chrome/shared/llm-settings.css b/extension/chrome/shared/llm-settings.css index 0f37884..f84f5b4 100644 --- a/extension/chrome/shared/llm-settings.css +++ b/extension/chrome/shared/llm-settings.css @@ -32,7 +32,43 @@ } .bskyplus-llm-input:focus { - border-color: var(--accent-default, #1083fe); + border-color: #1083fe; +} + +.bskyplus-llm-prompt-heading { + display: flex; + align-items: center; + justify-content: flex-start; + gap: 5px; +} + +.bskyplus-llm-prompt-heading .switch { + width: 32px; + height: 18px; + border-radius: 999px; +} + +.bskyplus-llm-prompt-heading .switch::before { + top: 3px; + left: 3px; + width: 12px; + height: 12px; +} + +.bskyplus-llm-prompt-heading .switch:checked::before { + transform: translateX(14px); +} + +.bskyplus-llm-prompt-input { + box-sizing: border-box; + min-height: 0; + overflow-y: hidden; + line-height: 1.45; + resize: none; +} + +.bskyplus-llm-prompt-input:disabled { + cursor: not-allowed; } .bskyplus-llm-actions { @@ -41,15 +77,44 @@ margin-top: 2px; } -.bskyplus-llm-save { - min-width: 72px; +.bskyplus-llm-key-row, +.bskyplus-appview-provider-row { + display: grid; + align-items: stretch; + gap: 8px; +} + +.bskyplus-llm-key-row { + grid-template-columns: minmax(0, 4fr) minmax(0, 1fr); +} + +.bskyplus-appview-provider-row { + grid-template-columns: minmax(0, 7fr) minmax(0, 3fr); +} + +.bskyplus-appview-provider-row > select, +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > input, +.bskyplus-llm-key-row > .bskyplus-llm-save { + min-width: 0; + width: 100%; +} + +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > .bskyplus-llm-save { + padding-inline: 4px; + border-radius: 8px; +} + +.bskyplus-appview-provider-row > button { + white-space: nowrap; } .bskyplus-llm-status { min-height: 14px; margin-top: 8px; font-size: 11px; - color: var(--accent-default, #1083fe); + color: #1083fe; } .bskyplus-llm-status-error { @@ -62,3 +127,94 @@ line-height: 1.4; color: var(--text-secondary, #8c9eb5); } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: var(--text-primary, #f1f3f5); + background: var(--bg-primary, #151d28); + box-shadow: 0 12px 48px #0008; + font-size: 14px; + line-height: 1.5; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-title { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-message { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions > button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions > button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } + +/* Shared controls must retain native hidden behavior in flex field layouts. */ +.bskyplus-llm-field[hidden] { + display: none; +} + +select.bskyplus-llm-input option { + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); +} + +.bskyplus-popup-feature .toggle-label { + column-gap: 0; +} + +.bskyplus-bookmarks-info { + display: inline-flex; + align-items: center; + justify-content: center; + flex: 0 0 12px; + width: 12px; + height: 12px; + padding: 0; + margin-left: 3px; + transform: translateY(-9%); + border: 1px solid var(--text-secondary, #8c9eb5); + border-radius: 50%; + background: transparent; + color: var(--text-secondary, #8c9eb5); + font-size: 9px; + font-weight: 600; + line-height: 1; + cursor: help; +} + +.bskyplus-bookmarks-info:hover, +.bskyplus-bookmarks-info:focus-visible { + color: var(--text-primary, #f1f3f5); + border-color: currentColor; +} + +.bskyplus-bookmarks-tooltip { + position: fixed; + z-index: 1000; + width: min(360px, calc(100vw - 16px)); + max-height: calc(100vh - 16px); + overflow: auto; + padding: 12px; + border: 1px solid var(--border-color, #2b394a); + border-radius: 10px; + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); + box-shadow: 0 6px 24px #0005; + font-size: 12px; + font-weight: 400; + line-height: 1.5; + user-select: text; +} diff --git a/extension/chrome/shared/llm-settings.js b/extension/chrome/shared/llm-settings.js index 82f61bd..3e8c084 100644 --- a/extension/chrome/shared/llm-settings.js +++ b/extension/chrome/shared/llm-settings.js @@ -26,7 +26,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -108,25 +111,13 @@ .then(function (res) { return res || {}; }, function () { return {}; }); } - function storageSet(api, value) { - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') { - result.then(resolve, reject); - return; - } - if (api.runtime && api.runtime.lastError) { - reject(new Error(api.runtime.lastError.message || 'Storage write failed')); - return; - } - reject(new Error('Storage did not confirm the write')); - }); + async function storageSet(api, value) { + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + if (api.runtime && api.runtime.lastError) { + throw new Error(api.runtime.lastError.message || 'Storage write failed'); + } + throw new Error('Storage did not confirm the write'); } function field(labelText, input) { @@ -140,6 +131,17 @@ return row; } + function makeInput(type, id, placeholder) { + var input = document.createElement('input'); + input.type = type; + input.id = id; + input.className = 'bskyplus-llm-input'; + input.placeholder = placeholder; + input.autocomplete = 'off'; + input.spellcheck = false; + return input; + } + function mount() { if (document.querySelector('.bskyplus-llm-section')) return null; @@ -158,33 +160,83 @@ subtitle.textContent = 'OpenAI-compatible vision chat/completions endpoint'; section.appendChild(subtitle); - var endpointInput = document.createElement('input'); - endpointInput.type = 'url'; - endpointInput.id = 'bskyplusLlmEndpoint'; - endpointInput.className = 'bskyplus-llm-input'; - endpointInput.placeholder = 'https://api.openai.com/v1/chat/completions'; - endpointInput.autocomplete = 'off'; - endpointInput.spellcheck = false; - - var modelInput = document.createElement('input'); - modelInput.type = 'text'; - modelInput.id = 'bskyplusLlmModel'; - modelInput.className = 'bskyplus-llm-input'; - modelInput.placeholder = 'gpt-4o-mini (optional)'; - modelInput.autocomplete = 'off'; - modelInput.spellcheck = false; - - var apiKeyInput = document.createElement('input'); - apiKeyInput.type = 'password'; - apiKeyInput.id = 'bskyplusLlmApiKey'; - apiKeyInput.className = 'bskyplus-llm-input'; - apiKeyInput.placeholder = 'API key (optional)'; - apiKeyInput.autocomplete = 'off'; - apiKeyInput.spellcheck = false; + var endpointInput = makeInput('url', 'bskyplusLlmEndpoint', 'https://api.openai.com/v1/chat/completions'); + var modelInput = makeInput('text', 'bskyplusLlmModel', 'gpt-4o-mini (optional)'); + var apiKeyInput = makeInput('password', 'bskyplusLlmApiKey', 'API key (optional)'); + var customPromptToggle = document.createElement('input'); + customPromptToggle.type = 'checkbox'; + customPromptToggle.id = 'bskyplusLlmUseCustomPrompt'; + customPromptToggle.className = 'switch'; + customPromptToggle.setAttribute('aria-label', 'Enable custom prompt'); + var customPromptPlaceholder = 'Write instructions for describing the image'; + var savedCustomPrompt = ''; + var customPromptInput = document.createElement('textarea'); + customPromptInput.id = 'bskyplusLlmCustomPrompt'; + customPromptInput.className = 'bskyplus-llm-input bskyplus-llm-prompt-input'; + customPromptInput.rows = 2; + customPromptInput.disabled = true; + customPromptInput.placeholder = ''; + customPromptInput.spellcheck = true; + var customPromptField = document.createElement('div'); + customPromptField.className = 'bskyplus-llm-field'; + var customPromptHeading = document.createElement('div'); + customPromptHeading.className = 'bskyplus-llm-prompt-heading'; + var customPromptTitle = document.createElement('span'); + customPromptTitle.id = 'bskyplusLlmCustomPromptTitle'; + customPromptTitle.className = 'bskyplus-llm-label'; + customPromptTitle.textContent = 'Custom prompt'; + customPromptInput.setAttribute('aria-labelledby', customPromptTitle.id); + customPromptToggle.setAttribute('aria-controls', customPromptInput.id); + customPromptHeading.append(customPromptTitle, customPromptToggle); + customPromptField.append(customPromptHeading, customPromptInput); + function resizeCustomPrompt() { + if (!customPromptInput.isConnected) return; + customPromptInput.style.height = 'auto'; + var styles = window.getComputedStyle(customPromptInput); + var borders = parseFloat(styles.borderTopWidth) + parseFloat(styles.borderBottomWidth); + customPromptInput.style.height = (customPromptInput.scrollHeight + borders) + 'px'; + } + function updateCustomPromptAvailability() { + var enabled = customPromptToggle.checked; + customPromptInput.disabled = !enabled; + customPromptInput.value = enabled ? savedCustomPrompt : ''; + customPromptInput.placeholder = enabled ? customPromptPlaceholder : ''; + resizeCustomPrompt(); + } + customPromptToggle.addEventListener('change', function () { + if (!customPromptToggle.checked) savedCustomPrompt = customPromptInput.value; + updateCustomPromptAvailability(); + }); + customPromptInput.addEventListener('input', function () { + savedCustomPrompt = customPromptInput.value; + resizeCustomPrompt(); + }); + window.addEventListener('resize', resizeCustomPrompt); + if (typeof ResizeObserver === 'function') { + var promptFieldWidth = 0; + var promptFieldObserver = new ResizeObserver(function (entries) { + var width = entries[0]?.contentRect.width || 0; + if (width === promptFieldWidth) return; + promptFieldWidth = width; + resizeCustomPrompt(); + }); + promptFieldObserver.observe(customPromptField); + } section.appendChild(field('Endpoint URL', endpointInput)); section.appendChild(field('Model', modelInput)); - section.appendChild(field('API key', apiKeyInput)); + var apiKeyField = document.createElement('div'); + apiKeyField.className = 'bskyplus-llm-field'; + var apiKeyLabel = document.createElement('label'); + apiKeyLabel.className = 'bskyplus-llm-label'; + apiKeyLabel.htmlFor = apiKeyInput.id; + apiKeyLabel.textContent = 'API key'; + var apiKeyRow = document.createElement('div'); + apiKeyRow.className = 'bskyplus-llm-key-row'; + apiKeyRow.appendChild(apiKeyInput); + apiKeyField.append(apiKeyLabel, apiKeyRow); + section.appendChild(apiKeyField); + section.appendChild(customPromptField); var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -194,7 +246,7 @@ saveButton.className = 'secondary-btn bskyplus-llm-save'; saveButton.textContent = 'Save'; saveButton.disabled = true; - actions.appendChild(saveButton); + apiKeyRow.appendChild(saveButton); var grantButton = document.createElement('button'); grantButton.type = 'button'; grantButton.className = 'secondary-btn bskyplus-llm-grant'; @@ -202,6 +254,92 @@ grantButton.hidden = true; actions.appendChild(grantButton); var pendingPermissionRequest = null; + var saveQueue = Promise.resolve(); + var editVersion = 0; + var dirtyFields = Object.create(null); + var draftRevisions = Object.create(null); + var settingsReady = Promise.resolve(); + + function queueSettingsSave(patch, message) { + if (!api) return Promise.reject(new Error('Settings storage is unavailable')); + var version = editVersion; + var revisions = Object.assign({}, draftRevisions); + saveQueue = saveQueue.catch(function () {}).then(async function () { + await settingsReady; + var saved = await storageGet(api, STORAGE_KEY); + var settings = normalizeSettings(saved[STORAGE_KEY]); + if (featureRow && typeof settings.enabled !== 'boolean') { + settings.enabled = validateEndpoint(settings.endpoint).ok; + } + Object.keys(patch).forEach(function (key) { settings[key] = patch[key]; }); + await storageSet(api, { llm: settings }); + Object.keys(patch).forEach(function (key) { + if (dirtyFields[key] && revisions[key] === draftRevisions[key]) dirtyFields[key] = false; + }); + if (version === editVersion) setStatus(message || '', false); + return settings; + }); + return saveQueue; + } + + function persistField(key, value) { + editVersion += 1; + return queueSettingsSave({ [key]: value }, 'Draft saved.'); + } + + function persistDraft() { + var patch = {}; + Object.keys(dirtyFields).forEach(function (key) { + if (dirtyFields[key]) patch[key] = draftValue(key); + }); + if (!Object.keys(patch).length) return Promise.resolve(); + editVersion += 1; + return queueSettingsSave(patch, 'Draft saved.'); + } + + function draftValue(key) { + if (key === 'endpoint') return endpointInput.value.trim(); + if (key === 'model') return modelInput.value.trim(); + if (key === 'apiKey') return apiKeyInput.value; + if (key === 'useCustomPrompt') return customPromptToggle.checked; + if (key === 'customPrompt') return savedCustomPrompt; + return undefined; + } + + function trackDraft(input, key) { + function markDirty() { + dirtyFields[key] = true; + draftRevisions[key] = (draftRevisions[key] || 0) + 1; + editVersion += 1; + } + input.addEventListener('input', markDirty); + input.addEventListener('change', markDirty); + input.addEventListener('blur', function () { + if (!dirtyFields[key]) return; + persistField(key, draftValue(key)).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + } + + trackDraft(endpointInput, 'endpoint'); + trackDraft(modelInput, 'model'); + trackDraft(apiKeyInput, 'apiKey'); + trackDraft(customPromptInput, 'customPrompt'); + customPromptToggle.addEventListener('change', function () { + dirtyFields.useCustomPrompt = true; + draftRevisions.useCustomPrompt = (draftRevisions.useCustomPrompt || 0) + 1; + editVersion += 1; + persistField('useCustomPrompt', customPromptToggle.checked).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + window.addEventListener('blur', function () { persistDraft().catch(function () {}); }); + window.addEventListener('pagehide', function () { persistDraft().catch(function () {}); }); + document.addEventListener('visibilitychange', function () { + if (document.hidden) persistDraft().catch(function () {}); + }); + section.appendChild(actions); var status = document.createElement('p'); @@ -227,12 +365,47 @@ document.body.appendChild(section); } + var featureRow = globalThis.BskyPlusFeatureRow?.(section, 'AI Alt Text (LLM)', 'Generate image descriptions with AI', 'llmEnabledToggle', 'altTextSection'); + if (featureRow) { + featureRow.addTooltip(() => notice.textContent); + notice.remove(); + featureRow.toggle.disabled = true; + featureRow.toggle.addEventListener('change', async function () { + var enabled = featureRow.toggle.checked; + featureRow.toggle.disabled = true; + saveButton.disabled = true; + try { + await queueSettingsSave({ enabled: enabled }, ''); + setStatus('', false); + } catch { + featureRow.setEnabled(!enabled); + setStatus('Could not change LLM settings. Try again.', true); + } finally { + featureRow.toggle.disabled = false; + saveButton.disabled = false; + } + }); + api?.storage?.onChanged?.addListener(function (changes, area) { + if (area !== 'local' || !changes.llm) return; + var settings = normalizeSettings(changes.llm.newValue); + featureRow.setEnabled(settings.enabled ?? validateEndpoint(settings.endpoint).ok); + }); + } + if (api) { - storageGet(api, STORAGE_KEY).then(function (res) { + settingsReady = storageGet(api, STORAGE_KEY).then(function (res) { var stored = normalizeSettings(res && res[STORAGE_KEY]); - endpointInput.value = stored.endpoint; - modelInput.value = stored.model; - apiKeyInput.value = stored.apiKey; + if (!dirtyFields.endpoint) endpointInput.value = stored.endpoint; + if (!dirtyFields.model) modelInput.value = stored.model; + if (!dirtyFields.apiKey) apiKeyInput.value = stored.apiKey; + if (!dirtyFields.useCustomPrompt) customPromptToggle.checked = stored.useCustomPrompt; + if (!dirtyFields.customPrompt) savedCustomPrompt = stored.customPrompt; + updateCustomPromptAvailability(); + resizeCustomPrompt(); + if (featureRow) { + featureRow.setEnabled(stored.enabled ?? validateEndpoint(stored.endpoint).ok); + featureRow.toggle.disabled = false; + } }); } @@ -252,31 +425,31 @@ var endpoint = endpointInput.value.trim(); var model = modelInput.value.trim(); var apiKey = apiKeyInput.value; - - if (endpoint === '') { - saveSettings({ endpoint: '', model: '', apiKey: '' }, 'LLM endpoint cleared.').catch(function () { - setStatus('Could not save LLM settings.', true); - }); - return; - } - + var useCustomPrompt = customPromptToggle.checked; + var customPrompt = savedCustomPrompt; var target = validateEndpoint(endpoint); - if (!target.ok) { - setStatus(target.error, true); - return; - } - var dataTypes = ['websiteContent']; if (apiKey) dataTypes.push('authenticationInfo'); saveButton.disabled = true; - saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey }, 'Settings saved. Requesting access…').then(function () { + if (featureRow) featureRow.toggle.disabled = true; + saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey, useCustomPrompt: useCustomPrompt, customPrompt: customPrompt }, 'Draft saved.').then(function () { + if (!target.ok) { + setStatus(endpoint ? target.error : 'LLM endpoint cleared. Other settings are saved.', !endpoint ? false : true); + return; + } + if (useCustomPrompt && !customPrompt.trim()) { + setStatus('Settings saved. Enter a custom prompt or turn the custom prompt off.', true); + return; + } pendingPermissionRequest = buildPermissionRequest(target.originPattern, dataConsentSupported, dataTypes); + setStatus('Settings saved. Requesting access…', false); return requestSavedPermissions(); }).catch(function () { setStatus('Could not save LLM settings.', true); }).finally(function () { saveButton.disabled = false; + if (featureRow) featureRow.toggle.disabled = false; }); }); @@ -287,6 +460,7 @@ function requestSavedPermissions() { if (!pendingPermissionRequest) return Promise.resolve(); var permissionPromise; + var usingPermissionBroker = false; grantButton.disabled = true; if (api && api.permissions && api.permissions.request) { try { @@ -295,11 +469,31 @@ permissionPromise = Promise.reject(err); } } else { - permissionPromise = Promise.resolve(true); + usingPermissionBroker = true; + try { + permissionPromise = api && api.runtime && typeof api.runtime.sendMessage === 'function' + ? api.runtime.sendMessage({ action: 'REQUEST_LLM_ACCESS' }) + : Promise.reject(new Error('LLM permissions are unavailable.')); + } catch (err) { + permissionPromise = Promise.reject(err); + } } return Promise.resolve(permissionPromise).then(function (granted) { - if (!granted) { + if (usingPermissionBroker) { + if (granted && granted.success === true && granted.opened === true) { + grantButton.hidden = false; + setStatus('Settings saved. Finish granting LLM access in the permissions page.', false); + return; + } + if (granted && granted.success === true && granted.granted === true) { + grantButton.hidden = true; + setStatus('LLM endpoint saved.', false); + return; + } + throw new Error(granted && granted.error ? granted.error : 'LLM permissions are unavailable.'); + } + if (granted !== true) { grantButton.hidden = false; setStatus('Settings saved. Access was not granted. Choose Grant access to enable LLM.', true); return; @@ -320,10 +514,10 @@ return Promise.reject(new Error('Settings storage is unavailable')); } // Content/composer observes storage.onChanged and calls GET_LLM_STATUS; - // never broadcast the endpoint or API key. - return storageSet(api, { llm: settings }).then(function () { - setStatus(message, false); - }); + // never broadcast the endpoint or API key. Merge through the same queue + // as blur saves so an older write cannot replace a later draft. + editVersion += 1; + return queueSettingsSave(settings, message); } return { endpointInput: endpointInput, modelInput: modelInput, apiKeyInput: apiKeyInput, saveButton: saveButton, status: status }; diff --git a/extension/chrome/shared/llm.js b/extension/chrome/shared/llm.js index f6513c0..835b322 100644 --- a/extension/chrome/shared/llm.js +++ b/extension/chrome/shared/llm.js @@ -7,7 +7,8 @@ // content scripts: GET_LLM_STATUS only reports whether an endpoint is set. // // Storage contract: a single chrome.storage.local key "llm" holding -// { endpoint, model, apiKey }. An empty endpoint means the feature is off. +// { endpoint, model, apiKey, enabled, useCustomPrompt, customPrompt }. An +// empty endpoint means the feature is off. (function (global) { 'use strict'; @@ -23,7 +24,6 @@ var FIREFOX_DATA_CONSENT_DESKTOP = 140; var FIREFOX_DATA_CONSENT_ANDROID = 142; var DEFAULT_SYSTEM_PROMPT = 'Write concise, accurate alt text for this image for blind and low-vision readers. Include meaningful visible text. Do not invent detail. Output only the alt text, under 2000 characters.'; - var DEFAULT_USER_PROMPT = 'Write alt text for this image.'; function getBrowserApi() { // Prefer the promise-based namespace; Firefox/Safari expose `browser`. @@ -37,7 +37,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -69,7 +72,7 @@ } function isEnabled(raw) { - return validateEndpoint(normalizeSettings(raw).endpoint).ok; + return raw?.enabled !== false && validateEndpoint(normalizeSettings(raw).endpoint).ok; } // RUN_LLM may only come from this extension's own top frame on bsky.app or a @@ -88,6 +91,15 @@ return host === 'bsky.app' || host.endsWith('.bsky.app'); } + function isAllowedSettingsSender(sender, ownId, api) { + if (!sender || typeof sender !== 'object' || !ownId || sender.id !== ownId || + typeof sender.url !== 'string' || !api || !api.runtime || + typeof api.runtime.getURL !== 'function') return false; + var extensionRoot = api.runtime.getURL(''); + return typeof extensionRoot === 'string' && extensionRoot !== '' && + sender.url.indexOf(extensionRoot) === 0; + } + function isAndroidPlatform() { try { return typeof navigator !== 'undefined' && /android/i.test(navigator.userAgent || ''); @@ -181,17 +193,16 @@ } function buildRequestBody(settings, prompt, image) { - var systemText = (prompt && typeof prompt.system === 'string' && prompt.system.trim()) - ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT; - var userText = (prompt && typeof prompt.user === 'string' && prompt.user.trim()) - ? prompt.user.trim() : DEFAULT_USER_PROMPT; + var promptText = (settings && settings.useCustomPrompt && typeof settings.customPrompt === 'string' && settings.customPrompt.trim()) + ? settings.customPrompt.trim() + : ((prompt && typeof prompt.system === 'string' && prompt.system.trim()) + ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT); var body = { messages: [ - { role: 'system', content: systemText }, { role: 'user', content: [ - { type: 'text', text: userText }, + { type: 'text', text: promptText }, { type: 'image_url', image_url: { url: image } } ] } @@ -310,7 +321,7 @@ }); }; - function sendRequest(settings, prompt, image, target) { + async function sendRequest(settings, prompt, image, target) { var body = buildRequestBody(settings, prompt, image); var headers = { 'Content-Type': 'application/json' }; if (settings.apiKey) headers.Authorization = 'Bearer ' + settings.apiKey; @@ -318,37 +329,29 @@ var controller = typeof AbortController === 'function' ? new AbortController() : null; var timeoutId = controller ? setTimeout(function () { controller.abort(); }, env.timeoutMs || REQUEST_TIMEOUT_MS) : null; - function clear() { - if (timeoutId) clearTimeout(timeoutId); - } - - return fetchFn(target.url.toString(), { - method: 'POST', - headers: headers, - body: JSON.stringify(body), - credentials: 'omit', - redirect: 'error', - signal: controller ? controller.signal : undefined - }).then(function (response) { + try { + const response = await fetchFn(target.url.toString(), { + method: 'POST', + headers: headers, + body: JSON.stringify(body), + credentials: 'omit', + redirect: 'error', + signal: controller ? controller.signal : undefined + }); if (!response) throw safeError('LLM request failed'); if (!response.ok) throw safeError('LLM endpoint returned HTTP ' + response.status); - return response.text(); - }).then(function (raw) { + const raw = await response.text(); if (typeof raw !== 'string' || raw.trim() === '') { throw safeError('LLM endpoint returned an empty response'); } - var data; try { - data = JSON.parse(raw); + return JSON.parse(raw); } catch (err) { throw safeError('LLM endpoint returned an invalid response'); } - clear(); - return data; - }, function (err) { - clear(); - throw err; - }); + } finally { + if (timeoutId) clearTimeout(timeoutId); + } } function runLlm(message, sender) { @@ -366,6 +369,7 @@ .then(function () { return getSettings(); }) .then(function (rawSettings) { var settings = normalizeSettings(rawSettings); + if (settings.enabled === false) return { success: false, error: 'LLM is disabled' }; var target = validateEndpoint(settings.endpoint); if (!target.ok) { return { success: false, error: 'LLM endpoint is not configured' }; @@ -396,12 +400,8 @@ if (!text) throw safeError('The LLM endpoint returned no alt text'); return { success: true, text: text }; }) - .then(function (result) { - delete inFlight[key]; - return result; - }, function (err) { + .finally(function () { delete inFlight[key]; - return { success: false, error: cleanError(err) }; }); }) .catch(function (err) { @@ -415,8 +415,50 @@ .then(function (raw) { return { enabled: isEnabled(raw) }; }, function () { return { enabled: false }; }); } + function openPermissionPage(sender) { + if (!isAllowedSettingsSender(sender, getOwnId(), api)) { + return Promise.resolve({ success: false, error: 'Open Bsky+ settings to grant LLM access.' }); + } + if (!api.tabs || typeof api.tabs.create !== 'function' || + !api.runtime || typeof api.runtime.getURL !== 'function') { + return Promise.resolve({ success: false, error: 'LLM permissions are unavailable in this browser.' }); + } + return Promise.resolve() + .then(function () { return getSettings(); }) + .then(function (rawSettings) { + var settings = normalizeSettings(rawSettings); + var target = validateEndpoint(settings.endpoint); + if (!target.ok) { + return { success: false, error: 'Save a valid LLM endpoint before granting access.' }; + } + var originRequest = { origins: [target.originPattern] }; + return Promise.all([ + permissionsContains(api, originRequest), + getSupportsDataConsent().then(function (supported) { + return supported + ? permissionsContains(api, { data_collection: requiredDataCollection(settings) }) + : true; + }) + ]).then(function (grants) { + if (grants[0] && grants[1]) return { success: true, granted: true }; + return Promise.resolve(api.tabs.create({ + url: api.runtime.getURL('shared/llm-permissions.html') + })).then(function () { return { success: true, opened: true }; }); + }); + }) + .catch(function () { + return { success: false, error: 'Could not open LLM permissions. Try saving again.' }; + }); + } + function onMessage(message, sender, sendResponse) { if (!message || typeof message.action !== 'string') return undefined; + if (message.action === 'REQUEST_LLM_ACCESS') { + openPermissionPage(sender).then(sendResponse, function () { + sendResponse({ success: false, error: 'Could not open LLM permissions. Try saving again.' }); + }); + return true; + } if (message.action === 'RUN_LLM') { runLlm(message, sender).then(sendResponse, function () { sendResponse({ success: false, error: 'LLM request failed' }); @@ -463,7 +505,6 @@ STORAGE_KEY: STORAGE_KEY, PROMPT_PATH: PROMPT_PATH, DEFAULT_SYSTEM_PROMPT: DEFAULT_SYSTEM_PROMPT, - DEFAULT_USER_PROMPT: DEFAULT_USER_PROMPT, MAX_IMAGE_BYTES: MAX_IMAGE_BYTES, DATA_COLLECTION_TYPES: DATA_COLLECTION_TYPES, normalizeSettings: normalizeSettings, @@ -485,7 +526,8 @@ global.BskyPlusLLM = BskyPlusLLM; if (typeof module !== 'undefined' && module.exports) module.exports = BskyPlusLLM; - // Auto-wire when loaded as a background dependency. register() is idempotent, - // so hosts may also call BskyPlusLLM.register() themselves. - register(); + // Auto-wire when loaded as a background dependency. Standalone pages may + // load the helper library without registering a second message listener. + var currentScript = global.document && global.document.currentScript; + if (!currentScript || !currentScript.hasAttribute('data-no-register')) register(); })(typeof globalThis !== 'undefined' ? globalThis : this); diff --git a/extension/chrome/shared/media-viewer.js b/extension/chrome/shared/media-viewer.js index 432f1bd..8185335 100644 --- a/extension/chrome/shared/media-viewer.js +++ b/extension/chrome/shared/media-viewer.js @@ -5,11 +5,14 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const SPEEDS = [0.5, 1, 1.25, 1.5, 2]; - let rememberedSpeed = 1; let enabled = true; + let nextSpeedMenuId = 0; + let activeSpeedControl = null; + const speedControls = new Set(); + const videoSources = new WeakMap(); function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -19,12 +22,10 @@ // Load initial settings if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['mediaViewerEnabled', 'videoSpeed'], (res) => { + chrome.storage.local.get(['mediaViewerEnabled'], (res) => { if (res) { if (res.mediaViewerEnabled !== undefined) enabled = res.mediaViewerEnabled; - if (res.videoSpeed !== undefined) rememberedSpeed = res.videoSpeed; } - applyToAllVideos(); scanVideos(); }); @@ -33,6 +34,7 @@ if (changes.mediaViewerEnabled || changes.enableAlphaFeatures) { if (changes.mediaViewerEnabled) enabled = changes.mediaViewerEnabled.newValue; if (!isFeatureActive()) { + disposeAllSpeedControls(); document.querySelectorAll('.bskyplus-video-toolbar').forEach(t => t.remove()); } else { scanVideos(); @@ -42,33 +44,213 @@ }); } - function saveSpeedState(speed) { - rememberedSpeed = speed; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.set({ videoSpeed: speed }); + function updateSpeedControl(trigger, speed) { + if (!trigger) return; + const value = String(speed); + trigger.value = value; + const label = trigger.querySelector('.bskyplus-speed-value'); + if (label) label.textContent = `${value}x`; + trigger.setAttribute('aria-label', `Playback speed ${value}x`); + const menu = document.getElementById(trigger.getAttribute('aria-controls')); + menu?.querySelectorAll('[data-speed]').forEach(option => { + option.setAttribute('aria-checked', String(option.dataset.speed === value)); + }); + } + + function getVideoControlsSibling(video) { + const figure = video.parentElement; + if (figure?.tagName !== 'FIGURE') return null; + const sibling = figure.nextElementSibling; + if (sibling?.tagName === 'DIV') return sibling; + return sibling?.nextElementSibling?.tagName === 'DIV' ? sibling.nextElementSibling : null; + } + + function getVideoToolbarContainer(video) { + const sibling = getVideoControlsSibling(video); + const container = sibling?.lastElementChild?.lastElementChild; + return container?.tagName === 'DIV' ? container : null; + } + + function eventIsInsideSpeedControl(event, control) { + const path = typeof event.composedPath === 'function' ? event.composedPath() : []; + return path.includes(control.trigger) || path.includes(control.menu) || + control.trigger.contains(event.target) || control.menu.contains(event.target); + } + + function getSpeedMenuMountRoot(trigger) { + const fullscreenRoot = document.fullscreenElement || document.webkitFullscreenElement; + const dialogRoot = trigger.closest('dialog[open], [role="dialog"], [aria-modal="true"]'); + if (fullscreenRoot?.contains(trigger)) { + return dialogRoot && fullscreenRoot.contains(dialogRoot) ? dialogRoot : fullscreenRoot; } + return dialogRoot || document.body; + } + + function mountSpeedMenu(control) { + const root = getSpeedMenuMountRoot(control.trigger); + if (root && control.menu.parentElement !== root) root.appendChild(control.menu); + } + + function positionSpeedMenu(control) { + const triggerRect = control.trigger.getBoundingClientRect(); + const menuRect = control.menu.getBoundingClientRect(); + const margin = 8; + const below = window.innerHeight - triggerRect.bottom; + const above = triggerRect.top; + const top = below >= menuRect.height + margin || below >= above + ? triggerRect.bottom + margin + : triggerRect.top - menuRect.height - margin; + const left = Math.max(margin, Math.min( + triggerRect.right - menuRect.width, + window.innerWidth - menuRect.width - margin + )); + const maxTop = Math.max(margin, window.innerHeight - menuRect.height - margin); + control.menu.style.setProperty('top', `${Math.max(margin, Math.min(top, maxTop))}px`, 'important'); + control.menu.style.setProperty('left', `${left}px`, 'important'); + } + + function closeSpeedMenu(control = activeSpeedControl, restoreFocus = false) { + if (!control) return; + const hadFocus = control.menu.contains(document.activeElement) || control.trigger === document.activeElement; + if (activeSpeedControl === control) activeSpeedControl = null; + control.trigger.setAttribute('aria-expanded', 'false'); + if (control.isPopoverOpen && typeof control.menu.hidePopover === 'function') { + try { control.menu.hidePopover(); } catch (_) { /* Already closed. */ } + } else { + control.menu.hidden = true; + } + control.isPopoverOpen = false; + mountSpeedMenu(control); + if (restoreFocus && hadFocus && control.trigger.isConnected) control.trigger.focus(); + } + + function openSpeedMenu(control) { + if (!control.trigger.isConnected || !isFeatureActive()) return; + if (activeSpeedControl && activeSpeedControl !== control) { + closeSpeedMenu(activeSpeedControl, false); + } + mountSpeedMenu(control); + activeSpeedControl = control; + control.trigger.setAttribute('aria-expanded', 'true'); + if (typeof control.menu.showPopover === 'function' && control.menu.hasAttribute('popover')) { + try { + control.menu.showPopover(); + control.isPopoverOpen = true; + } catch (_) { + control.menu.removeAttribute('popover'); + control.menu.hidden = false; + } + } else { + control.menu.hidden = false; + } + positionSpeedMenu(control); + const selected = control.menu.querySelector('[aria-checked="true"]'); + (selected || control.menu.querySelector('[data-speed]'))?.focus(); + } + + function moveSpeedMenuFocus(control, key) { + const options = Array.from(control.menu.querySelectorAll('[data-speed]')); + if (!options.length) return; + if (key === 'Home') { + options[0].focus(); + return; + } + if (key === 'End') { + options[options.length - 1].focus(); + return; + } + const current = options.indexOf(document.activeElement); + const direction = key === 'ArrowDown' ? 1 : -1; + const next = current < 0 + ? (direction > 0 ? 0 : options.length - 1) + : (current + direction + options.length) % options.length; + options[next].focus(); + } + + function focusOutsideSpeedMenu(control, backwards) { + const selector = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])'; + const focusables = Array.from(document.querySelectorAll(selector)).filter(element => { + if (control.menu.contains(element) || element.tabIndex < 0 || element.closest('[hidden]')) return false; + return typeof element.getClientRects !== 'function' || element.getClientRects().length > 0; + }); + const index = focusables.indexOf(control.trigger); + const destination = focusables[index + (backwards ? -1 : 1)]; + closeSpeedMenu(control, false); + if (destination) destination.focus(); + } + + document.addEventListener('pointerdown', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('focusin', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('scroll', event => { + if (activeSpeedControl && !activeSpeedControl.menu.contains(event.target)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + document.addEventListener('fullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('webkitfullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('close', event => { + if (event.target?.tagName === 'DIALOG' && activeSpeedControl && + event.target.contains(activeSpeedControl.trigger)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + window.addEventListener('resize', () => closeSpeedMenu()); + + function disposeSpeedControl(control) { + if (activeSpeedControl === control) closeSpeedMenu(control, false); + control.menu.remove(); + speedControls.delete(control); + } + + function disposeAllSpeedControls() { + Array.from(speedControls).forEach(disposeSpeedControl); + } + + function cleanupDisconnectedSpeedControls() { + Array.from(speedControls).forEach(control => { + if (!control.video.isConnected || !control.trigger.isConnected) disposeSpeedControl(control); + }); + } + + function getVideoSourceKey(video) { + const sources = Array.from(video.querySelectorAll('source'), source => source.getAttribute('src') || ''); + return JSON.stringify([video.getAttribute('src') || '', ...sources]); + } + + function resetSpeedForChangedSource(video) { + const source = getVideoSourceKey(video); + const previousSource = videoSources.get(video); + if (previousSource === undefined || previousSource !== source) { + video.playbackRate = 1; + updateSpeedControl(getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'), 1); + } + videoSources.set(video, source); } function setupVideo(video) { if (!isFeatureActive()) return; - const figure = video.parentElement; - if (figure?.tagName !== 'FIGURE') return; - const container = figure.nextElementSibling?.lastElementChild?.lastElementChild; - if (!container || container.tagName !== 'DIV') return; + const container = getVideoToolbarContainer(video); + if (!container) return; + + resetSpeedForChangedSource(video); if (!video.dataset.bskyplusViewerSetup) { video.dataset.bskyplusViewerSetup = 'true'; - video.playbackRate = rememberedSpeed; - - video.addEventListener('play', () => { - if (isFeatureActive()) video.playbackRate = rememberedSpeed; - }); + video.addEventListener('loadstart', () => resetSpeedForChangedSource(video)); video.addEventListener('ratechange', () => { - const chooser = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-speed-select'); - if (chooser) chooser.value = String(video.playbackRate); + const chooser = getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'); + updateSpeedControl(chooser, video.playbackRate); }); const updatePipButton = () => { - const button = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-pip-btn'); + const button = getVideoControlsSibling(video)?.querySelector('.bskyplus-pip-btn'); if (button) button.setAttribute('aria-pressed', String(document.pictureInPictureElement === video)); }; video.addEventListener('enterpictureinpicture', updatePipButton); @@ -79,37 +261,90 @@ const toolbar = createEl('div', { className: 'bskyplus-video-toolbar' }); - const chooser = createEl('select', { + const chooser = createEl('button', { + type: 'button', className: 'bskyplus-speed-select', - 'aria-label': 'Playback speed', + 'aria-label': `Playback speed ${video.playbackRate}x`, + 'aria-haspopup': 'menu', + 'aria-expanded': 'false', title: 'Playback speed' }); - SPEEDS.forEach((spd) => { - chooser.appendChild(createEl('option', { value: spd, textContent: `${spd}x` })); + const valueLabel = createEl('span', { + className: 'bskyplus-speed-value', + textContent: `${video.playbackRate}x` + }); + chooser.appendChild(valueLabel); + chooser.appendChild(createEl('span', { className: 'bskyplus-speed-chevron', 'aria-hidden': 'true' })); + + const menu = createEl('div', { + className: 'bskyplus-speed-menu', + role: 'menu', + 'aria-label': 'Playback speed' + }); + const menuId = `bskyplus-speed-menu-${++nextSpeedMenuId}`; + menu.id = menuId; + chooser.setAttribute('aria-controls', menuId); + if (typeof menu.showPopover === 'function') menu.setAttribute('popover', 'manual'); + else menu.hidden = true; + + const control = { video, trigger: chooser, menu, isPopoverOpen: false }; + SPEEDS.forEach(speed => { + const option = createEl('button', { + type: 'button', + className: 'bskyplus-speed-option', + role: 'menuitemradio', + 'aria-checked': String(String(speed) === String(video.playbackRate)) + }); + option.dataset.speed = String(speed); + option.appendChild(createEl('span', { textContent: `${speed}x` })); + option.appendChild(createEl('span', { className: 'bskyplus-speed-option-check', 'aria-hidden': 'true' })); + option.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + if (!SPEEDS.includes(speed)) return; + video.playbackRate = speed; + updateSpeedControl(chooser, speed); + closeSpeedMenu(control, true); + }); + menu.appendChild(option); }); - chooser.value = String(video.playbackRate); - ['click', 'pointerdown', 'keydown'].forEach(type => { - chooser.addEventListener(type, e => e.stopPropagation()); + mountSpeedMenu(control); + speedControls.add(control); + + chooser.addEventListener('click', event => { + event.stopPropagation(); + if (activeSpeedControl === control) closeSpeedMenu(control, false); + else openSpeedMenu(control); }); - // Selecting the current option closes the picker without a change event. - const blurClosedChooser = () => { - setTimeout(() => { - if (!chooser.matches(':open')) chooser.blur(); - }, 0); - }; - chooser.addEventListener('click', blurClosedChooser); - chooser.addEventListener('keyup', e => { - e.stopPropagation(); - if (['Enter', 'Escape', ' '].includes(e.key)) blurClosedChooser(); + chooser.addEventListener('pointerdown', event => event.stopPropagation()); + chooser.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { + event.preventDefault(); + openSpeedMenu(control); + } else if (event.key === 'Escape' && activeSpeedControl === control) { + event.preventDefault(); + closeSpeedMenu(control, true); + } }); - chooser.addEventListener('change', e => { - e.stopPropagation(); - const speed = Number(chooser.value); - if (!SPEEDS.includes(speed)) return; - video.playbackRate = speed; - saveSpeedState(speed); - chooser.blur(); + chooser.addEventListener('keyup', event => event.stopPropagation()); + menu.addEventListener('pointerdown', event => event.stopPropagation()); + menu.addEventListener('click', event => event.stopPropagation()); + menu.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'Escape') { + event.preventDefault(); + closeSpeedMenu(control, true); + } else if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) { + event.preventDefault(); + moveSpeedMenuFocus(control, event.key); + } else if (event.key === 'Tab') { + event.preventDefault(); + focusOutsideSpeedMenu(control, event.shiftKey); + } }); + menu.addEventListener('keyup', event => event.stopPropagation()); + updateSpeedControl(chooser, video.playbackRate); toolbar.appendChild(chooser); // Picture-in-Picture Button @@ -150,32 +385,21 @@ } function applyToAllVideos() { - if (!isFeatureActive()) return; - const videos = document.querySelectorAll('video'); - videos.forEach(v => { - v.playbackRate = rememberedSpeed; - }); + scanVideos(); } function scanVideos() { - if (!isFeatureActive()) return; + cleanupDisconnectedSpeedControls(); + if (!isFeatureActive()) { + disposeAllSpeedControls(); + document.querySelectorAll('.bskyplus-video-toolbar').forEach(toolbar => toolbar.remove()); + return; + } const videos = document.querySelectorAll('video'); videos.forEach(v => setupVideo(v)); } - const observer = new MutationObserver(() => { - scanVideos(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - }); - } + observeDom(scanVideos); window.BskyPlusMediaViewer = { scanVideos, diff --git a/extension/chrome/shared/settings-frame.css b/extension/chrome/shared/settings-frame.css index 5cefbe1..6930530 100644 --- a/extension/chrome/shared/settings-frame.css +++ b/extension/chrome/shared/settings-frame.css @@ -37,6 +37,10 @@ body { gap: 12px; } +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 10px; +} + .toggle-info { min-width: 0; } @@ -47,8 +51,7 @@ body { gap: 6px; } -.slider-header, -.custom-color-row { +.slider-header { flex-wrap: wrap; gap: 12px; } @@ -66,12 +69,6 @@ body { min-height: 36px; } -.palette-container { - justify-content: flex-start; - flex-wrap: wrap; - gap: 12px; -} - .bskyplus-llm-input { font-size: 15px; padding: 10px 12px; @@ -89,11 +86,20 @@ body { input:focus-visible, button:focus-visible { - outline: 2px solid var(--accent-default); + outline: 2px solid #1083fe; outline-offset: 3px; } @media (max-width: 400px) { body { padding: 16px; } .toggle-row { padding: 12px; } + .bskyplus-feature-expanded > .toggle-row { padding-bottom: 9px; } +} +#appviewSection [hidden] { + display: none; +} + +#appviewProvider option { + background: var(--bg-secondary); + color: var(--text-primary); } diff --git a/extension/chrome/shared/settings-frame.html b/extension/chrome/shared/settings-frame.html index ad6dc29..681f1f4 100644 --- a/extension/chrome/shared/settings-frame.html +++ b/extension/chrome/shared/settings-frame.html @@ -7,6 +7,7 @@ + diff --git a/extension/chrome/shared/settings-frame.js b/extension/chrome/shared/settings-frame.js index 95031f9..ed8a1da 100644 --- a/extension/chrome/shared/settings-frame.js +++ b/extension/chrome/shared/settings-frame.js @@ -36,21 +36,36 @@ } async function mount() { + if (new URLSearchParams(location.search).get('section') === 'theme') { + document.body.replaceChildren(); + await loadScript('shared/theme-model.js'); + await loadScript('shared/theme-editor.js'); + new ResizeObserver(reportHeight).observe(document.body); + reportHeight(); + return; + } // This is packaged, trusted markup, not content supplied by the website. const response = await fetch(api.runtime.getURL('popup/popup.html')); if (!response.ok) throw new Error('Could not load settings.'); const template = new DOMParser().parseFromString(await response.text(), 'text/html'); template.querySelectorAll('script').forEach(script => script.remove()); document.body.replaceChildren(...Array.from(template.body.children, node => document.importNode(node, true))); + document.getElementById('moreSettingsButton')?.remove(); document.getElementById('feedWidthSlider')?.setAttribute('aria-label', 'Feed column width'); - document.getElementById('colorPicker')?.setAttribute('aria-label', 'Accent color'); - document.getElementById('hexInput')?.setAttribute('aria-label', 'Hex color'); - await loadScript('shared/feature-flags.js'); - await loadScript('popup/popup.js'); - await loadScript('shared/llm-settings.js'); - await loadScript('shared/cdn-config.js'); - await loadScript('shared/cdn-settings.js'); + for (const script of [ + 'shared/feature-flags.js', + 'shared/theme-model.js', + 'popup/popup.js', + 'shared/popup-theme.js', + 'popup/feature-row.js', + 'shared/llm-settings.js', + 'shared/bookmarks-settings.js', + 'shared/cdn-config.js', + 'shared/cdn-settings.js', + 'shared/appview-config.js', + 'shared/appview-settings.js', + ]) await loadScript(script); // Keep this long-lived page current when another extension view saves. api.storage.onChanged.addListener((changes, area) => { diff --git a/extension/chrome/shared/thread-unroll.js b/extension/chrome/shared/thread-unroll.js index 0d1d47d..5f1ff8b 100644 --- a/extension/chrome/shared/thread-unroll.js +++ b/extension/chrome/shared/thread-unroll.js @@ -1,583 +1,320 @@ -// Bsky+ Thread Unroll & Reader View -// Concatenates connected skeets into a distraction-free reader view with Markdown and PDF export. - -(function () { +// Inline thread unroll for numbered Bluesky author threads. +(() => { 'use strict'; - const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const POST_SELECTOR = '[data-testid^="postThreadItem-by-"]'; + const MENU_SELECTOR = 'button[aria-label="Thread options"], [role="button"][aria-label="Thread options"]'; + const REPLY_PROMPT_SELECTOR = 'button[aria-label="Compose reply"], [role="button"][aria-label="Compose reply"]'; + const INTERACTIVE_SELECTOR = 'a[href], button, [role="button"], [role="link"], input, select, textarea, [contenteditable]:not([contenteditable="false"]), video, audio'; + const POST_ROUTE = /^\/profile\/[^/]+\/post\/[^/]+\/?$/; + const NUMBER_LABEL = /^Post ([1-9]\d*) of ([1-9]\d*)$/; + let active = false; + let route = location.pathname; + let toggle = null; + let marked = new Map(); + let scanQueued = false; - let enabled = true; - let activeModal = null; - let lastInteractedPost = null; + function guardPostActivation(event) { + if (!active || route !== location.pathname) return; - function isFeatureActive() { - const flags = window.BskyPlusFeatureFlags; - if (flags && !flags.isFeatureEnabled('threadUnroll')) return false; - return enabled; - } + const target = event.target; + if (!(target instanceof Element)) return; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['threadUnrollEnabled'], (res) => { - if (res && res.threadUnrollEnabled !== undefined) { - enabled = res.threadUnrollEnabled; - } - }); + const post = target.closest('[data-bskyplus-unroll-post]'); + if (!post) return; - chrome.storage.onChanged.addListener((changes, area) => { - if ((area === 'local' || area === 'sync') && changes.threadUnrollEnabled) { - enabled = changes.threadUnrollEnabled.newValue; - if (!isFeatureActive()) { - document.querySelectorAll('.bskyplus-unroll-btn, .bskyplus-unroll-menu-item').forEach(b => b.remove()); - closeReader(); - } else { - scanForThreads(); - scanForDropdownMenus(); - } - } - }); + const interactive = target.closest(INTERACTIVE_SELECTOR); + if (interactive && interactive !== post && post.contains(interactive)) return; + + event.preventDefault(); + event.stopPropagation(); } - // -------------------------------------------------------------------------- - // Track 3-Dot Button Interactions - // -------------------------------------------------------------------------- - document.addEventListener('click', (e) => { - const btn = e.target.closest ? e.target.closest('button, [role="button"]') : null; - if (!btn) return; - const label = (btn.getAttribute('aria-label') || '').toLowerCase(); - const testid = (btn.getAttribute('data-testid') || '').toLowerCase(); - const hasPopup = btn.getAttribute('aria-haspopup'); - - if ( - label.includes('more') || - label.includes('option') || - label.includes('menu') || - testid.includes('dropdown') || - testid.includes('more') || - hasPopup === 'menu' - ) { - lastInteractedPost = btn.closest ? btn.closest( - '[data-testid*="postThreadItem"], [data-testid*="feedItem"], [data-testid*="post"]' - ) : null; - } - }, true); - - // -------------------------------------------------------------------------- - // Thread Fetching & Tree Extraction - // -------------------------------------------------------------------------- - async function fetchThreadData(actor, rkey) { - try { - const atUri = `at://${actor}/app.bsky.feed.post/${rkey}`; - const res = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread?uri=${encodeURIComponent(atUri)}&depth=100`, { - headers: { 'Accept': 'application/json' } - }); - if (!res.ok) throw new Error(`HTTP ${res.status}`); - const data = await res.json(); - return data.thread; - } catch (err) { - console.warn('Bsky+ API thread fetch failed, falling back to DOM:', err); - return null; - } + function guardPostKeydown(event) { + if (event.key !== 'Enter' && event.key !== ' ') return; + guardPostActivation(event); } - function extractLinearAuthorThread(threadNode) { - if (!threadNode || !threadNode.post) return []; + window.addEventListener('click', guardPostActivation, true); + window.addEventListener('auxclick', guardPostActivation, true); + window.addEventListener('keydown', guardPostKeydown, true); - // Find root author - let current = threadNode; - while (current.parent && current.parent.post) { - current = current.parent; + function threadScope(menu, firstPost) { + let node = firstPost.parentElement; + while (node && node !== document.body && node !== document.documentElement) { + if (node.contains(menu)) return node; + node = node.parentElement; } - const rootAuthorDid = current.post.author.did; - - const posts = []; - - function collect(node) { - if (!node || !node.post) return; - if (node.post.author.did === rootAuthorDid) { - const p = node.post; - const images = []; - - if (p.embed && p.embed.images) { - p.embed.images.forEach(img => { - images.push({ - thumb: img.thumb, - fullsize: img.fullsize, - alt: img.alt || '' - }); - }); - } - - posts.push({ - uri: p.uri, - cid: p.cid, - author: { - handle: p.author.handle, - displayName: p.author.displayName || p.author.handle, - avatar: p.author.avatar || '' - }, - text: (p.record && p.record.text) ? p.record.text : '', - createdAt: (p.record && p.record.createdAt) ? p.record.createdAt : '', - images - }); - } + return null; + } - if (node.replies && Array.isArray(node.replies)) { - // Sort replies chronologically - const sorted = [...node.replies].sort((a, b) => { - const dateA = new Date(a.post?.record?.createdAt || 0).getTime(); - const dateB = new Date(b.post?.record?.createdAt || 0).getTime(); - return dateA - dateB; - }); - for (const reply of sorted) { - collect(reply); - } - } + function numberIn(post) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post) continue; + const match = NUMBER_LABEL.exec(badge.getAttribute('aria-label') || ''); + if (match) return { index: Number(match[1]), total: Number(match[2]) }; } - - collect(current); - return posts; + return null; } - function extractThreadFromDom() { - const threadPosts = []; - const postElements = document.querySelectorAll('[data-testid*="postThreadItem"], [data-testid*="feedItem"]'); - - postElements.forEach(item => { - const textEl = item.querySelector('[data-testid="postText"], div[dir="auto"]'); - const authorLink = item.querySelector('a[href^="/profile/"]'); - const timeEl = item.querySelector('time'); - const imgEls = item.querySelectorAll('img[src*="feed_thumbnail"], img[src*="feed_fullsize"]'); - - if (textEl || imgEls.length > 0) { - const handle = authorLink ? (authorLink.getAttribute('href') || '').replace('/profile/', '') : 'unknown'; - const images = []; - imgEls.forEach(img => { - images.push({ - thumb: img.getAttribute('src') || '', - fullsize: (img.getAttribute('src') || '').replace('/feed_thumbnail/', '/feed_fullsize/'), - alt: img.getAttribute('alt') || '' - }); - }); - - threadPosts.push({ - author: { handle, displayName: handle }, - text: textEl ? textEl.textContent.trim() : '', - createdAt: timeEl ? timeEl.getAttribute('datetime') || '' : '', - images - }); - } - }); - - return threadPosts; + function containsProfileLink(element) { + return !!element?.querySelector('a[href^="/profile/"]'); } - // -------------------------------------------------------------------------- - // Markdown & Export Generators - // -------------------------------------------------------------------------- - function generateMarkdown(posts) { - if (!posts || posts.length === 0) return ''; - const author = posts[0].author; - const dateStr = posts[0].createdAt ? new Date(posts[0].createdAt).toLocaleDateString() : ''; - - let md = `# Thread by ${author.displayName} (@${author.handle})\n`; - if (dateStr) md += `*Date: ${dateStr}*\n\n---\n\n`; - - posts.forEach((p, index) => { - md += `### ${index + 1}/${posts.length}\n\n`; - if (p.text) { - md += `${p.text}\n\n`; - } - if (p.images && p.images.length > 0) { - p.images.forEach(img => { - md += `![${img.alt || 'Post image'}](${img.fullsize || img.thumb})\n\n`; - }); - } - md += `---\n\n`; - }); - - return md; - } + function findThread() { + if (!POST_ROUTE.test(location.pathname)) return null; - function downloadFile(content, filename, type = 'text/markdown') { - const blob = new Blob([content], { type }); - const url = URL.createObjectURL(blob); - const a = createEl('a', { - href: url, - download: filename, - style: 'display: none;' + const menus = [...document.querySelectorAll(MENU_SELECTOR)]; + const firstPosts = [...document.querySelectorAll(POST_SELECTOR)].filter(post => { + if (post.parentElement?.closest(POST_SELECTOR)) return false; + const number = numberIn(post); + return number?.index === 1 && number.total >= 2; }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(url); - }, 1000); - } - - // -------------------------------------------------------------------------- - // Reader View Modal - // -------------------------------------------------------------------------- - function openReaderView(posts) { - if (!posts || posts.length === 0) return; - closeReader(); - - const author = posts[0].author; - const totalWords = posts.reduce((sum, p) => sum + (p.text ? p.text.split(/\s+/).length : 0), 0); - const readingTimeMinutes = Math.max(1, Math.ceil(totalWords / 200)); - const backdrop = createEl('div', { className: 'bskyplus-reader-backdrop' }); - activeModal = backdrop; + for (const menu of menus) { + for (const firstPost of firstPosts) { + const scope = threadScope(menu, firstPost); + if (!scope) continue; - const card = createEl('div', { className: 'bskyplus-reader-modal' }); + const { total } = numberIn(firstPost); + const authorTestId = firstPost.getAttribute('data-testid'); + const posts = [firstPost]; + let expected = 2; - // Header - const header = createEl('div', { className: 'bskyplus-reader-header' }); + for (const post of scope.querySelectorAll(POST_SELECTOR)) { + if (post === firstPost) continue; + if (post.parentElement?.closest(POST_SELECTOR)) continue; + if (firstPost.compareDocumentPosition(post) & Node.DOCUMENT_POSITION_PRECEDING) continue; - const authorSection = createEl('div', { className: 'bskyplus-reader-meta' }); - if (author.avatar) { - authorSection.appendChild(createEl('img', { - className: 'bskyplus-reader-avatar', - src: author.avatar, - alt: author.handle - })); - } - - const nameCol = createEl('div'); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-name', - textContent: author.displayName || author.handle - })); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-sub', - textContent: `@${author.handle} · ${posts.length} skeets · ${readingTimeMinutes} min read` - })); - authorSection.appendChild(nameCol); - header.appendChild(authorSection); - - // Actions (Export MD, PDF, Copy, Close) - const actions = createEl('div', { className: 'bskyplus-reader-actions' }); - - const copyBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Copy as Markdown' - }, [ - Icons.copy ? Icons.copy() : document.createTextNode('📋'), - createEl('span', { textContent: 'Copy MD' }) - ]); - copyBtn.addEventListener('click', async () => { - const md = generateMarkdown(posts); - await navigator.clipboard.writeText(md); - if (showToast) showToast('Thread copied to clipboard as Markdown!'); - }); - - const exportMdBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Export Markdown file' - }, [ - Icons.markdown ? Icons.markdown() : document.createTextNode('↓'), - createEl('span', { textContent: 'Export MD' }) - ]); - exportMdBtn.addEventListener('click', () => { - const md = generateMarkdown(posts); - const filename = `${author.handle}_thread_${Date.now()}.md`; - downloadFile(md, filename); - if (showToast) showToast('Exported thread as Markdown'); - }); + const number = numberIn(post); + if (!number || number.total !== total || post.getAttribute('data-testid') !== authorTestId) continue; + if (number.index !== expected) break; - const exportPdfBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn bskyplus-btn-primary', - title: 'Print / Save as PDF' - }, [ - Icons.printer ? Icons.printer() : document.createTextNode('🖨️'), - createEl('span', { textContent: 'Export PDF' }) - ]); - exportPdfBtn.addEventListener('click', () => { - window.print(); - }); - - const closeBtn = createEl('button', { - type: 'button', - className: 'bskyplus-reader-close', - title: 'Close reader' - }, [document.createTextNode('✕')]); - closeBtn.addEventListener('click', closeReader); - - actions.append(copyBtn, exportMdBtn, exportPdfBtn, closeBtn); - header.appendChild(actions); - card.appendChild(header); - - // Body: Skeets - const body = createEl('div', { className: 'bskyplus-reader-body' }); - posts.forEach((p, index) => { - const skeetCard = createEl('div', { className: 'bskyplus-reader-skeet' }); - - const skeetHeader = createEl('div', { className: 'bskyplus-skeet-header' }); - skeetHeader.appendChild(createEl('span', { - className: 'bskyplus-skeet-index', - textContent: `${index + 1} / ${posts.length}` - })); - if (p.createdAt) { - const timeStr = new Date(p.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }); - skeetHeader.appendChild(createEl('span', { textContent: timeStr })); - } - skeetCard.appendChild(skeetHeader); - - if (p.text) { - skeetCard.appendChild(createEl('div', { - className: 'bskyplus-skeet-text', - textContent: p.text - })); - } + posts.push(post); + expected += 1; + if (expected > total) break; + } - if (p.images && p.images.length > 0) { - const mediaContainer = createEl('div', { className: 'bskyplus-skeet-media' }); - p.images.forEach(img => { - const imgWrap = createEl('div'); - imgWrap.appendChild(createEl('img', { - className: 'bskyplus-skeet-img', - src: img.fullsize || img.thumb, - alt: img.alt || '' - })); - if (img.alt) { - imgWrap.appendChild(createEl('div', { - className: 'bskyplus-skeet-alt', - textContent: `Alt: ${img.alt}` - })); - } - mediaContainer.appendChild(imgWrap); - }); - skeetCard.appendChild(mediaContainer); + return { menu, posts, total, scope }; } + } - body.appendChild(skeetCard); - }); - - card.appendChild(body); - backdrop.appendChild(card); - - backdrop.addEventListener('click', (e) => { - if (e.target === backdrop) closeReader(); - }); - - document.body.appendChild(backdrop); + return null; } - function closeReader() { - if (activeModal) { - activeModal.remove(); - activeModal = null; + function mark(next, element, attribute, value = '') { + if (!element) return; + let attrs = next.get(element); + if (!attrs) { + attrs = new Map(); + next.set(element, attrs); } + attrs.set(attribute, value); } - document.addEventListener('keydown', (e) => { - if (e.key === 'Escape' && activeModal) { - closeReader(); + function controlRow(post, next) { + const ownControl = selector => [...post.querySelectorAll(selector)] + .find(button => button.closest(POST_SELECTOR) === post); + const reply = ownControl('[data-testid="replyBtn"]'); + const like = ownControl('[data-testid="likeBtn"]'); + const menu = ownControl('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]'); + if (!reply || !like || !menu) return null; + + let controls = reply.parentElement; + while (controls && controls !== post && (!controls.contains(like) || !controls.contains(menu))) { + controls = controls.parentElement; } - }); - - // -------------------------------------------------------------------------- - // Helper: Extract actor and rkey from element or URL - // -------------------------------------------------------------------------- - function getPostCoords(el) { - if (!el) return null; - const postLink = el.querySelector ? el.querySelector('a[href*="/post/"]') : null; - if (postLink) { - const href = postLink.getAttribute('href') || ''; - const match = href.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - return { actor: match[1], rkey: match[2] }; - } - } - return null; + if (!controls || controls === post) return null; + + // The native row contains a primary reply/repost/like group and a + // secondary bookmark/share/menu group. Keep the primary buttons in place. + const primary = [...controls.children].find(child => child.contains(reply) && child.contains(like)); + const secondary = [...controls.children].find(child => child.querySelector('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]')); + if (!primary || !secondary) return null; + + mark(next, controls, 'data-bskyplus-unroll-controls'); + mark(next, primary, 'data-bskyplus-unroll-primary'); + mark(next, secondary, 'data-bskyplus-unroll-secondary'); + return controls; } - async function handleUnrollClick(targetElement) { - if (showToast) showToast('Unrolling thread...'); - - let actor = null; - let rkey = null; + function compactFollowup(post, next) { + mark(next, post, 'data-bskyplus-unroll-followup'); - // 1. Check target element - if (targetElement) { - const coords = getPostCoords(targetElement); - if (coords) { - actor = coords.actor; - rkey = coords.rkey; - } + // The expanded anchor can be post 2 or later when the user opened a + // middle post. It has a full author header instead of the linear layout. + if (isExpandedAnchor(post)) { + mark(next, post.firstElementChild, 'data-bskyplus-unroll-author'); + return; } - // 2. Check current URL if on a post page - if (!actor || !rkey) { - const path = window.location.pathname; - const match = path.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - actor = match[1]; - rkey = match[2]; + // ThreadItemPost starts with a 12px parent-reply line. Its next child is + // the avatar/content row. Work only inside this numbered post. + const first = post.firstElementChild; + const main = first?.nextElementSibling; + if (first && main && main.children.length >= 2) { + mark(next, first, 'data-bskyplus-unroll-line'); + mark(next, main, 'data-bskyplus-unroll-main'); + const avatar = main.firstElementChild; + const content = avatar?.nextElementSibling; + if (containsProfileLink(avatar) && content?.querySelector('[data-testid="replyBtn"]')) { + mark(next, avatar, 'data-bskyplus-unroll-avatar'); + + const meta = content.firstElementChild; + if (containsProfileLink(meta)) { + mark(next, meta, 'data-bskyplus-unroll-author'); + } } } + } - let posts = []; - if (actor && rkey) { - const threadNode = await fetchThreadData(actor, rkey); - if (threadNode) { - posts = extractLinearAuthorThread(threadNode); - } - } + function isExpandedAnchor(post) { + return containsProfileLink(post.firstElementChild) && + !!post.firstElementChild?.nextElementSibling?.querySelector('[data-testid="replyBtn"]'); + } - if (posts.length === 0) { - posts = extractThreadFromDom(); + function compactNumber(post, next) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post || !NUMBER_LABEL.test(badge.getAttribute('aria-label') || '')) continue; + const wrapper = badge.parentElement; + const onlyBadge = wrapper?.children.length === 1 && wrapper.textContent?.trim() === badge.textContent?.trim(); + mark(next, onlyBadge ? wrapper : badge, 'data-bskyplus-unroll-number'); + break; } + } - if (posts.length > 0) { - openReaderView(posts); - } else { - if (showToast) showToast('Could not find thread to unroll'); + function compactAnchorChrome(post, controls, next) { + const badge = [...post.querySelectorAll('span[aria-label^="Post "]')] + .find(span => NUMBER_LABEL.test(span.getAttribute('aria-label') || '') && span.closest(POST_SELECTOR) === post); + const controlsWrapper = controls?.parentElement; + const content = controlsWrapper?.parentElement; + if (!badge || !content || !post.contains(content)) return; + mark(next, content, 'data-bskyplus-unroll-anchor-content'); + + // ExpandedPostDetails, aggregate counts, and KnownLikers are siblings + // between the actual post content and its native action toolbar. + const children = [...content.children]; + const contentIndex = children.findIndex(child => child.contains(badge)); + const controlsIndex = children.indexOf(controlsWrapper); + if (contentIndex < 0 || controlsIndex <= contentIndex) return; + for (const extra of children.slice(contentIndex + 1, controlsIndex)) { + mark(next, extra, 'data-bskyplus-unroll-chrome'); } } - // -------------------------------------------------------------------------- - // 3-Dot Post Menu Injection - // -------------------------------------------------------------------------- - function injectUnrollMenuItem(menu) { - if (!isFeatureActive()) return; - if (!menu || menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const postContext = lastInteractedPost; - - const menuItem = createEl('div', { - role: 'menuitem', - tabIndex: 0, - className: 'bskyplus-unroll-menu-item', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll Thread' }) - ]); - - menuItem.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - - // Dismiss the menu - const esc = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }); - menu.dispatchEvent(esc); - document.dispatchEvent(esc); - - handleUnrollClick(postContext); - }); + function compactReplyPrompt(scope, next) { + for (const prompt of scope.querySelectorAll(REPLY_PROMPT_SELECTOR)) { + if (prompt.closest(POST_SELECTOR) || prompt.closest('[role="dialog"], dialog')) continue; - menuItem.addEventListener('keydown', (e) => { - if (e.key === 'Enter' || e.key === ' ') { - e.preventDefault(); - e.stopPropagation(); - menuItem.click(); - } - }); - - const firstItem = menu.querySelector('[role="menuitem"], button, div'); - if (firstItem && firstItem.parentElement === menu) { - firstItem.after(menuItem); - } else { - menu.prepend(menuItem); + const wrapper = prompt.parentElement; + if (!wrapper || wrapper === scope) continue; + mark(next, wrapper, 'data-bskyplus-unroll-chrome'); } } - function scanForDropdownMenus() { - if (!isFeatureActive()) return; - - const menus = document.querySelectorAll( - 'div[role="menu"], [data-testid*="dropdownMenu"], [data-radix-menu-content]' - ); - - menus.forEach(menu => { - if (menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const text = menu.textContent || ''; - const isPostMenu = - text.includes('Translate') || - text.includes('Copy link') || - text.includes('Quote') || - text.includes('Mute') || - text.includes('Report') || - text.includes('Pin') || - text.includes('Embed') || - lastInteractedPost !== null; - - if (isPostMenu) { - injectUnrollMenuItem(menu); + function reconcile(next) { + for (const [element, attrs] of marked) { + const wanted = next.get(element); + for (const name of attrs.keys()) { + if (!wanted?.has(name)) element.removeAttribute(name); } - }); + } + + for (const [element, attrs] of next) { + for (const [name, value] of attrs) { + if (element.getAttribute(name) !== value) element.setAttribute(name, value); + } + } + marked = next; } - // -------------------------------------------------------------------------- - // Direct Thread Header Button - // -------------------------------------------------------------------------- - function attachUnrollButton(container) { - if (!isFeatureActive()) return; - if (container.querySelector('.bskyplus-unroll-btn')) return; - - const btn = createEl('button', { - type: 'button', - className: 'bskyplus-unroll-btn', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll' }) - ]); - - btn.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - handleUnrollClick(container); + function makeToggle() { + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'bskyplus-thread-unroll-toggle'; + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('width', '19'); + icon.setAttribute('height', '19'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('stroke', 'currentColor'); + icon.setAttribute('stroke-width', '1.8'); + icon.setAttribute('stroke-linecap', 'round'); + icon.setAttribute('stroke-linejoin', 'round'); + + for (const pathData of ['M5 5h14', 'M5 10h14', 'M5 15h10', 'M5 20h10']) { + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('d', pathData); + icon.append(path); + } + button.append(icon); + button.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + active = !active; + scan(); }); - - container.appendChild(btn); + return button; } - function scanForThreads() { - if (!isFeatureActive()) return; + function scan() { + if (route !== location.pathname) { + route = location.pathname; + active = false; + } - if (window.location.pathname.includes('/post/')) { - const headers = document.querySelectorAll('[data-testid*="postThreadItem"] [data-testid="postHeader"], div[data-testid*="post"] [data-testid="postHeader"]'); - if (headers.length > 0) { - attachUnrollButton(headers[0]); - } + const thread = findThread(); + if (!thread) { + toggle?.remove(); + reconcile(new Map()); + return; + } - const actionBars = document.querySelectorAll('[role="group"][aria-label*="post" i], [data-testid*="post-actions"]'); - if (actionBars.length > 0 && !document.querySelector('.bskyplus-unroll-btn')) { - attachUnrollButton(actionBars[0]); - } + if (!toggle) toggle = makeToggle(); + if (toggle.nextElementSibling !== thread.menu) thread.menu.before(toggle); + const label = active ? 'Restore thread' : 'Unroll thread'; + if (toggle.getAttribute('aria-label') !== label) toggle.setAttribute('aria-label', label); + toggle.setAttribute('title', active ? 'Restore thread' : `Unroll ${thread.total} posts`); + toggle.setAttribute('aria-pressed', String(active)); + + const next = new Map(); + mark(next, thread.menu.parentElement, 'data-bskyplus-unroll-header-controls'); + if (active) { + thread.posts.forEach((post, index) => { + mark(next, post, 'data-bskyplus-unroll-post', String(index + 1)); + if (post.parentElement && post.parentElement.querySelectorAll(POST_SELECTOR).length === 1) { + mark(next, post.parentElement, 'data-bskyplus-unroll-outer'); + } + compactNumber(post, next); + const controls = controlRow(post, next); + if (isExpandedAnchor(post)) compactAnchorChrome(post, controls, next); + if (index > 0) compactFollowup(post, next); + }); + compactReplyPrompt(thread.scope, next); } + reconcile(next); } - const observer = new MutationObserver(() => { - scanForThreads(); - scanForDropdownMenus(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); + function scheduleScan() { + if (scanQueued) return; + scanQueued = true; + requestAnimationFrame(() => { + scanQueued = false; + scan(); }); } - window.BskyPlusThreadUnroll = { - scanForThreads, - scanForDropdownMenus, - injectUnrollMenuItem, - handleUnrollClick, - openReaderView, - generateMarkdown, - extractLinearAuthorThread - }; + new MutationObserver(scheduleScan).observe(document, { + childList: true, + subtree: true, + attributes: true, + attributeFilter: ['aria-label', 'data-testid'] + }); + window.addEventListener('popstate', scheduleScan); + window.navigation?.addEventListener('navigatesuccess', scheduleScan); + setInterval(() => { + if (route !== location.pathname) scheduleScan(); + }, 1000); + scheduleScan(); })(); diff --git a/extension/firefox/background.js b/extension/firefox/background.js index 3c106a9..21aba1c 100644 --- a/extension/firefox/background.js +++ b/extension/firefox/background.js @@ -1,12 +1,14 @@ // Bsky+ Background Script for Firefox const DEFAULT_SETTINGS = { - skeetMode: false, - accentColor: '#1083fe' + skeetMode: false }; const browserAPI = typeof browser !== 'undefined' ? browser : chrome; +// Remove the obsolete accent-color setting when the background starts. +void browserAPI.storage.local.remove('accentColor'); + browserAPI.action.onClicked.addListener(tab => { const url = 'https://bsky.app/bskyplus'; if (tab?.id !== undefined && tab.url && new URL(tab.url).hostname === 'bsky.app') { diff --git a/extension/firefox/content.js b/extension/firefox/content.js index 87574e6..9632b10 100644 --- a/extension/firefox/content.js +++ b/extension/firefox/content.js @@ -7,12 +7,9 @@ document.documentElement.dataset.bskyplusLoaded = "true"; // Default settings let settings = { skeetMode: false, - accentColor: '#1083fe', // default Bluesky blue localOcrEnabled: true }; - const DEFAULT_BLUE = '#1083fe'; - // ------------------------------------------------------------- // Helpers // ------------------------------------------------------------- @@ -112,21 +109,54 @@ document.documentElement.dataset.bskyplusLoaded = "true"; element.dispatchEvent(new Event('change', { bubbles: true })); } + const altTextDialogSelector = '[role="dialog"], [aria-modal="true"], :is([aria-label="Add alt text" i], [aria-label="Edit alt text" i], [aria-label="Alt text" i]):not(input):not(textarea):not(button):not(img):not([role="button"])'; + + function ownedDialogElements(dialog, selector) { + return Array.from(dialog.querySelectorAll(selector)).filter(element => + element.closest(altTextDialogSelector) === dialog + ); + } + + function altTextDialogFields(dialog) { + if (dialog.closest('.bskyplus-edit-dialog')) return null; + + const normalizeTitle = value => (value || '').replace(/\s+/g, ' ').trim(); + let title = normalizeTitle(dialog.getAttribute('aria-label')); + if (!title) { + const labelledBy = (dialog.getAttribute('aria-labelledby') || '').split(/\s+/).filter(Boolean); + title = normalizeTitle(labelledBy.map(id => { + const label = document.getElementById(id); + return label && (!dialog.contains(label) || label.closest(altTextDialogSelector) === dialog) + ? label.textContent : ''; + }).join(' ')); + } + if (!title) { + title = normalizeTitle(ownedDialogElements(dialog, 'h1, h2, h3, h4, h5, h6, [role="heading"]')[0]?.textContent); + } + if (!/^(?:Add alt text|Edit alt text|Alt text)$/i.test(title)) return null; + + const textarea = ownedDialogElements(dialog, 'textarea, input[type="text"]')[0]; + const img = ownedDialogElements(dialog, 'img')[0]; + return textarea && img ? { textarea, img } : null; + } + function checkAltTextModal() { if (settings.localOcrEnabled === false) { document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn, .bskyplus-composer-ocr-btn').forEach(btn => btn.remove()); return; } - // Find dialog/modal that contains both a textarea and an uploaded image - const candidates = Array.from(document.querySelectorAll('[aria-label="Add alt text"], div[role="dialog"]')); - const modal = candidates.find(m => m.querySelector('textarea') && m.querySelector('img')); + document.querySelectorAll('#bskyplus-ocr-btn').forEach(button => { + const dialog = button.closest(altTextDialogSelector); + if (!dialog || !altTextDialogFields(dialog)) button.remove(); + }); + + const candidates = Array.from(document.querySelectorAll(altTextDialogSelector)); + const modal = candidates.find(candidate => altTextDialogFields(candidate)); if (!modal) return; if (modal.querySelector('#bskyplus-ocr-btn')) return; - const img = modal.querySelector('img'); - const textarea = modal.querySelector('textarea') || modal.querySelector('input[type="text"]'); - if (!textarea) return; + const { textarea } = altTextDialogFields(modal); const ocrBtn = document.createElement('button'); ocrBtn.id = 'bskyplus-ocr-btn'; @@ -159,16 +189,9 @@ document.documentElement.dataset.bskyplusLoaded = "true"; e.preventDefault(); e.stopPropagation(); - const currentCandidates = Array.from(document.querySelectorAll('[aria-label="Add alt text"], div[role="dialog"]')); - const currentModal = currentCandidates.find(m => m.querySelector('textarea') && m.querySelector('img')); - if (!currentModal) return; - const targetImg = currentModal.querySelector('img'); - const targetInput = currentModal.querySelector('textarea') || currentModal.querySelector('input[type="text"]'); - - if (!targetImg) { - showToast('There was no text in the image'); - return; - } + const fields = modal.isConnected && altTextDialogFields(modal); + if (!fields) return; + const { img: targetImg, textarea: targetInput } = fields; const originalNodes = [...ocrBtn.childNodes]; ocrBtn.disabled = true; @@ -296,54 +319,6 @@ document.documentElement.dataset.bskyplusLoaded = "true"; } } - // ------------------------------------------------------------- - // Feature 3: Accent Color Customizer - // ------------------------------------------------------------- - const ACCENT_STYLE_ID = 'bskyplus-accent-style'; - // Include the current light/dark palettes as well as older Bluesky blues. - const ACCENT_BLUES = [ - '#1083fe', '#0f73ff', '#006aff', '#0085ff', '#127ef1', - '#208bfe', '#2e93fe', '#1976d2', '#4d97ff', - ]; - - function accentSelectors(property) { - return ACCENT_BLUES.flatMap(hex => { - const rgb = [1, 3, 5].map(index => parseInt(hex.slice(index, index + 2), 16)); - const values = [hex, hex.toUpperCase(), `rgb(${rgb.join(', ')})`, `rgb(${rgb.join(',')})`]; - return values.flatMap(value => { - // Match a whole declaration: "color" must not match "background-color". - const selectors = ['', ' '].flatMap(space => [ - `[style^="${property}:${space}${value}"]`, - `[style*=";${property}:${space}${value}"]`, - `[style*="; ${property}:${space}${value}"]`, - ]); - if (property === 'fill' || property === 'stroke') { - selectors.push(`svg[${property}="${value}"]`, `svg [${property}="${value}"]`); - } - return selectors; - }); - }).join(',\n'); - } - - function applyAccentColor(color) { - let style = document.getElementById(ACCENT_STYLE_ID); - if (!color || color.toLowerCase() === DEFAULT_BLUE.toLowerCase()) { - if (style) style.remove(); - return; - } - - if (!style) { - style = document.createElement('style'); - style.id = ACCENT_STYLE_ID; - (document.head || document.documentElement).appendChild(style); - } - - style.textContent = `:root { --bskyplus-accent: ${color} !important; }\n` + - ['background-color', 'color', 'border-color', 'fill', 'stroke'].map(property => - `${accentSelectors(property)} { ${property}: ${color} !important; }` - ).join('\n'); - } - // ------------------------------------------------------------- // Mutation Observer Loop // ------------------------------------------------------------- @@ -381,10 +356,6 @@ document.documentElement.dataset.bskyplusLoaded = "true"; document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn, .bskyplus-composer-ocr-btn').forEach(btn => btn.remove()); } - if (newSettings.accentColor !== undefined) { - applyAccentColor(settings.accentColor); - } - if (settings.skeetMode && !prevSkeet) { walkTextNodes(document.body); } else if (!settings.skeetMode && prevSkeet) { @@ -393,14 +364,14 @@ document.documentElement.dataset.bskyplusLoaded = "true"; } // Initial load from storage - chrome.storage.local.get(['skeetMode', 'accentColor', 'localOcrEnabled'], (res) => { + chrome.storage.local.get(['skeetMode', 'localOcrEnabled'], (res) => { if (res) { updateLocalSettings({ skeetMode: !!res.skeetMode, - accentColor: res.accentColor || '#1083fe', localOcrEnabled: res.localOcrEnabled !== false }); } + checkAltTextModal(); }); // Listen directly for storage changes diff --git a/extension/firefox/icons/icon128.png b/extension/firefox/icons/icon128.png index fa4e27a5429ec4e59b67d77503cd6eaf8cbbe140..573fb1f64740f9e84b837668ecf231df4050d9fb 100644 GIT binary patch literal 9046 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 literal 7567 zcme7R@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_Sz!#rIaLn`LHt>vB)eYNu4 z|M#_hamr^;^YgUbVq_9O!#ZgK`_6OBvsl8Mqi)?U)bqWy?%ube;92g%84W)cPRz{_ zn$FN@qPo}j((MUTK4vwjd^h71;aIrliBs6*1Rmcc=|58a#{8LX?~A|vd;jaZ<*bQs zC%Vm=n5N=B|9YgHr~9RA_x}I;{{J7N)r$qqd^iZE4uMC7iT~L5Sw+MM%-g}%-Dttt zF*)?>R>euOO&LrT6D#v7`_iKeoOx0tn^rJy)_;~Gp}@%*!m!|H;+t)UPv^|#6+g6S zMx*oO2?uIknlj71>2{cKVCHkH74po^LTqdd7tYwmGjKK-KXzAIHKTv$i>On4DM1~c z3Bb+yzmFNk1vxyzs;=ql#$ zmObEp>&YkoXZ`r{s(Gsr<292Byeq2Mmgk8r{2(ha#j${4#h=Bj3|{Z+mj%Av(LUi$ z`_@^%ys}Q8s-LgM;?}Ml!hZg;LO|xj-;W-@RuuRv>`*An_TSagM6}$?zhzV-D8C9*e^tu*$??r^~i`Vxoistp`R7*N|`5#zcD6sioSdc=? z5d(&&bLKlK{(so%^4(Z{e&v3%j?Xg2pWR;Fo%J(!%bRM$ob^lBq=lV3BtQSvXXfGr zZzjugGc5j{s(k!C*5KvJXUoqOE|txl=WbnN+P35|4d|gbCsP! zGK#ADeK4xta4vAC^Pgt_Av^zic~Oy>7Dli!CZmJGTF*{kYQp zK*9Cz0XNb&Ht^iI5NqE&DX6cYt#VKKtt?ERZd=~o zZ=T=lUn zQKi3HoA$eEF85>lPMDz^waJwKQ6N+Pc`Z{KeO*<`g4YT`)4u~+cE0Qo7kq_;SeAf)6@F?O=o(3rm>Pk zNAq)s+tYTlCqLv5p4R(N=Z)^8yiYC;VFpIe{x{ytpFNl1M%kOa)k(K*GIXEi+_Hpe zhmqL5tJ3rLtjz6Dh!gr@WSwI2#qj(N=WmmGj;@(&ocC|tX+DEoYq$R#5lq^-og7_J zof&UF@BMg1eyfe(ogaI0zx+A)#jVFR@4MLkz6G<>93G@xot|F1%|-W?Z`Jb?LN{O9 z&UBc-&82)%|9hTS?Db790_xoRDq0Uq^>mcxnls5WNLNfNi}CUesjk!uJz~u?O-N4N z;R4e}ZKErHS6(!iR5IAuzBcvA%bPYIci#~G$s`(a)wp~AmCfuNm#mqdIWu@<U}@G|nq;j($&N zsK~l@``N4mtFCNb;UMxPqm{8*)or@%t@76u{e{ZcC0TC=967n7%2v8Pp84SkbAeQj zDc>F|PLs&l_x;R|dx9I@&D}byDSd_OVyXNt;|xWy!+XkHkL+q$G_jqhJ=T1ONhRl# z+UH%fzqz)+@kK@S>N2d10t&C;w=lxw5IbS!hyRGw?WwY1=>jd^7 zlL}vdrRw$NA|EPu&roP_G_b4ve&%|esPeU?ZZEQzC=^sH8JO!UU7SCW#*i8o0qvOeuG^`g7d_tg6n^4XCMD}dQm1@;r+F{Q(ygcyMF%T zxp*aKf76O@vrD#EOr2L5vs?9o&bF{DA%V-@NxXBobyBr^I}R-?`0gD0@!?dpiHl~= za=dfIYgg^;w(E`-UsQ`CAH~0Uyqry8!tu?9rbXAEM*cr(WzpcT8~l4xu!Bje-I|o> zJk=kw8abj?=idCkV0~HlGLF_K+_fKV1G#jiolbW(WFNX8?QW-a@btw8x@V*qLcQhI zZit={C6Mr4)s?~HoUF~hBeNX+b}zF2ux?*P+H7@xlf-boUrzIF-sihcuQe2n@_aFy zbN{|1D_w#>G<|mtc zVN8CUue$JkN` z1A`QmfA?-5*KaL&lBZlzG|g{yv$9^G?CjUuP6?a56}TiPy45Ct!Cjbj?bOD1^Va|1 z)9EjH&g3r?@qU(rS{1?9Jn*P{G7b=lOBm@_qCoq*y(V3Tjp3+`2A*Z zcRsDawm7~~T7H9VC#G~~XYIjH;K;i~5v8d>6tzdfx@uPwOnS==V{e4s+aQ{kkef0c6PW+wfJJ}VQ) zx$lYd664lCPa;f>4Hkdu|1_7KX-;6l-KOJ=QDm%Dx3!(c6s}e}pJ+nk*b*#J2VFr_EUz-_{DG zxXKy0H+J@{EfP8M`0^Tg=7r}agY~y?zy98sapu5^uQwjZVkLoQCFs~*MJ z_$BcFOjZGhl>salA70ze7S{Apis_b70&CKD=_SMxW7Q%Zjad83+kHrs}i@$ zzn`nZX`jW5l})>L_*>`Q+uXc;s_p}q1)f${ zB{*uXJQ3q*GLqc$@#9yel>c^5cL*d~zx=bjq2dcmRYlRKABmrPR=SwQGkK^)Om6$Q z*Pn;^V%>eAd;3@tSe#rXHaRKX*?cv)l+)3ztSRN>%CoC)Y?^i~+oekXPPya3%Vn#U ze?9y5PDi#dPvi8I{ruBv1uc#lE8L1vxFW%K=R)!8BWfH=&mYYwu}v-A{r=xf2Z6VC z@9Yo14w<^@d7MW)--TU2c+)22?)|}bBG@T`vvJ}BJ;k@W#)c(tdF*DjF4z$lKC&+pliwc*5!u7o<}3&i(d!@4N3Fu$G$^Udp_!|Bq)v$iKYL;ZuJdc)B82 zTs^{4Y0D+{|8dLbDrZRNE;y^IW?!~I_R#LE+kb=7xzDRV+EBQ9@>f}Of8m!W)gHT#_xLb8VcNQJ{eq{Cw>}eD$3O_skFhOYKJpNFYD?%Pn4qd54+v{z01ySPu(Bm^u1dys7Z5QZ#;c# z($~DxH7surxbZ}!3p^LyEfevu^5L!PM|XuNtS_ICc~@EG#vQA3clrJ5J|CHOAnxU!L!mQ^nbXFC< zN!$1{Y`u#3ZMCHn?&x3G6BWYl@N|EJvb($i?*geC8LKxMM<453^ilbA?&|ORn-um7(-U7vljCr_p{ zLnv>C^R!*-KOLRD>_F(gx$+Z=dGY~ab|KFhE7^usicmb2dL$~sE!ZE;}cSu~;Xo26Ta$7-9~&lps>T@$w~O?-U$ zr|1)5w*PVMbA`TWGu-Ouuy@n4>pk~lf3NDbDN5C|uN7{s6h75*z)z)bmt|+@*E`=f z+hxw(>ZLeW)g^;W>&wT1>htZ8N7Kc2(slT-yY6FC2 z9g4nBek~{Hl;+{V$fT-uD!ZUBJ5*v@YFUNN!M}e`9auB(>@MG&t-CFRUmbl|Ep=Rn z<=_iHmHQfRKa?_j(o)#L;h;0W?D{J+TPBy2uUAxjQFi#{>hjk@#Q6R^51r3ZFV1bt zv|wAjrnn-wowJ*B-8MrLgUdp;6L($O^oCz3;=QorZ<)(E*S_{Me7jiv=KkkfTV*rU zCbk{d7rgN8T;-#8uU(&ux4cR$D315ed-?xmP-(>Rqj?Jt^;d0QwvJi*OQ6f|yAoe! zdCy)JcrWhzcVBD0DpLuuXCIB3IvE??ww~4$cc`5l^6;Lp^%`j<3tkI{nd`Eo)YzJ% zFY@gSm}~0*K$)pfOG8@w`h^%hFu)34vcnxPpI7~6P@fj zbK%;(91E_fO+CHEWf6bZhP{28&iwN!JbLcXZvmGH8(CRGq~ffJo_HRf!9v#8vDYYzzGvD${?v1Z^ z_;#37@+`Tw#a<|Q_Wg}Ft18a6Ij76WSH6GfzrJc=AUwe7b;H9F0HA)DQ=Lm_CvFaRkyu##A(%rd2i|_ zUr_H6d*is_wtVi3vwYDL%3^z3_4K;7TAz8BZd}cLaR>kBF721^Tz*Nt;o3Xh$Tz3= zp23A6eugQJ&s6al*Y4npKI-vGMnjO}Z{_`E8%ulhrd_pQ`fzyy>#gkv9(|FCw&CNPU;S%o z?|%lS?AIs%&gSk-z06{J;giC)U0kPj?w4r)9T&EwAg5;vH*+c|$LEyy$rTGXLeSO_R91oHu^(zkGhjPIkxk zf3w2{suLfl$=;hPq;})``{}YX-U{bVTF}I>Q){b6cgF)3W`l({v{hK5L$1sUtuFkX z$GRc9wkKaJo8y#A!l`&2M#dTXs_OgOxdMY%GDQh3F;HkZCpzCh?|uEklqlZA|I~|i zp6*My5XGyvJM;PTS>I%=g??>be}FyihgOVXoxrZWS}vRKMT-dONmnu+;F=v9_fN`0 z`rb5|#`X5!><_5DV@~HPy%61RvwiLJL)ZPp7@71kr8)09-?IJlxaOO7#giZBA2BEe zvJ0Ac{CGIOgXN=bqg~~}(*j%K55J9$I(Phhq^Y1{rqS<(od?&kFWcR_>3UK0JL5&# zU&5COs$9uG@M!M*t*S9~f7(AhJ)Ymf9emt!L4BTIMysVt!nfZuG-UR_jpsZlvAlWu z-FKl|X9wlw^`H9xF}l98;JW}rdy@Gky8|%~j;4Qquj=Ylb)-K%f9)^EIV)2ZF6l8| z_Ia`M<&T{YdV@tT)%#aIt+IC0>b~E@ zGSB>Wk}2y%Za3u&tvcJ%=d(DIce$w~$IB~NZmm69KjE=Wo8sZD(!Eacfm{~GwLE%K z_6$}M%+Zz#y$TUOlN<~66fX#?rRyD>$()nqzJ;aejHQZ#5~oC`bG`nmbAspU zj%~fl4D(JXPI`Id)%1gfa)&1Td=qB0uAtJwUF>sxu@~!E#`pFQcYUv@UhbzH7P*Rj z`3{|lfd{i^uX_D@`i&dLxAYYjcK_71T5qJbd%5Z)mz$r|Cv+WcKfYbR{^SvzDZj6p zSMW{yn7i?K>AD}v$ptG98=Y8VwZcTEYh6?Q`*`LTDGM}m12mrPS>@X&FL?fAan-Z` zllARHEf`%L{8oQCJ)^!+^PoMO*i43+^3+#-`F7Yol7vJXFZEnn`G>{Ww=SM&5LJtE#;`?J3zgV!Ywkv~8?&=KqoWb6$Kui@48Q_TG8o&r=Gz z7IZVknOpI!-Ylu0=;zUza!8`vZh7RhXmW~{n(XWgZ-pLBXAk`-zy417 zi`idSHJ*(W(KGUGd3V?B5!K=Mc z;p4_=$D96FciWmMxyZ7v{}RJh|8rY)&(pp=x85$llRdGm=0ell|G&};Zg=-fa?WS9 z`*4{x@=&$p!vnv5+tpjHi9g@DaH?DJB&Qo^q#U<4c~8w{nE3C_tH2XW*Q+m`q;~wS zOk_6)Q?RY@oJV&jcN*7aF3MbW^h)jrt%a(O|K7j;^N@ge@`uk;vfA7j6~i6t54Os& zFTBp_us->Gm8W~tjH6yDTWS&y{+zrraA%#ZdtV`+Zs?8!Gnx--m&d*rF+Cq}Sa6NA ziu$(i`yE!EynpRU+QCUlA3GXuRI6z|ez*BcqwLaS0;Zgs3Wc1~^Oo6IcSZ!S_Mecd z6rka#*x(fVbd?^HSYX7P@b8;nZal=gqk8*Ktr_gIvR8i2=2R{J_P=4-rT5H5#u>(f zCbz%mc}YsQ`dPn}uAjO?g|~X|F@fTJrj5%kJgP|gnHYQG&Y5M8TRAsb91nduH%_uU8FvyvKNURLZ0S2RX$3&(y0;eNoNy$Umy|=#~5r z9OhGB{G2pTizo5P7u~L%7Tc=kbEv(ucr5AF8|Qk;_QDp=r$Sk=hpq*;9-s8_LT=oK zSJtoZA8by@VK%CLaK7Z&&E|#6dZtgi<+rKg+^nF`jdNGmO_TRux4h=#@0fRItdB{B zRLnAwuF*NQOFtm($zS8#{AUx>`!DwzFE7b^R8@2*QSZ!&tkmRVUbk*Y>r@}qd(oOu zxVO}Yg;}L|cbLrFAMZB5zx48ttpvl#r|0+F-P&;1;Yor^)UF5nR3^EvH~sd{(P91D zvwM!OuG}-Ze9p#xwd3nl*SZ;~{QOZQX5d#Quv=mii`I$ta`Lvv*4D zS&U!Sqq)0Y>^tG!^YdPniB#~LrkI59yz=#a50|SX{*{ieeHO1N!F*1@?x$|IVu?=g z{(0hUCRJAD-xpg|e&L#X@;>W}G@p&0>sF_TT`OQ+*XL8~%KNYrK2;Nz( zR`=<}ZsYmUrb!%YCU#Dd4ls0FTE4DgrW@b-*Uhy zj57@_4_RI;y}tgN{5`Ji5Bj+uz6(@2t9C+?$>5&H6~66nOtl_3T;|E}mgkL5o7J0Z z^(9Js(;t0?H_`?g;qwB*)*TTpST<)?c>RS+9L8?LXcc-+hu zrS3g?BY1Vs<<(PP$gvdtcU0;BuUo7kyiZj9$Fcu$rAJE--jlz1>`(9{{eTUupR0ea zlwNnU{>S_b29hC_9t2ThpXF>Bd1 z`@OsP@yI86v&}uXG(VguYcB3(uSHKPO&V=)lR; zi+(BhYs=rg7EC^>C&-!E;B!l&OiSm)qQnPRYHIU5wPmJrGMqU0XH+kB0zLjX>Jk&1A|;v zX>LlgQ9&YuAcH^y1H&o?i`j+DU;zdOu?VOtcZjN7R8^%#c~&5mR>sCj#^#A;iMpnS z78bfDX32@VmIfx4x|T^sX2~WgX~~90CJYP=%#)$UX+n%kEXJ@@FR{2dwWuUBKd+d9 zfq`KMRD%mxLsEVbvIb$0-FlgM=|!n2nW=dtdS%8SJrc=A#Tl70&Mv3?r=-tR%3rb1 zV(CK$28NvEr2L}AnJLLuY57IDi6xntxryni`UQFES($moC5d^-sh%zsIu*GER+*V8 zRwm{~=85Ks#=0q~W~RC(MybiVmX@YQx@MM^iG~IyMuw@$X*oryIf-D$W@Hv*6eJd< z=9T!TF)%Pbg1Xxgx4RRQ!5a0-jNpzw>i(3;#=g^KgY)iX|K#r}GcYjD1UY(9I#hAf zqBICA8|?M`g4Dd!l&pfpqQu|DGIrXl?oY&WvL3uMX8A;sVNHiMGCq3DVb@RsVQJ>U?Y(gdHvd3ni&`v8bA@eG&wORJ*_w+(a6*+xgasc z7o-D@p>Z!@LH+`FlWC(uRhYQA)3z>aS*(BVZcnxF!N6pGz%~OhSto)g%-nnYav^nAi-O7<(5mGchtTi8wr6!1eBs<%NAant!o5 zvD&7G3NsjRv2kd%d7QIlVP-b)G!!=wWn&Iy;S%P9yH`gcz{%NA&p-zx!7Qu_mr!tq z>ULy+w3j;GlOEA~K z1-Dh22I>&26p*ZflvFSqgEQ0fGV{_6A`OJu*ul=Z^SQbUnZu_Xk4CB{`bx)8&~EMji-86wYBzLVkV*Up4IO6 z65ngSee&W6gD?X=Hs(-Sen!UsEG*1S>m<$YyWku#O zR$V$B+IPc6&yfB*1l>Ss&Y=%acG!NPy$n0P(X%9yltcgVfV)e)zd1K(dxeP%rW(L>Rk#am5k zE4CLFCjOq4&cMLHmgMd3!tfsi7wla=nSp`vxTlL_h(&MjL|>1PM3J`n#d|ZISH`j* zE!cE%k$_;J(-O1D?v9osWe+p%@W9zluD3cAoZEKSZ9AJF;IuoSU;$%cs)%6Fg#8O5 z9`mOKT3VL9&r}SGd(O9S_2-YD?C$@b>;K|n&gqgW!JUjUsr69~Pfq@_{dJVnf!}{>)*G|31xmI^89&b5oUv100;6Qu21Yifs7HqY0 zZa$^--oRlRT*WY2&M$UL6&eNw2thicRFI-?~WJr!L7Sw*D z!*G0$!twqCJA*1>zOXqdu2`*n&DP<|+)r73=i64;oVk+pPugaFLyJ8}o&A+-MkXtd zq#fAyb>;%CYqeH^dwHi+HJ+Pt;O^!_%R^sCUp_KzG4tzax9{;9J9?}2%$?qYlBuVw KpUXO@geCyX$PEnu literal 732 zcme7R@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to7JIrlhE&Yyo$T!qk|=Wg z|MNT5&#kh2AE$7p*&RByX+e|R4y{G5SJVV$v15mOc+~u9%St^@8as=W2T7f>O>g3_eZBCa(FDbrt;Q;*$3K7F zwc!z0cPyjxMS{3p4wS|O`RusWD6gEYIt;qYj;2^ zi_@My&&7orpAsfKTk0Ygb#*%X%DC7M(M6xm^t1f@G{GkCV$+ld4IC$CDwrSiD=T6; zpt9`$r!5+a$9LYHvMBqhh>?nv+PdO7w{y1iMETdI4jfw9iM%eNHKHm@f&(<} zY$|9~l%K~Yu}SClKC8qEuP!4eyXt_eo4O`+$i%sw`P$Lp;9~ad#~V*aJC{ST(^3UK z*am+zi+*6nd)9D=6;lxNrdBa#!=zdz!#9APIG(T9x9-*NJM*kP4^K;7;-Pr9B7JMObjUo=%4>8?IqhV} z>B4qm#=#X#mn?p|e&4%a+j^6;w%^xSyYP(6IJ<4jrb$Hl_|N{Nd(!#jQwb5lqXz}v z^?APZ+0an=_bP0l+XkKEUsHz diff --git a/extension/firefox/icons/icon48.png b/extension/firefox/icons/icon48.png index 3a4e837fcfd43b4620fb0be29e017431b3d50093..27d455650f13c3d6465d75a7fe1dd8774dca2849 100644 GIT binary patch literal 7105 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 literal 2741 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 { const url = new URL(details.url); + if (url.pathname === '/bskyplus/infrastructure' || url.pathname === '/bskyplus/infrastructure/') { + return { redirectUrl: 'https://bsky.app/settings?bskyplus=infrastructure' }; + } + if (url.pathname === '/bskyplus/theme' || url.pathname === '/bskyplus/theme/') { + return { redirectUrl: 'https://bsky.app/settings?bskyplus=theme' }; + } if (url.pathname === '/bskyplus' || url.pathname === '/bskyplus/') { return { redirectUrl: 'https://bsky.app/settings?bskyplus=1' }; } diff --git a/extension/firefox/manifest.json b/extension/firefox/manifest.json index 21aac8a..4a6721a 100644 --- a/extension/firefox/manifest.json +++ b/extension/firefox/manifest.json @@ -1,12 +1,16 @@ { "manifest_version": 3, "name": "Bsky+", - "version": "1.0.3.1", - "description": "Enhanced features for Bluesky (bsky.app) including local OCR, custom accent colors, and skeet mode.", + "version": "2.0.0", + "description": "Enhanced features for Bluesky (bsky.app) including local OCR and skeet mode.", "browser_specific_settings": { "gecko": { "id": "bskyplus@bluesky.app", - "strict_min_version": "109.0" + "strict_min_version": "109.0", + "data_collection_permissions": { + "required": ["none"], + "optional": ["websiteContent", "authenticationInfo"] + } } }, "permissions": [ @@ -15,13 +19,10 @@ "storage" ], "optional_permissions": [ - "data_collection" - ], - "host_permissions": ["https://bsky.app/*"], - "optional_host_permissions": [ "http://*/*", "https://*/*" ], + "host_permissions": ["https://bsky.app/*"], "content_security_policy": { "extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'" }, @@ -29,15 +30,18 @@ "page": "background.html" }, "action": { + "default_popup": "popup/popup.html", "default_title": "Bsky+ Settings", "default_icon": { "16": "icons/icon16.png", + "32": "icons/icon32.png", "48": "icons/icon48.png", "128": "icons/icon128.png" } }, "icons": { "16": "icons/icon16.png", + "32": "icons/icon32.png", "48": "icons/icon48.png", "128": "icons/icon128.png" }, @@ -49,9 +53,16 @@ ], "js": [ "content.js", + "shared/theme-model.js", + "shared/theme-runtime.js", "shared/feature-flags.js", "shared/dom-utils.js", "shared/integrated-settings.js", + "shared/appview-config.js", + "shared/appview.js", + "shared/bookmarks.js", + "shared/hide-liked-by.js", + "shared/edit-post.js", "shared/composer.js", "shared/downloader.js", "shared/media-viewer.js", @@ -65,7 +76,10 @@ "content.css", "shared/composer.css", "shared/integrated-settings.css", - "shared/features.css" + "shared/bookmarks.css", + "shared/edit-post.css", + "shared/features.css", + "shared/thread-unroll.css" ], "run_at": "document_start" } @@ -73,15 +87,13 @@ "web_accessible_resources": [ { "resources": [ + "icons/icon32.png", "shared/settings-frame.html", - "tesseract/tesseract.min.js", - "tesseract/worker.min.js", - "tesseract/tesseract-core.wasm.js", - "tesseract/tesseract-core-simd.wasm.js", - "tesseract/tesseract-core-lstm.wasm.js", - "tesseract/tesseract-core-simd-lstm.wasm.js", - "tesseract/eng.traineddata.gz", "shared/composer-bridge.js", + "shared/bookmarks-page.js", + "shared/edit-post-page.js", + "shared/appview-config.js", + "shared/appview-page.js", "shared/alt-text-prompt.json" ], "matches": [ diff --git a/extension/firefox/popup/popup.css b/extension/firefox/popup/popup.css index 70049c4..fd5a0c0 100644 --- a/extension/firefox/popup/popup.css +++ b/extension/firefox/popup/popup.css @@ -4,7 +4,6 @@ --bg-hover: #263342; --text-primary: #f1f3f5; --text-secondary: #8c9eb5; - --accent-default: #1083fe; --border-color: #2b394a; } @@ -16,7 +15,7 @@ } body { - width: 320px; + width: 400px; background-color: var(--bg-primary); color: var(--text-primary); padding: 16px; @@ -79,6 +78,265 @@ body { margin-bottom: 8px; } +.theme-select-header { + display: flex; + align-items: center; + justify-content: space-between; + margin: -2px 0 6px; +} + +#themeSelect { + width: 100%; + min-height: 46px; + padding: 6px 8px; + border: 1px solid var(--border-color); + border-radius: 7px; + background: var(--bg-secondary); + color: var(--text-primary); + font: inherit; + text-align: left; + cursor: pointer; +} + +#themeSelect:focus-visible, +.theme-edit-link:focus-visible { + outline: 2px solid #1083fe; + outline-offset: 2px; +} + +#themeSelect:disabled { opacity: .6; cursor: wait; } + +.theme-picker { position: relative; } + +.theme-select-trigger { + display: flex; + align-items: center; + gap: 9px; +} + +.theme-select-name, +.theme-option-name { + min-width: 0; + overflow: hidden; + color: var(--text-primary); + font-size: 12px; + font-weight: 600; + text-overflow: ellipsis; + white-space: nowrap; +} + +.theme-select-chevron { + width: 7px; + height: 7px; + margin: 0 3px 4px auto; + border-right: 1.5px solid currentColor; + border-bottom: 1.5px solid currentColor; + transform: rotate(45deg); + transition: transform 160ms ease; + flex: none; +} + +#themeSelect[aria-expanded="true"] .theme-select-chevron { + margin-bottom: -4px; + transform: rotate(225deg); +} + +.theme-options { + position: absolute; + z-index: 20; + top: calc(100% + 4px); + left: 0; + width: 100%; + max-height: 260px; + overflow-y: auto; + padding: 4px; + border: 1px solid var(--border-color); + border-radius: 8px; + background: var(--bg-secondary); + box-shadow: 0 8px 22px rgba(0, 0, 0, .38); +} + +.theme-options[hidden] { display: none; } + +.theme-option-group + .theme-option-group { margin-top: 3px; } + +.theme-option-group-label { + padding: 5px 7px 3px; + color: var(--text-secondary); + font-size: 9px; + font-weight: 700; + letter-spacing: .4px; + text-transform: uppercase; +} + +.theme-option { + display: flex; + align-items: center; + width: 100%; + min-height: 48px; + gap: 9px; + padding: 5px 7px; + border: 1px solid transparent; + border-radius: 6px; + background: transparent; + color: var(--text-primary); + font: inherit; + text-align: left; + cursor: pointer; +} + +.theme-option:hover, +.theme-option:focus-visible { + border-color: var(--border-color); + background: var(--bg-hover); +} + +.theme-option:focus-visible { outline: 2px solid #1083fe; outline-offset: -2px; } + +.theme-option[aria-pressed="true"] { background: var(--bg-hover); } + +.theme-option:disabled { opacity: .6; cursor: wait; } + +.theme-option-name { flex: 1; font-size: 11px; } + +.theme-option-check { + width: 14px; + color: #75a9ff; + font-size: 13px; + font-weight: 700; + text-align: center; + flex: none; +} + +.theme-option-check[hidden] { display: none; } + +.theme-option-preview { + display: flex; + width: 80px; + height: 32px; + overflow: hidden; + flex: none; + flex-direction: column; + border: 1px solid rgba(127, 140, 160, .42); + border-radius: 5px; + background: var(--theme-option-background); +} + +.theme-option-preview-bar { + height: 4px; + background: var(--theme-option-primary); + flex: none; +} + +.theme-option-preview-body { + display: flex; + align-items: center; + gap: 5px; + min-height: 0; + padding: 4px 5px; + flex: 1; +} + +.theme-option-preview-avatar { + width: 11px; + height: 11px; + border-radius: 50%; + background: var(--theme-option-primary); + flex: none; +} + +.theme-option-preview-copy { + display: flex; + width: 100%; + flex-direction: column; + gap: 4px; +} + +.theme-option-preview-line { + width: 78%; + height: 3px; + border-radius: 2px; + background: var(--theme-option-text); +} + +.theme-option-preview-line-muted { width: 55%; background: var(--theme-option-text-muted); } + +.theme-edit-link { + border: 0; + padding: 2px 0; + background: transparent; + color: #75a9ff; + font: inherit; + font-size: 11px; + cursor: pointer; +} + +.theme-edit-link:hover { color: #a5c8ff; } + +.theme-edit-link:disabled { opacity: .6; cursor: wait; } + +.theme-status { + min-height: 0; + margin-top: 4px; + color: var(--text-secondary); + font-size: 10px; +} + +.theme-status:empty { display: none; } + + +.section-collapse-button { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + border: 0; + background: transparent; + color: inherit; + font: inherit; + text-transform: inherit; + letter-spacing: inherit; + text-align: left; + cursor: pointer; + padding: 3px 0; +} + +.section-collapse-button:hover { + color: var(--text-primary); +} + +.section-collapse-button:focus-visible { + outline: 2px solid #1083fe; + outline-offset: 3px; + border-radius: 3px; +} + +.section-collapse-arrow { + width: 7px; + height: 7px; + margin-right: 4px; + border-right: 1.5px solid currentColor; + border-bottom: 1.5px solid currentColor; + transform: rotate(45deg); + transition: transform 180ms ease; +} + +.section-collapsed > .section-title .section-collapse-arrow { + transform: rotate(-45deg); +} + +.section-collapsed > :not(.section-title) { + display: none !important; +} + +@media (prefers-reduced-motion: reduce) { + .theme-select-chevron { transition: none; } + + .section-collapse-arrow { + transition: none; + } +} + .section-subtitle { font-size: 11px; color: var(--text-secondary); @@ -151,7 +409,7 @@ body { } .switch:checked { - background-color: var(--accent-default); + background-color: #1083fe; } .switch:checked::before { @@ -203,7 +461,7 @@ body { width: 16px; height: 16px; border-radius: 50%; - background: var(--accent-default); + background: #1083fe; cursor: pointer; box-shadow: 0 0 4px rgba(0,0,0,0.4); } @@ -212,7 +470,7 @@ body { width: 16px; height: 16px; border-radius: 50%; - background: var(--accent-default); + background: #1083fe; cursor: pointer; border: none; } @@ -245,86 +503,6 @@ body { cursor: not-allowed; } -/* Palette */ -.palette-container { - display: flex; - gap: 7px; - justify-content: space-between; - margin-bottom: 12px; -} - -.color-swatch { - width: 32px; - height: 32px; - border-radius: 50%; - border: 2px solid transparent; - cursor: pointer; - transition: transform 0.15s ease, border-color 0.15s ease; - padding: 0; - outline: none; -} - -.color-swatch:hover { - transform: scale(1.15); -} - -.color-swatch.active { - border-color: #ffffff; - box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.4); - transform: scale(1.1); -} - -.custom-color-row { - display: flex; - align-items: center; - justify-content: space-between; - gap: 10px; -} - -.color-input-wrapper { - display: flex; - align-items: center; - gap: 8px; - background-color: var(--bg-secondary); - padding: 4px 8px; - border-radius: 8px; - border: 1px solid var(--border-color); - flex: 1; -} - -#colorPicker { - appearance: none; - -webkit-appearance: none; - border: none; - width: 26px; - height: 26px; - border-radius: 6px; - cursor: pointer; - background: none; - padding: 0; -} - -#colorPicker::-webkit-color-swatch-wrapper { - padding: 0; -} - -#colorPicker::-webkit-color-swatch { - border: 1px solid rgba(255, 255, 255, 0.2); - border-radius: 6px; -} - -#hexInput { - background: transparent; - border: none; - color: var(--text-primary); - font-family: monospace; - font-size: 13px; - font-weight: 600; - width: 75px; - outline: none; - text-transform: uppercase; -} - .secondary-btn { background-color: var(--bg-secondary); color: var(--text-secondary); @@ -360,3 +538,98 @@ body { font-size: 10px; color: var(--text-secondary); } +.header-actions { + display: flex; + align-items: center; + gap: 8px; + flex-shrink: 0; +} + +#moreSettingsButton { + width: auto; + margin: 0; + white-space: nowrap; +} +#featuresSection .bskyplus-popup-feature, +#altTextSection .bskyplus-popup-feature, +#infrastructureSection .bskyplus-popup-feature { + border-radius: 10px; + background: var(--bg-secondary); + margin-bottom: 8px; + overflow-anchor: none; +} + +.bskyplus-popup-feature > .toggle-row { + margin-bottom: 0; + transition: background-color 0.15s ease, padding-bottom 300ms ease; +} + +.bskyplus-controls-reveal { + display: grid; + grid-template-rows: 0fr; + opacity: 0; + transition: grid-template-rows 300ms ease, opacity 180ms ease; +} + +.bskyplus-feature-expanded > .bskyplus-controls-reveal { + grid-template-rows: 1fr; + opacity: 1; +} + +.bskyplus-controls-clip { + min-height: 0; + min-width: 0; + overflow: hidden; +} + +@media (prefers-reduced-motion: reduce) { + .bskyplus-controls-reveal, + .bskyplus-popup-feature > .toggle-row { + transition: none; + } +} + +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 9px; +} + +.bskyplus-popup-controls { + padding: 0 12px 12px; +} + +.bskyplus-popup-controls .bskyplus-llm-field { + gap: 4px; + margin-bottom: 8px; +} + +.bskyplus-popup-controls .bskyplus-llm-label { + padding-inline: 10px; + line-height: 1.4; +} + +.bskyplus-popup-controls [role="status"]:empty { + display: none; +} + +.bskyplus-popup-controls [role="status"], +.bskyplus-popup-controls .bskyplus-llm-notice { + min-height: 0; + margin-top: 4px; +} + +.bskyplus-popup-controls[hidden] { + display: none; +} + +#bookmarksSection .bskyplus-popup-controls { + padding-bottom: 4px; +} + +#bookmarksSection .bskyplus-llm-field { + margin-bottom: 4px; +} + +.bskyplus-popup-controls .bskyplus-llm-actions { + flex-wrap: wrap; + gap: 6px; +} diff --git a/extension/firefox/popup/popup.html b/extension/firefox/popup/popup.html index 7b2b7d8..4149d34 100644 --- a/extension/firefox/popup/popup.html +++ b/extension/firefox/popup/popup.html @@ -10,13 +10,16 @@
- Bsky+ Logo + Bsky+ Logo

Bsky+

Power tools for Bluesky
- v1.0.2 +
+ + v2.0.0 +
@@ -35,6 +38,20 @@
+
+
Theme
+
+ Color theme + +
+
+ + +
+

+
+
Features
@@ -49,7 +66,7 @@ @@ -57,7 +74,7 @@ @@ -70,20 +87,12 @@ -
-
-
Accent Color
-
Pride palette & custom colors
- -
- - - - - - - - -
- -
-
- - +
+
ALT Text
+
+ +
-
- OCR runs 100% locally in your browser +
+
Local Bookmarks
+

Enable local bookmarks to download all your bookmarks into this browser’s IndexedDB for local browsing on Bluesky’s Saved page. Rough estimate: 100 bookmarks use 0.5–2 MB; 1,000 use 5–20 MB, depending on post size. Only post data and media URLs are stored, not media files. Data stays on this device, is accessible to bsky.app, and clearing site data removes it. Search and filters on the Saved page apply to your entire local collection.

+
+
Infrastructure
+
+ + + + + + + + + diff --git a/extension/firefox/popup/popup.js b/extension/firefox/popup/popup.js index 58f4dc4..367e858 100644 --- a/extension/firefox/popup/popup.js +++ b/extension/firefox/popup/popup.js @@ -1,15 +1,65 @@ // Bsky+ Settings Popup +// Section disclosure is independent of feature enablement and shared across settings views. +(() => { + const api = globalThis.browser || globalThis.chrome; + const sections = [ + ['feedLayout', document.querySelector('[data-feature="feedWidth"]')], + ['features', document.getElementById('featuresSection')], + ['altText', document.getElementById('altTextSection')], + ['infrastructure', document.getElementById('infrastructureSection')], + ]; + for (const [name, section] of sections) { + const title = section?.querySelector(':scope > .section-title'); + if (!title) continue; + const key = 'settingsSectionCollapsed_' + name; + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'section-collapse-button'; + button.textContent = title.textContent; + const arrow = document.createElement('span'); + arrow.className = 'section-collapse-arrow'; + arrow.setAttribute('aria-hidden', 'true'); + button.append(arrow); + title.replaceChildren(button); + function render(collapsed) { + section.classList.toggle('section-collapsed', collapsed); + button.setAttribute('aria-expanded', String(!collapsed)); + } + render(false); + button.disabled = true; + api.storage.local.get(key).then(stored => render(stored[key] === true)) + .catch(error => console.error('Could not load section state:', error)) + .finally(() => { button.disabled = false; }); + button.addEventListener('click', async () => { + const collapsed = button.getAttribute('aria-expanded') === 'true'; + render(collapsed); + button.disabled = true; + try { + await api.storage.local.set({ [key]: collapsed }); + } catch (error) { + render(!collapsed); + console.error('Could not save section state:', error); + } finally { + button.disabled = false; + } + }); + api.storage.onChanged.addListener((changes, area) => { + if (area === 'local' && changes[key]) render(changes[key].newValue === true); + }); + } +})(); + + const DEFAULT_SETTINGS = { skeetMode: false, - accentColor: '#1083fe', feedWidth: 600, mediaDownloaderEnabled: true, mediaViewerEnabled: true, quickEmojiEnabled: true, accountAgeEnabled: true, - threadUnrollEnabled: true, localOcrEnabled: true, + hideLikedByEnabled: false, enableAlphaFeatures: false }; @@ -18,18 +68,14 @@ const mediaDownloaderToggle = document.getElementById('mediaDownloaderToggle'); const mediaViewerToggle = document.getElementById('mediaViewerToggle'); const quickEmojiToggle = document.getElementById('quickEmojiToggle'); const accountAgeToggle = document.getElementById('accountAgeToggle'); -const threadUnrollToggle = document.getElementById('threadUnrollToggle'); const localOcrToggle = document.getElementById('localOcrToggle'); +const hideLikedByToggle = document.getElementById('hideLikedByToggle'); const feedWidthSlider = document.getElementById('feedWidthSlider'); const feedWidthVal = document.getElementById('feedWidthVal'); const feedWidthMaxLimit = document.getElementById('feedWidthMaxLimit'); const presetButtons = document.querySelectorAll('.preset-btn'); -const colorPicker = document.getElementById('colorPicker'); -const hexInput = document.getElementById('hexInput'); -const resetColorBtn = document.getElementById('resetColorBtn'); -const pridePalette = document.getElementById('pridePalette'); const versionText = document.getElementById('versionText'); // Set version from manifest @@ -153,8 +199,8 @@ function updateUI() { if (mediaViewerToggle) mediaViewerToggle.checked = !!currentSettings.mediaViewerEnabled; if (quickEmojiToggle) quickEmojiToggle.checked = !!currentSettings.quickEmojiEnabled; if (accountAgeToggle) accountAgeToggle.checked = !!currentSettings.accountAgeEnabled; - if (threadUnrollToggle) threadUnrollToggle.checked = !!currentSettings.threadUnrollEnabled; if (localOcrToggle) localOcrToggle.checked = currentSettings.localOcrEnabled !== false; + if (hideLikedByToggle) hideLikedByToggle.checked = !!currentSettings.hideLikedByEnabled; const w = currentSettings.feedWidth || 600; if (feedWidthSlider) feedWidthSlider.value = String(w); @@ -170,26 +216,6 @@ function updateUI() { } }); - const hex = (currentSettings.accentColor || '#1083fe').toUpperCase(); - if (colorPicker) colorPicker.value = hex; - if (hexInput) hexInput.value = hex; - - // Active swatch - if (pridePalette) { - const swatches = pridePalette.querySelectorAll('.color-swatch'); - swatches.forEach(swatch => { - const swatchColor = swatch.getAttribute('data-color').toUpperCase(); - if (swatchColor === hex) { - swatch.classList.add('active'); - } else { - swatch.classList.remove('active'); - } - }); - } - - // Apply accent color to checked toggles & badges - document.documentElement.style.setProperty('--accent-default', hex); - // Apply feature flag gates applyFeatureFlags(); } @@ -218,6 +244,13 @@ function saveAndNotify() { } // Toggle listeners +if (hideLikedByToggle) { + hideLikedByToggle.addEventListener('change', () => { + currentSettings.hideLikedByEnabled = hideLikedByToggle.checked; + saveAndNotify(); + }); +} + if (skeetModeToggle) { skeetModeToggle.addEventListener('change', () => { currentSettings.skeetMode = skeetModeToggle.checked; @@ -253,13 +286,6 @@ if (accountAgeToggle) { }); } -if (threadUnrollToggle) { - threadUnrollToggle.addEventListener('change', () => { - currentSettings.threadUnrollEnabled = threadUnrollToggle.checked; - saveAndNotify(); - }); -} - if (localOcrToggle) { localOcrToggle.addEventListener('change', () => { currentSettings.localOcrEnabled = localOcrToggle.checked; @@ -302,6 +328,24 @@ if (feedWidthSlider) { }); } +document.getElementById('moreSettingsButton')?.addEventListener('click', async () => { + const api = globalThis.browser || globalThis.chrome; + const button = document.getElementById('moreSettingsButton'); + button.disabled = true; + try { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + if (tab?.url?.startsWith('https://bsky.app/')) { + await api.tabs.update(tab.id, { url: 'https://bsky.app/bskyplus' }); + } else { + await api.tabs.create({ url: 'https://bsky.app/bskyplus' }); + } + window.close(); + } catch { + button.textContent = 'Could not open settings. Try again'; + button.disabled = false; + } +}); + presetButtons.forEach(btn => { btn.addEventListener('click', () => { let w = Number(btn.getAttribute('data-width')); @@ -314,46 +358,3 @@ presetButtons.forEach(btn => { saveAndNotify(); }); }); - -// Color swatch click -if (pridePalette) { - pridePalette.addEventListener('click', (e) => { - const swatch = e.target.closest('.color-swatch'); - if (!swatch) return; - const color = swatch.getAttribute('data-color'); - setAccentColor(color); - }); -} - -// Color picker input -if (colorPicker) { - colorPicker.addEventListener('input', (e) => { - setAccentColor(e.target.value); - }); -} - -// Hex text input -if (hexInput) { - hexInput.addEventListener('change', () => { - let val = hexInput.value.trim(); - if (!val.startsWith('#')) val = '#' + val; - if (/^#[0-9A-F]{6}$/i.test(val)) { - setAccentColor(val); - } else { - hexInput.value = currentSettings.accentColor.toUpperCase(); - } - }); -} - -// Reset color button -if (resetColorBtn) { - resetColorBtn.addEventListener('click', () => { - setAccentColor('#1083fe'); - }); -} - -function setAccentColor(hex) { - currentSettings.accentColor = hex; - updateUI(); - saveAndNotify(); -} diff --git a/extension/firefox/shared/account-age.js b/extension/firefox/shared/account-age.js index 70a87cb..46852cf 100644 --- a/extension/firefox/shared/account-age.js +++ b/extension/firefox/shared/account-age.js @@ -6,7 +6,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const DB_NAME = 'bskyplus_db'; const STORE_NAME = 'account_ages'; @@ -51,7 +51,7 @@ // -------------------------------------------------------------------------- function openDatabase() { if (!dbPromise) { - dbPromise = new Promise((resolve, reject) => { + dbPromise = new Promise(resolve => { if (!window.indexedDB) { return resolve(null); } @@ -140,8 +140,6 @@ rateLimitBackoffUntil = Date.now() + 30000; console.warn('Bsky+ AccountAge: rate limited, backing off 30s'); batch.forEach(h => queue.add(h)); - isProcessing = false; - scheduleQueueProcessing(); return; } @@ -212,7 +210,7 @@ title: `Fresh account! Created on ${formattedDate} (${days} days ago)` }, [ Icons.sprout ? Icons.sprout() : document.createTextNode('🌱'), - document.createTextNode(isBrandNew ? `New (${days}d)` : `New (${days}d)`) + document.createTextNode(`New (${days}d)`) ]); linkEl.insertAdjacentElement('afterend', badge); @@ -265,19 +263,7 @@ links.forEach(link => checkHandleElement(link)); } - const observer = new MutationObserver(() => { - scanHandles(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - }); - } + observeDom(scanHandles); window.BskyPlusAccountAge = { scanHandles, diff --git a/extension/firefox/shared/cdn-background.js b/extension/firefox/shared/cdn-background.js index 0a4a02a..54129c5 100644 --- a/extension/firefox/shared/cdn-background.js +++ b/extension/firefox/shared/cdn-background.js @@ -52,12 +52,18 @@ api.permissions.onAdded.addListener(refresh); api.permissions.onRemoved.addListener(refresh); api.runtime.onMessage.addListener((message, sender, sendResponse) => { - if (message?.action !== 'APPLY_IMAGE_CDN') return; + if (!['APPLY_IMAGE_CDN', 'REQUEST_IMAGE_CDN_ACCESS'].includes(message?.action)) return; if (sender.id !== api.runtime.id || !sender.url?.startsWith(api.runtime.getURL(''))) { sendResponse({ success: false, error: 'Open Bsky+ settings to change the CDN.' }); return false; } - apply().then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); + apply().then(async result => { + if (message.action === 'REQUEST_IMAGE_CDN_ACCESS' && result.hostname && !result.enabled) { + await api.tabs.create({ url: api.runtime.getURL('shared/cdn-permissions.html') }); + return { success: true, opened: true }; + } + return result; + }).then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); return true; }); refresh(); diff --git a/extension/firefox/shared/cdn-config.js b/extension/firefox/shared/cdn-config.js index 6e38532..164efc7 100644 --- a/extension/firefox/shared/cdn-config.js +++ b/extension/firefox/shared/cdn-config.js @@ -2,6 +2,7 @@ 'use strict'; const SOURCE_HOST = 'cdn.bsky.app'; const IMAGE_PATTERN = '^https://cdn\\.bsky\\.app/img/(feed_thumbnail|feed_fullsize|avatar_thumbnail)/plain/'; + const IMAGE_URL = new RegExp(IMAGE_PATTERN); const RULE_ID = 2001; function normalizeHostname(value) { @@ -43,7 +44,7 @@ } function redirectUrl(url, hostname) { - if (!hostname || !new RegExp(IMAGE_PATTERN).test(url)) return undefined; + if (!hostname || !IMAGE_URL.test(url)) return undefined; return `https://${hostname}${url.slice(`https://${SOURCE_HOST}`.length)}`; } diff --git a/extension/firefox/shared/cdn-settings.js b/extension/firefox/shared/cdn-settings.js index e63bfa6..43d8fc9 100644 --- a/extension/firefox/shared/cdn-settings.js +++ b/extension/firefox/shared/cdn-settings.js @@ -19,21 +19,13 @@ }, function () { return {}; }); } - function storageSet(api, value) { + async function storageSet(api, value) { if (!api || !api.storage || !api.storage.local || typeof api.storage.local.set !== 'function') { - return Promise.reject(new Error('Settings storage is unavailable.')); + throw new Error('Settings storage is unavailable.'); } - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') result.then(resolve, reject); - else reject(new Error('Storage did not confirm the write.')); - }); + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + throw new Error('Storage did not confirm the write.'); } function makeField(labelText, input) { @@ -71,7 +63,38 @@ input.placeholder = 'luna.danielmorrisey.com'; input.autocomplete = 'off'; input.spellcheck = false; - section.appendChild(makeField('CDN hostname', input)); + var customField = makeField('CDN hostname', input); + var provider = null; + if (globalThis.BskyPlusFeatureRow) { + provider = document.createElement('select'); + provider.id = 'bskyplusCdnProvider'; + provider.setAttribute('aria-label', 'CDN provider'); + provider.className = 'bskyplus-llm-input'; + [['', 'Bluesky (default)'], ['luna.danielmorrisey.com', 'Luna'], ['custom', 'Custom']].forEach(function (item) { + var option = document.createElement('option'); + option.value = item[0]; + option.textContent = item[1]; + provider.appendChild(option); + }); + provider.addEventListener('change', function () { + customField.hidden = provider.value !== 'custom'; + }); + var providerField = document.createElement('div'); + providerField.className = 'bskyplus-llm-field'; + providerField.appendChild(provider); + section.appendChild(providerField); + customField.hidden = true; + } + section.appendChild(customField); + + function displayHostname(hostname) { + input.value = hostname; + if (provider) { + provider.value = !hostname || hostname === 'luna.danielmorrisey.com' ? hostname : 'custom'; + customField.hidden = provider.value !== 'custom'; + } + if (popupRow) popupRow.setEnabled(!!hostname); + } var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -109,12 +132,27 @@ var before = llmSection || footer; if (before && before.parentElement) before.parentElement.insertBefore(section, before); else document.body.appendChild(section); + var popupRow = globalThis.BskyPlusFeatureRow?.(section, 'Image CDN', 'Choose where images load from', 'cdnEnabledToggle', + document.getElementById('infrastructureSection') ? 'infrastructureSection' : 'featuresSection'); + if (popupRow) { + popupRow.addTooltip(() => notice.textContent); + notice.remove(); + resetButton.hidden = true; + popupRow.toggle.addEventListener('change', function () { + if (!popupRow.toggle.checked) reset(); + }); + } function setStatus(message, isError) { status.textContent = message; status.classList.toggle('bskyplus-llm-status-error', !!isError); } + function showApplied(hostname) { + grantButton.hidden = true; + setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + } + function apply(hostname) { if (!api || !api.runtime || typeof api.runtime.sendMessage !== 'function') { return Promise.reject(new Error('Image CDN could not be applied.')); @@ -135,6 +173,8 @@ function setBusy(value) { saving = value; input.disabled = value; + if (provider) provider.disabled = value; + if (popupRow) popupRow.toggle.disabled = value; saveButton.disabled = value; resetButton.disabled = value; grantButton.disabled = value; @@ -142,7 +182,16 @@ function requestAccess(hostname) { var origins = config.permissionOrigins(hostname); - if (!origins.length || !api || !api.permissions || typeof api.permissions.request !== 'function') return Promise.resolve(true); + if (!origins.length) return Promise.resolve(true); + // Firefox's embedded extension pages cannot use the permissions API. + if (!api || !api.permissions || typeof api.permissions.request !== 'function') { + return Promise.resolve().then(function () { + return api.runtime.sendMessage({ action: 'REQUEST_IMAGE_CDN_ACCESS' }); + }).then(function (response) { + if (!response || !response.success) throw new Error('Could not open the CDN permission page.'); + return response.opened ? null : response.enabled === true && response.hostname === hostname; + }); + } try { return Promise.resolve(api.permissions.request({ origins: origins })); } catch (err) { @@ -166,17 +215,21 @@ var saved = false; storageSet(api, { imageCdnHostname: hostname }).then(function () { saved = true; - input.value = hostname; + displayHostname(hostname); return requestAccess(hostname); }).then(function (granted) { + if (granted === null) { + grantButton.hidden = false; + setStatus('CDN saved. Grant access in the opened tab, then return here.', false); + return; + } if (!granted) { grantButton.hidden = !hostname; setStatus('CDN saved. Access was not granted. Choose Grant access to try again.', true); return; } return apply(hostname).then(function () { - grantButton.hidden = true; - setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + showApplied(hostname); }); }).catch(function (err) { grantButton.hidden = !(saved && hostname); @@ -187,11 +240,15 @@ } function save() { - saveValue(input.value); + if (provider && provider.value === 'custom' && !input.value.trim()) { + setStatus('Enter a CDN hostname.', true); + return; + } + saveValue(provider && provider.value !== 'custom' ? provider.value : input.value); } function reset() { - input.value = ''; + displayHostname(''); saveValue(''); } @@ -199,11 +256,15 @@ if (saving) return; setBusy(true); requestAccess(pendingHostname).then(function (granted) { + if (granted === null) { + setStatus('Grant access in the opened tab, then return here.', false); + return null; + } if (!granted) throw new Error('Access was not granted. Choose Grant access to try again.'); return apply(pendingHostname); - }).then(function () { - grantButton.hidden = true; - setStatus(pendingHostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + }).then(function (response) { + if (response === null) return; + showApplied(pendingHostname); }).catch(function (err) { grantButton.hidden = !pendingHostname; setStatus(err && err.message ? err.message : 'Could not apply image CDN.', true); @@ -215,14 +276,26 @@ saveButton.addEventListener('click', save); resetButton.addEventListener('click', reset); grantButton.addEventListener('click', retry); + function refreshAccess() { + if (saving || !pendingHostname || grantButton.hidden) return; + apply(pendingHostname).then(function () { + showApplied(pendingHostname); + }).catch(function () {}); + } + window.addEventListener('focus', refreshAccess); + if (api && api.runtime && api.runtime.onMessage) { + api.runtime.onMessage.addListener(function (message, sender) { + if (sender.id === api.runtime.id && message.action === 'IMAGE_CDN_ACCESS_GRANTED') refreshAccess(); + }); + } setBusy(true); storageGet(api, STORAGE_KEY).then(function (result) { var value = result && typeof result[STORAGE_KEY] === 'string' ? result[STORAGE_KEY] : ''; try { - input.value = config.normalizeHostname(value); + displayHostname(config.normalizeHostname(value)); pendingHostname = input.value; } catch (err) { - input.value = ''; + displayHostname(''); pendingHostname = ''; } }).catch(function () { diff --git a/extension/firefox/shared/composer.js b/extension/firefox/shared/composer.js index 87b73c5..55863fd 100644 --- a/extension/firefox/shared/composer.js +++ b/extension/firefox/shared/composer.js @@ -154,12 +154,31 @@ button.type = 'button'; button.className = 'bskyplus-preview-action'; button.dataset.method = method; - button.textContent = `+${method}`; button.setAttribute('aria-label', `Generate alt text with ${method}`); - button.innerHTML = ` - -
${method}
- ` + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('width', '10'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('height', '10'); + icon.setAttribute('style', 'color: rgb(255, 255, 255);'); + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('fill', '#FFFFFF'); + path.setAttribute('stroke', 'none'); + path.setAttribute('stroke-width', '0'); + path.setAttribute('stroke-linecap', 'butt'); + path.setAttribute('stroke-linejoin', 'miter'); + path.setAttribute('fill-rule', 'evenodd'); + path.setAttribute('clip-rule', 'evenodd'); + path.setAttribute('d', 'M12 3a1 1 0 0 1 1 1v7h7a1 1 0 1 1 0 2h-7v7a1 1 0 1 1-2 0v-7H4a1 1 0 1 1 0-2h7V4a1 1 0 0 1 1-1Z'); + icon.append(path); + + const label = document.createElement('div'); + label.dir = 'auto'; + label.className = 'css-146c3p1'; + label.setAttribute('style', 'font-size: 12px; letter-spacing: 1px; color: rgb(255, 255, 255); line-height: 16px; font-weight: 600; font-family: InterVariable, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; font-variant: no-contextual unicode;'); + label.textContent = method; + button.append(icon, label); button.addEventListener('click', event => { event.preventDefault(); event.stopPropagation(); diff --git a/extension/firefox/shared/dom-utils.js b/extension/firefox/shared/dom-utils.js index 24e1e5a..d701cb2 100644 --- a/extension/firefox/shared/dom-utils.js +++ b/extension/firefox/shared/dom-utils.js @@ -51,33 +51,30 @@ return el; } + function outlineIcon(children, strokeWidth = 2) { + return svgEl('svg', { + viewBox: '0 0 24 24', + fill: 'none', + stroke: 'currentColor', + 'stroke-width': strokeWidth, + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round' + }, children); + } + // Common SVG Icons const Icons = { download() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4' }), svgEl('polyline', { points: '7 10 12 15 17 10' }), svgEl('line', { x1: '12', y1: '15', x2: '12', y2: '3' }) ]); }, check() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2.5', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '20 6 9 17 4 12' }) - ]); + ], 2.5); }, pip() { // Font Awesome Free v7.3.1 by Fonticons, Inc. https://fontawesome.com/license/free @@ -92,68 +89,33 @@ ]); }, book() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M4 19.5A2.5 2.5 0 0 1 6.5 17H20' }), svgEl('path', { d: 'M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z' }) ]); }, markdown() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '2', y: '4', width: '20', height: '16', rx: '2' }), svgEl('path', { d: 'M6 16V8l3 4 3-4v8' }), svgEl('path', { d: 'M17 12l-2.5 3.5h5L17 12z' }) ]); }, printer() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '6 9 6 2 18 2 18 9' }), svgEl('path', { d: 'M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2' }), svgEl('rect', { x: '6', y: '14', width: '12', height: '8' }) ]); }, copy() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '9', y: '9', width: '13', height: '13', rx: '2', ry: '2' }), svgEl('path', { d: 'M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1' }) ]); }, sprout() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M7 20h10' }), svgEl('path', { d: 'M12 20v-8' }), svgEl('path', { d: 'M12 12a5 5 0 0 1 5-5h3v3a5 5 0 0 1-5 5h-3z' }), @@ -162,6 +124,28 @@ } }; + function observeDom(scan) { + const observer = new MutationObserver(scan); + const start = () => { + observer.observe(document.body, { childList: true, subtree: true }); + scan(); + }; + if (document.body) start(); + else document.addEventListener('DOMContentLoaded', start, { once: true }); + return observer; + } + + function downloadBlob(blob, filename) { + const url = URL.createObjectURL(blob); + const link = createEl('a', { href: url, download: filename, style: 'display: none;' }); + document.body.appendChild(link); + link.click(); + setTimeout(() => { + link.remove(); + URL.revokeObjectURL(url); + }, 1000); + } + // Toast Notification Helper function showToast(message, duration = 3000) { let container = document.getElementById('bskyplus-toast-container'); @@ -186,6 +170,8 @@ createEl, svgEl, Icons, + observeDom, + downloadBlob, showToast }; })(); diff --git a/extension/firefox/shared/downloader.js b/extension/firefox/shared/downloader.js index 48ed18e..aa7191f 100644 --- a/extension/firefox/shared/downloader.js +++ b/extension/firefox/shared/downloader.js @@ -5,7 +5,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const { createEl, Icons, showToast, observeDom, downloadBlob } = utils; let enabled = true; @@ -81,7 +81,7 @@ const res = await fetch(fullUrl, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename); + downloadBlob(blob, filename); } async function downloadHlsVideo(videoEl, filename) { @@ -93,7 +93,7 @@ const res = await fetch(src, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); + downloadBlob(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); return; } @@ -150,32 +150,8 @@ segmentBuffers.push(buf); } - // Calculate total length and concatenate - const totalLength = segmentBuffers.reduce((acc, b) => acc + b.byteLength, 0); - const combined = new Uint8Array(totalLength); - let offset = 0; - for (const buf of segmentBuffers) { - combined.set(new Uint8Array(buf), offset); - offset += buf.byteLength; - } - - const videoBlob = new Blob([combined], { type: 'video/mp4' }); - triggerDownload(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); - } - - function triggerDownload(blob, filename) { - const objectUrl = URL.createObjectURL(blob); - const a = createEl('a', { - href: objectUrl, - download: filename, - style: 'display: none;' - }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(objectUrl); - }, 1000); + const videoBlob = new Blob(segmentBuffers, { type: 'video/mp4' }); + downloadBlob(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); } async function handleMediaDownload(mediaEl, btn) { @@ -278,19 +254,7 @@ } // Observe DOM for newly rendered posts and media - const observer = new MutationObserver(() => { - scanForMedia(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - }); - } + observeDom(scanForMedia); window.BskyPlusDownloader = { scanForMedia, diff --git a/extension/firefox/shared/emoji-picker.js b/extension/firefox/shared/emoji-picker.js index 4794c97..9f31a99 100644 --- a/extension/firefox/shared/emoji-picker.js +++ b/extension/firefox/shared/emoji-picker.js @@ -568,17 +568,11 @@ document.addEventListener('keydown', (e) => { if (!activePicker || activePicker.style.display === 'none' || activeMatches.length === 0) return; - if (e.key === 'ArrowDown') { + if (e.key === 'ArrowDown' || e.key === 'ArrowUp') { e.preventDefault(); e.stopPropagation(); - selectedIndex = (selectedIndex + 1) % activeMatches.length; - renderPickerItems(); - const selectedEl = activePicker.querySelector('.bskyplus-selected'); - if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); - } else if (e.key === 'ArrowUp') { - e.preventDefault(); - e.stopPropagation(); - selectedIndex = (selectedIndex - 1 + activeMatches.length) % activeMatches.length; + const direction = e.key === 'ArrowDown' ? 1 : -1; + selectedIndex = (selectedIndex + direction + activeMatches.length) % activeMatches.length; renderPickerItems(); const selectedEl = activePicker.querySelector('.bskyplus-selected'); if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); diff --git a/extension/firefox/shared/feature-flags.js b/extension/firefox/shared/feature-flags.js index 94bb4b7..9bb56d6 100644 --- a/extension/firefox/shared/feature-flags.js +++ b/extension/firefox/shared/feature-flags.js @@ -25,7 +25,7 @@ enabled: true, stage: 'release', name: 'Quick Emoji Suggestions', - desc: ': (color) & emoji autocomplete like Slack' + desc: ': emoji autocomplete like Slack' }, feedWidth: { enabled: true, @@ -39,24 +39,12 @@ name: 'Fresh Account Badge', desc: 'Spot new accounts <30d, cached in IndexedDB' }, - threadUnroll: { - enabled: true, - stage: 'alpha', - name: 'Thread Unroll & Reader View', - desc: 'Distraction-free reading from 3-dot menu, export Markdown/PDF' - }, skeetMode: { enabled: true, stage: 'release', name: 'Skeet Mode', desc: 'Replaces "post" with "skeet"' }, - accentColor: { - enabled: true, - stage: 'release', - name: 'Custom Accent Color', - desc: 'Pride flag palette & custom hex accent colors' - }, localOcr: { enabled: true, stage: 'release', diff --git a/extension/firefox/shared/features.css b/extension/firefox/shared/features.css index 9f8e3db..94200db 100644 --- a/extension/firefox/shared/features.css +++ b/extension/firefox/shared/features.css @@ -2,8 +2,11 @@ Bsky+ Extended Features Stylesheet ========================================================================== */ -/* Keep embedded media and galleries contained when the feed is widened. */ -div[data-testid="contentHider-post"] > div:last-child { +/* Limit post media without constraining text or text-only quote cards. */ +[data-bskyplus-feed-column] div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] video, +[data-bskyplus-post-media] { max-width: min(100%, 600px) !important; } @@ -39,7 +42,7 @@ div[data-testid="contentHider-post"] > div:last-child { .bskyplus-media-dl-btn:hover { opacity: 1 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; border-color: rgba(255, 255, 255, 0.4) !important; transform: translateY(-1px); } @@ -73,18 +76,112 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-speed-select { - field-sizing: content; + appearance: none !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + gap: 5px !important; min-width: 0 !important; background: transparent !important; color: #fff !important; border: none !important; border-radius: 4px !important; min-height: 28px !important; + padding: 4px 7px !important; + font: inherit !important; + font-size: 12px !important; + cursor: pointer !important; +} + +.bskyplus-speed-select:hover, +.bskyplus-speed-select[aria-expanded="true"] { + background-color: rgba(255, 255, 255, 0.12) !important; +} + +.bskyplus-speed-select:focus-visible { + outline: 2px solid rgba(255, 255, 255, 0.75) !important; + outline-offset: 1px !important; +} + +.bskyplus-speed-chevron { + width: 0 !important; + height: 0 !important; + border-left: 3px solid transparent !important; + border-right: 3px solid transparent !important; + border-top: 4px solid currentColor !important; + opacity: 0.75 !important; +} + +.bskyplus-speed-menu { + position: fixed !important; + inset: auto !important; + z-index: 2147483647 !important; + min-width: 96px !important; + max-height: min(220px, calc(100vh - 16px)) !important; + overflow-y: auto !important; + flex-direction: column !important; + gap: 2px !important; + margin: 0 !important; padding: 4px !important; + background-color: #1e2936 !important; + color: #f1f3f5 !important; + border: 1px solid #2b394a !important; + border-radius: 8px !important; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.42) !important; + box-sizing: border-box !important; +} + +.bskyplus-speed-menu:not([popover]):not([hidden]) { + display: flex !important; +} + +.bskyplus-speed-menu[popover]:popover-open { + display: flex !important; +} + +.bskyplus-speed-menu[hidden] { + display: none !important; +} + +.bskyplus-speed-option { + appearance: none !important; + display: flex !important; + align-items: center !important; + justify-content: space-between !important; + width: 100% !important; + min-height: 30px !important; + margin: 0 !important; + padding: 5px 8px !important; + color: #f1f3f5 !important; + background-color: transparent !important; + border: 0 !important; + border-radius: 5px !important; font: inherit !important; font-size: 12px !important; + text-align: left !important; cursor: pointer !important; - color-scheme: dark; + box-sizing: border-box !important; +} + +.bskyplus-speed-option:hover, +.bskyplus-speed-option:focus-visible, +.bskyplus-speed-option[aria-checked="true"] { + background-color: #263342 !important; +} + +.bskyplus-speed-option:focus-visible { + outline: 2px solid #71859b !important; + outline-offset: -2px !important; +} + +.bskyplus-speed-option-check::before { + content: "✓"; + color: #f1f3f5 !important; + opacity: 0; +} + +.bskyplus-speed-option[aria-checked="true"] .bskyplus-speed-option-check::before { + opacity: 1; } .bskyplus-toolbar-btn { @@ -106,7 +203,7 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-toolbar-btn[aria-pressed="true"] { - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; color: #ffffff !important; } @@ -216,260 +313,3 @@ div[data-testid="contentHider-post"] > div:last-child { color: #fbbf24 !important; border-color: rgba(251, 191, 36, 0.4) !important; } - -/* -------------------------------------------------------------------------- - 6. Thread Unroll / Reader View - -------------------------------------------------------------------------- */ -.bskyplus-unroll-btn { - display: inline-flex !important; - align-items: center !important; - gap: 5px !important; - background: transparent !important; - border: 1px solid rgba(140, 158, 181, 0.3) !important; - color: #8c9eb5 !important; - padding: 3px 8px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - margin-left: 8px !important; - transition: all 0.15s ease !important; - user-select: none !important; -} - -.bskyplus-unroll-btn:hover { - background: rgba(16, 131, 254, 0.12) !important; - color: #1083fe !important; - border-color: #1083fe !important; -} - -.bskyplus-unroll-btn svg { - width: 13px !important; - height: 13px !important; -} - -/* 3-Dot Post Dropdown Menu Item */ -.bskyplus-unroll-menu-item { - display: flex !important; - align-items: center !important; - gap: 12px !important; - padding: 10px 14px !important; - cursor: pointer !important; - border-radius: 6px !important; - font-size: 14px !important; - font-weight: 500 !important; - color: inherit !important; - transition: background-color 0.15s ease !important; - user-select: none !important; - outline: none !important; -} - -.bskyplus-unroll-menu-item:hover, -.bskyplus-unroll-menu-item:focus { - background-color: rgba(128, 128, 128, 0.15) !important; -} - -.bskyplus-unroll-menu-item svg { - width: 18px !important; - height: 18px !important; - flex-shrink: 0 !important; -} - -/* Reader Modal Backdrop */ -.bskyplus-reader-backdrop { - position: fixed !important; - inset: 0 !important; - z-index: 2147483646 !important; - background-color: rgba(0, 0, 0, 0.75) !important; - backdrop-filter: blur(5px) !important; - display: flex !important; - justify-content: center !important; - align-items: flex-start !important; - overflow-y: auto !important; - padding: 40px 16px !important; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif !important; -} - -.bskyplus-reader-modal { - width: 100% !important; - max-width: 680px !important; - background-color: #161e27 !important; - color: #f1f3f5 !important; - border-radius: 14px !important; - border: 1px solid #2b394a !important; - box-shadow: 0 16px 48px rgba(0, 0, 0, 0.7) !important; - overflow: hidden !important; - display: flex !important; - flex-direction: column !important; -} - -.bskyplus-reader-header { - display: flex !important; - align-items: center !important; - justify-content: space-between !important; - padding: 16px 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-title { - font-size: 18px !important; - font-weight: 700 !important; - color: #fff !important; -} - -.bskyplus-reader-meta { - font-size: 12px !important; - color: #8c9eb5 !important; - margin-top: 2px !important; -} - -.bskyplus-reader-close { - background: transparent !important; - border: none !important; - color: #8c9eb5 !important; - font-size: 24px !important; - cursor: pointer !important; - padding: 4px 8px !important; - border-radius: 6px !important; - line-height: 1 !important; -} - -.bskyplus-reader-close:hover { - background-color: #263342 !important; - color: #fff !important; -} - -.bskyplus-reader-actions { - display: flex !important; - gap: 8px !important; - padding: 12px 20px !important; - background-color: #1e2936 !important; - border-bottom: 1px solid #2b394a !important; - flex-wrap: wrap !important; -} - -.bskyplus-reader-action-btn { - display: inline-flex !important; - align-items: center !important; - gap: 6px !important; - background-color: #263342 !important; - border: 1px solid #2b394a !important; - color: #f1f3f5 !important; - padding: 6px 12px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - transition: background-color 0.15s ease !important; -} - -.bskyplus-reader-action-btn:hover { - background-color: #324357 !important; - color: #fff !important; -} - -.bskyplus-reader-action-btn svg { - width: 14px !important; - height: 14px !important; - fill: currentColor !important; -} - -.bskyplus-reader-content { - padding: 24px 20px !important; - max-height: 75vh !important; - overflow-y: auto !important; -} - -.bskyplus-reader-post { - padding-bottom: 20px !important; - margin-bottom: 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-post:last-child { - border-bottom: none !important; - margin-bottom: 0 !important; - padding-bottom: 0 !important; -} - -.bskyplus-reader-post-header { - display: flex !important; - align-items: center !important; - gap: 8px !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-post-num { - font-size: 11px !important; - font-weight: 700 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; - color: #fff !important; - padding: 2px 7px !important; - border-radius: 10px !important; -} - -.bskyplus-reader-post-author { - font-size: 13px !important; - font-weight: 600 !important; - color: #8c9eb5 !important; -} - -.bskyplus-reader-post-text { - font-size: 15px !important; - line-height: 1.55 !important; - color: #f1f3f5 !important; - white-space: pre-wrap !important; - word-break: break-word !important; -} - -.bskyplus-reader-post-media { - margin-top: 12px !important; - border-radius: 8px !important; - overflow: hidden !important; -} - -.bskyplus-reader-img { - max-width: 100% !important; - max-height: 480px !important; - border-radius: 8px !important; - display: block !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-video { - max-width: 100% !important; - border-radius: 8px !important; - display: block !important; -} - -/* Clean Print / PDF Export Styling */ -@media print { - body * { - visibility: hidden !important; - } - .bskyplus-reader-backdrop, - .bskyplus-reader-modal, - .bskyplus-reader-modal * { - visibility: visible !important; - } - .bskyplus-reader-backdrop { - position: absolute !important; - inset: 0 !important; - background: #ffffff !important; - padding: 0 !important; - } - .bskyplus-reader-modal { - box-shadow: none !important; - border: none !important; - background: #ffffff !important; - color: #000000 !important; - max-width: 100% !important; - } - .bskyplus-reader-actions, - .bskyplus-reader-close { - display: none !important; - } - .bskyplus-reader-post-text { - color: #000000 !important; - } -} diff --git a/extension/firefox/shared/feed-width.js b/extension/firefox/shared/feed-width.js index 07b2c56..e6a8244 100644 --- a/extension/firefox/shared/feed-width.js +++ b/extension/firefox/shared/feed-width.js @@ -7,9 +7,68 @@ 'use strict'; const STYLE_ID = 'bskyplus-feed-width-style'; + const TRANSITION_STYLE_ID = 'bskyplus-feed-width-transition-style'; + const TRANSITION_ATTRIBUTE = 'data-bskyplus-feed-width-animating'; + const TRANSITION_DURATION = 800; + const TRANSITION_TARGETS = [ + 'div[style*="max-width: 600px"]', + 'div[style*="max-width:600px"]', + 'div[style*="max-width: 550px"]', + 'div[style*="max-width:550px"]', + '[data-bskyplus-feed-column]', + '[role="tablist"]', + '[data-bskyplus-tablist]', + '[data-bskyplus-center-borders]', + 'div[style*="width: 602px"]', + 'div[style*="width:602px"]', + '[data-bskyplus-left-nav]', + 'div[role="navigation"]:not([style*="bottom:"])', + 'nav[role="navigation"]:not([style*="bottom:"])', + '[data-bskyplus-right-nav]', + 'div[style*="translateX(300px)"]', + 'div[style*="translateX(195px)"]', + '[data-bskyplus-settings-page]' + ].join(', '); let currentConfiguredWidth = 600; let currentEffectiveWidth = 600; let hasLiveWidthUpdate = false; + let transitionTimeout; + + function startWidthTransition() { + if (!isFeatureActive() || window.matchMedia?.('(prefers-reduced-motion: reduce)').matches) return; + + let style = document.getElementById(TRANSITION_STYLE_ID); + if (!style) { + style = document.createElement('style'); + style.id = TRANSITION_STYLE_ID; + style.textContent = ` + @media (prefers-reduced-motion: no-preference) { + html[${TRANSITION_ATTRIBUTE}] :is(${TRANSITION_TARGETS}) { + transition: max-width ${TRANSITION_DURATION}ms ease, + width ${TRANSITION_DURATION}ms ease, + margin-left ${TRANSITION_DURATION}ms ease, + margin-right ${TRANSITION_DURATION}ms ease !important; + } + } + `; + (document.head || document.documentElement).appendChild(style); + } + + const root = document.documentElement; + if (root.getAttribute(TRANSITION_ATTRIBUTE) === null) { + root.setAttribute(TRANSITION_ATTRIBUTE, ''); + // Apply the transition before changing widths, including the first live update. + document.querySelectorAll(TRANSITION_TARGETS).forEach(element => { + window.getComputedStyle(element).transitionDuration; + }); + } + + if (transitionTimeout) window.clearTimeout?.(transitionTimeout); + transitionTimeout = window.setTimeout?.(() => { + root.removeAttribute(TRANSITION_ATTRIBUTE); + transitionTimeout = undefined; + }, TRANSITION_DURATION + 50); + } function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -55,6 +114,17 @@ return document.querySelector('div[role="navigation"]:not([style*="bottom:"]), nav[role="navigation"]:not([style*="bottom:"])'); } + function findFixedAncestor(element) { + let parent = element?.parentElement; + while (parent && parent !== document.body && parent !== document.documentElement) { + const style = parent.getAttribute('style') || ''; + if (style.includes('position: fixed') || style.includes('position:fixed') || style.includes('translateX') || + window.getComputedStyle?.(parent)?.position === 'fixed') return parent; + parent = parent.parentElement; + } + return null; + } + function findRightNav() { // 1. Direct match on Bluesky's desktop fixed right column transform const direct = document.querySelector('div[style*="translateX(300px)"], div[style*="translateX( 300px)"], div[style*="translateX(195px)"], div[style*="translateX( 195px)"]'); @@ -73,50 +143,17 @@ // 2. Check via desktop search input const searchInput = document.querySelector('input[placeholder*="Search" i], input[aria-label*="Search" i]'); - if (searchInput) { - let parent = searchInput.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } + const searchNav = findFixedAncestor(searchInput); + if (searchNav) return searchNav; // 3. Check via desktop right sidebar links (privacy policy, terms, etc.) const privacyLink = document.querySelector('a[href*="privacy-policy"], a[href*="tos"], a[href*="zendesk.com"]'); - if (privacyLink) { - let parent = privacyLink.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } - - return null; + return findFixedAncestor(privacyLink); } function findCenterBorders() { - const borders = document.querySelectorAll('div[style*="602px"], div[style*="602 px"]'); - for (const el of borders) { - return el; - } + const borders = document.querySelector('div[style*="602px"], div[style*="602 px"]'); + if (borders) return borders; const borderCandidates = document.querySelectorAll('div[style*="border-left-width"][style*="border-right-width"], div[style*="translateX(-50%)"]'); for (const el of borderCandidates) { if (el.children.length === 0) { @@ -184,8 +221,11 @@ } function clearLayoutTags() { - const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist]'); + const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist], [data-bskyplus-post-media]'); tagged.forEach(el => { + if (el.dataset && el.dataset.bskyplusPostMedia) { + delete el.dataset.bskyplusPostMedia; + } if (el.dataset && el.dataset.bskyplusLeftNav) { if (el.style && el.style.removeProperty) el.style.removeProperty('margin-left'); delete el.dataset.bskyplusLeftNav; @@ -238,6 +278,30 @@ } } + function setColumnWidth(element, width) { + if (!element.style?.setProperty) return; + element.style.setProperty('max-width', `${width}px`, 'important'); + element.style.setProperty('margin-left', 'auto', 'important'); + element.style.setProperty('margin-right', 'auto', 'important'); + element.style.setProperty('width', '100%', 'important'); + } + + function tagPostMedia() { + document.querySelectorAll('[data-testid="contentHider-post"]').forEach(post => { + for (const child of post.children) { + const hasMedia = !child.querySelector('[data-testid="postText"]') && ( + child.querySelector('video') || + Array.from(child.querySelectorAll('img')).some(image => !image.closest('[data-testid="userAvatarImage"]')) + ); + if (hasMedia) { + child.dataset.bskyplusPostMedia = 'true'; + } else if (child.dataset.bskyplusPostMedia) { + delete child.dataset.bskyplusPostMedia; + } + } + }); + } + function scanAndTagLayout(effectiveWidth) { if (!isFeatureActive() || effectiveWidth === 600) { clearLayoutTags(); @@ -285,12 +349,7 @@ } el.dataset.bskyplusFeedColumn = 'true'; } - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - el.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(el, effectiveWidth); } }); @@ -298,12 +357,7 @@ const tablists = document.querySelectorAll('div[role="tablist"], [role="tablist"]'); tablists.forEach(el => { if (el.dataset) el.dataset.bskyplusTablist = 'true'; - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('width', '100%', 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - } + setColumnWidth(el, effectiveWidth); // Check parent header wrappers and feed column parents let parent = el.parentElement; @@ -312,12 +366,7 @@ const pStyle = parent.getAttribute('style') || ''; if (isTagged || /max-width:\s*(550|600)px/i.test(pStyle)) { if (parent.dataset) parent.dataset.bskyplusFeedColumn = 'true'; - if (parent.style && parent.style.setProperty) { - parent.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - parent.style.setProperty('margin-left', 'auto', 'important'); - parent.style.setProperty('margin-right', 'auto', 'important'); - parent.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(parent, effectiveWidth); } if (parent.getAttribute('data-bskyplus-left-nav') || parent.getAttribute('data-bskyplus-right-nav')) { break; @@ -326,6 +375,8 @@ } }); + tagPostMedia(); + // Child positions differ between feeds and notifications. The column's // width constraint above identifies it without resizing avatar columns. } @@ -403,6 +454,7 @@ function applyLiveFeedWidth(width) { hasLiveWidthUpdate = true; + startWidthTransition(); // A live reset to 600 breaks the layout. Keep the saved default for reloads. updateFeedWidthStyle(width === 600 ? 599 : width); if (isFeatureActive() && width) currentConfiguredWidth = width; diff --git a/extension/firefox/shared/integrated-settings-rules.json b/extension/firefox/shared/integrated-settings-rules.json index 82644b1..9653c25 100644 --- a/extension/firefox/shared/integrated-settings-rules.json +++ b/extension/firefox/shared/integrated-settings-rules.json @@ -10,5 +10,29 @@ "regexFilter": "^https://bsky\\.app/bskyplus/?(\\?.*)?$", "resourceTypes": ["main_frame"] } + }, + { + "id": 3, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=infrastructure" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/infrastructure/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } + }, + { + "id": 2, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=theme" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/theme/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } } ] diff --git a/extension/firefox/shared/integrated-settings.css b/extension/firefox/shared/integrated-settings.css index b397a81..0fd4dcd 100644 --- a/extension/firefox/shared/integrated-settings.css +++ b/extension/firefox/shared/integrated-settings.css @@ -90,6 +90,23 @@ color-scheme: normal; } +[data-bskyplus-theme-link] { + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + min-height: 56px; + padding: 8px 20px; + border-bottom: 1px solid color-mix(in srgb, currentColor 15%, transparent); + color: var(--bskyplus-theme-text, inherit); + font-size: 15px; + text-decoration: none; +} + +[data-bskyplus-theme-link]:hover { + background: color-mix(in srgb, currentColor 6%, transparent); +} + [data-bskyplus-settings-page] header a { display: grid; place-items: center; @@ -106,3 +123,35 @@ outline: 2px solid currentColor; outline-offset: -2px; } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: inherit; + background: #151d28; + box-shadow: 0 12px 48px #0008; + font: 14px/1.5 InterVariable, system-ui, sans-serif; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-dialog h2 { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-dialog p { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } diff --git a/extension/firefox/shared/integrated-settings.js b/extension/firefox/shared/integrated-settings.js index 0863650..ce8d3f8 100644 --- a/extension/firefox/shared/integrated-settings.js +++ b/extension/firefox/shared/integrated-settings.js @@ -8,14 +8,31 @@ let scheduled = false; let settingsFrame; let nativeCenter; + let nativeTitle; let centerObserver; - let bootstrapRequested = location.pathname === '/settings' && - new URLSearchParams(location.search).get('bskyplus') === '1'; + function bootstrapPath() { + const value = new URLSearchParams(location.search).get('bskyplus'); + return value === 'theme' ? '/bskyplus/theme' : ['1', 'infrastructure'].includes(value) ? '/bskyplus' : null; + } + let bootstrapRequested = location.pathname === '/settings' ? bootstrapPath() : null; + + function settingsReference() { + return document.querySelector('a[href="/settings/about"]') || + document.querySelector('a[href="/settings/account"]'); + } + + function navigate(event, path) { + if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; + event.preventDefault(); + history.pushState(history.state, '', path); + update(); + page?.querySelector('h1')?.focus(); + window.scrollTo(0, 0); + } function addSettingsLink() { if (document.querySelector('[data-bskyplus-settings-link]')) return; - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + const reference = settingsReference(); if (!reference) return; const link = document.createElement('a'); @@ -55,15 +72,16 @@ label.dataset.bskyplusSettingsLabel = ''; label.textContent = 'Bsky+'; const nativeLabel = reference.querySelector('[dir="auto"]') || reference; - link.style.color = getComputedStyle(nativeLabel).color; + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(nativeLabel).color})`; const chevron = document.createElement('div'); chevron.dataset.bskyplusSettingsChevron = ''; chevron.setAttribute('aria-hidden', 'true'); const nativeChevron = reference.querySelector('svg:last-child'); const nativeIcons = reference.querySelectorAll('svg'); - chevron.style.color = nativeIcons.length > 1 + const chevronColor = nativeIcons.length > 1 ? getComputedStyle(nativeIcons[nativeIcons.length - 1]).color : getComputedStyle(nativeChevron || nativeLabel).color; + chevron.style.color = `var(--bskyplus-theme-muted, ${chevronColor})`; const arrow = document.createElementNS(svgNamespace, 'svg'); arrow.setAttribute('viewBox', '0 0 24 24'); arrow.setAttribute('width', '18'); @@ -79,32 +97,37 @@ iconWrapper.append(icon); row.append(iconWrapper, label, chevron); link.append(row); - link.addEventListener('click', event => { - if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; - event.preventDefault(); - history.pushState(history.state, '', '/bskyplus'); - update(); - page?.querySelector('h1')?.focus(); - window.scrollTo(0, 0); - }); + link.addEventListener('click', event => navigate(event, '/bskyplus')); const firstRow = Array.from(reference.parentElement.children) .find(element => element.matches('a[href^="/settings/"]')) || reference; firstRow.before(link); } function unmountPage() { + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: null })); centerObserver?.disconnect(); centerObserver = nativeCenter = undefined; host?.removeAttribute('data-bskyplus-settings-host'); page?.remove(); settingsFrame = undefined; - if (previousTitle !== undefined && document.title === 'Bsky+ — Bluesky') { + if (previousTitle !== undefined && ['Bsky+ — Bluesky', 'Theme editor — Bsky+'].includes(document.title)) { document.title = previousTitle; } - host = page = undefined; + host = page = nativeTitle = undefined; previousTitle = undefined; } + function syncSettingsLinkColors() { + const link = document.querySelector('[data-bskyplus-settings-link]'); + const reference = settingsReference(); + if (!link || !reference) return; + const label = reference.querySelector('[dir="auto"]') || reference; + const icons = reference.querySelectorAll('svg'); + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(label).color})`; + const chevron = link.querySelector('[data-bskyplus-settings-chevron]'); + chevron.style.color = `var(--bskyplus-theme-muted, ${getComputedStyle(icons.length > 1 ? icons[icons.length - 1] : label).color})`; + } + function findNativeCenter(reference) { const content = reference?.closest('#content'); let candidate; @@ -133,38 +156,54 @@ syncAlignment(); } - function mountPage() { - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + function mountPage(path) { + const themePage = path === '/bskyplus/theme'; + const pageTitle = themePage ? 'Theme editor' : 'Bsky+'; + const reference = settingsReference(); const screen = reference?.closest('#content')?.parentElement || document.querySelector('[data-testid="notFoundView"]'); if (!screen) return; - if (host !== screen || !page?.isConnected) { + if (host !== screen || !page?.isConnected || page.dataset.bskyplusSettingsPage !== path) { unmountPage(); host = screen; previousTitle = document.title; - const nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); + nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); page = document.createElement('section'); - page.dataset.bskyplusSettingsPage = ''; - page.setAttribute('aria-label', 'Bsky+'); - if (nativeTitle) page.style.color = getComputedStyle(nativeTitle).color; + page.dataset.bskyplusSettingsPage = path; + page.setAttribute('aria-label', pageTitle); + syncPageColor(); const header = document.createElement('header'); const back = document.createElement('a'); - back.href = '/settings'; + back.href = themePage ? '/bskyplus' : '/settings'; + if (themePage) back.addEventListener('click', event => navigate(event, '/bskyplus')); back.textContent = '←'; - back.setAttribute('aria-label', 'Back to Settings'); + back.setAttribute('aria-label', themePage ? 'Back to Bsky+ settings' : 'Back to Settings'); const title = document.createElement('h1'); - title.textContent = 'Bsky+'; + title.textContent = pageTitle; title.tabIndex = -1; header.append(back, title); page.append(header); + if (!themePage) { + const themeLink = document.createElement('a'); + themeLink.href = '/bskyplus/theme'; + themeLink.dataset.bskyplusThemeLink = ''; + const label = document.createElement('span'); + label.textContent = 'Theme editor'; + const arrow = document.createElement('span'); + arrow.textContent = '›'; + arrow.setAttribute('aria-hidden', 'true'); + themeLink.append(label, arrow); + themeLink.addEventListener('click', event => navigate(event, '/bskyplus/theme')); + page.append(themeLink); + } const api = typeof browser !== 'undefined' ? browser : globalThis.chrome; if (api?.runtime?.getURL) { settingsFrame = document.createElement('iframe'); settingsFrame.dataset.bskyplusSettingsFrame = ''; - settingsFrame.title = 'Bsky+ settings'; - settingsFrame.src = api.runtime.getURL('shared/settings-frame.html'); + settingsFrame.title = themePage ? 'Bsky+ ' + pageTitle : 'Bsky+ settings'; + settingsFrame.src = api.runtime.getURL('shared/settings-frame.html') + + (themePage ? '?section=theme' : ''); settingsFrame.referrerPolicy = 'no-referrer'; settingsFrame.addEventListener('load', sendTheme); page.append(settingsFrame); @@ -173,11 +212,22 @@ host.append(page); } trackNativeCenter(findNativeCenter(reference) || screen.firstElementChild); - if (document.title !== 'Bsky+ — Bluesky') document.title = 'Bsky+ — Bluesky'; + const title = themePage ? pageTitle + ' — Bsky+' : 'Bsky+ — Bluesky'; + if (document.title !== title) document.title = title; + } + + function syncPageColor() { + if (!page) return; + // The sampled heading may already be themed. Use the palette variable so + // the runtime cannot translate that resolved color a second time. + const fallback = nativeTitle?.isConnected ? getComputedStyle(nativeTitle).color : 'inherit'; + const color = `var(--bskyplus-theme-text, ${fallback})`; + if (page.style.color !== color) page.style.color = color; } function sendTheme() { if (!settingsFrame?.contentWindow || !page) return; + syncPageColor(); let background = 'rgb(255, 255, 255)'; for (let element = page; element; element = element.parentElement) { const value = getComputedStyle(element).backgroundColor; @@ -191,27 +241,81 @@ }, '*'); } + function showAppviewRestartPrompt() { + if (document.querySelector('dialog[data-bskyplus-appview-restart]')) return; + const dialog = document.createElement('dialog'); + dialog.className = 'bskyplus-appview-restart-dialog'; + dialog.dataset.bskyplusAppviewRestart = ''; + dialog.setAttribute('aria-labelledby', 'bskyplusAppviewRestartTitle'); + const form = document.createElement('form'); + form.method = 'dialog'; + const title = document.createElement('h2'); + title.id = 'bskyplusAppviewRestartTitle'; + title.textContent = 'Restart Bluesky'; + const message = document.createElement('p'); + message.textContent = 'The AppView changed. Bluesky needs to restart to use the new provider.'; + const actions = document.createElement('div'); + actions.className = 'bskyplus-appview-restart-actions'; + const confirm = document.createElement('button'); + confirm.type = 'submit'; + confirm.value = 'ok'; + confirm.textContent = 'OK'; + actions.append(confirm); + form.append(title, message, actions); + dialog.append(form); + dialog.addEventListener('cancel', event => event.preventDefault()); + dialog.addEventListener('close', () => { + const confirmed = dialog.returnValue === 'ok'; + dialog.remove(); + if (confirmed) window.location.reload(); + }, { once: true }); + const foreground = page ? getComputedStyle(page).color : ''; + if (foreground) dialog.style.color = foreground; + for (let node = page; node; node = node.parentElement) { + const background = getComputedStyle(node).backgroundColor; + if (background && background !== 'transparent' && background !== 'rgba(0, 0, 0, 0)') { + dialog.style.backgroundColor = background; + break; + } + } + document.body.append(dialog); + dialog.showModal(); + confirm.focus(); + } + window.addEventListener('message', event => { - if (!settingsFrame || event.source !== settingsFrame.contentWindow || - event.data?.type !== 'BSKYPLUS_SETTINGS_HEIGHT') return; - const height = event.data.height; - if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { - settingsFrame.style.height = `${Math.ceil(height)}px`; + if (!settingsFrame || event.source !== settingsFrame.contentWindow) return; + if (event.data?.type === 'BSKYPLUS_SETTINGS_HEIGHT') { + const height = event.data.height; + if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { + settingsFrame.style.height = `${Math.ceil(height)}px`; + } + } else if (event.data?.type === 'BSKYPLUS_APPVIEW_RESTART') { + showAppviewRestartPrompt(); + } else if (event.data?.type === 'BSKYPLUS_THEME_PREVIEW') { + const model = globalThis.BskyPlusThemes; + if (!model) return; + let theme = null; + if (event.data.theme !== null) { + try { theme = model.validateTheme(event.data.theme); } + catch { return; } + } + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: theme })); } }); function update() { scheduled = false; const path = location.pathname.replace(/\/$/, ''); - const bootstrap = path === '/settings' && (bootstrapRequested || - new URLSearchParams(location.search).get('bskyplus') === '1'); - if (path === '/bskyplus' || bootstrap) { - mountPage(); + const bootstrap = path === '/settings' && (bootstrapRequested || bootstrapPath()); + if (path === '/bskyplus' || path === '/bskyplus/theme' || path === '/bskyplus/infrastructure' || bootstrap) { + const targetPath = path === '/bskyplus/infrastructure' ? '/bskyplus' : bootstrap || path; + mountPage(targetPath); // Let Bluesky mount its Settings screen before claiming the URL. A // request rule bootstraps hard loads because the server rejects /bskyplus. - if (bootstrap && page?.isConnected) { - bootstrapRequested = false; - history.replaceState(history.state, '', '/bskyplus'); + if ((bootstrap || path === '/bskyplus/infrastructure') && page?.isConnected) { + bootstrapRequested = null; + history.replaceState(history.state, '', targetPath); } } else { @@ -231,8 +335,12 @@ childList: true, subtree: true, }); - window.addEventListener('popstate', scheduleUpdate); + window.addEventListener('popstate', update); window.addEventListener('pageshow', scheduleUpdate); window.addEventListener('resize', scheduleUpdate); + window.addEventListener('bskyplus:theme-changed', () => { + syncSettingsLinkColors(); + sendTheme(); + }); scheduleUpdate(); })(); diff --git a/extension/firefox/shared/llm-settings.css b/extension/firefox/shared/llm-settings.css index 0f37884..f84f5b4 100644 --- a/extension/firefox/shared/llm-settings.css +++ b/extension/firefox/shared/llm-settings.css @@ -32,7 +32,43 @@ } .bskyplus-llm-input:focus { - border-color: var(--accent-default, #1083fe); + border-color: #1083fe; +} + +.bskyplus-llm-prompt-heading { + display: flex; + align-items: center; + justify-content: flex-start; + gap: 5px; +} + +.bskyplus-llm-prompt-heading .switch { + width: 32px; + height: 18px; + border-radius: 999px; +} + +.bskyplus-llm-prompt-heading .switch::before { + top: 3px; + left: 3px; + width: 12px; + height: 12px; +} + +.bskyplus-llm-prompt-heading .switch:checked::before { + transform: translateX(14px); +} + +.bskyplus-llm-prompt-input { + box-sizing: border-box; + min-height: 0; + overflow-y: hidden; + line-height: 1.45; + resize: none; +} + +.bskyplus-llm-prompt-input:disabled { + cursor: not-allowed; } .bskyplus-llm-actions { @@ -41,15 +77,44 @@ margin-top: 2px; } -.bskyplus-llm-save { - min-width: 72px; +.bskyplus-llm-key-row, +.bskyplus-appview-provider-row { + display: grid; + align-items: stretch; + gap: 8px; +} + +.bskyplus-llm-key-row { + grid-template-columns: minmax(0, 4fr) minmax(0, 1fr); +} + +.bskyplus-appview-provider-row { + grid-template-columns: minmax(0, 7fr) minmax(0, 3fr); +} + +.bskyplus-appview-provider-row > select, +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > input, +.bskyplus-llm-key-row > .bskyplus-llm-save { + min-width: 0; + width: 100%; +} + +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > .bskyplus-llm-save { + padding-inline: 4px; + border-radius: 8px; +} + +.bskyplus-appview-provider-row > button { + white-space: nowrap; } .bskyplus-llm-status { min-height: 14px; margin-top: 8px; font-size: 11px; - color: var(--accent-default, #1083fe); + color: #1083fe; } .bskyplus-llm-status-error { @@ -62,3 +127,94 @@ line-height: 1.4; color: var(--text-secondary, #8c9eb5); } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: var(--text-primary, #f1f3f5); + background: var(--bg-primary, #151d28); + box-shadow: 0 12px 48px #0008; + font-size: 14px; + line-height: 1.5; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-title { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-message { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions > button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions > button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } + +/* Shared controls must retain native hidden behavior in flex field layouts. */ +.bskyplus-llm-field[hidden] { + display: none; +} + +select.bskyplus-llm-input option { + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); +} + +.bskyplus-popup-feature .toggle-label { + column-gap: 0; +} + +.bskyplus-bookmarks-info { + display: inline-flex; + align-items: center; + justify-content: center; + flex: 0 0 12px; + width: 12px; + height: 12px; + padding: 0; + margin-left: 3px; + transform: translateY(-9%); + border: 1px solid var(--text-secondary, #8c9eb5); + border-radius: 50%; + background: transparent; + color: var(--text-secondary, #8c9eb5); + font-size: 9px; + font-weight: 600; + line-height: 1; + cursor: help; +} + +.bskyplus-bookmarks-info:hover, +.bskyplus-bookmarks-info:focus-visible { + color: var(--text-primary, #f1f3f5); + border-color: currentColor; +} + +.bskyplus-bookmarks-tooltip { + position: fixed; + z-index: 1000; + width: min(360px, calc(100vw - 16px)); + max-height: calc(100vh - 16px); + overflow: auto; + padding: 12px; + border: 1px solid var(--border-color, #2b394a); + border-radius: 10px; + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); + box-shadow: 0 6px 24px #0005; + font-size: 12px; + font-weight: 400; + line-height: 1.5; + user-select: text; +} diff --git a/extension/firefox/shared/llm-settings.js b/extension/firefox/shared/llm-settings.js index 82f61bd..3e8c084 100644 --- a/extension/firefox/shared/llm-settings.js +++ b/extension/firefox/shared/llm-settings.js @@ -26,7 +26,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -108,25 +111,13 @@ .then(function (res) { return res || {}; }, function () { return {}; }); } - function storageSet(api, value) { - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') { - result.then(resolve, reject); - return; - } - if (api.runtime && api.runtime.lastError) { - reject(new Error(api.runtime.lastError.message || 'Storage write failed')); - return; - } - reject(new Error('Storage did not confirm the write')); - }); + async function storageSet(api, value) { + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + if (api.runtime && api.runtime.lastError) { + throw new Error(api.runtime.lastError.message || 'Storage write failed'); + } + throw new Error('Storage did not confirm the write'); } function field(labelText, input) { @@ -140,6 +131,17 @@ return row; } + function makeInput(type, id, placeholder) { + var input = document.createElement('input'); + input.type = type; + input.id = id; + input.className = 'bskyplus-llm-input'; + input.placeholder = placeholder; + input.autocomplete = 'off'; + input.spellcheck = false; + return input; + } + function mount() { if (document.querySelector('.bskyplus-llm-section')) return null; @@ -158,33 +160,83 @@ subtitle.textContent = 'OpenAI-compatible vision chat/completions endpoint'; section.appendChild(subtitle); - var endpointInput = document.createElement('input'); - endpointInput.type = 'url'; - endpointInput.id = 'bskyplusLlmEndpoint'; - endpointInput.className = 'bskyplus-llm-input'; - endpointInput.placeholder = 'https://api.openai.com/v1/chat/completions'; - endpointInput.autocomplete = 'off'; - endpointInput.spellcheck = false; - - var modelInput = document.createElement('input'); - modelInput.type = 'text'; - modelInput.id = 'bskyplusLlmModel'; - modelInput.className = 'bskyplus-llm-input'; - modelInput.placeholder = 'gpt-4o-mini (optional)'; - modelInput.autocomplete = 'off'; - modelInput.spellcheck = false; - - var apiKeyInput = document.createElement('input'); - apiKeyInput.type = 'password'; - apiKeyInput.id = 'bskyplusLlmApiKey'; - apiKeyInput.className = 'bskyplus-llm-input'; - apiKeyInput.placeholder = 'API key (optional)'; - apiKeyInput.autocomplete = 'off'; - apiKeyInput.spellcheck = false; + var endpointInput = makeInput('url', 'bskyplusLlmEndpoint', 'https://api.openai.com/v1/chat/completions'); + var modelInput = makeInput('text', 'bskyplusLlmModel', 'gpt-4o-mini (optional)'); + var apiKeyInput = makeInput('password', 'bskyplusLlmApiKey', 'API key (optional)'); + var customPromptToggle = document.createElement('input'); + customPromptToggle.type = 'checkbox'; + customPromptToggle.id = 'bskyplusLlmUseCustomPrompt'; + customPromptToggle.className = 'switch'; + customPromptToggle.setAttribute('aria-label', 'Enable custom prompt'); + var customPromptPlaceholder = 'Write instructions for describing the image'; + var savedCustomPrompt = ''; + var customPromptInput = document.createElement('textarea'); + customPromptInput.id = 'bskyplusLlmCustomPrompt'; + customPromptInput.className = 'bskyplus-llm-input bskyplus-llm-prompt-input'; + customPromptInput.rows = 2; + customPromptInput.disabled = true; + customPromptInput.placeholder = ''; + customPromptInput.spellcheck = true; + var customPromptField = document.createElement('div'); + customPromptField.className = 'bskyplus-llm-field'; + var customPromptHeading = document.createElement('div'); + customPromptHeading.className = 'bskyplus-llm-prompt-heading'; + var customPromptTitle = document.createElement('span'); + customPromptTitle.id = 'bskyplusLlmCustomPromptTitle'; + customPromptTitle.className = 'bskyplus-llm-label'; + customPromptTitle.textContent = 'Custom prompt'; + customPromptInput.setAttribute('aria-labelledby', customPromptTitle.id); + customPromptToggle.setAttribute('aria-controls', customPromptInput.id); + customPromptHeading.append(customPromptTitle, customPromptToggle); + customPromptField.append(customPromptHeading, customPromptInput); + function resizeCustomPrompt() { + if (!customPromptInput.isConnected) return; + customPromptInput.style.height = 'auto'; + var styles = window.getComputedStyle(customPromptInput); + var borders = parseFloat(styles.borderTopWidth) + parseFloat(styles.borderBottomWidth); + customPromptInput.style.height = (customPromptInput.scrollHeight + borders) + 'px'; + } + function updateCustomPromptAvailability() { + var enabled = customPromptToggle.checked; + customPromptInput.disabled = !enabled; + customPromptInput.value = enabled ? savedCustomPrompt : ''; + customPromptInput.placeholder = enabled ? customPromptPlaceholder : ''; + resizeCustomPrompt(); + } + customPromptToggle.addEventListener('change', function () { + if (!customPromptToggle.checked) savedCustomPrompt = customPromptInput.value; + updateCustomPromptAvailability(); + }); + customPromptInput.addEventListener('input', function () { + savedCustomPrompt = customPromptInput.value; + resizeCustomPrompt(); + }); + window.addEventListener('resize', resizeCustomPrompt); + if (typeof ResizeObserver === 'function') { + var promptFieldWidth = 0; + var promptFieldObserver = new ResizeObserver(function (entries) { + var width = entries[0]?.contentRect.width || 0; + if (width === promptFieldWidth) return; + promptFieldWidth = width; + resizeCustomPrompt(); + }); + promptFieldObserver.observe(customPromptField); + } section.appendChild(field('Endpoint URL', endpointInput)); section.appendChild(field('Model', modelInput)); - section.appendChild(field('API key', apiKeyInput)); + var apiKeyField = document.createElement('div'); + apiKeyField.className = 'bskyplus-llm-field'; + var apiKeyLabel = document.createElement('label'); + apiKeyLabel.className = 'bskyplus-llm-label'; + apiKeyLabel.htmlFor = apiKeyInput.id; + apiKeyLabel.textContent = 'API key'; + var apiKeyRow = document.createElement('div'); + apiKeyRow.className = 'bskyplus-llm-key-row'; + apiKeyRow.appendChild(apiKeyInput); + apiKeyField.append(apiKeyLabel, apiKeyRow); + section.appendChild(apiKeyField); + section.appendChild(customPromptField); var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -194,7 +246,7 @@ saveButton.className = 'secondary-btn bskyplus-llm-save'; saveButton.textContent = 'Save'; saveButton.disabled = true; - actions.appendChild(saveButton); + apiKeyRow.appendChild(saveButton); var grantButton = document.createElement('button'); grantButton.type = 'button'; grantButton.className = 'secondary-btn bskyplus-llm-grant'; @@ -202,6 +254,92 @@ grantButton.hidden = true; actions.appendChild(grantButton); var pendingPermissionRequest = null; + var saveQueue = Promise.resolve(); + var editVersion = 0; + var dirtyFields = Object.create(null); + var draftRevisions = Object.create(null); + var settingsReady = Promise.resolve(); + + function queueSettingsSave(patch, message) { + if (!api) return Promise.reject(new Error('Settings storage is unavailable')); + var version = editVersion; + var revisions = Object.assign({}, draftRevisions); + saveQueue = saveQueue.catch(function () {}).then(async function () { + await settingsReady; + var saved = await storageGet(api, STORAGE_KEY); + var settings = normalizeSettings(saved[STORAGE_KEY]); + if (featureRow && typeof settings.enabled !== 'boolean') { + settings.enabled = validateEndpoint(settings.endpoint).ok; + } + Object.keys(patch).forEach(function (key) { settings[key] = patch[key]; }); + await storageSet(api, { llm: settings }); + Object.keys(patch).forEach(function (key) { + if (dirtyFields[key] && revisions[key] === draftRevisions[key]) dirtyFields[key] = false; + }); + if (version === editVersion) setStatus(message || '', false); + return settings; + }); + return saveQueue; + } + + function persistField(key, value) { + editVersion += 1; + return queueSettingsSave({ [key]: value }, 'Draft saved.'); + } + + function persistDraft() { + var patch = {}; + Object.keys(dirtyFields).forEach(function (key) { + if (dirtyFields[key]) patch[key] = draftValue(key); + }); + if (!Object.keys(patch).length) return Promise.resolve(); + editVersion += 1; + return queueSettingsSave(patch, 'Draft saved.'); + } + + function draftValue(key) { + if (key === 'endpoint') return endpointInput.value.trim(); + if (key === 'model') return modelInput.value.trim(); + if (key === 'apiKey') return apiKeyInput.value; + if (key === 'useCustomPrompt') return customPromptToggle.checked; + if (key === 'customPrompt') return savedCustomPrompt; + return undefined; + } + + function trackDraft(input, key) { + function markDirty() { + dirtyFields[key] = true; + draftRevisions[key] = (draftRevisions[key] || 0) + 1; + editVersion += 1; + } + input.addEventListener('input', markDirty); + input.addEventListener('change', markDirty); + input.addEventListener('blur', function () { + if (!dirtyFields[key]) return; + persistField(key, draftValue(key)).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + } + + trackDraft(endpointInput, 'endpoint'); + trackDraft(modelInput, 'model'); + trackDraft(apiKeyInput, 'apiKey'); + trackDraft(customPromptInput, 'customPrompt'); + customPromptToggle.addEventListener('change', function () { + dirtyFields.useCustomPrompt = true; + draftRevisions.useCustomPrompt = (draftRevisions.useCustomPrompt || 0) + 1; + editVersion += 1; + persistField('useCustomPrompt', customPromptToggle.checked).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + window.addEventListener('blur', function () { persistDraft().catch(function () {}); }); + window.addEventListener('pagehide', function () { persistDraft().catch(function () {}); }); + document.addEventListener('visibilitychange', function () { + if (document.hidden) persistDraft().catch(function () {}); + }); + section.appendChild(actions); var status = document.createElement('p'); @@ -227,12 +365,47 @@ document.body.appendChild(section); } + var featureRow = globalThis.BskyPlusFeatureRow?.(section, 'AI Alt Text (LLM)', 'Generate image descriptions with AI', 'llmEnabledToggle', 'altTextSection'); + if (featureRow) { + featureRow.addTooltip(() => notice.textContent); + notice.remove(); + featureRow.toggle.disabled = true; + featureRow.toggle.addEventListener('change', async function () { + var enabled = featureRow.toggle.checked; + featureRow.toggle.disabled = true; + saveButton.disabled = true; + try { + await queueSettingsSave({ enabled: enabled }, ''); + setStatus('', false); + } catch { + featureRow.setEnabled(!enabled); + setStatus('Could not change LLM settings. Try again.', true); + } finally { + featureRow.toggle.disabled = false; + saveButton.disabled = false; + } + }); + api?.storage?.onChanged?.addListener(function (changes, area) { + if (area !== 'local' || !changes.llm) return; + var settings = normalizeSettings(changes.llm.newValue); + featureRow.setEnabled(settings.enabled ?? validateEndpoint(settings.endpoint).ok); + }); + } + if (api) { - storageGet(api, STORAGE_KEY).then(function (res) { + settingsReady = storageGet(api, STORAGE_KEY).then(function (res) { var stored = normalizeSettings(res && res[STORAGE_KEY]); - endpointInput.value = stored.endpoint; - modelInput.value = stored.model; - apiKeyInput.value = stored.apiKey; + if (!dirtyFields.endpoint) endpointInput.value = stored.endpoint; + if (!dirtyFields.model) modelInput.value = stored.model; + if (!dirtyFields.apiKey) apiKeyInput.value = stored.apiKey; + if (!dirtyFields.useCustomPrompt) customPromptToggle.checked = stored.useCustomPrompt; + if (!dirtyFields.customPrompt) savedCustomPrompt = stored.customPrompt; + updateCustomPromptAvailability(); + resizeCustomPrompt(); + if (featureRow) { + featureRow.setEnabled(stored.enabled ?? validateEndpoint(stored.endpoint).ok); + featureRow.toggle.disabled = false; + } }); } @@ -252,31 +425,31 @@ var endpoint = endpointInput.value.trim(); var model = modelInput.value.trim(); var apiKey = apiKeyInput.value; - - if (endpoint === '') { - saveSettings({ endpoint: '', model: '', apiKey: '' }, 'LLM endpoint cleared.').catch(function () { - setStatus('Could not save LLM settings.', true); - }); - return; - } - + var useCustomPrompt = customPromptToggle.checked; + var customPrompt = savedCustomPrompt; var target = validateEndpoint(endpoint); - if (!target.ok) { - setStatus(target.error, true); - return; - } - var dataTypes = ['websiteContent']; if (apiKey) dataTypes.push('authenticationInfo'); saveButton.disabled = true; - saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey }, 'Settings saved. Requesting access…').then(function () { + if (featureRow) featureRow.toggle.disabled = true; + saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey, useCustomPrompt: useCustomPrompt, customPrompt: customPrompt }, 'Draft saved.').then(function () { + if (!target.ok) { + setStatus(endpoint ? target.error : 'LLM endpoint cleared. Other settings are saved.', !endpoint ? false : true); + return; + } + if (useCustomPrompt && !customPrompt.trim()) { + setStatus('Settings saved. Enter a custom prompt or turn the custom prompt off.', true); + return; + } pendingPermissionRequest = buildPermissionRequest(target.originPattern, dataConsentSupported, dataTypes); + setStatus('Settings saved. Requesting access…', false); return requestSavedPermissions(); }).catch(function () { setStatus('Could not save LLM settings.', true); }).finally(function () { saveButton.disabled = false; + if (featureRow) featureRow.toggle.disabled = false; }); }); @@ -287,6 +460,7 @@ function requestSavedPermissions() { if (!pendingPermissionRequest) return Promise.resolve(); var permissionPromise; + var usingPermissionBroker = false; grantButton.disabled = true; if (api && api.permissions && api.permissions.request) { try { @@ -295,11 +469,31 @@ permissionPromise = Promise.reject(err); } } else { - permissionPromise = Promise.resolve(true); + usingPermissionBroker = true; + try { + permissionPromise = api && api.runtime && typeof api.runtime.sendMessage === 'function' + ? api.runtime.sendMessage({ action: 'REQUEST_LLM_ACCESS' }) + : Promise.reject(new Error('LLM permissions are unavailable.')); + } catch (err) { + permissionPromise = Promise.reject(err); + } } return Promise.resolve(permissionPromise).then(function (granted) { - if (!granted) { + if (usingPermissionBroker) { + if (granted && granted.success === true && granted.opened === true) { + grantButton.hidden = false; + setStatus('Settings saved. Finish granting LLM access in the permissions page.', false); + return; + } + if (granted && granted.success === true && granted.granted === true) { + grantButton.hidden = true; + setStatus('LLM endpoint saved.', false); + return; + } + throw new Error(granted && granted.error ? granted.error : 'LLM permissions are unavailable.'); + } + if (granted !== true) { grantButton.hidden = false; setStatus('Settings saved. Access was not granted. Choose Grant access to enable LLM.', true); return; @@ -320,10 +514,10 @@ return Promise.reject(new Error('Settings storage is unavailable')); } // Content/composer observes storage.onChanged and calls GET_LLM_STATUS; - // never broadcast the endpoint or API key. - return storageSet(api, { llm: settings }).then(function () { - setStatus(message, false); - }); + // never broadcast the endpoint or API key. Merge through the same queue + // as blur saves so an older write cannot replace a later draft. + editVersion += 1; + return queueSettingsSave(settings, message); } return { endpointInput: endpointInput, modelInput: modelInput, apiKeyInput: apiKeyInput, saveButton: saveButton, status: status }; diff --git a/extension/firefox/shared/llm.js b/extension/firefox/shared/llm.js index f6513c0..835b322 100644 --- a/extension/firefox/shared/llm.js +++ b/extension/firefox/shared/llm.js @@ -7,7 +7,8 @@ // content scripts: GET_LLM_STATUS only reports whether an endpoint is set. // // Storage contract: a single chrome.storage.local key "llm" holding -// { endpoint, model, apiKey }. An empty endpoint means the feature is off. +// { endpoint, model, apiKey, enabled, useCustomPrompt, customPrompt }. An +// empty endpoint means the feature is off. (function (global) { 'use strict'; @@ -23,7 +24,6 @@ var FIREFOX_DATA_CONSENT_DESKTOP = 140; var FIREFOX_DATA_CONSENT_ANDROID = 142; var DEFAULT_SYSTEM_PROMPT = 'Write concise, accurate alt text for this image for blind and low-vision readers. Include meaningful visible text. Do not invent detail. Output only the alt text, under 2000 characters.'; - var DEFAULT_USER_PROMPT = 'Write alt text for this image.'; function getBrowserApi() { // Prefer the promise-based namespace; Firefox/Safari expose `browser`. @@ -37,7 +37,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -69,7 +72,7 @@ } function isEnabled(raw) { - return validateEndpoint(normalizeSettings(raw).endpoint).ok; + return raw?.enabled !== false && validateEndpoint(normalizeSettings(raw).endpoint).ok; } // RUN_LLM may only come from this extension's own top frame on bsky.app or a @@ -88,6 +91,15 @@ return host === 'bsky.app' || host.endsWith('.bsky.app'); } + function isAllowedSettingsSender(sender, ownId, api) { + if (!sender || typeof sender !== 'object' || !ownId || sender.id !== ownId || + typeof sender.url !== 'string' || !api || !api.runtime || + typeof api.runtime.getURL !== 'function') return false; + var extensionRoot = api.runtime.getURL(''); + return typeof extensionRoot === 'string' && extensionRoot !== '' && + sender.url.indexOf(extensionRoot) === 0; + } + function isAndroidPlatform() { try { return typeof navigator !== 'undefined' && /android/i.test(navigator.userAgent || ''); @@ -181,17 +193,16 @@ } function buildRequestBody(settings, prompt, image) { - var systemText = (prompt && typeof prompt.system === 'string' && prompt.system.trim()) - ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT; - var userText = (prompt && typeof prompt.user === 'string' && prompt.user.trim()) - ? prompt.user.trim() : DEFAULT_USER_PROMPT; + var promptText = (settings && settings.useCustomPrompt && typeof settings.customPrompt === 'string' && settings.customPrompt.trim()) + ? settings.customPrompt.trim() + : ((prompt && typeof prompt.system === 'string' && prompt.system.trim()) + ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT); var body = { messages: [ - { role: 'system', content: systemText }, { role: 'user', content: [ - { type: 'text', text: userText }, + { type: 'text', text: promptText }, { type: 'image_url', image_url: { url: image } } ] } @@ -310,7 +321,7 @@ }); }; - function sendRequest(settings, prompt, image, target) { + async function sendRequest(settings, prompt, image, target) { var body = buildRequestBody(settings, prompt, image); var headers = { 'Content-Type': 'application/json' }; if (settings.apiKey) headers.Authorization = 'Bearer ' + settings.apiKey; @@ -318,37 +329,29 @@ var controller = typeof AbortController === 'function' ? new AbortController() : null; var timeoutId = controller ? setTimeout(function () { controller.abort(); }, env.timeoutMs || REQUEST_TIMEOUT_MS) : null; - function clear() { - if (timeoutId) clearTimeout(timeoutId); - } - - return fetchFn(target.url.toString(), { - method: 'POST', - headers: headers, - body: JSON.stringify(body), - credentials: 'omit', - redirect: 'error', - signal: controller ? controller.signal : undefined - }).then(function (response) { + try { + const response = await fetchFn(target.url.toString(), { + method: 'POST', + headers: headers, + body: JSON.stringify(body), + credentials: 'omit', + redirect: 'error', + signal: controller ? controller.signal : undefined + }); if (!response) throw safeError('LLM request failed'); if (!response.ok) throw safeError('LLM endpoint returned HTTP ' + response.status); - return response.text(); - }).then(function (raw) { + const raw = await response.text(); if (typeof raw !== 'string' || raw.trim() === '') { throw safeError('LLM endpoint returned an empty response'); } - var data; try { - data = JSON.parse(raw); + return JSON.parse(raw); } catch (err) { throw safeError('LLM endpoint returned an invalid response'); } - clear(); - return data; - }, function (err) { - clear(); - throw err; - }); + } finally { + if (timeoutId) clearTimeout(timeoutId); + } } function runLlm(message, sender) { @@ -366,6 +369,7 @@ .then(function () { return getSettings(); }) .then(function (rawSettings) { var settings = normalizeSettings(rawSettings); + if (settings.enabled === false) return { success: false, error: 'LLM is disabled' }; var target = validateEndpoint(settings.endpoint); if (!target.ok) { return { success: false, error: 'LLM endpoint is not configured' }; @@ -396,12 +400,8 @@ if (!text) throw safeError('The LLM endpoint returned no alt text'); return { success: true, text: text }; }) - .then(function (result) { - delete inFlight[key]; - return result; - }, function (err) { + .finally(function () { delete inFlight[key]; - return { success: false, error: cleanError(err) }; }); }) .catch(function (err) { @@ -415,8 +415,50 @@ .then(function (raw) { return { enabled: isEnabled(raw) }; }, function () { return { enabled: false }; }); } + function openPermissionPage(sender) { + if (!isAllowedSettingsSender(sender, getOwnId(), api)) { + return Promise.resolve({ success: false, error: 'Open Bsky+ settings to grant LLM access.' }); + } + if (!api.tabs || typeof api.tabs.create !== 'function' || + !api.runtime || typeof api.runtime.getURL !== 'function') { + return Promise.resolve({ success: false, error: 'LLM permissions are unavailable in this browser.' }); + } + return Promise.resolve() + .then(function () { return getSettings(); }) + .then(function (rawSettings) { + var settings = normalizeSettings(rawSettings); + var target = validateEndpoint(settings.endpoint); + if (!target.ok) { + return { success: false, error: 'Save a valid LLM endpoint before granting access.' }; + } + var originRequest = { origins: [target.originPattern] }; + return Promise.all([ + permissionsContains(api, originRequest), + getSupportsDataConsent().then(function (supported) { + return supported + ? permissionsContains(api, { data_collection: requiredDataCollection(settings) }) + : true; + }) + ]).then(function (grants) { + if (grants[0] && grants[1]) return { success: true, granted: true }; + return Promise.resolve(api.tabs.create({ + url: api.runtime.getURL('shared/llm-permissions.html') + })).then(function () { return { success: true, opened: true }; }); + }); + }) + .catch(function () { + return { success: false, error: 'Could not open LLM permissions. Try saving again.' }; + }); + } + function onMessage(message, sender, sendResponse) { if (!message || typeof message.action !== 'string') return undefined; + if (message.action === 'REQUEST_LLM_ACCESS') { + openPermissionPage(sender).then(sendResponse, function () { + sendResponse({ success: false, error: 'Could not open LLM permissions. Try saving again.' }); + }); + return true; + } if (message.action === 'RUN_LLM') { runLlm(message, sender).then(sendResponse, function () { sendResponse({ success: false, error: 'LLM request failed' }); @@ -463,7 +505,6 @@ STORAGE_KEY: STORAGE_KEY, PROMPT_PATH: PROMPT_PATH, DEFAULT_SYSTEM_PROMPT: DEFAULT_SYSTEM_PROMPT, - DEFAULT_USER_PROMPT: DEFAULT_USER_PROMPT, MAX_IMAGE_BYTES: MAX_IMAGE_BYTES, DATA_COLLECTION_TYPES: DATA_COLLECTION_TYPES, normalizeSettings: normalizeSettings, @@ -485,7 +526,8 @@ global.BskyPlusLLM = BskyPlusLLM; if (typeof module !== 'undefined' && module.exports) module.exports = BskyPlusLLM; - // Auto-wire when loaded as a background dependency. register() is idempotent, - // so hosts may also call BskyPlusLLM.register() themselves. - register(); + // Auto-wire when loaded as a background dependency. Standalone pages may + // load the helper library without registering a second message listener. + var currentScript = global.document && global.document.currentScript; + if (!currentScript || !currentScript.hasAttribute('data-no-register')) register(); })(typeof globalThis !== 'undefined' ? globalThis : this); diff --git a/extension/firefox/shared/media-viewer.js b/extension/firefox/shared/media-viewer.js index 432f1bd..8185335 100644 --- a/extension/firefox/shared/media-viewer.js +++ b/extension/firefox/shared/media-viewer.js @@ -5,11 +5,14 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const SPEEDS = [0.5, 1, 1.25, 1.5, 2]; - let rememberedSpeed = 1; let enabled = true; + let nextSpeedMenuId = 0; + let activeSpeedControl = null; + const speedControls = new Set(); + const videoSources = new WeakMap(); function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -19,12 +22,10 @@ // Load initial settings if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['mediaViewerEnabled', 'videoSpeed'], (res) => { + chrome.storage.local.get(['mediaViewerEnabled'], (res) => { if (res) { if (res.mediaViewerEnabled !== undefined) enabled = res.mediaViewerEnabled; - if (res.videoSpeed !== undefined) rememberedSpeed = res.videoSpeed; } - applyToAllVideos(); scanVideos(); }); @@ -33,6 +34,7 @@ if (changes.mediaViewerEnabled || changes.enableAlphaFeatures) { if (changes.mediaViewerEnabled) enabled = changes.mediaViewerEnabled.newValue; if (!isFeatureActive()) { + disposeAllSpeedControls(); document.querySelectorAll('.bskyplus-video-toolbar').forEach(t => t.remove()); } else { scanVideos(); @@ -42,33 +44,213 @@ }); } - function saveSpeedState(speed) { - rememberedSpeed = speed; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.set({ videoSpeed: speed }); + function updateSpeedControl(trigger, speed) { + if (!trigger) return; + const value = String(speed); + trigger.value = value; + const label = trigger.querySelector('.bskyplus-speed-value'); + if (label) label.textContent = `${value}x`; + trigger.setAttribute('aria-label', `Playback speed ${value}x`); + const menu = document.getElementById(trigger.getAttribute('aria-controls')); + menu?.querySelectorAll('[data-speed]').forEach(option => { + option.setAttribute('aria-checked', String(option.dataset.speed === value)); + }); + } + + function getVideoControlsSibling(video) { + const figure = video.parentElement; + if (figure?.tagName !== 'FIGURE') return null; + const sibling = figure.nextElementSibling; + if (sibling?.tagName === 'DIV') return sibling; + return sibling?.nextElementSibling?.tagName === 'DIV' ? sibling.nextElementSibling : null; + } + + function getVideoToolbarContainer(video) { + const sibling = getVideoControlsSibling(video); + const container = sibling?.lastElementChild?.lastElementChild; + return container?.tagName === 'DIV' ? container : null; + } + + function eventIsInsideSpeedControl(event, control) { + const path = typeof event.composedPath === 'function' ? event.composedPath() : []; + return path.includes(control.trigger) || path.includes(control.menu) || + control.trigger.contains(event.target) || control.menu.contains(event.target); + } + + function getSpeedMenuMountRoot(trigger) { + const fullscreenRoot = document.fullscreenElement || document.webkitFullscreenElement; + const dialogRoot = trigger.closest('dialog[open], [role="dialog"], [aria-modal="true"]'); + if (fullscreenRoot?.contains(trigger)) { + return dialogRoot && fullscreenRoot.contains(dialogRoot) ? dialogRoot : fullscreenRoot; } + return dialogRoot || document.body; + } + + function mountSpeedMenu(control) { + const root = getSpeedMenuMountRoot(control.trigger); + if (root && control.menu.parentElement !== root) root.appendChild(control.menu); + } + + function positionSpeedMenu(control) { + const triggerRect = control.trigger.getBoundingClientRect(); + const menuRect = control.menu.getBoundingClientRect(); + const margin = 8; + const below = window.innerHeight - triggerRect.bottom; + const above = triggerRect.top; + const top = below >= menuRect.height + margin || below >= above + ? triggerRect.bottom + margin + : triggerRect.top - menuRect.height - margin; + const left = Math.max(margin, Math.min( + triggerRect.right - menuRect.width, + window.innerWidth - menuRect.width - margin + )); + const maxTop = Math.max(margin, window.innerHeight - menuRect.height - margin); + control.menu.style.setProperty('top', `${Math.max(margin, Math.min(top, maxTop))}px`, 'important'); + control.menu.style.setProperty('left', `${left}px`, 'important'); + } + + function closeSpeedMenu(control = activeSpeedControl, restoreFocus = false) { + if (!control) return; + const hadFocus = control.menu.contains(document.activeElement) || control.trigger === document.activeElement; + if (activeSpeedControl === control) activeSpeedControl = null; + control.trigger.setAttribute('aria-expanded', 'false'); + if (control.isPopoverOpen && typeof control.menu.hidePopover === 'function') { + try { control.menu.hidePopover(); } catch (_) { /* Already closed. */ } + } else { + control.menu.hidden = true; + } + control.isPopoverOpen = false; + mountSpeedMenu(control); + if (restoreFocus && hadFocus && control.trigger.isConnected) control.trigger.focus(); + } + + function openSpeedMenu(control) { + if (!control.trigger.isConnected || !isFeatureActive()) return; + if (activeSpeedControl && activeSpeedControl !== control) { + closeSpeedMenu(activeSpeedControl, false); + } + mountSpeedMenu(control); + activeSpeedControl = control; + control.trigger.setAttribute('aria-expanded', 'true'); + if (typeof control.menu.showPopover === 'function' && control.menu.hasAttribute('popover')) { + try { + control.menu.showPopover(); + control.isPopoverOpen = true; + } catch (_) { + control.menu.removeAttribute('popover'); + control.menu.hidden = false; + } + } else { + control.menu.hidden = false; + } + positionSpeedMenu(control); + const selected = control.menu.querySelector('[aria-checked="true"]'); + (selected || control.menu.querySelector('[data-speed]'))?.focus(); + } + + function moveSpeedMenuFocus(control, key) { + const options = Array.from(control.menu.querySelectorAll('[data-speed]')); + if (!options.length) return; + if (key === 'Home') { + options[0].focus(); + return; + } + if (key === 'End') { + options[options.length - 1].focus(); + return; + } + const current = options.indexOf(document.activeElement); + const direction = key === 'ArrowDown' ? 1 : -1; + const next = current < 0 + ? (direction > 0 ? 0 : options.length - 1) + : (current + direction + options.length) % options.length; + options[next].focus(); + } + + function focusOutsideSpeedMenu(control, backwards) { + const selector = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])'; + const focusables = Array.from(document.querySelectorAll(selector)).filter(element => { + if (control.menu.contains(element) || element.tabIndex < 0 || element.closest('[hidden]')) return false; + return typeof element.getClientRects !== 'function' || element.getClientRects().length > 0; + }); + const index = focusables.indexOf(control.trigger); + const destination = focusables[index + (backwards ? -1 : 1)]; + closeSpeedMenu(control, false); + if (destination) destination.focus(); + } + + document.addEventListener('pointerdown', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('focusin', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('scroll', event => { + if (activeSpeedControl && !activeSpeedControl.menu.contains(event.target)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + document.addEventListener('fullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('webkitfullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('close', event => { + if (event.target?.tagName === 'DIALOG' && activeSpeedControl && + event.target.contains(activeSpeedControl.trigger)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + window.addEventListener('resize', () => closeSpeedMenu()); + + function disposeSpeedControl(control) { + if (activeSpeedControl === control) closeSpeedMenu(control, false); + control.menu.remove(); + speedControls.delete(control); + } + + function disposeAllSpeedControls() { + Array.from(speedControls).forEach(disposeSpeedControl); + } + + function cleanupDisconnectedSpeedControls() { + Array.from(speedControls).forEach(control => { + if (!control.video.isConnected || !control.trigger.isConnected) disposeSpeedControl(control); + }); + } + + function getVideoSourceKey(video) { + const sources = Array.from(video.querySelectorAll('source'), source => source.getAttribute('src') || ''); + return JSON.stringify([video.getAttribute('src') || '', ...sources]); + } + + function resetSpeedForChangedSource(video) { + const source = getVideoSourceKey(video); + const previousSource = videoSources.get(video); + if (previousSource === undefined || previousSource !== source) { + video.playbackRate = 1; + updateSpeedControl(getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'), 1); + } + videoSources.set(video, source); } function setupVideo(video) { if (!isFeatureActive()) return; - const figure = video.parentElement; - if (figure?.tagName !== 'FIGURE') return; - const container = figure.nextElementSibling?.lastElementChild?.lastElementChild; - if (!container || container.tagName !== 'DIV') return; + const container = getVideoToolbarContainer(video); + if (!container) return; + + resetSpeedForChangedSource(video); if (!video.dataset.bskyplusViewerSetup) { video.dataset.bskyplusViewerSetup = 'true'; - video.playbackRate = rememberedSpeed; - - video.addEventListener('play', () => { - if (isFeatureActive()) video.playbackRate = rememberedSpeed; - }); + video.addEventListener('loadstart', () => resetSpeedForChangedSource(video)); video.addEventListener('ratechange', () => { - const chooser = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-speed-select'); - if (chooser) chooser.value = String(video.playbackRate); + const chooser = getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'); + updateSpeedControl(chooser, video.playbackRate); }); const updatePipButton = () => { - const button = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-pip-btn'); + const button = getVideoControlsSibling(video)?.querySelector('.bskyplus-pip-btn'); if (button) button.setAttribute('aria-pressed', String(document.pictureInPictureElement === video)); }; video.addEventListener('enterpictureinpicture', updatePipButton); @@ -79,37 +261,90 @@ const toolbar = createEl('div', { className: 'bskyplus-video-toolbar' }); - const chooser = createEl('select', { + const chooser = createEl('button', { + type: 'button', className: 'bskyplus-speed-select', - 'aria-label': 'Playback speed', + 'aria-label': `Playback speed ${video.playbackRate}x`, + 'aria-haspopup': 'menu', + 'aria-expanded': 'false', title: 'Playback speed' }); - SPEEDS.forEach((spd) => { - chooser.appendChild(createEl('option', { value: spd, textContent: `${spd}x` })); + const valueLabel = createEl('span', { + className: 'bskyplus-speed-value', + textContent: `${video.playbackRate}x` + }); + chooser.appendChild(valueLabel); + chooser.appendChild(createEl('span', { className: 'bskyplus-speed-chevron', 'aria-hidden': 'true' })); + + const menu = createEl('div', { + className: 'bskyplus-speed-menu', + role: 'menu', + 'aria-label': 'Playback speed' + }); + const menuId = `bskyplus-speed-menu-${++nextSpeedMenuId}`; + menu.id = menuId; + chooser.setAttribute('aria-controls', menuId); + if (typeof menu.showPopover === 'function') menu.setAttribute('popover', 'manual'); + else menu.hidden = true; + + const control = { video, trigger: chooser, menu, isPopoverOpen: false }; + SPEEDS.forEach(speed => { + const option = createEl('button', { + type: 'button', + className: 'bskyplus-speed-option', + role: 'menuitemradio', + 'aria-checked': String(String(speed) === String(video.playbackRate)) + }); + option.dataset.speed = String(speed); + option.appendChild(createEl('span', { textContent: `${speed}x` })); + option.appendChild(createEl('span', { className: 'bskyplus-speed-option-check', 'aria-hidden': 'true' })); + option.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + if (!SPEEDS.includes(speed)) return; + video.playbackRate = speed; + updateSpeedControl(chooser, speed); + closeSpeedMenu(control, true); + }); + menu.appendChild(option); }); - chooser.value = String(video.playbackRate); - ['click', 'pointerdown', 'keydown'].forEach(type => { - chooser.addEventListener(type, e => e.stopPropagation()); + mountSpeedMenu(control); + speedControls.add(control); + + chooser.addEventListener('click', event => { + event.stopPropagation(); + if (activeSpeedControl === control) closeSpeedMenu(control, false); + else openSpeedMenu(control); }); - // Selecting the current option closes the picker without a change event. - const blurClosedChooser = () => { - setTimeout(() => { - if (!chooser.matches(':open')) chooser.blur(); - }, 0); - }; - chooser.addEventListener('click', blurClosedChooser); - chooser.addEventListener('keyup', e => { - e.stopPropagation(); - if (['Enter', 'Escape', ' '].includes(e.key)) blurClosedChooser(); + chooser.addEventListener('pointerdown', event => event.stopPropagation()); + chooser.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { + event.preventDefault(); + openSpeedMenu(control); + } else if (event.key === 'Escape' && activeSpeedControl === control) { + event.preventDefault(); + closeSpeedMenu(control, true); + } }); - chooser.addEventListener('change', e => { - e.stopPropagation(); - const speed = Number(chooser.value); - if (!SPEEDS.includes(speed)) return; - video.playbackRate = speed; - saveSpeedState(speed); - chooser.blur(); + chooser.addEventListener('keyup', event => event.stopPropagation()); + menu.addEventListener('pointerdown', event => event.stopPropagation()); + menu.addEventListener('click', event => event.stopPropagation()); + menu.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'Escape') { + event.preventDefault(); + closeSpeedMenu(control, true); + } else if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) { + event.preventDefault(); + moveSpeedMenuFocus(control, event.key); + } else if (event.key === 'Tab') { + event.preventDefault(); + focusOutsideSpeedMenu(control, event.shiftKey); + } }); + menu.addEventListener('keyup', event => event.stopPropagation()); + updateSpeedControl(chooser, video.playbackRate); toolbar.appendChild(chooser); // Picture-in-Picture Button @@ -150,32 +385,21 @@ } function applyToAllVideos() { - if (!isFeatureActive()) return; - const videos = document.querySelectorAll('video'); - videos.forEach(v => { - v.playbackRate = rememberedSpeed; - }); + scanVideos(); } function scanVideos() { - if (!isFeatureActive()) return; + cleanupDisconnectedSpeedControls(); + if (!isFeatureActive()) { + disposeAllSpeedControls(); + document.querySelectorAll('.bskyplus-video-toolbar').forEach(toolbar => toolbar.remove()); + return; + } const videos = document.querySelectorAll('video'); videos.forEach(v => setupVideo(v)); } - const observer = new MutationObserver(() => { - scanVideos(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - }); - } + observeDom(scanVideos); window.BskyPlusMediaViewer = { scanVideos, diff --git a/extension/firefox/shared/settings-frame.css b/extension/firefox/shared/settings-frame.css index 5cefbe1..6930530 100644 --- a/extension/firefox/shared/settings-frame.css +++ b/extension/firefox/shared/settings-frame.css @@ -37,6 +37,10 @@ body { gap: 12px; } +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 10px; +} + .toggle-info { min-width: 0; } @@ -47,8 +51,7 @@ body { gap: 6px; } -.slider-header, -.custom-color-row { +.slider-header { flex-wrap: wrap; gap: 12px; } @@ -66,12 +69,6 @@ body { min-height: 36px; } -.palette-container { - justify-content: flex-start; - flex-wrap: wrap; - gap: 12px; -} - .bskyplus-llm-input { font-size: 15px; padding: 10px 12px; @@ -89,11 +86,20 @@ body { input:focus-visible, button:focus-visible { - outline: 2px solid var(--accent-default); + outline: 2px solid #1083fe; outline-offset: 3px; } @media (max-width: 400px) { body { padding: 16px; } .toggle-row { padding: 12px; } + .bskyplus-feature-expanded > .toggle-row { padding-bottom: 9px; } +} +#appviewSection [hidden] { + display: none; +} + +#appviewProvider option { + background: var(--bg-secondary); + color: var(--text-primary); } diff --git a/extension/firefox/shared/settings-frame.html b/extension/firefox/shared/settings-frame.html index ad6dc29..681f1f4 100644 --- a/extension/firefox/shared/settings-frame.html +++ b/extension/firefox/shared/settings-frame.html @@ -7,6 +7,7 @@ + diff --git a/extension/firefox/shared/settings-frame.js b/extension/firefox/shared/settings-frame.js index 95031f9..ed8a1da 100644 --- a/extension/firefox/shared/settings-frame.js +++ b/extension/firefox/shared/settings-frame.js @@ -36,21 +36,36 @@ } async function mount() { + if (new URLSearchParams(location.search).get('section') === 'theme') { + document.body.replaceChildren(); + await loadScript('shared/theme-model.js'); + await loadScript('shared/theme-editor.js'); + new ResizeObserver(reportHeight).observe(document.body); + reportHeight(); + return; + } // This is packaged, trusted markup, not content supplied by the website. const response = await fetch(api.runtime.getURL('popup/popup.html')); if (!response.ok) throw new Error('Could not load settings.'); const template = new DOMParser().parseFromString(await response.text(), 'text/html'); template.querySelectorAll('script').forEach(script => script.remove()); document.body.replaceChildren(...Array.from(template.body.children, node => document.importNode(node, true))); + document.getElementById('moreSettingsButton')?.remove(); document.getElementById('feedWidthSlider')?.setAttribute('aria-label', 'Feed column width'); - document.getElementById('colorPicker')?.setAttribute('aria-label', 'Accent color'); - document.getElementById('hexInput')?.setAttribute('aria-label', 'Hex color'); - await loadScript('shared/feature-flags.js'); - await loadScript('popup/popup.js'); - await loadScript('shared/llm-settings.js'); - await loadScript('shared/cdn-config.js'); - await loadScript('shared/cdn-settings.js'); + for (const script of [ + 'shared/feature-flags.js', + 'shared/theme-model.js', + 'popup/popup.js', + 'shared/popup-theme.js', + 'popup/feature-row.js', + 'shared/llm-settings.js', + 'shared/bookmarks-settings.js', + 'shared/cdn-config.js', + 'shared/cdn-settings.js', + 'shared/appview-config.js', + 'shared/appview-settings.js', + ]) await loadScript(script); // Keep this long-lived page current when another extension view saves. api.storage.onChanged.addListener((changes, area) => { diff --git a/extension/firefox/shared/thread-unroll.js b/extension/firefox/shared/thread-unroll.js index 0d1d47d..5f1ff8b 100644 --- a/extension/firefox/shared/thread-unroll.js +++ b/extension/firefox/shared/thread-unroll.js @@ -1,583 +1,320 @@ -// Bsky+ Thread Unroll & Reader View -// Concatenates connected skeets into a distraction-free reader view with Markdown and PDF export. - -(function () { +// Inline thread unroll for numbered Bluesky author threads. +(() => { 'use strict'; - const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const POST_SELECTOR = '[data-testid^="postThreadItem-by-"]'; + const MENU_SELECTOR = 'button[aria-label="Thread options"], [role="button"][aria-label="Thread options"]'; + const REPLY_PROMPT_SELECTOR = 'button[aria-label="Compose reply"], [role="button"][aria-label="Compose reply"]'; + const INTERACTIVE_SELECTOR = 'a[href], button, [role="button"], [role="link"], input, select, textarea, [contenteditable]:not([contenteditable="false"]), video, audio'; + const POST_ROUTE = /^\/profile\/[^/]+\/post\/[^/]+\/?$/; + const NUMBER_LABEL = /^Post ([1-9]\d*) of ([1-9]\d*)$/; + let active = false; + let route = location.pathname; + let toggle = null; + let marked = new Map(); + let scanQueued = false; - let enabled = true; - let activeModal = null; - let lastInteractedPost = null; + function guardPostActivation(event) { + if (!active || route !== location.pathname) return; - function isFeatureActive() { - const flags = window.BskyPlusFeatureFlags; - if (flags && !flags.isFeatureEnabled('threadUnroll')) return false; - return enabled; - } + const target = event.target; + if (!(target instanceof Element)) return; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['threadUnrollEnabled'], (res) => { - if (res && res.threadUnrollEnabled !== undefined) { - enabled = res.threadUnrollEnabled; - } - }); + const post = target.closest('[data-bskyplus-unroll-post]'); + if (!post) return; - chrome.storage.onChanged.addListener((changes, area) => { - if ((area === 'local' || area === 'sync') && changes.threadUnrollEnabled) { - enabled = changes.threadUnrollEnabled.newValue; - if (!isFeatureActive()) { - document.querySelectorAll('.bskyplus-unroll-btn, .bskyplus-unroll-menu-item').forEach(b => b.remove()); - closeReader(); - } else { - scanForThreads(); - scanForDropdownMenus(); - } - } - }); + const interactive = target.closest(INTERACTIVE_SELECTOR); + if (interactive && interactive !== post && post.contains(interactive)) return; + + event.preventDefault(); + event.stopPropagation(); } - // -------------------------------------------------------------------------- - // Track 3-Dot Button Interactions - // -------------------------------------------------------------------------- - document.addEventListener('click', (e) => { - const btn = e.target.closest ? e.target.closest('button, [role="button"]') : null; - if (!btn) return; - const label = (btn.getAttribute('aria-label') || '').toLowerCase(); - const testid = (btn.getAttribute('data-testid') || '').toLowerCase(); - const hasPopup = btn.getAttribute('aria-haspopup'); - - if ( - label.includes('more') || - label.includes('option') || - label.includes('menu') || - testid.includes('dropdown') || - testid.includes('more') || - hasPopup === 'menu' - ) { - lastInteractedPost = btn.closest ? btn.closest( - '[data-testid*="postThreadItem"], [data-testid*="feedItem"], [data-testid*="post"]' - ) : null; - } - }, true); - - // -------------------------------------------------------------------------- - // Thread Fetching & Tree Extraction - // -------------------------------------------------------------------------- - async function fetchThreadData(actor, rkey) { - try { - const atUri = `at://${actor}/app.bsky.feed.post/${rkey}`; - const res = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread?uri=${encodeURIComponent(atUri)}&depth=100`, { - headers: { 'Accept': 'application/json' } - }); - if (!res.ok) throw new Error(`HTTP ${res.status}`); - const data = await res.json(); - return data.thread; - } catch (err) { - console.warn('Bsky+ API thread fetch failed, falling back to DOM:', err); - return null; - } + function guardPostKeydown(event) { + if (event.key !== 'Enter' && event.key !== ' ') return; + guardPostActivation(event); } - function extractLinearAuthorThread(threadNode) { - if (!threadNode || !threadNode.post) return []; + window.addEventListener('click', guardPostActivation, true); + window.addEventListener('auxclick', guardPostActivation, true); + window.addEventListener('keydown', guardPostKeydown, true); - // Find root author - let current = threadNode; - while (current.parent && current.parent.post) { - current = current.parent; + function threadScope(menu, firstPost) { + let node = firstPost.parentElement; + while (node && node !== document.body && node !== document.documentElement) { + if (node.contains(menu)) return node; + node = node.parentElement; } - const rootAuthorDid = current.post.author.did; - - const posts = []; - - function collect(node) { - if (!node || !node.post) return; - if (node.post.author.did === rootAuthorDid) { - const p = node.post; - const images = []; - - if (p.embed && p.embed.images) { - p.embed.images.forEach(img => { - images.push({ - thumb: img.thumb, - fullsize: img.fullsize, - alt: img.alt || '' - }); - }); - } - - posts.push({ - uri: p.uri, - cid: p.cid, - author: { - handle: p.author.handle, - displayName: p.author.displayName || p.author.handle, - avatar: p.author.avatar || '' - }, - text: (p.record && p.record.text) ? p.record.text : '', - createdAt: (p.record && p.record.createdAt) ? p.record.createdAt : '', - images - }); - } + return null; + } - if (node.replies && Array.isArray(node.replies)) { - // Sort replies chronologically - const sorted = [...node.replies].sort((a, b) => { - const dateA = new Date(a.post?.record?.createdAt || 0).getTime(); - const dateB = new Date(b.post?.record?.createdAt || 0).getTime(); - return dateA - dateB; - }); - for (const reply of sorted) { - collect(reply); - } - } + function numberIn(post) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post) continue; + const match = NUMBER_LABEL.exec(badge.getAttribute('aria-label') || ''); + if (match) return { index: Number(match[1]), total: Number(match[2]) }; } - - collect(current); - return posts; + return null; } - function extractThreadFromDom() { - const threadPosts = []; - const postElements = document.querySelectorAll('[data-testid*="postThreadItem"], [data-testid*="feedItem"]'); - - postElements.forEach(item => { - const textEl = item.querySelector('[data-testid="postText"], div[dir="auto"]'); - const authorLink = item.querySelector('a[href^="/profile/"]'); - const timeEl = item.querySelector('time'); - const imgEls = item.querySelectorAll('img[src*="feed_thumbnail"], img[src*="feed_fullsize"]'); - - if (textEl || imgEls.length > 0) { - const handle = authorLink ? (authorLink.getAttribute('href') || '').replace('/profile/', '') : 'unknown'; - const images = []; - imgEls.forEach(img => { - images.push({ - thumb: img.getAttribute('src') || '', - fullsize: (img.getAttribute('src') || '').replace('/feed_thumbnail/', '/feed_fullsize/'), - alt: img.getAttribute('alt') || '' - }); - }); - - threadPosts.push({ - author: { handle, displayName: handle }, - text: textEl ? textEl.textContent.trim() : '', - createdAt: timeEl ? timeEl.getAttribute('datetime') || '' : '', - images - }); - } - }); - - return threadPosts; + function containsProfileLink(element) { + return !!element?.querySelector('a[href^="/profile/"]'); } - // -------------------------------------------------------------------------- - // Markdown & Export Generators - // -------------------------------------------------------------------------- - function generateMarkdown(posts) { - if (!posts || posts.length === 0) return ''; - const author = posts[0].author; - const dateStr = posts[0].createdAt ? new Date(posts[0].createdAt).toLocaleDateString() : ''; - - let md = `# Thread by ${author.displayName} (@${author.handle})\n`; - if (dateStr) md += `*Date: ${dateStr}*\n\n---\n\n`; - - posts.forEach((p, index) => { - md += `### ${index + 1}/${posts.length}\n\n`; - if (p.text) { - md += `${p.text}\n\n`; - } - if (p.images && p.images.length > 0) { - p.images.forEach(img => { - md += `![${img.alt || 'Post image'}](${img.fullsize || img.thumb})\n\n`; - }); - } - md += `---\n\n`; - }); - - return md; - } + function findThread() { + if (!POST_ROUTE.test(location.pathname)) return null; - function downloadFile(content, filename, type = 'text/markdown') { - const blob = new Blob([content], { type }); - const url = URL.createObjectURL(blob); - const a = createEl('a', { - href: url, - download: filename, - style: 'display: none;' + const menus = [...document.querySelectorAll(MENU_SELECTOR)]; + const firstPosts = [...document.querySelectorAll(POST_SELECTOR)].filter(post => { + if (post.parentElement?.closest(POST_SELECTOR)) return false; + const number = numberIn(post); + return number?.index === 1 && number.total >= 2; }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(url); - }, 1000); - } - - // -------------------------------------------------------------------------- - // Reader View Modal - // -------------------------------------------------------------------------- - function openReaderView(posts) { - if (!posts || posts.length === 0) return; - closeReader(); - - const author = posts[0].author; - const totalWords = posts.reduce((sum, p) => sum + (p.text ? p.text.split(/\s+/).length : 0), 0); - const readingTimeMinutes = Math.max(1, Math.ceil(totalWords / 200)); - const backdrop = createEl('div', { className: 'bskyplus-reader-backdrop' }); - activeModal = backdrop; + for (const menu of menus) { + for (const firstPost of firstPosts) { + const scope = threadScope(menu, firstPost); + if (!scope) continue; - const card = createEl('div', { className: 'bskyplus-reader-modal' }); + const { total } = numberIn(firstPost); + const authorTestId = firstPost.getAttribute('data-testid'); + const posts = [firstPost]; + let expected = 2; - // Header - const header = createEl('div', { className: 'bskyplus-reader-header' }); + for (const post of scope.querySelectorAll(POST_SELECTOR)) { + if (post === firstPost) continue; + if (post.parentElement?.closest(POST_SELECTOR)) continue; + if (firstPost.compareDocumentPosition(post) & Node.DOCUMENT_POSITION_PRECEDING) continue; - const authorSection = createEl('div', { className: 'bskyplus-reader-meta' }); - if (author.avatar) { - authorSection.appendChild(createEl('img', { - className: 'bskyplus-reader-avatar', - src: author.avatar, - alt: author.handle - })); - } - - const nameCol = createEl('div'); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-name', - textContent: author.displayName || author.handle - })); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-sub', - textContent: `@${author.handle} · ${posts.length} skeets · ${readingTimeMinutes} min read` - })); - authorSection.appendChild(nameCol); - header.appendChild(authorSection); - - // Actions (Export MD, PDF, Copy, Close) - const actions = createEl('div', { className: 'bskyplus-reader-actions' }); - - const copyBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Copy as Markdown' - }, [ - Icons.copy ? Icons.copy() : document.createTextNode('📋'), - createEl('span', { textContent: 'Copy MD' }) - ]); - copyBtn.addEventListener('click', async () => { - const md = generateMarkdown(posts); - await navigator.clipboard.writeText(md); - if (showToast) showToast('Thread copied to clipboard as Markdown!'); - }); - - const exportMdBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Export Markdown file' - }, [ - Icons.markdown ? Icons.markdown() : document.createTextNode('↓'), - createEl('span', { textContent: 'Export MD' }) - ]); - exportMdBtn.addEventListener('click', () => { - const md = generateMarkdown(posts); - const filename = `${author.handle}_thread_${Date.now()}.md`; - downloadFile(md, filename); - if (showToast) showToast('Exported thread as Markdown'); - }); + const number = numberIn(post); + if (!number || number.total !== total || post.getAttribute('data-testid') !== authorTestId) continue; + if (number.index !== expected) break; - const exportPdfBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn bskyplus-btn-primary', - title: 'Print / Save as PDF' - }, [ - Icons.printer ? Icons.printer() : document.createTextNode('🖨️'), - createEl('span', { textContent: 'Export PDF' }) - ]); - exportPdfBtn.addEventListener('click', () => { - window.print(); - }); - - const closeBtn = createEl('button', { - type: 'button', - className: 'bskyplus-reader-close', - title: 'Close reader' - }, [document.createTextNode('✕')]); - closeBtn.addEventListener('click', closeReader); - - actions.append(copyBtn, exportMdBtn, exportPdfBtn, closeBtn); - header.appendChild(actions); - card.appendChild(header); - - // Body: Skeets - const body = createEl('div', { className: 'bskyplus-reader-body' }); - posts.forEach((p, index) => { - const skeetCard = createEl('div', { className: 'bskyplus-reader-skeet' }); - - const skeetHeader = createEl('div', { className: 'bskyplus-skeet-header' }); - skeetHeader.appendChild(createEl('span', { - className: 'bskyplus-skeet-index', - textContent: `${index + 1} / ${posts.length}` - })); - if (p.createdAt) { - const timeStr = new Date(p.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }); - skeetHeader.appendChild(createEl('span', { textContent: timeStr })); - } - skeetCard.appendChild(skeetHeader); - - if (p.text) { - skeetCard.appendChild(createEl('div', { - className: 'bskyplus-skeet-text', - textContent: p.text - })); - } + posts.push(post); + expected += 1; + if (expected > total) break; + } - if (p.images && p.images.length > 0) { - const mediaContainer = createEl('div', { className: 'bskyplus-skeet-media' }); - p.images.forEach(img => { - const imgWrap = createEl('div'); - imgWrap.appendChild(createEl('img', { - className: 'bskyplus-skeet-img', - src: img.fullsize || img.thumb, - alt: img.alt || '' - })); - if (img.alt) { - imgWrap.appendChild(createEl('div', { - className: 'bskyplus-skeet-alt', - textContent: `Alt: ${img.alt}` - })); - } - mediaContainer.appendChild(imgWrap); - }); - skeetCard.appendChild(mediaContainer); + return { menu, posts, total, scope }; } + } - body.appendChild(skeetCard); - }); - - card.appendChild(body); - backdrop.appendChild(card); - - backdrop.addEventListener('click', (e) => { - if (e.target === backdrop) closeReader(); - }); - - document.body.appendChild(backdrop); + return null; } - function closeReader() { - if (activeModal) { - activeModal.remove(); - activeModal = null; + function mark(next, element, attribute, value = '') { + if (!element) return; + let attrs = next.get(element); + if (!attrs) { + attrs = new Map(); + next.set(element, attrs); } + attrs.set(attribute, value); } - document.addEventListener('keydown', (e) => { - if (e.key === 'Escape' && activeModal) { - closeReader(); + function controlRow(post, next) { + const ownControl = selector => [...post.querySelectorAll(selector)] + .find(button => button.closest(POST_SELECTOR) === post); + const reply = ownControl('[data-testid="replyBtn"]'); + const like = ownControl('[data-testid="likeBtn"]'); + const menu = ownControl('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]'); + if (!reply || !like || !menu) return null; + + let controls = reply.parentElement; + while (controls && controls !== post && (!controls.contains(like) || !controls.contains(menu))) { + controls = controls.parentElement; } - }); - - // -------------------------------------------------------------------------- - // Helper: Extract actor and rkey from element or URL - // -------------------------------------------------------------------------- - function getPostCoords(el) { - if (!el) return null; - const postLink = el.querySelector ? el.querySelector('a[href*="/post/"]') : null; - if (postLink) { - const href = postLink.getAttribute('href') || ''; - const match = href.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - return { actor: match[1], rkey: match[2] }; - } - } - return null; + if (!controls || controls === post) return null; + + // The native row contains a primary reply/repost/like group and a + // secondary bookmark/share/menu group. Keep the primary buttons in place. + const primary = [...controls.children].find(child => child.contains(reply) && child.contains(like)); + const secondary = [...controls.children].find(child => child.querySelector('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]')); + if (!primary || !secondary) return null; + + mark(next, controls, 'data-bskyplus-unroll-controls'); + mark(next, primary, 'data-bskyplus-unroll-primary'); + mark(next, secondary, 'data-bskyplus-unroll-secondary'); + return controls; } - async function handleUnrollClick(targetElement) { - if (showToast) showToast('Unrolling thread...'); - - let actor = null; - let rkey = null; + function compactFollowup(post, next) { + mark(next, post, 'data-bskyplus-unroll-followup'); - // 1. Check target element - if (targetElement) { - const coords = getPostCoords(targetElement); - if (coords) { - actor = coords.actor; - rkey = coords.rkey; - } + // The expanded anchor can be post 2 or later when the user opened a + // middle post. It has a full author header instead of the linear layout. + if (isExpandedAnchor(post)) { + mark(next, post.firstElementChild, 'data-bskyplus-unroll-author'); + return; } - // 2. Check current URL if on a post page - if (!actor || !rkey) { - const path = window.location.pathname; - const match = path.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - actor = match[1]; - rkey = match[2]; + // ThreadItemPost starts with a 12px parent-reply line. Its next child is + // the avatar/content row. Work only inside this numbered post. + const first = post.firstElementChild; + const main = first?.nextElementSibling; + if (first && main && main.children.length >= 2) { + mark(next, first, 'data-bskyplus-unroll-line'); + mark(next, main, 'data-bskyplus-unroll-main'); + const avatar = main.firstElementChild; + const content = avatar?.nextElementSibling; + if (containsProfileLink(avatar) && content?.querySelector('[data-testid="replyBtn"]')) { + mark(next, avatar, 'data-bskyplus-unroll-avatar'); + + const meta = content.firstElementChild; + if (containsProfileLink(meta)) { + mark(next, meta, 'data-bskyplus-unroll-author'); + } } } + } - let posts = []; - if (actor && rkey) { - const threadNode = await fetchThreadData(actor, rkey); - if (threadNode) { - posts = extractLinearAuthorThread(threadNode); - } - } + function isExpandedAnchor(post) { + return containsProfileLink(post.firstElementChild) && + !!post.firstElementChild?.nextElementSibling?.querySelector('[data-testid="replyBtn"]'); + } - if (posts.length === 0) { - posts = extractThreadFromDom(); + function compactNumber(post, next) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post || !NUMBER_LABEL.test(badge.getAttribute('aria-label') || '')) continue; + const wrapper = badge.parentElement; + const onlyBadge = wrapper?.children.length === 1 && wrapper.textContent?.trim() === badge.textContent?.trim(); + mark(next, onlyBadge ? wrapper : badge, 'data-bskyplus-unroll-number'); + break; } + } - if (posts.length > 0) { - openReaderView(posts); - } else { - if (showToast) showToast('Could not find thread to unroll'); + function compactAnchorChrome(post, controls, next) { + const badge = [...post.querySelectorAll('span[aria-label^="Post "]')] + .find(span => NUMBER_LABEL.test(span.getAttribute('aria-label') || '') && span.closest(POST_SELECTOR) === post); + const controlsWrapper = controls?.parentElement; + const content = controlsWrapper?.parentElement; + if (!badge || !content || !post.contains(content)) return; + mark(next, content, 'data-bskyplus-unroll-anchor-content'); + + // ExpandedPostDetails, aggregate counts, and KnownLikers are siblings + // between the actual post content and its native action toolbar. + const children = [...content.children]; + const contentIndex = children.findIndex(child => child.contains(badge)); + const controlsIndex = children.indexOf(controlsWrapper); + if (contentIndex < 0 || controlsIndex <= contentIndex) return; + for (const extra of children.slice(contentIndex + 1, controlsIndex)) { + mark(next, extra, 'data-bskyplus-unroll-chrome'); } } - // -------------------------------------------------------------------------- - // 3-Dot Post Menu Injection - // -------------------------------------------------------------------------- - function injectUnrollMenuItem(menu) { - if (!isFeatureActive()) return; - if (!menu || menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const postContext = lastInteractedPost; - - const menuItem = createEl('div', { - role: 'menuitem', - tabIndex: 0, - className: 'bskyplus-unroll-menu-item', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll Thread' }) - ]); - - menuItem.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - - // Dismiss the menu - const esc = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }); - menu.dispatchEvent(esc); - document.dispatchEvent(esc); - - handleUnrollClick(postContext); - }); + function compactReplyPrompt(scope, next) { + for (const prompt of scope.querySelectorAll(REPLY_PROMPT_SELECTOR)) { + if (prompt.closest(POST_SELECTOR) || prompt.closest('[role="dialog"], dialog')) continue; - menuItem.addEventListener('keydown', (e) => { - if (e.key === 'Enter' || e.key === ' ') { - e.preventDefault(); - e.stopPropagation(); - menuItem.click(); - } - }); - - const firstItem = menu.querySelector('[role="menuitem"], button, div'); - if (firstItem && firstItem.parentElement === menu) { - firstItem.after(menuItem); - } else { - menu.prepend(menuItem); + const wrapper = prompt.parentElement; + if (!wrapper || wrapper === scope) continue; + mark(next, wrapper, 'data-bskyplus-unroll-chrome'); } } - function scanForDropdownMenus() { - if (!isFeatureActive()) return; - - const menus = document.querySelectorAll( - 'div[role="menu"], [data-testid*="dropdownMenu"], [data-radix-menu-content]' - ); - - menus.forEach(menu => { - if (menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const text = menu.textContent || ''; - const isPostMenu = - text.includes('Translate') || - text.includes('Copy link') || - text.includes('Quote') || - text.includes('Mute') || - text.includes('Report') || - text.includes('Pin') || - text.includes('Embed') || - lastInteractedPost !== null; - - if (isPostMenu) { - injectUnrollMenuItem(menu); + function reconcile(next) { + for (const [element, attrs] of marked) { + const wanted = next.get(element); + for (const name of attrs.keys()) { + if (!wanted?.has(name)) element.removeAttribute(name); } - }); + } + + for (const [element, attrs] of next) { + for (const [name, value] of attrs) { + if (element.getAttribute(name) !== value) element.setAttribute(name, value); + } + } + marked = next; } - // -------------------------------------------------------------------------- - // Direct Thread Header Button - // -------------------------------------------------------------------------- - function attachUnrollButton(container) { - if (!isFeatureActive()) return; - if (container.querySelector('.bskyplus-unroll-btn')) return; - - const btn = createEl('button', { - type: 'button', - className: 'bskyplus-unroll-btn', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll' }) - ]); - - btn.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - handleUnrollClick(container); + function makeToggle() { + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'bskyplus-thread-unroll-toggle'; + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('width', '19'); + icon.setAttribute('height', '19'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('stroke', 'currentColor'); + icon.setAttribute('stroke-width', '1.8'); + icon.setAttribute('stroke-linecap', 'round'); + icon.setAttribute('stroke-linejoin', 'round'); + + for (const pathData of ['M5 5h14', 'M5 10h14', 'M5 15h10', 'M5 20h10']) { + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('d', pathData); + icon.append(path); + } + button.append(icon); + button.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + active = !active; + scan(); }); - - container.appendChild(btn); + return button; } - function scanForThreads() { - if (!isFeatureActive()) return; + function scan() { + if (route !== location.pathname) { + route = location.pathname; + active = false; + } - if (window.location.pathname.includes('/post/')) { - const headers = document.querySelectorAll('[data-testid*="postThreadItem"] [data-testid="postHeader"], div[data-testid*="post"] [data-testid="postHeader"]'); - if (headers.length > 0) { - attachUnrollButton(headers[0]); - } + const thread = findThread(); + if (!thread) { + toggle?.remove(); + reconcile(new Map()); + return; + } - const actionBars = document.querySelectorAll('[role="group"][aria-label*="post" i], [data-testid*="post-actions"]'); - if (actionBars.length > 0 && !document.querySelector('.bskyplus-unroll-btn')) { - attachUnrollButton(actionBars[0]); - } + if (!toggle) toggle = makeToggle(); + if (toggle.nextElementSibling !== thread.menu) thread.menu.before(toggle); + const label = active ? 'Restore thread' : 'Unroll thread'; + if (toggle.getAttribute('aria-label') !== label) toggle.setAttribute('aria-label', label); + toggle.setAttribute('title', active ? 'Restore thread' : `Unroll ${thread.total} posts`); + toggle.setAttribute('aria-pressed', String(active)); + + const next = new Map(); + mark(next, thread.menu.parentElement, 'data-bskyplus-unroll-header-controls'); + if (active) { + thread.posts.forEach((post, index) => { + mark(next, post, 'data-bskyplus-unroll-post', String(index + 1)); + if (post.parentElement && post.parentElement.querySelectorAll(POST_SELECTOR).length === 1) { + mark(next, post.parentElement, 'data-bskyplus-unroll-outer'); + } + compactNumber(post, next); + const controls = controlRow(post, next); + if (isExpandedAnchor(post)) compactAnchorChrome(post, controls, next); + if (index > 0) compactFollowup(post, next); + }); + compactReplyPrompt(thread.scope, next); } + reconcile(next); } - const observer = new MutationObserver(() => { - scanForThreads(); - scanForDropdownMenus(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); + function scheduleScan() { + if (scanQueued) return; + scanQueued = true; + requestAnimationFrame(() => { + scanQueued = false; + scan(); }); } - window.BskyPlusThreadUnroll = { - scanForThreads, - scanForDropdownMenus, - injectUnrollMenuItem, - handleUnrollClick, - openReaderView, - generateMarkdown, - extractLinearAuthorThread - }; + new MutationObserver(scheduleScan).observe(document, { + childList: true, + subtree: true, + attributes: true, + attributeFilter: ['aria-label', 'data-testid'] + }); + window.addEventListener('popstate', scheduleScan); + window.navigation?.addEventListener('navigatesuccess', scheduleScan); + setInterval(() => { + if (route !== location.pathname) scheduleScan(); + }, 1000); + scheduleScan(); })(); diff --git a/extension/safari/background.js b/extension/safari/background.js index ec53f92..3e93910 100644 --- a/extension/safari/background.js +++ b/extension/safari/background.js @@ -2,12 +2,14 @@ importScripts('shared/cdn-config.js', 'shared/cdn-background.js'); const DEFAULT_SETTINGS = { - skeetMode: false, - accentColor: '#1083fe' + skeetMode: false }; const browserAPI = typeof browser !== 'undefined' ? browser : chrome; +// Remove the obsolete accent-color setting when the background starts. +void browserAPI.storage.local.remove('accentColor'); + browserAPI.action.onClicked.addListener(tab => { const url = 'https://bsky.app/bskyplus'; if (tab?.id !== undefined && tab.url && new URL(tab.url).hostname === 'bsky.app') { diff --git a/extension/safari/content.js b/extension/safari/content.js index 69a7398..f2159cd 100644 --- a/extension/safari/content.js +++ b/extension/safari/content.js @@ -7,12 +7,9 @@ document.documentElement.dataset.bskyplusLoaded = "true"; // Default settings let settings = { skeetMode: false, - accentColor: '#1083fe', // default Bluesky blue localOcrEnabled: true }; - const DEFAULT_BLUE = '#1083fe'; - // ------------------------------------------------------------- // Helpers // ------------------------------------------------------------- @@ -112,21 +109,54 @@ document.documentElement.dataset.bskyplusLoaded = "true"; element.dispatchEvent(new Event('change', { bubbles: true })); } + const altTextDialogSelector = '[role="dialog"], [aria-modal="true"], :is([aria-label="Add alt text" i], [aria-label="Edit alt text" i], [aria-label="Alt text" i]):not(input):not(textarea):not(button):not(img):not([role="button"])'; + + function ownedDialogElements(dialog, selector) { + return Array.from(dialog.querySelectorAll(selector)).filter(element => + element.closest(altTextDialogSelector) === dialog + ); + } + + function altTextDialogFields(dialog) { + if (dialog.closest('.bskyplus-edit-dialog')) return null; + + const normalizeTitle = value => (value || '').replace(/\s+/g, ' ').trim(); + let title = normalizeTitle(dialog.getAttribute('aria-label')); + if (!title) { + const labelledBy = (dialog.getAttribute('aria-labelledby') || '').split(/\s+/).filter(Boolean); + title = normalizeTitle(labelledBy.map(id => { + const label = document.getElementById(id); + return label && (!dialog.contains(label) || label.closest(altTextDialogSelector) === dialog) + ? label.textContent : ''; + }).join(' ')); + } + if (!title) { + title = normalizeTitle(ownedDialogElements(dialog, 'h1, h2, h3, h4, h5, h6, [role="heading"]')[0]?.textContent); + } + if (!/^(?:Add alt text|Edit alt text|Alt text)$/i.test(title)) return null; + + const textarea = ownedDialogElements(dialog, 'textarea, input[type="text"]')[0]; + const img = ownedDialogElements(dialog, 'img')[0]; + return textarea && img ? { textarea, img } : null; + } + function checkAltTextModal() { if (settings.localOcrEnabled === false) { document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn, .bskyplus-composer-ocr-btn').forEach(btn => btn.remove()); return; } - // Find dialog/modal that contains both a textarea and an uploaded image - const candidates = Array.from(document.querySelectorAll('[aria-label="Add alt text"], div[role="dialog"]')); - const modal = candidates.find(m => m.querySelector('textarea') && m.querySelector('img')); + document.querySelectorAll('#bskyplus-ocr-btn').forEach(button => { + const dialog = button.closest(altTextDialogSelector); + if (!dialog || !altTextDialogFields(dialog)) button.remove(); + }); + + const candidates = Array.from(document.querySelectorAll(altTextDialogSelector)); + const modal = candidates.find(candidate => altTextDialogFields(candidate)); if (!modal) return; if (modal.querySelector('#bskyplus-ocr-btn')) return; - const img = modal.querySelector('img'); - const textarea = modal.querySelector('textarea') || modal.querySelector('input[type="text"]'); - if (!textarea) return; + const { textarea } = altTextDialogFields(modal); const ocrBtn = document.createElement('button'); ocrBtn.id = 'bskyplus-ocr-btn'; @@ -151,16 +181,9 @@ document.documentElement.dataset.bskyplusLoaded = "true"; e.preventDefault(); e.stopPropagation(); - const currentCandidates = Array.from(document.querySelectorAll('[aria-label="Add alt text"], div[role="dialog"]')); - const currentModal = currentCandidates.find(m => m.querySelector('textarea') && m.querySelector('img')); - if (!currentModal) return; - const targetImg = currentModal.querySelector('img'); - const targetInput = currentModal.querySelector('textarea') || currentModal.querySelector('input[type="text"]'); - - if (!targetImg) { - showToast('There was no text in the image'); - return; - } + const fields = modal.isConnected && altTextDialogFields(modal); + if (!fields) return; + const { img: targetImg, textarea: targetInput } = fields; const originalHtml = ocrBtn.innerHTML; ocrBtn.disabled = true; @@ -284,70 +307,6 @@ document.documentElement.dataset.bskyplusLoaded = "true"; } } - // ------------------------------------------------------------- - // Feature 3: Accent Color Customizer - // ------------------------------------------------------------- - const ACCENT_STYLE_ID = 'bskyplus-accent-style'; - function applyAccentColor(color) { - let style = document.getElementById(ACCENT_STYLE_ID); - if (!color || color.toLowerCase() === DEFAULT_BLUE.toLowerCase()) { - if (style) style.remove(); - return; - } - - if (!style) { - style = document.createElement('style'); - style.id = ACCENT_STYLE_ID; - document.head.appendChild(style); - } - - // Bluesky official blue is rgb(16, 131, 254) / #1083fe / hsl(211, 99%, 53%) - style.textContent = ` - :root { - --bskyplus-accent: ${color} !important; - } - /* Override background color on elements styled with official blue */ - [style*="background-color: rgb(16, 131, 254)"], - [style*="background-color: #1083fe"], - [style*="background-color:#1083fe"], - [style*="background-color: rgb(18, 126, 241)"] { - background-color: ${color} !important; - } - /* Override text color on elements styled with official blue */ - [style*="color: rgb(16, 131, 254)"], - [style*="color: #1083fe"], - [style*="color:#1083fe"], - [style*="color: rgb(18, 126, 241)"] { - color: ${color} !important; - } - /* Override border color on elements styled with official blue */ - [style*="border-color: rgb(16, 131, 254)"], - [style*="border-color: #1083fe"], - [style*="border-color:#1083fe"], - [style*="border-color: rgb(18, 126, 241)"] { - border-color: ${color} !important; - } - /* Override SVG fill and stroke */ - svg [fill="rgb(16, 131, 254)"], - svg [fill="#1083fe"], - svg [fill="#1083FE"] { - fill: ${color} !important; - } - svg [stroke="rgb(16, 131, 254)"], - svg [stroke="#1083fe"], - svg [stroke="#1083FE"] { - stroke: ${color} !important; - } - /* Buttons and active tabs */ - button[aria-label="Publish post"], - button[aria-label="Save"], - button[aria-label="Follow"], - button[data-testid="loginNextButton"] { - background-color: ${color} !important; - } - `; - } - // ------------------------------------------------------------- // Mutation Observer Loop // ------------------------------------------------------------- @@ -385,10 +344,6 @@ document.documentElement.dataset.bskyplusLoaded = "true"; document.querySelectorAll('#bskyplus-ocr-btn, #bskyplus-ocr-header-btn, .bskyplus-composer-ocr-btn').forEach(btn => btn.remove()); } - if (newSettings.accentColor !== undefined) { - applyAccentColor(settings.accentColor); - } - if (settings.skeetMode && !prevSkeet) { walkTextNodes(document.body); } else if (!settings.skeetMode && prevSkeet) { @@ -397,14 +352,14 @@ document.documentElement.dataset.bskyplusLoaded = "true"; } // Initial load from storage - chrome.storage.local.get(['skeetMode', 'accentColor', 'localOcrEnabled'], (res) => { + chrome.storage.local.get(['skeetMode', 'localOcrEnabled'], (res) => { if (res) { updateLocalSettings({ skeetMode: !!res.skeetMode, - accentColor: res.accentColor || '#1083fe', localOcrEnabled: res.localOcrEnabled !== false }); } + checkAltTextModal(); }); // Listen directly for storage changes diff --git a/extension/safari/icons/icon128.png b/extension/safari/icons/icon128.png index fa4e27a5429ec4e59b67d77503cd6eaf8cbbe140..573fb1f64740f9e84b837668ecf231df4050d9fb 100644 GIT binary patch literal 9046 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 literal 7567 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 KpUXO@geCyX$PEnu literal 732 zcme7R@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to7JIrlhE&Yyo$T!qk|=Wg z|MNT5&#kh2AE$7p*&RByX+e|R4y{G5SJVV$v15mOc+~u9%St^@8as=W2T7f>O>g3_eZBCa(FDbrt;Q;*$3K7F zwc!z0cPyjxMS{3p4wS|O`RusWD6gEYIt;qYj;2^ zi_@My&&7orpAsfKTk0Ygb#*%X%DC7M(M6xm^t1f@G{GkCV$+ld4IC$CDwrSiD=T6; zpt9`$r!5+a$9LYHvMBqhh>?nv+PdO7w{y1iMETdI4jfw9iM%eNHKHm@f&(<} zY$|9~l%K~Yu}SClKC8qEuP!4eyXt_eo4O`+$i%sw`P$Lp;9~ad#~V*aJC{ST(^3UK z*am+zi+*6nd)9D=6;lxNrdBa#!=zdz!#9APIG(T9x9-*NJM*kP4^K;7;-Pr9B7JMObjUo=%4>8?IqhV} z>B4qm#=#X#mn?p|e&4%a+j^6;w%^xSyYP(6IJ<4jrb$Hl_|N{Nd(!#jQwb5lqXz}v z^?APZ+0an=_bP0l+XkKEUsHz diff --git a/extension/safari/icons/icon48.png b/extension/safari/icons/icon48.png index 3a4e837fcfd43b4620fb0be29e017431b3d50093..27d455650f13c3d6465d75a7fe1dd8774dca2849 100644 GIT binary patch literal 7105 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 literal 2741 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 .section-title .section-collapse-arrow { + transform: rotate(-45deg); +} + +.section-collapsed > :not(.section-title) { + display: none !important; +} + +@media (prefers-reduced-motion: reduce) { + .theme-select-chevron { transition: none; } + + .section-collapse-arrow { + transition: none; + } +} + .section-subtitle { font-size: 11px; color: var(--text-secondary); @@ -151,7 +409,7 @@ body { } .switch:checked { - background-color: var(--accent-default); + background-color: #1083fe; } .switch:checked::before { @@ -203,7 +461,7 @@ body { width: 16px; height: 16px; border-radius: 50%; - background: var(--accent-default); + background: #1083fe; cursor: pointer; box-shadow: 0 0 4px rgba(0,0,0,0.4); } @@ -212,7 +470,7 @@ body { width: 16px; height: 16px; border-radius: 50%; - background: var(--accent-default); + background: #1083fe; cursor: pointer; border: none; } @@ -245,86 +503,6 @@ body { cursor: not-allowed; } -/* Palette */ -.palette-container { - display: flex; - gap: 7px; - justify-content: space-between; - margin-bottom: 12px; -} - -.color-swatch { - width: 32px; - height: 32px; - border-radius: 50%; - border: 2px solid transparent; - cursor: pointer; - transition: transform 0.15s ease, border-color 0.15s ease; - padding: 0; - outline: none; -} - -.color-swatch:hover { - transform: scale(1.15); -} - -.color-swatch.active { - border-color: #ffffff; - box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.4); - transform: scale(1.1); -} - -.custom-color-row { - display: flex; - align-items: center; - justify-content: space-between; - gap: 10px; -} - -.color-input-wrapper { - display: flex; - align-items: center; - gap: 8px; - background-color: var(--bg-secondary); - padding: 4px 8px; - border-radius: 8px; - border: 1px solid var(--border-color); - flex: 1; -} - -#colorPicker { - appearance: none; - -webkit-appearance: none; - border: none; - width: 26px; - height: 26px; - border-radius: 6px; - cursor: pointer; - background: none; - padding: 0; -} - -#colorPicker::-webkit-color-swatch-wrapper { - padding: 0; -} - -#colorPicker::-webkit-color-swatch { - border: 1px solid rgba(255, 255, 255, 0.2); - border-radius: 6px; -} - -#hexInput { - background: transparent; - border: none; - color: var(--text-primary); - font-family: monospace; - font-size: 13px; - font-weight: 600; - width: 75px; - outline: none; - text-transform: uppercase; -} - .secondary-btn { background-color: var(--bg-secondary); color: var(--text-secondary); @@ -360,3 +538,98 @@ body { font-size: 10px; color: var(--text-secondary); } +.header-actions { + display: flex; + align-items: center; + gap: 8px; + flex-shrink: 0; +} + +#moreSettingsButton { + width: auto; + margin: 0; + white-space: nowrap; +} +#featuresSection .bskyplus-popup-feature, +#altTextSection .bskyplus-popup-feature, +#infrastructureSection .bskyplus-popup-feature { + border-radius: 10px; + background: var(--bg-secondary); + margin-bottom: 8px; + overflow-anchor: none; +} + +.bskyplus-popup-feature > .toggle-row { + margin-bottom: 0; + transition: background-color 0.15s ease, padding-bottom 300ms ease; +} + +.bskyplus-controls-reveal { + display: grid; + grid-template-rows: 0fr; + opacity: 0; + transition: grid-template-rows 300ms ease, opacity 180ms ease; +} + +.bskyplus-feature-expanded > .bskyplus-controls-reveal { + grid-template-rows: 1fr; + opacity: 1; +} + +.bskyplus-controls-clip { + min-height: 0; + min-width: 0; + overflow: hidden; +} + +@media (prefers-reduced-motion: reduce) { + .bskyplus-controls-reveal, + .bskyplus-popup-feature > .toggle-row { + transition: none; + } +} + +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 9px; +} + +.bskyplus-popup-controls { + padding: 0 12px 12px; +} + +.bskyplus-popup-controls .bskyplus-llm-field { + gap: 4px; + margin-bottom: 8px; +} + +.bskyplus-popup-controls .bskyplus-llm-label { + padding-inline: 10px; + line-height: 1.4; +} + +.bskyplus-popup-controls [role="status"]:empty { + display: none; +} + +.bskyplus-popup-controls [role="status"], +.bskyplus-popup-controls .bskyplus-llm-notice { + min-height: 0; + margin-top: 4px; +} + +.bskyplus-popup-controls[hidden] { + display: none; +} + +#bookmarksSection .bskyplus-popup-controls { + padding-bottom: 4px; +} + +#bookmarksSection .bskyplus-llm-field { + margin-bottom: 4px; +} + +.bskyplus-popup-controls .bskyplus-llm-actions { + flex-wrap: wrap; + gap: 6px; +} diff --git a/extension/safari/popup/popup.html b/extension/safari/popup/popup.html index 7b2b7d8..4149d34 100644 --- a/extension/safari/popup/popup.html +++ b/extension/safari/popup/popup.html @@ -10,13 +10,16 @@
- Bsky+ Logo + Bsky+ Logo

Bsky+

Power tools for Bluesky
- v1.0.2 +
+ + v2.0.0 +
@@ -35,6 +38,20 @@
+
+
Theme
+
+ Color theme + +
+
+ + +
+

+
+
Features
@@ -49,7 +66,7 @@ @@ -57,7 +74,7 @@ @@ -70,20 +87,12 @@ -
-
-
Accent Color
-
Pride palette & custom colors
- -
- - - - - - - - -
- -
-
- - +
+
ALT Text
+
+ +
-
- OCR runs 100% locally in your browser +
+
Local Bookmarks
+

Enable local bookmarks to download all your bookmarks into this browser’s IndexedDB for local browsing on Bluesky’s Saved page. Rough estimate: 100 bookmarks use 0.5–2 MB; 1,000 use 5–20 MB, depending on post size. Only post data and media URLs are stored, not media files. Data stays on this device, is accessible to bsky.app, and clearing site data removes it. Search and filters on the Saved page apply to your entire local collection.

+
+
Infrastructure
+
+ + + + + + + + + diff --git a/extension/safari/popup/popup.js b/extension/safari/popup/popup.js index 58f4dc4..367e858 100644 --- a/extension/safari/popup/popup.js +++ b/extension/safari/popup/popup.js @@ -1,15 +1,65 @@ // Bsky+ Settings Popup +// Section disclosure is independent of feature enablement and shared across settings views. +(() => { + const api = globalThis.browser || globalThis.chrome; + const sections = [ + ['feedLayout', document.querySelector('[data-feature="feedWidth"]')], + ['features', document.getElementById('featuresSection')], + ['altText', document.getElementById('altTextSection')], + ['infrastructure', document.getElementById('infrastructureSection')], + ]; + for (const [name, section] of sections) { + const title = section?.querySelector(':scope > .section-title'); + if (!title) continue; + const key = 'settingsSectionCollapsed_' + name; + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'section-collapse-button'; + button.textContent = title.textContent; + const arrow = document.createElement('span'); + arrow.className = 'section-collapse-arrow'; + arrow.setAttribute('aria-hidden', 'true'); + button.append(arrow); + title.replaceChildren(button); + function render(collapsed) { + section.classList.toggle('section-collapsed', collapsed); + button.setAttribute('aria-expanded', String(!collapsed)); + } + render(false); + button.disabled = true; + api.storage.local.get(key).then(stored => render(stored[key] === true)) + .catch(error => console.error('Could not load section state:', error)) + .finally(() => { button.disabled = false; }); + button.addEventListener('click', async () => { + const collapsed = button.getAttribute('aria-expanded') === 'true'; + render(collapsed); + button.disabled = true; + try { + await api.storage.local.set({ [key]: collapsed }); + } catch (error) { + render(!collapsed); + console.error('Could not save section state:', error); + } finally { + button.disabled = false; + } + }); + api.storage.onChanged.addListener((changes, area) => { + if (area === 'local' && changes[key]) render(changes[key].newValue === true); + }); + } +})(); + + const DEFAULT_SETTINGS = { skeetMode: false, - accentColor: '#1083fe', feedWidth: 600, mediaDownloaderEnabled: true, mediaViewerEnabled: true, quickEmojiEnabled: true, accountAgeEnabled: true, - threadUnrollEnabled: true, localOcrEnabled: true, + hideLikedByEnabled: false, enableAlphaFeatures: false }; @@ -18,18 +68,14 @@ const mediaDownloaderToggle = document.getElementById('mediaDownloaderToggle'); const mediaViewerToggle = document.getElementById('mediaViewerToggle'); const quickEmojiToggle = document.getElementById('quickEmojiToggle'); const accountAgeToggle = document.getElementById('accountAgeToggle'); -const threadUnrollToggle = document.getElementById('threadUnrollToggle'); const localOcrToggle = document.getElementById('localOcrToggle'); +const hideLikedByToggle = document.getElementById('hideLikedByToggle'); const feedWidthSlider = document.getElementById('feedWidthSlider'); const feedWidthVal = document.getElementById('feedWidthVal'); const feedWidthMaxLimit = document.getElementById('feedWidthMaxLimit'); const presetButtons = document.querySelectorAll('.preset-btn'); -const colorPicker = document.getElementById('colorPicker'); -const hexInput = document.getElementById('hexInput'); -const resetColorBtn = document.getElementById('resetColorBtn'); -const pridePalette = document.getElementById('pridePalette'); const versionText = document.getElementById('versionText'); // Set version from manifest @@ -153,8 +199,8 @@ function updateUI() { if (mediaViewerToggle) mediaViewerToggle.checked = !!currentSettings.mediaViewerEnabled; if (quickEmojiToggle) quickEmojiToggle.checked = !!currentSettings.quickEmojiEnabled; if (accountAgeToggle) accountAgeToggle.checked = !!currentSettings.accountAgeEnabled; - if (threadUnrollToggle) threadUnrollToggle.checked = !!currentSettings.threadUnrollEnabled; if (localOcrToggle) localOcrToggle.checked = currentSettings.localOcrEnabled !== false; + if (hideLikedByToggle) hideLikedByToggle.checked = !!currentSettings.hideLikedByEnabled; const w = currentSettings.feedWidth || 600; if (feedWidthSlider) feedWidthSlider.value = String(w); @@ -170,26 +216,6 @@ function updateUI() { } }); - const hex = (currentSettings.accentColor || '#1083fe').toUpperCase(); - if (colorPicker) colorPicker.value = hex; - if (hexInput) hexInput.value = hex; - - // Active swatch - if (pridePalette) { - const swatches = pridePalette.querySelectorAll('.color-swatch'); - swatches.forEach(swatch => { - const swatchColor = swatch.getAttribute('data-color').toUpperCase(); - if (swatchColor === hex) { - swatch.classList.add('active'); - } else { - swatch.classList.remove('active'); - } - }); - } - - // Apply accent color to checked toggles & badges - document.documentElement.style.setProperty('--accent-default', hex); - // Apply feature flag gates applyFeatureFlags(); } @@ -218,6 +244,13 @@ function saveAndNotify() { } // Toggle listeners +if (hideLikedByToggle) { + hideLikedByToggle.addEventListener('change', () => { + currentSettings.hideLikedByEnabled = hideLikedByToggle.checked; + saveAndNotify(); + }); +} + if (skeetModeToggle) { skeetModeToggle.addEventListener('change', () => { currentSettings.skeetMode = skeetModeToggle.checked; @@ -253,13 +286,6 @@ if (accountAgeToggle) { }); } -if (threadUnrollToggle) { - threadUnrollToggle.addEventListener('change', () => { - currentSettings.threadUnrollEnabled = threadUnrollToggle.checked; - saveAndNotify(); - }); -} - if (localOcrToggle) { localOcrToggle.addEventListener('change', () => { currentSettings.localOcrEnabled = localOcrToggle.checked; @@ -302,6 +328,24 @@ if (feedWidthSlider) { }); } +document.getElementById('moreSettingsButton')?.addEventListener('click', async () => { + const api = globalThis.browser || globalThis.chrome; + const button = document.getElementById('moreSettingsButton'); + button.disabled = true; + try { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + if (tab?.url?.startsWith('https://bsky.app/')) { + await api.tabs.update(tab.id, { url: 'https://bsky.app/bskyplus' }); + } else { + await api.tabs.create({ url: 'https://bsky.app/bskyplus' }); + } + window.close(); + } catch { + button.textContent = 'Could not open settings. Try again'; + button.disabled = false; + } +}); + presetButtons.forEach(btn => { btn.addEventListener('click', () => { let w = Number(btn.getAttribute('data-width')); @@ -314,46 +358,3 @@ presetButtons.forEach(btn => { saveAndNotify(); }); }); - -// Color swatch click -if (pridePalette) { - pridePalette.addEventListener('click', (e) => { - const swatch = e.target.closest('.color-swatch'); - if (!swatch) return; - const color = swatch.getAttribute('data-color'); - setAccentColor(color); - }); -} - -// Color picker input -if (colorPicker) { - colorPicker.addEventListener('input', (e) => { - setAccentColor(e.target.value); - }); -} - -// Hex text input -if (hexInput) { - hexInput.addEventListener('change', () => { - let val = hexInput.value.trim(); - if (!val.startsWith('#')) val = '#' + val; - if (/^#[0-9A-F]{6}$/i.test(val)) { - setAccentColor(val); - } else { - hexInput.value = currentSettings.accentColor.toUpperCase(); - } - }); -} - -// Reset color button -if (resetColorBtn) { - resetColorBtn.addEventListener('click', () => { - setAccentColor('#1083fe'); - }); -} - -function setAccentColor(hex) { - currentSettings.accentColor = hex; - updateUI(); - saveAndNotify(); -} diff --git a/extension/safari/shared/account-age.js b/extension/safari/shared/account-age.js index 70a87cb..46852cf 100644 --- a/extension/safari/shared/account-age.js +++ b/extension/safari/shared/account-age.js @@ -6,7 +6,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const DB_NAME = 'bskyplus_db'; const STORE_NAME = 'account_ages'; @@ -51,7 +51,7 @@ // -------------------------------------------------------------------------- function openDatabase() { if (!dbPromise) { - dbPromise = new Promise((resolve, reject) => { + dbPromise = new Promise(resolve => { if (!window.indexedDB) { return resolve(null); } @@ -140,8 +140,6 @@ rateLimitBackoffUntil = Date.now() + 30000; console.warn('Bsky+ AccountAge: rate limited, backing off 30s'); batch.forEach(h => queue.add(h)); - isProcessing = false; - scheduleQueueProcessing(); return; } @@ -212,7 +210,7 @@ title: `Fresh account! Created on ${formattedDate} (${days} days ago)` }, [ Icons.sprout ? Icons.sprout() : document.createTextNode('🌱'), - document.createTextNode(isBrandNew ? `New (${days}d)` : `New (${days}d)`) + document.createTextNode(`New (${days}d)`) ]); linkEl.insertAdjacentElement('afterend', badge); @@ -265,19 +263,7 @@ links.forEach(link => checkHandleElement(link)); } - const observer = new MutationObserver(() => { - scanHandles(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - }); - } + observeDom(scanHandles); window.BskyPlusAccountAge = { scanHandles, diff --git a/extension/safari/shared/cdn-background.js b/extension/safari/shared/cdn-background.js index 0a4a02a..54129c5 100644 --- a/extension/safari/shared/cdn-background.js +++ b/extension/safari/shared/cdn-background.js @@ -52,12 +52,18 @@ api.permissions.onAdded.addListener(refresh); api.permissions.onRemoved.addListener(refresh); api.runtime.onMessage.addListener((message, sender, sendResponse) => { - if (message?.action !== 'APPLY_IMAGE_CDN') return; + if (!['APPLY_IMAGE_CDN', 'REQUEST_IMAGE_CDN_ACCESS'].includes(message?.action)) return; if (sender.id !== api.runtime.id || !sender.url?.startsWith(api.runtime.getURL(''))) { sendResponse({ success: false, error: 'Open Bsky+ settings to change the CDN.' }); return false; } - apply().then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); + apply().then(async result => { + if (message.action === 'REQUEST_IMAGE_CDN_ACCESS' && result.hostname && !result.enabled) { + await api.tabs.create({ url: api.runtime.getURL('shared/cdn-permissions.html') }); + return { success: true, opened: true }; + } + return result; + }).then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); return true; }); refresh(); diff --git a/extension/safari/shared/cdn-config.js b/extension/safari/shared/cdn-config.js index 6e38532..164efc7 100644 --- a/extension/safari/shared/cdn-config.js +++ b/extension/safari/shared/cdn-config.js @@ -2,6 +2,7 @@ 'use strict'; const SOURCE_HOST = 'cdn.bsky.app'; const IMAGE_PATTERN = '^https://cdn\\.bsky\\.app/img/(feed_thumbnail|feed_fullsize|avatar_thumbnail)/plain/'; + const IMAGE_URL = new RegExp(IMAGE_PATTERN); const RULE_ID = 2001; function normalizeHostname(value) { @@ -43,7 +44,7 @@ } function redirectUrl(url, hostname) { - if (!hostname || !new RegExp(IMAGE_PATTERN).test(url)) return undefined; + if (!hostname || !IMAGE_URL.test(url)) return undefined; return `https://${hostname}${url.slice(`https://${SOURCE_HOST}`.length)}`; } diff --git a/extension/safari/shared/cdn-settings.js b/extension/safari/shared/cdn-settings.js index e63bfa6..43d8fc9 100644 --- a/extension/safari/shared/cdn-settings.js +++ b/extension/safari/shared/cdn-settings.js @@ -19,21 +19,13 @@ }, function () { return {}; }); } - function storageSet(api, value) { + async function storageSet(api, value) { if (!api || !api.storage || !api.storage.local || typeof api.storage.local.set !== 'function') { - return Promise.reject(new Error('Settings storage is unavailable.')); + throw new Error('Settings storage is unavailable.'); } - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') result.then(resolve, reject); - else reject(new Error('Storage did not confirm the write.')); - }); + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + throw new Error('Storage did not confirm the write.'); } function makeField(labelText, input) { @@ -71,7 +63,38 @@ input.placeholder = 'luna.danielmorrisey.com'; input.autocomplete = 'off'; input.spellcheck = false; - section.appendChild(makeField('CDN hostname', input)); + var customField = makeField('CDN hostname', input); + var provider = null; + if (globalThis.BskyPlusFeatureRow) { + provider = document.createElement('select'); + provider.id = 'bskyplusCdnProvider'; + provider.setAttribute('aria-label', 'CDN provider'); + provider.className = 'bskyplus-llm-input'; + [['', 'Bluesky (default)'], ['luna.danielmorrisey.com', 'Luna'], ['custom', 'Custom']].forEach(function (item) { + var option = document.createElement('option'); + option.value = item[0]; + option.textContent = item[1]; + provider.appendChild(option); + }); + provider.addEventListener('change', function () { + customField.hidden = provider.value !== 'custom'; + }); + var providerField = document.createElement('div'); + providerField.className = 'bskyplus-llm-field'; + providerField.appendChild(provider); + section.appendChild(providerField); + customField.hidden = true; + } + section.appendChild(customField); + + function displayHostname(hostname) { + input.value = hostname; + if (provider) { + provider.value = !hostname || hostname === 'luna.danielmorrisey.com' ? hostname : 'custom'; + customField.hidden = provider.value !== 'custom'; + } + if (popupRow) popupRow.setEnabled(!!hostname); + } var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -109,12 +132,27 @@ var before = llmSection || footer; if (before && before.parentElement) before.parentElement.insertBefore(section, before); else document.body.appendChild(section); + var popupRow = globalThis.BskyPlusFeatureRow?.(section, 'Image CDN', 'Choose where images load from', 'cdnEnabledToggle', + document.getElementById('infrastructureSection') ? 'infrastructureSection' : 'featuresSection'); + if (popupRow) { + popupRow.addTooltip(() => notice.textContent); + notice.remove(); + resetButton.hidden = true; + popupRow.toggle.addEventListener('change', function () { + if (!popupRow.toggle.checked) reset(); + }); + } function setStatus(message, isError) { status.textContent = message; status.classList.toggle('bskyplus-llm-status-error', !!isError); } + function showApplied(hostname) { + grantButton.hidden = true; + setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + } + function apply(hostname) { if (!api || !api.runtime || typeof api.runtime.sendMessage !== 'function') { return Promise.reject(new Error('Image CDN could not be applied.')); @@ -135,6 +173,8 @@ function setBusy(value) { saving = value; input.disabled = value; + if (provider) provider.disabled = value; + if (popupRow) popupRow.toggle.disabled = value; saveButton.disabled = value; resetButton.disabled = value; grantButton.disabled = value; @@ -142,7 +182,16 @@ function requestAccess(hostname) { var origins = config.permissionOrigins(hostname); - if (!origins.length || !api || !api.permissions || typeof api.permissions.request !== 'function') return Promise.resolve(true); + if (!origins.length) return Promise.resolve(true); + // Firefox's embedded extension pages cannot use the permissions API. + if (!api || !api.permissions || typeof api.permissions.request !== 'function') { + return Promise.resolve().then(function () { + return api.runtime.sendMessage({ action: 'REQUEST_IMAGE_CDN_ACCESS' }); + }).then(function (response) { + if (!response || !response.success) throw new Error('Could not open the CDN permission page.'); + return response.opened ? null : response.enabled === true && response.hostname === hostname; + }); + } try { return Promise.resolve(api.permissions.request({ origins: origins })); } catch (err) { @@ -166,17 +215,21 @@ var saved = false; storageSet(api, { imageCdnHostname: hostname }).then(function () { saved = true; - input.value = hostname; + displayHostname(hostname); return requestAccess(hostname); }).then(function (granted) { + if (granted === null) { + grantButton.hidden = false; + setStatus('CDN saved. Grant access in the opened tab, then return here.', false); + return; + } if (!granted) { grantButton.hidden = !hostname; setStatus('CDN saved. Access was not granted. Choose Grant access to try again.', true); return; } return apply(hostname).then(function () { - grantButton.hidden = true; - setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + showApplied(hostname); }); }).catch(function (err) { grantButton.hidden = !(saved && hostname); @@ -187,11 +240,15 @@ } function save() { - saveValue(input.value); + if (provider && provider.value === 'custom' && !input.value.trim()) { + setStatus('Enter a CDN hostname.', true); + return; + } + saveValue(provider && provider.value !== 'custom' ? provider.value : input.value); } function reset() { - input.value = ''; + displayHostname(''); saveValue(''); } @@ -199,11 +256,15 @@ if (saving) return; setBusy(true); requestAccess(pendingHostname).then(function (granted) { + if (granted === null) { + setStatus('Grant access in the opened tab, then return here.', false); + return null; + } if (!granted) throw new Error('Access was not granted. Choose Grant access to try again.'); return apply(pendingHostname); - }).then(function () { - grantButton.hidden = true; - setStatus(pendingHostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + }).then(function (response) { + if (response === null) return; + showApplied(pendingHostname); }).catch(function (err) { grantButton.hidden = !pendingHostname; setStatus(err && err.message ? err.message : 'Could not apply image CDN.', true); @@ -215,14 +276,26 @@ saveButton.addEventListener('click', save); resetButton.addEventListener('click', reset); grantButton.addEventListener('click', retry); + function refreshAccess() { + if (saving || !pendingHostname || grantButton.hidden) return; + apply(pendingHostname).then(function () { + showApplied(pendingHostname); + }).catch(function () {}); + } + window.addEventListener('focus', refreshAccess); + if (api && api.runtime && api.runtime.onMessage) { + api.runtime.onMessage.addListener(function (message, sender) { + if (sender.id === api.runtime.id && message.action === 'IMAGE_CDN_ACCESS_GRANTED') refreshAccess(); + }); + } setBusy(true); storageGet(api, STORAGE_KEY).then(function (result) { var value = result && typeof result[STORAGE_KEY] === 'string' ? result[STORAGE_KEY] : ''; try { - input.value = config.normalizeHostname(value); + displayHostname(config.normalizeHostname(value)); pendingHostname = input.value; } catch (err) { - input.value = ''; + displayHostname(''); pendingHostname = ''; } }).catch(function () { diff --git a/extension/safari/shared/composer.js b/extension/safari/shared/composer.js index 87b73c5..55863fd 100644 --- a/extension/safari/shared/composer.js +++ b/extension/safari/shared/composer.js @@ -154,12 +154,31 @@ button.type = 'button'; button.className = 'bskyplus-preview-action'; button.dataset.method = method; - button.textContent = `+${method}`; button.setAttribute('aria-label', `Generate alt text with ${method}`); - button.innerHTML = ` - -
${method}
- ` + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('width', '10'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('height', '10'); + icon.setAttribute('style', 'color: rgb(255, 255, 255);'); + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('fill', '#FFFFFF'); + path.setAttribute('stroke', 'none'); + path.setAttribute('stroke-width', '0'); + path.setAttribute('stroke-linecap', 'butt'); + path.setAttribute('stroke-linejoin', 'miter'); + path.setAttribute('fill-rule', 'evenodd'); + path.setAttribute('clip-rule', 'evenodd'); + path.setAttribute('d', 'M12 3a1 1 0 0 1 1 1v7h7a1 1 0 1 1 0 2h-7v7a1 1 0 1 1-2 0v-7H4a1 1 0 1 1 0-2h7V4a1 1 0 0 1 1-1Z'); + icon.append(path); + + const label = document.createElement('div'); + label.dir = 'auto'; + label.className = 'css-146c3p1'; + label.setAttribute('style', 'font-size: 12px; letter-spacing: 1px; color: rgb(255, 255, 255); line-height: 16px; font-weight: 600; font-family: InterVariable, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; font-variant: no-contextual unicode;'); + label.textContent = method; + button.append(icon, label); button.addEventListener('click', event => { event.preventDefault(); event.stopPropagation(); diff --git a/extension/safari/shared/dom-utils.js b/extension/safari/shared/dom-utils.js index 24e1e5a..d701cb2 100644 --- a/extension/safari/shared/dom-utils.js +++ b/extension/safari/shared/dom-utils.js @@ -51,33 +51,30 @@ return el; } + function outlineIcon(children, strokeWidth = 2) { + return svgEl('svg', { + viewBox: '0 0 24 24', + fill: 'none', + stroke: 'currentColor', + 'stroke-width': strokeWidth, + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round' + }, children); + } + // Common SVG Icons const Icons = { download() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4' }), svgEl('polyline', { points: '7 10 12 15 17 10' }), svgEl('line', { x1: '12', y1: '15', x2: '12', y2: '3' }) ]); }, check() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2.5', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '20 6 9 17 4 12' }) - ]); + ], 2.5); }, pip() { // Font Awesome Free v7.3.1 by Fonticons, Inc. https://fontawesome.com/license/free @@ -92,68 +89,33 @@ ]); }, book() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M4 19.5A2.5 2.5 0 0 1 6.5 17H20' }), svgEl('path', { d: 'M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z' }) ]); }, markdown() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '2', y: '4', width: '20', height: '16', rx: '2' }), svgEl('path', { d: 'M6 16V8l3 4 3-4v8' }), svgEl('path', { d: 'M17 12l-2.5 3.5h5L17 12z' }) ]); }, printer() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '6 9 6 2 18 2 18 9' }), svgEl('path', { d: 'M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2' }), svgEl('rect', { x: '6', y: '14', width: '12', height: '8' }) ]); }, copy() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '9', y: '9', width: '13', height: '13', rx: '2', ry: '2' }), svgEl('path', { d: 'M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1' }) ]); }, sprout() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M7 20h10' }), svgEl('path', { d: 'M12 20v-8' }), svgEl('path', { d: 'M12 12a5 5 0 0 1 5-5h3v3a5 5 0 0 1-5 5h-3z' }), @@ -162,6 +124,28 @@ } }; + function observeDom(scan) { + const observer = new MutationObserver(scan); + const start = () => { + observer.observe(document.body, { childList: true, subtree: true }); + scan(); + }; + if (document.body) start(); + else document.addEventListener('DOMContentLoaded', start, { once: true }); + return observer; + } + + function downloadBlob(blob, filename) { + const url = URL.createObjectURL(blob); + const link = createEl('a', { href: url, download: filename, style: 'display: none;' }); + document.body.appendChild(link); + link.click(); + setTimeout(() => { + link.remove(); + URL.revokeObjectURL(url); + }, 1000); + } + // Toast Notification Helper function showToast(message, duration = 3000) { let container = document.getElementById('bskyplus-toast-container'); @@ -186,6 +170,8 @@ createEl, svgEl, Icons, + observeDom, + downloadBlob, showToast }; })(); diff --git a/extension/safari/shared/downloader.js b/extension/safari/shared/downloader.js index 48ed18e..aa7191f 100644 --- a/extension/safari/shared/downloader.js +++ b/extension/safari/shared/downloader.js @@ -5,7 +5,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const { createEl, Icons, showToast, observeDom, downloadBlob } = utils; let enabled = true; @@ -81,7 +81,7 @@ const res = await fetch(fullUrl, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename); + downloadBlob(blob, filename); } async function downloadHlsVideo(videoEl, filename) { @@ -93,7 +93,7 @@ const res = await fetch(src, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); + downloadBlob(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); return; } @@ -150,32 +150,8 @@ segmentBuffers.push(buf); } - // Calculate total length and concatenate - const totalLength = segmentBuffers.reduce((acc, b) => acc + b.byteLength, 0); - const combined = new Uint8Array(totalLength); - let offset = 0; - for (const buf of segmentBuffers) { - combined.set(new Uint8Array(buf), offset); - offset += buf.byteLength; - } - - const videoBlob = new Blob([combined], { type: 'video/mp4' }); - triggerDownload(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); - } - - function triggerDownload(blob, filename) { - const objectUrl = URL.createObjectURL(blob); - const a = createEl('a', { - href: objectUrl, - download: filename, - style: 'display: none;' - }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(objectUrl); - }, 1000); + const videoBlob = new Blob(segmentBuffers, { type: 'video/mp4' }); + downloadBlob(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); } async function handleMediaDownload(mediaEl, btn) { @@ -278,19 +254,7 @@ } // Observe DOM for newly rendered posts and media - const observer = new MutationObserver(() => { - scanForMedia(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - }); - } + observeDom(scanForMedia); window.BskyPlusDownloader = { scanForMedia, diff --git a/extension/safari/shared/emoji-picker.js b/extension/safari/shared/emoji-picker.js index 4794c97..9f31a99 100644 --- a/extension/safari/shared/emoji-picker.js +++ b/extension/safari/shared/emoji-picker.js @@ -568,17 +568,11 @@ document.addEventListener('keydown', (e) => { if (!activePicker || activePicker.style.display === 'none' || activeMatches.length === 0) return; - if (e.key === 'ArrowDown') { + if (e.key === 'ArrowDown' || e.key === 'ArrowUp') { e.preventDefault(); e.stopPropagation(); - selectedIndex = (selectedIndex + 1) % activeMatches.length; - renderPickerItems(); - const selectedEl = activePicker.querySelector('.bskyplus-selected'); - if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); - } else if (e.key === 'ArrowUp') { - e.preventDefault(); - e.stopPropagation(); - selectedIndex = (selectedIndex - 1 + activeMatches.length) % activeMatches.length; + const direction = e.key === 'ArrowDown' ? 1 : -1; + selectedIndex = (selectedIndex + direction + activeMatches.length) % activeMatches.length; renderPickerItems(); const selectedEl = activePicker.querySelector('.bskyplus-selected'); if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); diff --git a/extension/safari/shared/feature-flags.js b/extension/safari/shared/feature-flags.js index 94bb4b7..9bb56d6 100644 --- a/extension/safari/shared/feature-flags.js +++ b/extension/safari/shared/feature-flags.js @@ -25,7 +25,7 @@ enabled: true, stage: 'release', name: 'Quick Emoji Suggestions', - desc: ': (color) & emoji autocomplete like Slack' + desc: ': emoji autocomplete like Slack' }, feedWidth: { enabled: true, @@ -39,24 +39,12 @@ name: 'Fresh Account Badge', desc: 'Spot new accounts <30d, cached in IndexedDB' }, - threadUnroll: { - enabled: true, - stage: 'alpha', - name: 'Thread Unroll & Reader View', - desc: 'Distraction-free reading from 3-dot menu, export Markdown/PDF' - }, skeetMode: { enabled: true, stage: 'release', name: 'Skeet Mode', desc: 'Replaces "post" with "skeet"' }, - accentColor: { - enabled: true, - stage: 'release', - name: 'Custom Accent Color', - desc: 'Pride flag palette & custom hex accent colors' - }, localOcr: { enabled: true, stage: 'release', diff --git a/extension/safari/shared/features.css b/extension/safari/shared/features.css index 9f8e3db..94200db 100644 --- a/extension/safari/shared/features.css +++ b/extension/safari/shared/features.css @@ -2,8 +2,11 @@ Bsky+ Extended Features Stylesheet ========================================================================== */ -/* Keep embedded media and galleries contained when the feed is widened. */ -div[data-testid="contentHider-post"] > div:last-child { +/* Limit post media without constraining text or text-only quote cards. */ +[data-bskyplus-feed-column] div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] video, +[data-bskyplus-post-media] { max-width: min(100%, 600px) !important; } @@ -39,7 +42,7 @@ div[data-testid="contentHider-post"] > div:last-child { .bskyplus-media-dl-btn:hover { opacity: 1 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; border-color: rgba(255, 255, 255, 0.4) !important; transform: translateY(-1px); } @@ -73,18 +76,112 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-speed-select { - field-sizing: content; + appearance: none !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + gap: 5px !important; min-width: 0 !important; background: transparent !important; color: #fff !important; border: none !important; border-radius: 4px !important; min-height: 28px !important; + padding: 4px 7px !important; + font: inherit !important; + font-size: 12px !important; + cursor: pointer !important; +} + +.bskyplus-speed-select:hover, +.bskyplus-speed-select[aria-expanded="true"] { + background-color: rgba(255, 255, 255, 0.12) !important; +} + +.bskyplus-speed-select:focus-visible { + outline: 2px solid rgba(255, 255, 255, 0.75) !important; + outline-offset: 1px !important; +} + +.bskyplus-speed-chevron { + width: 0 !important; + height: 0 !important; + border-left: 3px solid transparent !important; + border-right: 3px solid transparent !important; + border-top: 4px solid currentColor !important; + opacity: 0.75 !important; +} + +.bskyplus-speed-menu { + position: fixed !important; + inset: auto !important; + z-index: 2147483647 !important; + min-width: 96px !important; + max-height: min(220px, calc(100vh - 16px)) !important; + overflow-y: auto !important; + flex-direction: column !important; + gap: 2px !important; + margin: 0 !important; padding: 4px !important; + background-color: #1e2936 !important; + color: #f1f3f5 !important; + border: 1px solid #2b394a !important; + border-radius: 8px !important; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.42) !important; + box-sizing: border-box !important; +} + +.bskyplus-speed-menu:not([popover]):not([hidden]) { + display: flex !important; +} + +.bskyplus-speed-menu[popover]:popover-open { + display: flex !important; +} + +.bskyplus-speed-menu[hidden] { + display: none !important; +} + +.bskyplus-speed-option { + appearance: none !important; + display: flex !important; + align-items: center !important; + justify-content: space-between !important; + width: 100% !important; + min-height: 30px !important; + margin: 0 !important; + padding: 5px 8px !important; + color: #f1f3f5 !important; + background-color: transparent !important; + border: 0 !important; + border-radius: 5px !important; font: inherit !important; font-size: 12px !important; + text-align: left !important; cursor: pointer !important; - color-scheme: dark; + box-sizing: border-box !important; +} + +.bskyplus-speed-option:hover, +.bskyplus-speed-option:focus-visible, +.bskyplus-speed-option[aria-checked="true"] { + background-color: #263342 !important; +} + +.bskyplus-speed-option:focus-visible { + outline: 2px solid #71859b !important; + outline-offset: -2px !important; +} + +.bskyplus-speed-option-check::before { + content: "✓"; + color: #f1f3f5 !important; + opacity: 0; +} + +.bskyplus-speed-option[aria-checked="true"] .bskyplus-speed-option-check::before { + opacity: 1; } .bskyplus-toolbar-btn { @@ -106,7 +203,7 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-toolbar-btn[aria-pressed="true"] { - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; color: #ffffff !important; } @@ -216,260 +313,3 @@ div[data-testid="contentHider-post"] > div:last-child { color: #fbbf24 !important; border-color: rgba(251, 191, 36, 0.4) !important; } - -/* -------------------------------------------------------------------------- - 6. Thread Unroll / Reader View - -------------------------------------------------------------------------- */ -.bskyplus-unroll-btn { - display: inline-flex !important; - align-items: center !important; - gap: 5px !important; - background: transparent !important; - border: 1px solid rgba(140, 158, 181, 0.3) !important; - color: #8c9eb5 !important; - padding: 3px 8px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - margin-left: 8px !important; - transition: all 0.15s ease !important; - user-select: none !important; -} - -.bskyplus-unroll-btn:hover { - background: rgba(16, 131, 254, 0.12) !important; - color: #1083fe !important; - border-color: #1083fe !important; -} - -.bskyplus-unroll-btn svg { - width: 13px !important; - height: 13px !important; -} - -/* 3-Dot Post Dropdown Menu Item */ -.bskyplus-unroll-menu-item { - display: flex !important; - align-items: center !important; - gap: 12px !important; - padding: 10px 14px !important; - cursor: pointer !important; - border-radius: 6px !important; - font-size: 14px !important; - font-weight: 500 !important; - color: inherit !important; - transition: background-color 0.15s ease !important; - user-select: none !important; - outline: none !important; -} - -.bskyplus-unroll-menu-item:hover, -.bskyplus-unroll-menu-item:focus { - background-color: rgba(128, 128, 128, 0.15) !important; -} - -.bskyplus-unroll-menu-item svg { - width: 18px !important; - height: 18px !important; - flex-shrink: 0 !important; -} - -/* Reader Modal Backdrop */ -.bskyplus-reader-backdrop { - position: fixed !important; - inset: 0 !important; - z-index: 2147483646 !important; - background-color: rgba(0, 0, 0, 0.75) !important; - backdrop-filter: blur(5px) !important; - display: flex !important; - justify-content: center !important; - align-items: flex-start !important; - overflow-y: auto !important; - padding: 40px 16px !important; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif !important; -} - -.bskyplus-reader-modal { - width: 100% !important; - max-width: 680px !important; - background-color: #161e27 !important; - color: #f1f3f5 !important; - border-radius: 14px !important; - border: 1px solid #2b394a !important; - box-shadow: 0 16px 48px rgba(0, 0, 0, 0.7) !important; - overflow: hidden !important; - display: flex !important; - flex-direction: column !important; -} - -.bskyplus-reader-header { - display: flex !important; - align-items: center !important; - justify-content: space-between !important; - padding: 16px 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-title { - font-size: 18px !important; - font-weight: 700 !important; - color: #fff !important; -} - -.bskyplus-reader-meta { - font-size: 12px !important; - color: #8c9eb5 !important; - margin-top: 2px !important; -} - -.bskyplus-reader-close { - background: transparent !important; - border: none !important; - color: #8c9eb5 !important; - font-size: 24px !important; - cursor: pointer !important; - padding: 4px 8px !important; - border-radius: 6px !important; - line-height: 1 !important; -} - -.bskyplus-reader-close:hover { - background-color: #263342 !important; - color: #fff !important; -} - -.bskyplus-reader-actions { - display: flex !important; - gap: 8px !important; - padding: 12px 20px !important; - background-color: #1e2936 !important; - border-bottom: 1px solid #2b394a !important; - flex-wrap: wrap !important; -} - -.bskyplus-reader-action-btn { - display: inline-flex !important; - align-items: center !important; - gap: 6px !important; - background-color: #263342 !important; - border: 1px solid #2b394a !important; - color: #f1f3f5 !important; - padding: 6px 12px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - transition: background-color 0.15s ease !important; -} - -.bskyplus-reader-action-btn:hover { - background-color: #324357 !important; - color: #fff !important; -} - -.bskyplus-reader-action-btn svg { - width: 14px !important; - height: 14px !important; - fill: currentColor !important; -} - -.bskyplus-reader-content { - padding: 24px 20px !important; - max-height: 75vh !important; - overflow-y: auto !important; -} - -.bskyplus-reader-post { - padding-bottom: 20px !important; - margin-bottom: 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-post:last-child { - border-bottom: none !important; - margin-bottom: 0 !important; - padding-bottom: 0 !important; -} - -.bskyplus-reader-post-header { - display: flex !important; - align-items: center !important; - gap: 8px !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-post-num { - font-size: 11px !important; - font-weight: 700 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; - color: #fff !important; - padding: 2px 7px !important; - border-radius: 10px !important; -} - -.bskyplus-reader-post-author { - font-size: 13px !important; - font-weight: 600 !important; - color: #8c9eb5 !important; -} - -.bskyplus-reader-post-text { - font-size: 15px !important; - line-height: 1.55 !important; - color: #f1f3f5 !important; - white-space: pre-wrap !important; - word-break: break-word !important; -} - -.bskyplus-reader-post-media { - margin-top: 12px !important; - border-radius: 8px !important; - overflow: hidden !important; -} - -.bskyplus-reader-img { - max-width: 100% !important; - max-height: 480px !important; - border-radius: 8px !important; - display: block !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-video { - max-width: 100% !important; - border-radius: 8px !important; - display: block !important; -} - -/* Clean Print / PDF Export Styling */ -@media print { - body * { - visibility: hidden !important; - } - .bskyplus-reader-backdrop, - .bskyplus-reader-modal, - .bskyplus-reader-modal * { - visibility: visible !important; - } - .bskyplus-reader-backdrop { - position: absolute !important; - inset: 0 !important; - background: #ffffff !important; - padding: 0 !important; - } - .bskyplus-reader-modal { - box-shadow: none !important; - border: none !important; - background: #ffffff !important; - color: #000000 !important; - max-width: 100% !important; - } - .bskyplus-reader-actions, - .bskyplus-reader-close { - display: none !important; - } - .bskyplus-reader-post-text { - color: #000000 !important; - } -} diff --git a/extension/safari/shared/feed-width.js b/extension/safari/shared/feed-width.js index 07b2c56..e6a8244 100644 --- a/extension/safari/shared/feed-width.js +++ b/extension/safari/shared/feed-width.js @@ -7,9 +7,68 @@ 'use strict'; const STYLE_ID = 'bskyplus-feed-width-style'; + const TRANSITION_STYLE_ID = 'bskyplus-feed-width-transition-style'; + const TRANSITION_ATTRIBUTE = 'data-bskyplus-feed-width-animating'; + const TRANSITION_DURATION = 800; + const TRANSITION_TARGETS = [ + 'div[style*="max-width: 600px"]', + 'div[style*="max-width:600px"]', + 'div[style*="max-width: 550px"]', + 'div[style*="max-width:550px"]', + '[data-bskyplus-feed-column]', + '[role="tablist"]', + '[data-bskyplus-tablist]', + '[data-bskyplus-center-borders]', + 'div[style*="width: 602px"]', + 'div[style*="width:602px"]', + '[data-bskyplus-left-nav]', + 'div[role="navigation"]:not([style*="bottom:"])', + 'nav[role="navigation"]:not([style*="bottom:"])', + '[data-bskyplus-right-nav]', + 'div[style*="translateX(300px)"]', + 'div[style*="translateX(195px)"]', + '[data-bskyplus-settings-page]' + ].join(', '); let currentConfiguredWidth = 600; let currentEffectiveWidth = 600; let hasLiveWidthUpdate = false; + let transitionTimeout; + + function startWidthTransition() { + if (!isFeatureActive() || window.matchMedia?.('(prefers-reduced-motion: reduce)').matches) return; + + let style = document.getElementById(TRANSITION_STYLE_ID); + if (!style) { + style = document.createElement('style'); + style.id = TRANSITION_STYLE_ID; + style.textContent = ` + @media (prefers-reduced-motion: no-preference) { + html[${TRANSITION_ATTRIBUTE}] :is(${TRANSITION_TARGETS}) { + transition: max-width ${TRANSITION_DURATION}ms ease, + width ${TRANSITION_DURATION}ms ease, + margin-left ${TRANSITION_DURATION}ms ease, + margin-right ${TRANSITION_DURATION}ms ease !important; + } + } + `; + (document.head || document.documentElement).appendChild(style); + } + + const root = document.documentElement; + if (root.getAttribute(TRANSITION_ATTRIBUTE) === null) { + root.setAttribute(TRANSITION_ATTRIBUTE, ''); + // Apply the transition before changing widths, including the first live update. + document.querySelectorAll(TRANSITION_TARGETS).forEach(element => { + window.getComputedStyle(element).transitionDuration; + }); + } + + if (transitionTimeout) window.clearTimeout?.(transitionTimeout); + transitionTimeout = window.setTimeout?.(() => { + root.removeAttribute(TRANSITION_ATTRIBUTE); + transitionTimeout = undefined; + }, TRANSITION_DURATION + 50); + } function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -55,6 +114,17 @@ return document.querySelector('div[role="navigation"]:not([style*="bottom:"]), nav[role="navigation"]:not([style*="bottom:"])'); } + function findFixedAncestor(element) { + let parent = element?.parentElement; + while (parent && parent !== document.body && parent !== document.documentElement) { + const style = parent.getAttribute('style') || ''; + if (style.includes('position: fixed') || style.includes('position:fixed') || style.includes('translateX') || + window.getComputedStyle?.(parent)?.position === 'fixed') return parent; + parent = parent.parentElement; + } + return null; + } + function findRightNav() { // 1. Direct match on Bluesky's desktop fixed right column transform const direct = document.querySelector('div[style*="translateX(300px)"], div[style*="translateX( 300px)"], div[style*="translateX(195px)"], div[style*="translateX( 195px)"]'); @@ -73,50 +143,17 @@ // 2. Check via desktop search input const searchInput = document.querySelector('input[placeholder*="Search" i], input[aria-label*="Search" i]'); - if (searchInput) { - let parent = searchInput.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } + const searchNav = findFixedAncestor(searchInput); + if (searchNav) return searchNav; // 3. Check via desktop right sidebar links (privacy policy, terms, etc.) const privacyLink = document.querySelector('a[href*="privacy-policy"], a[href*="tos"], a[href*="zendesk.com"]'); - if (privacyLink) { - let parent = privacyLink.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } - - return null; + return findFixedAncestor(privacyLink); } function findCenterBorders() { - const borders = document.querySelectorAll('div[style*="602px"], div[style*="602 px"]'); - for (const el of borders) { - return el; - } + const borders = document.querySelector('div[style*="602px"], div[style*="602 px"]'); + if (borders) return borders; const borderCandidates = document.querySelectorAll('div[style*="border-left-width"][style*="border-right-width"], div[style*="translateX(-50%)"]'); for (const el of borderCandidates) { if (el.children.length === 0) { @@ -184,8 +221,11 @@ } function clearLayoutTags() { - const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist]'); + const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist], [data-bskyplus-post-media]'); tagged.forEach(el => { + if (el.dataset && el.dataset.bskyplusPostMedia) { + delete el.dataset.bskyplusPostMedia; + } if (el.dataset && el.dataset.bskyplusLeftNav) { if (el.style && el.style.removeProperty) el.style.removeProperty('margin-left'); delete el.dataset.bskyplusLeftNav; @@ -238,6 +278,30 @@ } } + function setColumnWidth(element, width) { + if (!element.style?.setProperty) return; + element.style.setProperty('max-width', `${width}px`, 'important'); + element.style.setProperty('margin-left', 'auto', 'important'); + element.style.setProperty('margin-right', 'auto', 'important'); + element.style.setProperty('width', '100%', 'important'); + } + + function tagPostMedia() { + document.querySelectorAll('[data-testid="contentHider-post"]').forEach(post => { + for (const child of post.children) { + const hasMedia = !child.querySelector('[data-testid="postText"]') && ( + child.querySelector('video') || + Array.from(child.querySelectorAll('img')).some(image => !image.closest('[data-testid="userAvatarImage"]')) + ); + if (hasMedia) { + child.dataset.bskyplusPostMedia = 'true'; + } else if (child.dataset.bskyplusPostMedia) { + delete child.dataset.bskyplusPostMedia; + } + } + }); + } + function scanAndTagLayout(effectiveWidth) { if (!isFeatureActive() || effectiveWidth === 600) { clearLayoutTags(); @@ -285,12 +349,7 @@ } el.dataset.bskyplusFeedColumn = 'true'; } - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - el.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(el, effectiveWidth); } }); @@ -298,12 +357,7 @@ const tablists = document.querySelectorAll('div[role="tablist"], [role="tablist"]'); tablists.forEach(el => { if (el.dataset) el.dataset.bskyplusTablist = 'true'; - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('width', '100%', 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - } + setColumnWidth(el, effectiveWidth); // Check parent header wrappers and feed column parents let parent = el.parentElement; @@ -312,12 +366,7 @@ const pStyle = parent.getAttribute('style') || ''; if (isTagged || /max-width:\s*(550|600)px/i.test(pStyle)) { if (parent.dataset) parent.dataset.bskyplusFeedColumn = 'true'; - if (parent.style && parent.style.setProperty) { - parent.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - parent.style.setProperty('margin-left', 'auto', 'important'); - parent.style.setProperty('margin-right', 'auto', 'important'); - parent.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(parent, effectiveWidth); } if (parent.getAttribute('data-bskyplus-left-nav') || parent.getAttribute('data-bskyplus-right-nav')) { break; @@ -326,6 +375,8 @@ } }); + tagPostMedia(); + // Child positions differ between feeds and notifications. The column's // width constraint above identifies it without resizing avatar columns. } @@ -403,6 +454,7 @@ function applyLiveFeedWidth(width) { hasLiveWidthUpdate = true; + startWidthTransition(); // A live reset to 600 breaks the layout. Keep the saved default for reloads. updateFeedWidthStyle(width === 600 ? 599 : width); if (isFeatureActive() && width) currentConfiguredWidth = width; diff --git a/extension/safari/shared/integrated-settings-rules.json b/extension/safari/shared/integrated-settings-rules.json index 82644b1..9653c25 100644 --- a/extension/safari/shared/integrated-settings-rules.json +++ b/extension/safari/shared/integrated-settings-rules.json @@ -10,5 +10,29 @@ "regexFilter": "^https://bsky\\.app/bskyplus/?(\\?.*)?$", "resourceTypes": ["main_frame"] } + }, + { + "id": 3, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=infrastructure" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/infrastructure/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } + }, + { + "id": 2, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=theme" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/theme/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } } ] diff --git a/extension/safari/shared/integrated-settings.css b/extension/safari/shared/integrated-settings.css index b397a81..0fd4dcd 100644 --- a/extension/safari/shared/integrated-settings.css +++ b/extension/safari/shared/integrated-settings.css @@ -90,6 +90,23 @@ color-scheme: normal; } +[data-bskyplus-theme-link] { + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + min-height: 56px; + padding: 8px 20px; + border-bottom: 1px solid color-mix(in srgb, currentColor 15%, transparent); + color: var(--bskyplus-theme-text, inherit); + font-size: 15px; + text-decoration: none; +} + +[data-bskyplus-theme-link]:hover { + background: color-mix(in srgb, currentColor 6%, transparent); +} + [data-bskyplus-settings-page] header a { display: grid; place-items: center; @@ -106,3 +123,35 @@ outline: 2px solid currentColor; outline-offset: -2px; } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: inherit; + background: #151d28; + box-shadow: 0 12px 48px #0008; + font: 14px/1.5 InterVariable, system-ui, sans-serif; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-dialog h2 { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-dialog p { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } diff --git a/extension/safari/shared/integrated-settings.js b/extension/safari/shared/integrated-settings.js index 0863650..ce8d3f8 100644 --- a/extension/safari/shared/integrated-settings.js +++ b/extension/safari/shared/integrated-settings.js @@ -8,14 +8,31 @@ let scheduled = false; let settingsFrame; let nativeCenter; + let nativeTitle; let centerObserver; - let bootstrapRequested = location.pathname === '/settings' && - new URLSearchParams(location.search).get('bskyplus') === '1'; + function bootstrapPath() { + const value = new URLSearchParams(location.search).get('bskyplus'); + return value === 'theme' ? '/bskyplus/theme' : ['1', 'infrastructure'].includes(value) ? '/bskyplus' : null; + } + let bootstrapRequested = location.pathname === '/settings' ? bootstrapPath() : null; + + function settingsReference() { + return document.querySelector('a[href="/settings/about"]') || + document.querySelector('a[href="/settings/account"]'); + } + + function navigate(event, path) { + if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; + event.preventDefault(); + history.pushState(history.state, '', path); + update(); + page?.querySelector('h1')?.focus(); + window.scrollTo(0, 0); + } function addSettingsLink() { if (document.querySelector('[data-bskyplus-settings-link]')) return; - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + const reference = settingsReference(); if (!reference) return; const link = document.createElement('a'); @@ -55,15 +72,16 @@ label.dataset.bskyplusSettingsLabel = ''; label.textContent = 'Bsky+'; const nativeLabel = reference.querySelector('[dir="auto"]') || reference; - link.style.color = getComputedStyle(nativeLabel).color; + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(nativeLabel).color})`; const chevron = document.createElement('div'); chevron.dataset.bskyplusSettingsChevron = ''; chevron.setAttribute('aria-hidden', 'true'); const nativeChevron = reference.querySelector('svg:last-child'); const nativeIcons = reference.querySelectorAll('svg'); - chevron.style.color = nativeIcons.length > 1 + const chevronColor = nativeIcons.length > 1 ? getComputedStyle(nativeIcons[nativeIcons.length - 1]).color : getComputedStyle(nativeChevron || nativeLabel).color; + chevron.style.color = `var(--bskyplus-theme-muted, ${chevronColor})`; const arrow = document.createElementNS(svgNamespace, 'svg'); arrow.setAttribute('viewBox', '0 0 24 24'); arrow.setAttribute('width', '18'); @@ -79,32 +97,37 @@ iconWrapper.append(icon); row.append(iconWrapper, label, chevron); link.append(row); - link.addEventListener('click', event => { - if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; - event.preventDefault(); - history.pushState(history.state, '', '/bskyplus'); - update(); - page?.querySelector('h1')?.focus(); - window.scrollTo(0, 0); - }); + link.addEventListener('click', event => navigate(event, '/bskyplus')); const firstRow = Array.from(reference.parentElement.children) .find(element => element.matches('a[href^="/settings/"]')) || reference; firstRow.before(link); } function unmountPage() { + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: null })); centerObserver?.disconnect(); centerObserver = nativeCenter = undefined; host?.removeAttribute('data-bskyplus-settings-host'); page?.remove(); settingsFrame = undefined; - if (previousTitle !== undefined && document.title === 'Bsky+ — Bluesky') { + if (previousTitle !== undefined && ['Bsky+ — Bluesky', 'Theme editor — Bsky+'].includes(document.title)) { document.title = previousTitle; } - host = page = undefined; + host = page = nativeTitle = undefined; previousTitle = undefined; } + function syncSettingsLinkColors() { + const link = document.querySelector('[data-bskyplus-settings-link]'); + const reference = settingsReference(); + if (!link || !reference) return; + const label = reference.querySelector('[dir="auto"]') || reference; + const icons = reference.querySelectorAll('svg'); + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(label).color})`; + const chevron = link.querySelector('[data-bskyplus-settings-chevron]'); + chevron.style.color = `var(--bskyplus-theme-muted, ${getComputedStyle(icons.length > 1 ? icons[icons.length - 1] : label).color})`; + } + function findNativeCenter(reference) { const content = reference?.closest('#content'); let candidate; @@ -133,38 +156,54 @@ syncAlignment(); } - function mountPage() { - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + function mountPage(path) { + const themePage = path === '/bskyplus/theme'; + const pageTitle = themePage ? 'Theme editor' : 'Bsky+'; + const reference = settingsReference(); const screen = reference?.closest('#content')?.parentElement || document.querySelector('[data-testid="notFoundView"]'); if (!screen) return; - if (host !== screen || !page?.isConnected) { + if (host !== screen || !page?.isConnected || page.dataset.bskyplusSettingsPage !== path) { unmountPage(); host = screen; previousTitle = document.title; - const nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); + nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); page = document.createElement('section'); - page.dataset.bskyplusSettingsPage = ''; - page.setAttribute('aria-label', 'Bsky+'); - if (nativeTitle) page.style.color = getComputedStyle(nativeTitle).color; + page.dataset.bskyplusSettingsPage = path; + page.setAttribute('aria-label', pageTitle); + syncPageColor(); const header = document.createElement('header'); const back = document.createElement('a'); - back.href = '/settings'; + back.href = themePage ? '/bskyplus' : '/settings'; + if (themePage) back.addEventListener('click', event => navigate(event, '/bskyplus')); back.textContent = '←'; - back.setAttribute('aria-label', 'Back to Settings'); + back.setAttribute('aria-label', themePage ? 'Back to Bsky+ settings' : 'Back to Settings'); const title = document.createElement('h1'); - title.textContent = 'Bsky+'; + title.textContent = pageTitle; title.tabIndex = -1; header.append(back, title); page.append(header); + if (!themePage) { + const themeLink = document.createElement('a'); + themeLink.href = '/bskyplus/theme'; + themeLink.dataset.bskyplusThemeLink = ''; + const label = document.createElement('span'); + label.textContent = 'Theme editor'; + const arrow = document.createElement('span'); + arrow.textContent = '›'; + arrow.setAttribute('aria-hidden', 'true'); + themeLink.append(label, arrow); + themeLink.addEventListener('click', event => navigate(event, '/bskyplus/theme')); + page.append(themeLink); + } const api = typeof browser !== 'undefined' ? browser : globalThis.chrome; if (api?.runtime?.getURL) { settingsFrame = document.createElement('iframe'); settingsFrame.dataset.bskyplusSettingsFrame = ''; - settingsFrame.title = 'Bsky+ settings'; - settingsFrame.src = api.runtime.getURL('shared/settings-frame.html'); + settingsFrame.title = themePage ? 'Bsky+ ' + pageTitle : 'Bsky+ settings'; + settingsFrame.src = api.runtime.getURL('shared/settings-frame.html') + + (themePage ? '?section=theme' : ''); settingsFrame.referrerPolicy = 'no-referrer'; settingsFrame.addEventListener('load', sendTheme); page.append(settingsFrame); @@ -173,11 +212,22 @@ host.append(page); } trackNativeCenter(findNativeCenter(reference) || screen.firstElementChild); - if (document.title !== 'Bsky+ — Bluesky') document.title = 'Bsky+ — Bluesky'; + const title = themePage ? pageTitle + ' — Bsky+' : 'Bsky+ — Bluesky'; + if (document.title !== title) document.title = title; + } + + function syncPageColor() { + if (!page) return; + // The sampled heading may already be themed. Use the palette variable so + // the runtime cannot translate that resolved color a second time. + const fallback = nativeTitle?.isConnected ? getComputedStyle(nativeTitle).color : 'inherit'; + const color = `var(--bskyplus-theme-text, ${fallback})`; + if (page.style.color !== color) page.style.color = color; } function sendTheme() { if (!settingsFrame?.contentWindow || !page) return; + syncPageColor(); let background = 'rgb(255, 255, 255)'; for (let element = page; element; element = element.parentElement) { const value = getComputedStyle(element).backgroundColor; @@ -191,27 +241,81 @@ }, '*'); } + function showAppviewRestartPrompt() { + if (document.querySelector('dialog[data-bskyplus-appview-restart]')) return; + const dialog = document.createElement('dialog'); + dialog.className = 'bskyplus-appview-restart-dialog'; + dialog.dataset.bskyplusAppviewRestart = ''; + dialog.setAttribute('aria-labelledby', 'bskyplusAppviewRestartTitle'); + const form = document.createElement('form'); + form.method = 'dialog'; + const title = document.createElement('h2'); + title.id = 'bskyplusAppviewRestartTitle'; + title.textContent = 'Restart Bluesky'; + const message = document.createElement('p'); + message.textContent = 'The AppView changed. Bluesky needs to restart to use the new provider.'; + const actions = document.createElement('div'); + actions.className = 'bskyplus-appview-restart-actions'; + const confirm = document.createElement('button'); + confirm.type = 'submit'; + confirm.value = 'ok'; + confirm.textContent = 'OK'; + actions.append(confirm); + form.append(title, message, actions); + dialog.append(form); + dialog.addEventListener('cancel', event => event.preventDefault()); + dialog.addEventListener('close', () => { + const confirmed = dialog.returnValue === 'ok'; + dialog.remove(); + if (confirmed) window.location.reload(); + }, { once: true }); + const foreground = page ? getComputedStyle(page).color : ''; + if (foreground) dialog.style.color = foreground; + for (let node = page; node; node = node.parentElement) { + const background = getComputedStyle(node).backgroundColor; + if (background && background !== 'transparent' && background !== 'rgba(0, 0, 0, 0)') { + dialog.style.backgroundColor = background; + break; + } + } + document.body.append(dialog); + dialog.showModal(); + confirm.focus(); + } + window.addEventListener('message', event => { - if (!settingsFrame || event.source !== settingsFrame.contentWindow || - event.data?.type !== 'BSKYPLUS_SETTINGS_HEIGHT') return; - const height = event.data.height; - if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { - settingsFrame.style.height = `${Math.ceil(height)}px`; + if (!settingsFrame || event.source !== settingsFrame.contentWindow) return; + if (event.data?.type === 'BSKYPLUS_SETTINGS_HEIGHT') { + const height = event.data.height; + if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { + settingsFrame.style.height = `${Math.ceil(height)}px`; + } + } else if (event.data?.type === 'BSKYPLUS_APPVIEW_RESTART') { + showAppviewRestartPrompt(); + } else if (event.data?.type === 'BSKYPLUS_THEME_PREVIEW') { + const model = globalThis.BskyPlusThemes; + if (!model) return; + let theme = null; + if (event.data.theme !== null) { + try { theme = model.validateTheme(event.data.theme); } + catch { return; } + } + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: theme })); } }); function update() { scheduled = false; const path = location.pathname.replace(/\/$/, ''); - const bootstrap = path === '/settings' && (bootstrapRequested || - new URLSearchParams(location.search).get('bskyplus') === '1'); - if (path === '/bskyplus' || bootstrap) { - mountPage(); + const bootstrap = path === '/settings' && (bootstrapRequested || bootstrapPath()); + if (path === '/bskyplus' || path === '/bskyplus/theme' || path === '/bskyplus/infrastructure' || bootstrap) { + const targetPath = path === '/bskyplus/infrastructure' ? '/bskyplus' : bootstrap || path; + mountPage(targetPath); // Let Bluesky mount its Settings screen before claiming the URL. A // request rule bootstraps hard loads because the server rejects /bskyplus. - if (bootstrap && page?.isConnected) { - bootstrapRequested = false; - history.replaceState(history.state, '', '/bskyplus'); + if ((bootstrap || path === '/bskyplus/infrastructure') && page?.isConnected) { + bootstrapRequested = null; + history.replaceState(history.state, '', targetPath); } } else { @@ -231,8 +335,12 @@ childList: true, subtree: true, }); - window.addEventListener('popstate', scheduleUpdate); + window.addEventListener('popstate', update); window.addEventListener('pageshow', scheduleUpdate); window.addEventListener('resize', scheduleUpdate); + window.addEventListener('bskyplus:theme-changed', () => { + syncSettingsLinkColors(); + sendTheme(); + }); scheduleUpdate(); })(); diff --git a/extension/safari/shared/llm-settings.css b/extension/safari/shared/llm-settings.css index 0f37884..f84f5b4 100644 --- a/extension/safari/shared/llm-settings.css +++ b/extension/safari/shared/llm-settings.css @@ -32,7 +32,43 @@ } .bskyplus-llm-input:focus { - border-color: var(--accent-default, #1083fe); + border-color: #1083fe; +} + +.bskyplus-llm-prompt-heading { + display: flex; + align-items: center; + justify-content: flex-start; + gap: 5px; +} + +.bskyplus-llm-prompt-heading .switch { + width: 32px; + height: 18px; + border-radius: 999px; +} + +.bskyplus-llm-prompt-heading .switch::before { + top: 3px; + left: 3px; + width: 12px; + height: 12px; +} + +.bskyplus-llm-prompt-heading .switch:checked::before { + transform: translateX(14px); +} + +.bskyplus-llm-prompt-input { + box-sizing: border-box; + min-height: 0; + overflow-y: hidden; + line-height: 1.45; + resize: none; +} + +.bskyplus-llm-prompt-input:disabled { + cursor: not-allowed; } .bskyplus-llm-actions { @@ -41,15 +77,44 @@ margin-top: 2px; } -.bskyplus-llm-save { - min-width: 72px; +.bskyplus-llm-key-row, +.bskyplus-appview-provider-row { + display: grid; + align-items: stretch; + gap: 8px; +} + +.bskyplus-llm-key-row { + grid-template-columns: minmax(0, 4fr) minmax(0, 1fr); +} + +.bskyplus-appview-provider-row { + grid-template-columns: minmax(0, 7fr) minmax(0, 3fr); +} + +.bskyplus-appview-provider-row > select, +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > input, +.bskyplus-llm-key-row > .bskyplus-llm-save { + min-width: 0; + width: 100%; +} + +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > .bskyplus-llm-save { + padding-inline: 4px; + border-radius: 8px; +} + +.bskyplus-appview-provider-row > button { + white-space: nowrap; } .bskyplus-llm-status { min-height: 14px; margin-top: 8px; font-size: 11px; - color: var(--accent-default, #1083fe); + color: #1083fe; } .bskyplus-llm-status-error { @@ -62,3 +127,94 @@ line-height: 1.4; color: var(--text-secondary, #8c9eb5); } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: var(--text-primary, #f1f3f5); + background: var(--bg-primary, #151d28); + box-shadow: 0 12px 48px #0008; + font-size: 14px; + line-height: 1.5; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-title { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-message { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions > button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions > button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } + +/* Shared controls must retain native hidden behavior in flex field layouts. */ +.bskyplus-llm-field[hidden] { + display: none; +} + +select.bskyplus-llm-input option { + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); +} + +.bskyplus-popup-feature .toggle-label { + column-gap: 0; +} + +.bskyplus-bookmarks-info { + display: inline-flex; + align-items: center; + justify-content: center; + flex: 0 0 12px; + width: 12px; + height: 12px; + padding: 0; + margin-left: 3px; + transform: translateY(-9%); + border: 1px solid var(--text-secondary, #8c9eb5); + border-radius: 50%; + background: transparent; + color: var(--text-secondary, #8c9eb5); + font-size: 9px; + font-weight: 600; + line-height: 1; + cursor: help; +} + +.bskyplus-bookmarks-info:hover, +.bskyplus-bookmarks-info:focus-visible { + color: var(--text-primary, #f1f3f5); + border-color: currentColor; +} + +.bskyplus-bookmarks-tooltip { + position: fixed; + z-index: 1000; + width: min(360px, calc(100vw - 16px)); + max-height: calc(100vh - 16px); + overflow: auto; + padding: 12px; + border: 1px solid var(--border-color, #2b394a); + border-radius: 10px; + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); + box-shadow: 0 6px 24px #0005; + font-size: 12px; + font-weight: 400; + line-height: 1.5; + user-select: text; +} diff --git a/extension/safari/shared/llm-settings.js b/extension/safari/shared/llm-settings.js index 82f61bd..3e8c084 100644 --- a/extension/safari/shared/llm-settings.js +++ b/extension/safari/shared/llm-settings.js @@ -26,7 +26,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -108,25 +111,13 @@ .then(function (res) { return res || {}; }, function () { return {}; }); } - function storageSet(api, value) { - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') { - result.then(resolve, reject); - return; - } - if (api.runtime && api.runtime.lastError) { - reject(new Error(api.runtime.lastError.message || 'Storage write failed')); - return; - } - reject(new Error('Storage did not confirm the write')); - }); + async function storageSet(api, value) { + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + if (api.runtime && api.runtime.lastError) { + throw new Error(api.runtime.lastError.message || 'Storage write failed'); + } + throw new Error('Storage did not confirm the write'); } function field(labelText, input) { @@ -140,6 +131,17 @@ return row; } + function makeInput(type, id, placeholder) { + var input = document.createElement('input'); + input.type = type; + input.id = id; + input.className = 'bskyplus-llm-input'; + input.placeholder = placeholder; + input.autocomplete = 'off'; + input.spellcheck = false; + return input; + } + function mount() { if (document.querySelector('.bskyplus-llm-section')) return null; @@ -158,33 +160,83 @@ subtitle.textContent = 'OpenAI-compatible vision chat/completions endpoint'; section.appendChild(subtitle); - var endpointInput = document.createElement('input'); - endpointInput.type = 'url'; - endpointInput.id = 'bskyplusLlmEndpoint'; - endpointInput.className = 'bskyplus-llm-input'; - endpointInput.placeholder = 'https://api.openai.com/v1/chat/completions'; - endpointInput.autocomplete = 'off'; - endpointInput.spellcheck = false; - - var modelInput = document.createElement('input'); - modelInput.type = 'text'; - modelInput.id = 'bskyplusLlmModel'; - modelInput.className = 'bskyplus-llm-input'; - modelInput.placeholder = 'gpt-4o-mini (optional)'; - modelInput.autocomplete = 'off'; - modelInput.spellcheck = false; - - var apiKeyInput = document.createElement('input'); - apiKeyInput.type = 'password'; - apiKeyInput.id = 'bskyplusLlmApiKey'; - apiKeyInput.className = 'bskyplus-llm-input'; - apiKeyInput.placeholder = 'API key (optional)'; - apiKeyInput.autocomplete = 'off'; - apiKeyInput.spellcheck = false; + var endpointInput = makeInput('url', 'bskyplusLlmEndpoint', 'https://api.openai.com/v1/chat/completions'); + var modelInput = makeInput('text', 'bskyplusLlmModel', 'gpt-4o-mini (optional)'); + var apiKeyInput = makeInput('password', 'bskyplusLlmApiKey', 'API key (optional)'); + var customPromptToggle = document.createElement('input'); + customPromptToggle.type = 'checkbox'; + customPromptToggle.id = 'bskyplusLlmUseCustomPrompt'; + customPromptToggle.className = 'switch'; + customPromptToggle.setAttribute('aria-label', 'Enable custom prompt'); + var customPromptPlaceholder = 'Write instructions for describing the image'; + var savedCustomPrompt = ''; + var customPromptInput = document.createElement('textarea'); + customPromptInput.id = 'bskyplusLlmCustomPrompt'; + customPromptInput.className = 'bskyplus-llm-input bskyplus-llm-prompt-input'; + customPromptInput.rows = 2; + customPromptInput.disabled = true; + customPromptInput.placeholder = ''; + customPromptInput.spellcheck = true; + var customPromptField = document.createElement('div'); + customPromptField.className = 'bskyplus-llm-field'; + var customPromptHeading = document.createElement('div'); + customPromptHeading.className = 'bskyplus-llm-prompt-heading'; + var customPromptTitle = document.createElement('span'); + customPromptTitle.id = 'bskyplusLlmCustomPromptTitle'; + customPromptTitle.className = 'bskyplus-llm-label'; + customPromptTitle.textContent = 'Custom prompt'; + customPromptInput.setAttribute('aria-labelledby', customPromptTitle.id); + customPromptToggle.setAttribute('aria-controls', customPromptInput.id); + customPromptHeading.append(customPromptTitle, customPromptToggle); + customPromptField.append(customPromptHeading, customPromptInput); + function resizeCustomPrompt() { + if (!customPromptInput.isConnected) return; + customPromptInput.style.height = 'auto'; + var styles = window.getComputedStyle(customPromptInput); + var borders = parseFloat(styles.borderTopWidth) + parseFloat(styles.borderBottomWidth); + customPromptInput.style.height = (customPromptInput.scrollHeight + borders) + 'px'; + } + function updateCustomPromptAvailability() { + var enabled = customPromptToggle.checked; + customPromptInput.disabled = !enabled; + customPromptInput.value = enabled ? savedCustomPrompt : ''; + customPromptInput.placeholder = enabled ? customPromptPlaceholder : ''; + resizeCustomPrompt(); + } + customPromptToggle.addEventListener('change', function () { + if (!customPromptToggle.checked) savedCustomPrompt = customPromptInput.value; + updateCustomPromptAvailability(); + }); + customPromptInput.addEventListener('input', function () { + savedCustomPrompt = customPromptInput.value; + resizeCustomPrompt(); + }); + window.addEventListener('resize', resizeCustomPrompt); + if (typeof ResizeObserver === 'function') { + var promptFieldWidth = 0; + var promptFieldObserver = new ResizeObserver(function (entries) { + var width = entries[0]?.contentRect.width || 0; + if (width === promptFieldWidth) return; + promptFieldWidth = width; + resizeCustomPrompt(); + }); + promptFieldObserver.observe(customPromptField); + } section.appendChild(field('Endpoint URL', endpointInput)); section.appendChild(field('Model', modelInput)); - section.appendChild(field('API key', apiKeyInput)); + var apiKeyField = document.createElement('div'); + apiKeyField.className = 'bskyplus-llm-field'; + var apiKeyLabel = document.createElement('label'); + apiKeyLabel.className = 'bskyplus-llm-label'; + apiKeyLabel.htmlFor = apiKeyInput.id; + apiKeyLabel.textContent = 'API key'; + var apiKeyRow = document.createElement('div'); + apiKeyRow.className = 'bskyplus-llm-key-row'; + apiKeyRow.appendChild(apiKeyInput); + apiKeyField.append(apiKeyLabel, apiKeyRow); + section.appendChild(apiKeyField); + section.appendChild(customPromptField); var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -194,7 +246,7 @@ saveButton.className = 'secondary-btn bskyplus-llm-save'; saveButton.textContent = 'Save'; saveButton.disabled = true; - actions.appendChild(saveButton); + apiKeyRow.appendChild(saveButton); var grantButton = document.createElement('button'); grantButton.type = 'button'; grantButton.className = 'secondary-btn bskyplus-llm-grant'; @@ -202,6 +254,92 @@ grantButton.hidden = true; actions.appendChild(grantButton); var pendingPermissionRequest = null; + var saveQueue = Promise.resolve(); + var editVersion = 0; + var dirtyFields = Object.create(null); + var draftRevisions = Object.create(null); + var settingsReady = Promise.resolve(); + + function queueSettingsSave(patch, message) { + if (!api) return Promise.reject(new Error('Settings storage is unavailable')); + var version = editVersion; + var revisions = Object.assign({}, draftRevisions); + saveQueue = saveQueue.catch(function () {}).then(async function () { + await settingsReady; + var saved = await storageGet(api, STORAGE_KEY); + var settings = normalizeSettings(saved[STORAGE_KEY]); + if (featureRow && typeof settings.enabled !== 'boolean') { + settings.enabled = validateEndpoint(settings.endpoint).ok; + } + Object.keys(patch).forEach(function (key) { settings[key] = patch[key]; }); + await storageSet(api, { llm: settings }); + Object.keys(patch).forEach(function (key) { + if (dirtyFields[key] && revisions[key] === draftRevisions[key]) dirtyFields[key] = false; + }); + if (version === editVersion) setStatus(message || '', false); + return settings; + }); + return saveQueue; + } + + function persistField(key, value) { + editVersion += 1; + return queueSettingsSave({ [key]: value }, 'Draft saved.'); + } + + function persistDraft() { + var patch = {}; + Object.keys(dirtyFields).forEach(function (key) { + if (dirtyFields[key]) patch[key] = draftValue(key); + }); + if (!Object.keys(patch).length) return Promise.resolve(); + editVersion += 1; + return queueSettingsSave(patch, 'Draft saved.'); + } + + function draftValue(key) { + if (key === 'endpoint') return endpointInput.value.trim(); + if (key === 'model') return modelInput.value.trim(); + if (key === 'apiKey') return apiKeyInput.value; + if (key === 'useCustomPrompt') return customPromptToggle.checked; + if (key === 'customPrompt') return savedCustomPrompt; + return undefined; + } + + function trackDraft(input, key) { + function markDirty() { + dirtyFields[key] = true; + draftRevisions[key] = (draftRevisions[key] || 0) + 1; + editVersion += 1; + } + input.addEventListener('input', markDirty); + input.addEventListener('change', markDirty); + input.addEventListener('blur', function () { + if (!dirtyFields[key]) return; + persistField(key, draftValue(key)).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + } + + trackDraft(endpointInput, 'endpoint'); + trackDraft(modelInput, 'model'); + trackDraft(apiKeyInput, 'apiKey'); + trackDraft(customPromptInput, 'customPrompt'); + customPromptToggle.addEventListener('change', function () { + dirtyFields.useCustomPrompt = true; + draftRevisions.useCustomPrompt = (draftRevisions.useCustomPrompt || 0) + 1; + editVersion += 1; + persistField('useCustomPrompt', customPromptToggle.checked).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + window.addEventListener('blur', function () { persistDraft().catch(function () {}); }); + window.addEventListener('pagehide', function () { persistDraft().catch(function () {}); }); + document.addEventListener('visibilitychange', function () { + if (document.hidden) persistDraft().catch(function () {}); + }); + section.appendChild(actions); var status = document.createElement('p'); @@ -227,12 +365,47 @@ document.body.appendChild(section); } + var featureRow = globalThis.BskyPlusFeatureRow?.(section, 'AI Alt Text (LLM)', 'Generate image descriptions with AI', 'llmEnabledToggle', 'altTextSection'); + if (featureRow) { + featureRow.addTooltip(() => notice.textContent); + notice.remove(); + featureRow.toggle.disabled = true; + featureRow.toggle.addEventListener('change', async function () { + var enabled = featureRow.toggle.checked; + featureRow.toggle.disabled = true; + saveButton.disabled = true; + try { + await queueSettingsSave({ enabled: enabled }, ''); + setStatus('', false); + } catch { + featureRow.setEnabled(!enabled); + setStatus('Could not change LLM settings. Try again.', true); + } finally { + featureRow.toggle.disabled = false; + saveButton.disabled = false; + } + }); + api?.storage?.onChanged?.addListener(function (changes, area) { + if (area !== 'local' || !changes.llm) return; + var settings = normalizeSettings(changes.llm.newValue); + featureRow.setEnabled(settings.enabled ?? validateEndpoint(settings.endpoint).ok); + }); + } + if (api) { - storageGet(api, STORAGE_KEY).then(function (res) { + settingsReady = storageGet(api, STORAGE_KEY).then(function (res) { var stored = normalizeSettings(res && res[STORAGE_KEY]); - endpointInput.value = stored.endpoint; - modelInput.value = stored.model; - apiKeyInput.value = stored.apiKey; + if (!dirtyFields.endpoint) endpointInput.value = stored.endpoint; + if (!dirtyFields.model) modelInput.value = stored.model; + if (!dirtyFields.apiKey) apiKeyInput.value = stored.apiKey; + if (!dirtyFields.useCustomPrompt) customPromptToggle.checked = stored.useCustomPrompt; + if (!dirtyFields.customPrompt) savedCustomPrompt = stored.customPrompt; + updateCustomPromptAvailability(); + resizeCustomPrompt(); + if (featureRow) { + featureRow.setEnabled(stored.enabled ?? validateEndpoint(stored.endpoint).ok); + featureRow.toggle.disabled = false; + } }); } @@ -252,31 +425,31 @@ var endpoint = endpointInput.value.trim(); var model = modelInput.value.trim(); var apiKey = apiKeyInput.value; - - if (endpoint === '') { - saveSettings({ endpoint: '', model: '', apiKey: '' }, 'LLM endpoint cleared.').catch(function () { - setStatus('Could not save LLM settings.', true); - }); - return; - } - + var useCustomPrompt = customPromptToggle.checked; + var customPrompt = savedCustomPrompt; var target = validateEndpoint(endpoint); - if (!target.ok) { - setStatus(target.error, true); - return; - } - var dataTypes = ['websiteContent']; if (apiKey) dataTypes.push('authenticationInfo'); saveButton.disabled = true; - saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey }, 'Settings saved. Requesting access…').then(function () { + if (featureRow) featureRow.toggle.disabled = true; + saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey, useCustomPrompt: useCustomPrompt, customPrompt: customPrompt }, 'Draft saved.').then(function () { + if (!target.ok) { + setStatus(endpoint ? target.error : 'LLM endpoint cleared. Other settings are saved.', !endpoint ? false : true); + return; + } + if (useCustomPrompt && !customPrompt.trim()) { + setStatus('Settings saved. Enter a custom prompt or turn the custom prompt off.', true); + return; + } pendingPermissionRequest = buildPermissionRequest(target.originPattern, dataConsentSupported, dataTypes); + setStatus('Settings saved. Requesting access…', false); return requestSavedPermissions(); }).catch(function () { setStatus('Could not save LLM settings.', true); }).finally(function () { saveButton.disabled = false; + if (featureRow) featureRow.toggle.disabled = false; }); }); @@ -287,6 +460,7 @@ function requestSavedPermissions() { if (!pendingPermissionRequest) return Promise.resolve(); var permissionPromise; + var usingPermissionBroker = false; grantButton.disabled = true; if (api && api.permissions && api.permissions.request) { try { @@ -295,11 +469,31 @@ permissionPromise = Promise.reject(err); } } else { - permissionPromise = Promise.resolve(true); + usingPermissionBroker = true; + try { + permissionPromise = api && api.runtime && typeof api.runtime.sendMessage === 'function' + ? api.runtime.sendMessage({ action: 'REQUEST_LLM_ACCESS' }) + : Promise.reject(new Error('LLM permissions are unavailable.')); + } catch (err) { + permissionPromise = Promise.reject(err); + } } return Promise.resolve(permissionPromise).then(function (granted) { - if (!granted) { + if (usingPermissionBroker) { + if (granted && granted.success === true && granted.opened === true) { + grantButton.hidden = false; + setStatus('Settings saved. Finish granting LLM access in the permissions page.', false); + return; + } + if (granted && granted.success === true && granted.granted === true) { + grantButton.hidden = true; + setStatus('LLM endpoint saved.', false); + return; + } + throw new Error(granted && granted.error ? granted.error : 'LLM permissions are unavailable.'); + } + if (granted !== true) { grantButton.hidden = false; setStatus('Settings saved. Access was not granted. Choose Grant access to enable LLM.', true); return; @@ -320,10 +514,10 @@ return Promise.reject(new Error('Settings storage is unavailable')); } // Content/composer observes storage.onChanged and calls GET_LLM_STATUS; - // never broadcast the endpoint or API key. - return storageSet(api, { llm: settings }).then(function () { - setStatus(message, false); - }); + // never broadcast the endpoint or API key. Merge through the same queue + // as blur saves so an older write cannot replace a later draft. + editVersion += 1; + return queueSettingsSave(settings, message); } return { endpointInput: endpointInput, modelInput: modelInput, apiKeyInput: apiKeyInput, saveButton: saveButton, status: status }; diff --git a/extension/safari/shared/llm.js b/extension/safari/shared/llm.js index f6513c0..835b322 100644 --- a/extension/safari/shared/llm.js +++ b/extension/safari/shared/llm.js @@ -7,7 +7,8 @@ // content scripts: GET_LLM_STATUS only reports whether an endpoint is set. // // Storage contract: a single chrome.storage.local key "llm" holding -// { endpoint, model, apiKey }. An empty endpoint means the feature is off. +// { endpoint, model, apiKey, enabled, useCustomPrompt, customPrompt }. An +// empty endpoint means the feature is off. (function (global) { 'use strict'; @@ -23,7 +24,6 @@ var FIREFOX_DATA_CONSENT_DESKTOP = 140; var FIREFOX_DATA_CONSENT_ANDROID = 142; var DEFAULT_SYSTEM_PROMPT = 'Write concise, accurate alt text for this image for blind and low-vision readers. Include meaningful visible text. Do not invent detail. Output only the alt text, under 2000 characters.'; - var DEFAULT_USER_PROMPT = 'Write alt text for this image.'; function getBrowserApi() { // Prefer the promise-based namespace; Firefox/Safari expose `browser`. @@ -37,7 +37,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -69,7 +72,7 @@ } function isEnabled(raw) { - return validateEndpoint(normalizeSettings(raw).endpoint).ok; + return raw?.enabled !== false && validateEndpoint(normalizeSettings(raw).endpoint).ok; } // RUN_LLM may only come from this extension's own top frame on bsky.app or a @@ -88,6 +91,15 @@ return host === 'bsky.app' || host.endsWith('.bsky.app'); } + function isAllowedSettingsSender(sender, ownId, api) { + if (!sender || typeof sender !== 'object' || !ownId || sender.id !== ownId || + typeof sender.url !== 'string' || !api || !api.runtime || + typeof api.runtime.getURL !== 'function') return false; + var extensionRoot = api.runtime.getURL(''); + return typeof extensionRoot === 'string' && extensionRoot !== '' && + sender.url.indexOf(extensionRoot) === 0; + } + function isAndroidPlatform() { try { return typeof navigator !== 'undefined' && /android/i.test(navigator.userAgent || ''); @@ -181,17 +193,16 @@ } function buildRequestBody(settings, prompt, image) { - var systemText = (prompt && typeof prompt.system === 'string' && prompt.system.trim()) - ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT; - var userText = (prompt && typeof prompt.user === 'string' && prompt.user.trim()) - ? prompt.user.trim() : DEFAULT_USER_PROMPT; + var promptText = (settings && settings.useCustomPrompt && typeof settings.customPrompt === 'string' && settings.customPrompt.trim()) + ? settings.customPrompt.trim() + : ((prompt && typeof prompt.system === 'string' && prompt.system.trim()) + ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT); var body = { messages: [ - { role: 'system', content: systemText }, { role: 'user', content: [ - { type: 'text', text: userText }, + { type: 'text', text: promptText }, { type: 'image_url', image_url: { url: image } } ] } @@ -310,7 +321,7 @@ }); }; - function sendRequest(settings, prompt, image, target) { + async function sendRequest(settings, prompt, image, target) { var body = buildRequestBody(settings, prompt, image); var headers = { 'Content-Type': 'application/json' }; if (settings.apiKey) headers.Authorization = 'Bearer ' + settings.apiKey; @@ -318,37 +329,29 @@ var controller = typeof AbortController === 'function' ? new AbortController() : null; var timeoutId = controller ? setTimeout(function () { controller.abort(); }, env.timeoutMs || REQUEST_TIMEOUT_MS) : null; - function clear() { - if (timeoutId) clearTimeout(timeoutId); - } - - return fetchFn(target.url.toString(), { - method: 'POST', - headers: headers, - body: JSON.stringify(body), - credentials: 'omit', - redirect: 'error', - signal: controller ? controller.signal : undefined - }).then(function (response) { + try { + const response = await fetchFn(target.url.toString(), { + method: 'POST', + headers: headers, + body: JSON.stringify(body), + credentials: 'omit', + redirect: 'error', + signal: controller ? controller.signal : undefined + }); if (!response) throw safeError('LLM request failed'); if (!response.ok) throw safeError('LLM endpoint returned HTTP ' + response.status); - return response.text(); - }).then(function (raw) { + const raw = await response.text(); if (typeof raw !== 'string' || raw.trim() === '') { throw safeError('LLM endpoint returned an empty response'); } - var data; try { - data = JSON.parse(raw); + return JSON.parse(raw); } catch (err) { throw safeError('LLM endpoint returned an invalid response'); } - clear(); - return data; - }, function (err) { - clear(); - throw err; - }); + } finally { + if (timeoutId) clearTimeout(timeoutId); + } } function runLlm(message, sender) { @@ -366,6 +369,7 @@ .then(function () { return getSettings(); }) .then(function (rawSettings) { var settings = normalizeSettings(rawSettings); + if (settings.enabled === false) return { success: false, error: 'LLM is disabled' }; var target = validateEndpoint(settings.endpoint); if (!target.ok) { return { success: false, error: 'LLM endpoint is not configured' }; @@ -396,12 +400,8 @@ if (!text) throw safeError('The LLM endpoint returned no alt text'); return { success: true, text: text }; }) - .then(function (result) { - delete inFlight[key]; - return result; - }, function (err) { + .finally(function () { delete inFlight[key]; - return { success: false, error: cleanError(err) }; }); }) .catch(function (err) { @@ -415,8 +415,50 @@ .then(function (raw) { return { enabled: isEnabled(raw) }; }, function () { return { enabled: false }; }); } + function openPermissionPage(sender) { + if (!isAllowedSettingsSender(sender, getOwnId(), api)) { + return Promise.resolve({ success: false, error: 'Open Bsky+ settings to grant LLM access.' }); + } + if (!api.tabs || typeof api.tabs.create !== 'function' || + !api.runtime || typeof api.runtime.getURL !== 'function') { + return Promise.resolve({ success: false, error: 'LLM permissions are unavailable in this browser.' }); + } + return Promise.resolve() + .then(function () { return getSettings(); }) + .then(function (rawSettings) { + var settings = normalizeSettings(rawSettings); + var target = validateEndpoint(settings.endpoint); + if (!target.ok) { + return { success: false, error: 'Save a valid LLM endpoint before granting access.' }; + } + var originRequest = { origins: [target.originPattern] }; + return Promise.all([ + permissionsContains(api, originRequest), + getSupportsDataConsent().then(function (supported) { + return supported + ? permissionsContains(api, { data_collection: requiredDataCollection(settings) }) + : true; + }) + ]).then(function (grants) { + if (grants[0] && grants[1]) return { success: true, granted: true }; + return Promise.resolve(api.tabs.create({ + url: api.runtime.getURL('shared/llm-permissions.html') + })).then(function () { return { success: true, opened: true }; }); + }); + }) + .catch(function () { + return { success: false, error: 'Could not open LLM permissions. Try saving again.' }; + }); + } + function onMessage(message, sender, sendResponse) { if (!message || typeof message.action !== 'string') return undefined; + if (message.action === 'REQUEST_LLM_ACCESS') { + openPermissionPage(sender).then(sendResponse, function () { + sendResponse({ success: false, error: 'Could not open LLM permissions. Try saving again.' }); + }); + return true; + } if (message.action === 'RUN_LLM') { runLlm(message, sender).then(sendResponse, function () { sendResponse({ success: false, error: 'LLM request failed' }); @@ -463,7 +505,6 @@ STORAGE_KEY: STORAGE_KEY, PROMPT_PATH: PROMPT_PATH, DEFAULT_SYSTEM_PROMPT: DEFAULT_SYSTEM_PROMPT, - DEFAULT_USER_PROMPT: DEFAULT_USER_PROMPT, MAX_IMAGE_BYTES: MAX_IMAGE_BYTES, DATA_COLLECTION_TYPES: DATA_COLLECTION_TYPES, normalizeSettings: normalizeSettings, @@ -485,7 +526,8 @@ global.BskyPlusLLM = BskyPlusLLM; if (typeof module !== 'undefined' && module.exports) module.exports = BskyPlusLLM; - // Auto-wire when loaded as a background dependency. register() is idempotent, - // so hosts may also call BskyPlusLLM.register() themselves. - register(); + // Auto-wire when loaded as a background dependency. Standalone pages may + // load the helper library without registering a second message listener. + var currentScript = global.document && global.document.currentScript; + if (!currentScript || !currentScript.hasAttribute('data-no-register')) register(); })(typeof globalThis !== 'undefined' ? globalThis : this); diff --git a/extension/safari/shared/media-viewer.js b/extension/safari/shared/media-viewer.js index 432f1bd..8185335 100644 --- a/extension/safari/shared/media-viewer.js +++ b/extension/safari/shared/media-viewer.js @@ -5,11 +5,14 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const SPEEDS = [0.5, 1, 1.25, 1.5, 2]; - let rememberedSpeed = 1; let enabled = true; + let nextSpeedMenuId = 0; + let activeSpeedControl = null; + const speedControls = new Set(); + const videoSources = new WeakMap(); function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -19,12 +22,10 @@ // Load initial settings if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['mediaViewerEnabled', 'videoSpeed'], (res) => { + chrome.storage.local.get(['mediaViewerEnabled'], (res) => { if (res) { if (res.mediaViewerEnabled !== undefined) enabled = res.mediaViewerEnabled; - if (res.videoSpeed !== undefined) rememberedSpeed = res.videoSpeed; } - applyToAllVideos(); scanVideos(); }); @@ -33,6 +34,7 @@ if (changes.mediaViewerEnabled || changes.enableAlphaFeatures) { if (changes.mediaViewerEnabled) enabled = changes.mediaViewerEnabled.newValue; if (!isFeatureActive()) { + disposeAllSpeedControls(); document.querySelectorAll('.bskyplus-video-toolbar').forEach(t => t.remove()); } else { scanVideos(); @@ -42,33 +44,213 @@ }); } - function saveSpeedState(speed) { - rememberedSpeed = speed; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.set({ videoSpeed: speed }); + function updateSpeedControl(trigger, speed) { + if (!trigger) return; + const value = String(speed); + trigger.value = value; + const label = trigger.querySelector('.bskyplus-speed-value'); + if (label) label.textContent = `${value}x`; + trigger.setAttribute('aria-label', `Playback speed ${value}x`); + const menu = document.getElementById(trigger.getAttribute('aria-controls')); + menu?.querySelectorAll('[data-speed]').forEach(option => { + option.setAttribute('aria-checked', String(option.dataset.speed === value)); + }); + } + + function getVideoControlsSibling(video) { + const figure = video.parentElement; + if (figure?.tagName !== 'FIGURE') return null; + const sibling = figure.nextElementSibling; + if (sibling?.tagName === 'DIV') return sibling; + return sibling?.nextElementSibling?.tagName === 'DIV' ? sibling.nextElementSibling : null; + } + + function getVideoToolbarContainer(video) { + const sibling = getVideoControlsSibling(video); + const container = sibling?.lastElementChild?.lastElementChild; + return container?.tagName === 'DIV' ? container : null; + } + + function eventIsInsideSpeedControl(event, control) { + const path = typeof event.composedPath === 'function' ? event.composedPath() : []; + return path.includes(control.trigger) || path.includes(control.menu) || + control.trigger.contains(event.target) || control.menu.contains(event.target); + } + + function getSpeedMenuMountRoot(trigger) { + const fullscreenRoot = document.fullscreenElement || document.webkitFullscreenElement; + const dialogRoot = trigger.closest('dialog[open], [role="dialog"], [aria-modal="true"]'); + if (fullscreenRoot?.contains(trigger)) { + return dialogRoot && fullscreenRoot.contains(dialogRoot) ? dialogRoot : fullscreenRoot; } + return dialogRoot || document.body; + } + + function mountSpeedMenu(control) { + const root = getSpeedMenuMountRoot(control.trigger); + if (root && control.menu.parentElement !== root) root.appendChild(control.menu); + } + + function positionSpeedMenu(control) { + const triggerRect = control.trigger.getBoundingClientRect(); + const menuRect = control.menu.getBoundingClientRect(); + const margin = 8; + const below = window.innerHeight - triggerRect.bottom; + const above = triggerRect.top; + const top = below >= menuRect.height + margin || below >= above + ? triggerRect.bottom + margin + : triggerRect.top - menuRect.height - margin; + const left = Math.max(margin, Math.min( + triggerRect.right - menuRect.width, + window.innerWidth - menuRect.width - margin + )); + const maxTop = Math.max(margin, window.innerHeight - menuRect.height - margin); + control.menu.style.setProperty('top', `${Math.max(margin, Math.min(top, maxTop))}px`, 'important'); + control.menu.style.setProperty('left', `${left}px`, 'important'); + } + + function closeSpeedMenu(control = activeSpeedControl, restoreFocus = false) { + if (!control) return; + const hadFocus = control.menu.contains(document.activeElement) || control.trigger === document.activeElement; + if (activeSpeedControl === control) activeSpeedControl = null; + control.trigger.setAttribute('aria-expanded', 'false'); + if (control.isPopoverOpen && typeof control.menu.hidePopover === 'function') { + try { control.menu.hidePopover(); } catch (_) { /* Already closed. */ } + } else { + control.menu.hidden = true; + } + control.isPopoverOpen = false; + mountSpeedMenu(control); + if (restoreFocus && hadFocus && control.trigger.isConnected) control.trigger.focus(); + } + + function openSpeedMenu(control) { + if (!control.trigger.isConnected || !isFeatureActive()) return; + if (activeSpeedControl && activeSpeedControl !== control) { + closeSpeedMenu(activeSpeedControl, false); + } + mountSpeedMenu(control); + activeSpeedControl = control; + control.trigger.setAttribute('aria-expanded', 'true'); + if (typeof control.menu.showPopover === 'function' && control.menu.hasAttribute('popover')) { + try { + control.menu.showPopover(); + control.isPopoverOpen = true; + } catch (_) { + control.menu.removeAttribute('popover'); + control.menu.hidden = false; + } + } else { + control.menu.hidden = false; + } + positionSpeedMenu(control); + const selected = control.menu.querySelector('[aria-checked="true"]'); + (selected || control.menu.querySelector('[data-speed]'))?.focus(); + } + + function moveSpeedMenuFocus(control, key) { + const options = Array.from(control.menu.querySelectorAll('[data-speed]')); + if (!options.length) return; + if (key === 'Home') { + options[0].focus(); + return; + } + if (key === 'End') { + options[options.length - 1].focus(); + return; + } + const current = options.indexOf(document.activeElement); + const direction = key === 'ArrowDown' ? 1 : -1; + const next = current < 0 + ? (direction > 0 ? 0 : options.length - 1) + : (current + direction + options.length) % options.length; + options[next].focus(); + } + + function focusOutsideSpeedMenu(control, backwards) { + const selector = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])'; + const focusables = Array.from(document.querySelectorAll(selector)).filter(element => { + if (control.menu.contains(element) || element.tabIndex < 0 || element.closest('[hidden]')) return false; + return typeof element.getClientRects !== 'function' || element.getClientRects().length > 0; + }); + const index = focusables.indexOf(control.trigger); + const destination = focusables[index + (backwards ? -1 : 1)]; + closeSpeedMenu(control, false); + if (destination) destination.focus(); + } + + document.addEventListener('pointerdown', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('focusin', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('scroll', event => { + if (activeSpeedControl && !activeSpeedControl.menu.contains(event.target)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + document.addEventListener('fullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('webkitfullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('close', event => { + if (event.target?.tagName === 'DIALOG' && activeSpeedControl && + event.target.contains(activeSpeedControl.trigger)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + window.addEventListener('resize', () => closeSpeedMenu()); + + function disposeSpeedControl(control) { + if (activeSpeedControl === control) closeSpeedMenu(control, false); + control.menu.remove(); + speedControls.delete(control); + } + + function disposeAllSpeedControls() { + Array.from(speedControls).forEach(disposeSpeedControl); + } + + function cleanupDisconnectedSpeedControls() { + Array.from(speedControls).forEach(control => { + if (!control.video.isConnected || !control.trigger.isConnected) disposeSpeedControl(control); + }); + } + + function getVideoSourceKey(video) { + const sources = Array.from(video.querySelectorAll('source'), source => source.getAttribute('src') || ''); + return JSON.stringify([video.getAttribute('src') || '', ...sources]); + } + + function resetSpeedForChangedSource(video) { + const source = getVideoSourceKey(video); + const previousSource = videoSources.get(video); + if (previousSource === undefined || previousSource !== source) { + video.playbackRate = 1; + updateSpeedControl(getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'), 1); + } + videoSources.set(video, source); } function setupVideo(video) { if (!isFeatureActive()) return; - const figure = video.parentElement; - if (figure?.tagName !== 'FIGURE') return; - const container = figure.nextElementSibling?.lastElementChild?.lastElementChild; - if (!container || container.tagName !== 'DIV') return; + const container = getVideoToolbarContainer(video); + if (!container) return; + + resetSpeedForChangedSource(video); if (!video.dataset.bskyplusViewerSetup) { video.dataset.bskyplusViewerSetup = 'true'; - video.playbackRate = rememberedSpeed; - - video.addEventListener('play', () => { - if (isFeatureActive()) video.playbackRate = rememberedSpeed; - }); + video.addEventListener('loadstart', () => resetSpeedForChangedSource(video)); video.addEventListener('ratechange', () => { - const chooser = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-speed-select'); - if (chooser) chooser.value = String(video.playbackRate); + const chooser = getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'); + updateSpeedControl(chooser, video.playbackRate); }); const updatePipButton = () => { - const button = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-pip-btn'); + const button = getVideoControlsSibling(video)?.querySelector('.bskyplus-pip-btn'); if (button) button.setAttribute('aria-pressed', String(document.pictureInPictureElement === video)); }; video.addEventListener('enterpictureinpicture', updatePipButton); @@ -79,37 +261,90 @@ const toolbar = createEl('div', { className: 'bskyplus-video-toolbar' }); - const chooser = createEl('select', { + const chooser = createEl('button', { + type: 'button', className: 'bskyplus-speed-select', - 'aria-label': 'Playback speed', + 'aria-label': `Playback speed ${video.playbackRate}x`, + 'aria-haspopup': 'menu', + 'aria-expanded': 'false', title: 'Playback speed' }); - SPEEDS.forEach((spd) => { - chooser.appendChild(createEl('option', { value: spd, textContent: `${spd}x` })); + const valueLabel = createEl('span', { + className: 'bskyplus-speed-value', + textContent: `${video.playbackRate}x` + }); + chooser.appendChild(valueLabel); + chooser.appendChild(createEl('span', { className: 'bskyplus-speed-chevron', 'aria-hidden': 'true' })); + + const menu = createEl('div', { + className: 'bskyplus-speed-menu', + role: 'menu', + 'aria-label': 'Playback speed' + }); + const menuId = `bskyplus-speed-menu-${++nextSpeedMenuId}`; + menu.id = menuId; + chooser.setAttribute('aria-controls', menuId); + if (typeof menu.showPopover === 'function') menu.setAttribute('popover', 'manual'); + else menu.hidden = true; + + const control = { video, trigger: chooser, menu, isPopoverOpen: false }; + SPEEDS.forEach(speed => { + const option = createEl('button', { + type: 'button', + className: 'bskyplus-speed-option', + role: 'menuitemradio', + 'aria-checked': String(String(speed) === String(video.playbackRate)) + }); + option.dataset.speed = String(speed); + option.appendChild(createEl('span', { textContent: `${speed}x` })); + option.appendChild(createEl('span', { className: 'bskyplus-speed-option-check', 'aria-hidden': 'true' })); + option.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + if (!SPEEDS.includes(speed)) return; + video.playbackRate = speed; + updateSpeedControl(chooser, speed); + closeSpeedMenu(control, true); + }); + menu.appendChild(option); }); - chooser.value = String(video.playbackRate); - ['click', 'pointerdown', 'keydown'].forEach(type => { - chooser.addEventListener(type, e => e.stopPropagation()); + mountSpeedMenu(control); + speedControls.add(control); + + chooser.addEventListener('click', event => { + event.stopPropagation(); + if (activeSpeedControl === control) closeSpeedMenu(control, false); + else openSpeedMenu(control); }); - // Selecting the current option closes the picker without a change event. - const blurClosedChooser = () => { - setTimeout(() => { - if (!chooser.matches(':open')) chooser.blur(); - }, 0); - }; - chooser.addEventListener('click', blurClosedChooser); - chooser.addEventListener('keyup', e => { - e.stopPropagation(); - if (['Enter', 'Escape', ' '].includes(e.key)) blurClosedChooser(); + chooser.addEventListener('pointerdown', event => event.stopPropagation()); + chooser.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { + event.preventDefault(); + openSpeedMenu(control); + } else if (event.key === 'Escape' && activeSpeedControl === control) { + event.preventDefault(); + closeSpeedMenu(control, true); + } }); - chooser.addEventListener('change', e => { - e.stopPropagation(); - const speed = Number(chooser.value); - if (!SPEEDS.includes(speed)) return; - video.playbackRate = speed; - saveSpeedState(speed); - chooser.blur(); + chooser.addEventListener('keyup', event => event.stopPropagation()); + menu.addEventListener('pointerdown', event => event.stopPropagation()); + menu.addEventListener('click', event => event.stopPropagation()); + menu.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'Escape') { + event.preventDefault(); + closeSpeedMenu(control, true); + } else if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) { + event.preventDefault(); + moveSpeedMenuFocus(control, event.key); + } else if (event.key === 'Tab') { + event.preventDefault(); + focusOutsideSpeedMenu(control, event.shiftKey); + } }); + menu.addEventListener('keyup', event => event.stopPropagation()); + updateSpeedControl(chooser, video.playbackRate); toolbar.appendChild(chooser); // Picture-in-Picture Button @@ -150,32 +385,21 @@ } function applyToAllVideos() { - if (!isFeatureActive()) return; - const videos = document.querySelectorAll('video'); - videos.forEach(v => { - v.playbackRate = rememberedSpeed; - }); + scanVideos(); } function scanVideos() { - if (!isFeatureActive()) return; + cleanupDisconnectedSpeedControls(); + if (!isFeatureActive()) { + disposeAllSpeedControls(); + document.querySelectorAll('.bskyplus-video-toolbar').forEach(toolbar => toolbar.remove()); + return; + } const videos = document.querySelectorAll('video'); videos.forEach(v => setupVideo(v)); } - const observer = new MutationObserver(() => { - scanVideos(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - }); - } + observeDom(scanVideos); window.BskyPlusMediaViewer = { scanVideos, diff --git a/extension/safari/shared/settings-frame.css b/extension/safari/shared/settings-frame.css index 5cefbe1..6930530 100644 --- a/extension/safari/shared/settings-frame.css +++ b/extension/safari/shared/settings-frame.css @@ -37,6 +37,10 @@ body { gap: 12px; } +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 10px; +} + .toggle-info { min-width: 0; } @@ -47,8 +51,7 @@ body { gap: 6px; } -.slider-header, -.custom-color-row { +.slider-header { flex-wrap: wrap; gap: 12px; } @@ -66,12 +69,6 @@ body { min-height: 36px; } -.palette-container { - justify-content: flex-start; - flex-wrap: wrap; - gap: 12px; -} - .bskyplus-llm-input { font-size: 15px; padding: 10px 12px; @@ -89,11 +86,20 @@ body { input:focus-visible, button:focus-visible { - outline: 2px solid var(--accent-default); + outline: 2px solid #1083fe; outline-offset: 3px; } @media (max-width: 400px) { body { padding: 16px; } .toggle-row { padding: 12px; } + .bskyplus-feature-expanded > .toggle-row { padding-bottom: 9px; } +} +#appviewSection [hidden] { + display: none; +} + +#appviewProvider option { + background: var(--bg-secondary); + color: var(--text-primary); } diff --git a/extension/safari/shared/settings-frame.html b/extension/safari/shared/settings-frame.html index ad6dc29..681f1f4 100644 --- a/extension/safari/shared/settings-frame.html +++ b/extension/safari/shared/settings-frame.html @@ -7,6 +7,7 @@ + diff --git a/extension/safari/shared/settings-frame.js b/extension/safari/shared/settings-frame.js index 95031f9..ed8a1da 100644 --- a/extension/safari/shared/settings-frame.js +++ b/extension/safari/shared/settings-frame.js @@ -36,21 +36,36 @@ } async function mount() { + if (new URLSearchParams(location.search).get('section') === 'theme') { + document.body.replaceChildren(); + await loadScript('shared/theme-model.js'); + await loadScript('shared/theme-editor.js'); + new ResizeObserver(reportHeight).observe(document.body); + reportHeight(); + return; + } // This is packaged, trusted markup, not content supplied by the website. const response = await fetch(api.runtime.getURL('popup/popup.html')); if (!response.ok) throw new Error('Could not load settings.'); const template = new DOMParser().parseFromString(await response.text(), 'text/html'); template.querySelectorAll('script').forEach(script => script.remove()); document.body.replaceChildren(...Array.from(template.body.children, node => document.importNode(node, true))); + document.getElementById('moreSettingsButton')?.remove(); document.getElementById('feedWidthSlider')?.setAttribute('aria-label', 'Feed column width'); - document.getElementById('colorPicker')?.setAttribute('aria-label', 'Accent color'); - document.getElementById('hexInput')?.setAttribute('aria-label', 'Hex color'); - await loadScript('shared/feature-flags.js'); - await loadScript('popup/popup.js'); - await loadScript('shared/llm-settings.js'); - await loadScript('shared/cdn-config.js'); - await loadScript('shared/cdn-settings.js'); + for (const script of [ + 'shared/feature-flags.js', + 'shared/theme-model.js', + 'popup/popup.js', + 'shared/popup-theme.js', + 'popup/feature-row.js', + 'shared/llm-settings.js', + 'shared/bookmarks-settings.js', + 'shared/cdn-config.js', + 'shared/cdn-settings.js', + 'shared/appview-config.js', + 'shared/appview-settings.js', + ]) await loadScript(script); // Keep this long-lived page current when another extension view saves. api.storage.onChanged.addListener((changes, area) => { diff --git a/extension/safari/shared/thread-unroll.js b/extension/safari/shared/thread-unroll.js index 0d1d47d..5f1ff8b 100644 --- a/extension/safari/shared/thread-unroll.js +++ b/extension/safari/shared/thread-unroll.js @@ -1,583 +1,320 @@ -// Bsky+ Thread Unroll & Reader View -// Concatenates connected skeets into a distraction-free reader view with Markdown and PDF export. - -(function () { +// Inline thread unroll for numbered Bluesky author threads. +(() => { 'use strict'; - const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const POST_SELECTOR = '[data-testid^="postThreadItem-by-"]'; + const MENU_SELECTOR = 'button[aria-label="Thread options"], [role="button"][aria-label="Thread options"]'; + const REPLY_PROMPT_SELECTOR = 'button[aria-label="Compose reply"], [role="button"][aria-label="Compose reply"]'; + const INTERACTIVE_SELECTOR = 'a[href], button, [role="button"], [role="link"], input, select, textarea, [contenteditable]:not([contenteditable="false"]), video, audio'; + const POST_ROUTE = /^\/profile\/[^/]+\/post\/[^/]+\/?$/; + const NUMBER_LABEL = /^Post ([1-9]\d*) of ([1-9]\d*)$/; + let active = false; + let route = location.pathname; + let toggle = null; + let marked = new Map(); + let scanQueued = false; - let enabled = true; - let activeModal = null; - let lastInteractedPost = null; + function guardPostActivation(event) { + if (!active || route !== location.pathname) return; - function isFeatureActive() { - const flags = window.BskyPlusFeatureFlags; - if (flags && !flags.isFeatureEnabled('threadUnroll')) return false; - return enabled; - } + const target = event.target; + if (!(target instanceof Element)) return; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['threadUnrollEnabled'], (res) => { - if (res && res.threadUnrollEnabled !== undefined) { - enabled = res.threadUnrollEnabled; - } - }); + const post = target.closest('[data-bskyplus-unroll-post]'); + if (!post) return; - chrome.storage.onChanged.addListener((changes, area) => { - if ((area === 'local' || area === 'sync') && changes.threadUnrollEnabled) { - enabled = changes.threadUnrollEnabled.newValue; - if (!isFeatureActive()) { - document.querySelectorAll('.bskyplus-unroll-btn, .bskyplus-unroll-menu-item').forEach(b => b.remove()); - closeReader(); - } else { - scanForThreads(); - scanForDropdownMenus(); - } - } - }); + const interactive = target.closest(INTERACTIVE_SELECTOR); + if (interactive && interactive !== post && post.contains(interactive)) return; + + event.preventDefault(); + event.stopPropagation(); } - // -------------------------------------------------------------------------- - // Track 3-Dot Button Interactions - // -------------------------------------------------------------------------- - document.addEventListener('click', (e) => { - const btn = e.target.closest ? e.target.closest('button, [role="button"]') : null; - if (!btn) return; - const label = (btn.getAttribute('aria-label') || '').toLowerCase(); - const testid = (btn.getAttribute('data-testid') || '').toLowerCase(); - const hasPopup = btn.getAttribute('aria-haspopup'); - - if ( - label.includes('more') || - label.includes('option') || - label.includes('menu') || - testid.includes('dropdown') || - testid.includes('more') || - hasPopup === 'menu' - ) { - lastInteractedPost = btn.closest ? btn.closest( - '[data-testid*="postThreadItem"], [data-testid*="feedItem"], [data-testid*="post"]' - ) : null; - } - }, true); - - // -------------------------------------------------------------------------- - // Thread Fetching & Tree Extraction - // -------------------------------------------------------------------------- - async function fetchThreadData(actor, rkey) { - try { - const atUri = `at://${actor}/app.bsky.feed.post/${rkey}`; - const res = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread?uri=${encodeURIComponent(atUri)}&depth=100`, { - headers: { 'Accept': 'application/json' } - }); - if (!res.ok) throw new Error(`HTTP ${res.status}`); - const data = await res.json(); - return data.thread; - } catch (err) { - console.warn('Bsky+ API thread fetch failed, falling back to DOM:', err); - return null; - } + function guardPostKeydown(event) { + if (event.key !== 'Enter' && event.key !== ' ') return; + guardPostActivation(event); } - function extractLinearAuthorThread(threadNode) { - if (!threadNode || !threadNode.post) return []; + window.addEventListener('click', guardPostActivation, true); + window.addEventListener('auxclick', guardPostActivation, true); + window.addEventListener('keydown', guardPostKeydown, true); - // Find root author - let current = threadNode; - while (current.parent && current.parent.post) { - current = current.parent; + function threadScope(menu, firstPost) { + let node = firstPost.parentElement; + while (node && node !== document.body && node !== document.documentElement) { + if (node.contains(menu)) return node; + node = node.parentElement; } - const rootAuthorDid = current.post.author.did; - - const posts = []; - - function collect(node) { - if (!node || !node.post) return; - if (node.post.author.did === rootAuthorDid) { - const p = node.post; - const images = []; - - if (p.embed && p.embed.images) { - p.embed.images.forEach(img => { - images.push({ - thumb: img.thumb, - fullsize: img.fullsize, - alt: img.alt || '' - }); - }); - } - - posts.push({ - uri: p.uri, - cid: p.cid, - author: { - handle: p.author.handle, - displayName: p.author.displayName || p.author.handle, - avatar: p.author.avatar || '' - }, - text: (p.record && p.record.text) ? p.record.text : '', - createdAt: (p.record && p.record.createdAt) ? p.record.createdAt : '', - images - }); - } + return null; + } - if (node.replies && Array.isArray(node.replies)) { - // Sort replies chronologically - const sorted = [...node.replies].sort((a, b) => { - const dateA = new Date(a.post?.record?.createdAt || 0).getTime(); - const dateB = new Date(b.post?.record?.createdAt || 0).getTime(); - return dateA - dateB; - }); - for (const reply of sorted) { - collect(reply); - } - } + function numberIn(post) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post) continue; + const match = NUMBER_LABEL.exec(badge.getAttribute('aria-label') || ''); + if (match) return { index: Number(match[1]), total: Number(match[2]) }; } - - collect(current); - return posts; + return null; } - function extractThreadFromDom() { - const threadPosts = []; - const postElements = document.querySelectorAll('[data-testid*="postThreadItem"], [data-testid*="feedItem"]'); - - postElements.forEach(item => { - const textEl = item.querySelector('[data-testid="postText"], div[dir="auto"]'); - const authorLink = item.querySelector('a[href^="/profile/"]'); - const timeEl = item.querySelector('time'); - const imgEls = item.querySelectorAll('img[src*="feed_thumbnail"], img[src*="feed_fullsize"]'); - - if (textEl || imgEls.length > 0) { - const handle = authorLink ? (authorLink.getAttribute('href') || '').replace('/profile/', '') : 'unknown'; - const images = []; - imgEls.forEach(img => { - images.push({ - thumb: img.getAttribute('src') || '', - fullsize: (img.getAttribute('src') || '').replace('/feed_thumbnail/', '/feed_fullsize/'), - alt: img.getAttribute('alt') || '' - }); - }); - - threadPosts.push({ - author: { handle, displayName: handle }, - text: textEl ? textEl.textContent.trim() : '', - createdAt: timeEl ? timeEl.getAttribute('datetime') || '' : '', - images - }); - } - }); - - return threadPosts; + function containsProfileLink(element) { + return !!element?.querySelector('a[href^="/profile/"]'); } - // -------------------------------------------------------------------------- - // Markdown & Export Generators - // -------------------------------------------------------------------------- - function generateMarkdown(posts) { - if (!posts || posts.length === 0) return ''; - const author = posts[0].author; - const dateStr = posts[0].createdAt ? new Date(posts[0].createdAt).toLocaleDateString() : ''; - - let md = `# Thread by ${author.displayName} (@${author.handle})\n`; - if (dateStr) md += `*Date: ${dateStr}*\n\n---\n\n`; - - posts.forEach((p, index) => { - md += `### ${index + 1}/${posts.length}\n\n`; - if (p.text) { - md += `${p.text}\n\n`; - } - if (p.images && p.images.length > 0) { - p.images.forEach(img => { - md += `![${img.alt || 'Post image'}](${img.fullsize || img.thumb})\n\n`; - }); - } - md += `---\n\n`; - }); - - return md; - } + function findThread() { + if (!POST_ROUTE.test(location.pathname)) return null; - function downloadFile(content, filename, type = 'text/markdown') { - const blob = new Blob([content], { type }); - const url = URL.createObjectURL(blob); - const a = createEl('a', { - href: url, - download: filename, - style: 'display: none;' + const menus = [...document.querySelectorAll(MENU_SELECTOR)]; + const firstPosts = [...document.querySelectorAll(POST_SELECTOR)].filter(post => { + if (post.parentElement?.closest(POST_SELECTOR)) return false; + const number = numberIn(post); + return number?.index === 1 && number.total >= 2; }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(url); - }, 1000); - } - - // -------------------------------------------------------------------------- - // Reader View Modal - // -------------------------------------------------------------------------- - function openReaderView(posts) { - if (!posts || posts.length === 0) return; - closeReader(); - - const author = posts[0].author; - const totalWords = posts.reduce((sum, p) => sum + (p.text ? p.text.split(/\s+/).length : 0), 0); - const readingTimeMinutes = Math.max(1, Math.ceil(totalWords / 200)); - const backdrop = createEl('div', { className: 'bskyplus-reader-backdrop' }); - activeModal = backdrop; + for (const menu of menus) { + for (const firstPost of firstPosts) { + const scope = threadScope(menu, firstPost); + if (!scope) continue; - const card = createEl('div', { className: 'bskyplus-reader-modal' }); + const { total } = numberIn(firstPost); + const authorTestId = firstPost.getAttribute('data-testid'); + const posts = [firstPost]; + let expected = 2; - // Header - const header = createEl('div', { className: 'bskyplus-reader-header' }); + for (const post of scope.querySelectorAll(POST_SELECTOR)) { + if (post === firstPost) continue; + if (post.parentElement?.closest(POST_SELECTOR)) continue; + if (firstPost.compareDocumentPosition(post) & Node.DOCUMENT_POSITION_PRECEDING) continue; - const authorSection = createEl('div', { className: 'bskyplus-reader-meta' }); - if (author.avatar) { - authorSection.appendChild(createEl('img', { - className: 'bskyplus-reader-avatar', - src: author.avatar, - alt: author.handle - })); - } - - const nameCol = createEl('div'); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-name', - textContent: author.displayName || author.handle - })); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-sub', - textContent: `@${author.handle} · ${posts.length} skeets · ${readingTimeMinutes} min read` - })); - authorSection.appendChild(nameCol); - header.appendChild(authorSection); - - // Actions (Export MD, PDF, Copy, Close) - const actions = createEl('div', { className: 'bskyplus-reader-actions' }); - - const copyBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Copy as Markdown' - }, [ - Icons.copy ? Icons.copy() : document.createTextNode('📋'), - createEl('span', { textContent: 'Copy MD' }) - ]); - copyBtn.addEventListener('click', async () => { - const md = generateMarkdown(posts); - await navigator.clipboard.writeText(md); - if (showToast) showToast('Thread copied to clipboard as Markdown!'); - }); - - const exportMdBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Export Markdown file' - }, [ - Icons.markdown ? Icons.markdown() : document.createTextNode('↓'), - createEl('span', { textContent: 'Export MD' }) - ]); - exportMdBtn.addEventListener('click', () => { - const md = generateMarkdown(posts); - const filename = `${author.handle}_thread_${Date.now()}.md`; - downloadFile(md, filename); - if (showToast) showToast('Exported thread as Markdown'); - }); + const number = numberIn(post); + if (!number || number.total !== total || post.getAttribute('data-testid') !== authorTestId) continue; + if (number.index !== expected) break; - const exportPdfBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn bskyplus-btn-primary', - title: 'Print / Save as PDF' - }, [ - Icons.printer ? Icons.printer() : document.createTextNode('🖨️'), - createEl('span', { textContent: 'Export PDF' }) - ]); - exportPdfBtn.addEventListener('click', () => { - window.print(); - }); - - const closeBtn = createEl('button', { - type: 'button', - className: 'bskyplus-reader-close', - title: 'Close reader' - }, [document.createTextNode('✕')]); - closeBtn.addEventListener('click', closeReader); - - actions.append(copyBtn, exportMdBtn, exportPdfBtn, closeBtn); - header.appendChild(actions); - card.appendChild(header); - - // Body: Skeets - const body = createEl('div', { className: 'bskyplus-reader-body' }); - posts.forEach((p, index) => { - const skeetCard = createEl('div', { className: 'bskyplus-reader-skeet' }); - - const skeetHeader = createEl('div', { className: 'bskyplus-skeet-header' }); - skeetHeader.appendChild(createEl('span', { - className: 'bskyplus-skeet-index', - textContent: `${index + 1} / ${posts.length}` - })); - if (p.createdAt) { - const timeStr = new Date(p.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }); - skeetHeader.appendChild(createEl('span', { textContent: timeStr })); - } - skeetCard.appendChild(skeetHeader); - - if (p.text) { - skeetCard.appendChild(createEl('div', { - className: 'bskyplus-skeet-text', - textContent: p.text - })); - } + posts.push(post); + expected += 1; + if (expected > total) break; + } - if (p.images && p.images.length > 0) { - const mediaContainer = createEl('div', { className: 'bskyplus-skeet-media' }); - p.images.forEach(img => { - const imgWrap = createEl('div'); - imgWrap.appendChild(createEl('img', { - className: 'bskyplus-skeet-img', - src: img.fullsize || img.thumb, - alt: img.alt || '' - })); - if (img.alt) { - imgWrap.appendChild(createEl('div', { - className: 'bskyplus-skeet-alt', - textContent: `Alt: ${img.alt}` - })); - } - mediaContainer.appendChild(imgWrap); - }); - skeetCard.appendChild(mediaContainer); + return { menu, posts, total, scope }; } + } - body.appendChild(skeetCard); - }); - - card.appendChild(body); - backdrop.appendChild(card); - - backdrop.addEventListener('click', (e) => { - if (e.target === backdrop) closeReader(); - }); - - document.body.appendChild(backdrop); + return null; } - function closeReader() { - if (activeModal) { - activeModal.remove(); - activeModal = null; + function mark(next, element, attribute, value = '') { + if (!element) return; + let attrs = next.get(element); + if (!attrs) { + attrs = new Map(); + next.set(element, attrs); } + attrs.set(attribute, value); } - document.addEventListener('keydown', (e) => { - if (e.key === 'Escape' && activeModal) { - closeReader(); + function controlRow(post, next) { + const ownControl = selector => [...post.querySelectorAll(selector)] + .find(button => button.closest(POST_SELECTOR) === post); + const reply = ownControl('[data-testid="replyBtn"]'); + const like = ownControl('[data-testid="likeBtn"]'); + const menu = ownControl('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]'); + if (!reply || !like || !menu) return null; + + let controls = reply.parentElement; + while (controls && controls !== post && (!controls.contains(like) || !controls.contains(menu))) { + controls = controls.parentElement; } - }); - - // -------------------------------------------------------------------------- - // Helper: Extract actor and rkey from element or URL - // -------------------------------------------------------------------------- - function getPostCoords(el) { - if (!el) return null; - const postLink = el.querySelector ? el.querySelector('a[href*="/post/"]') : null; - if (postLink) { - const href = postLink.getAttribute('href') || ''; - const match = href.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - return { actor: match[1], rkey: match[2] }; - } - } - return null; + if (!controls || controls === post) return null; + + // The native row contains a primary reply/repost/like group and a + // secondary bookmark/share/menu group. Keep the primary buttons in place. + const primary = [...controls.children].find(child => child.contains(reply) && child.contains(like)); + const secondary = [...controls.children].find(child => child.querySelector('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]')); + if (!primary || !secondary) return null; + + mark(next, controls, 'data-bskyplus-unroll-controls'); + mark(next, primary, 'data-bskyplus-unroll-primary'); + mark(next, secondary, 'data-bskyplus-unroll-secondary'); + return controls; } - async function handleUnrollClick(targetElement) { - if (showToast) showToast('Unrolling thread...'); - - let actor = null; - let rkey = null; + function compactFollowup(post, next) { + mark(next, post, 'data-bskyplus-unroll-followup'); - // 1. Check target element - if (targetElement) { - const coords = getPostCoords(targetElement); - if (coords) { - actor = coords.actor; - rkey = coords.rkey; - } + // The expanded anchor can be post 2 or later when the user opened a + // middle post. It has a full author header instead of the linear layout. + if (isExpandedAnchor(post)) { + mark(next, post.firstElementChild, 'data-bskyplus-unroll-author'); + return; } - // 2. Check current URL if on a post page - if (!actor || !rkey) { - const path = window.location.pathname; - const match = path.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - actor = match[1]; - rkey = match[2]; + // ThreadItemPost starts with a 12px parent-reply line. Its next child is + // the avatar/content row. Work only inside this numbered post. + const first = post.firstElementChild; + const main = first?.nextElementSibling; + if (first && main && main.children.length >= 2) { + mark(next, first, 'data-bskyplus-unroll-line'); + mark(next, main, 'data-bskyplus-unroll-main'); + const avatar = main.firstElementChild; + const content = avatar?.nextElementSibling; + if (containsProfileLink(avatar) && content?.querySelector('[data-testid="replyBtn"]')) { + mark(next, avatar, 'data-bskyplus-unroll-avatar'); + + const meta = content.firstElementChild; + if (containsProfileLink(meta)) { + mark(next, meta, 'data-bskyplus-unroll-author'); + } } } + } - let posts = []; - if (actor && rkey) { - const threadNode = await fetchThreadData(actor, rkey); - if (threadNode) { - posts = extractLinearAuthorThread(threadNode); - } - } + function isExpandedAnchor(post) { + return containsProfileLink(post.firstElementChild) && + !!post.firstElementChild?.nextElementSibling?.querySelector('[data-testid="replyBtn"]'); + } - if (posts.length === 0) { - posts = extractThreadFromDom(); + function compactNumber(post, next) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post || !NUMBER_LABEL.test(badge.getAttribute('aria-label') || '')) continue; + const wrapper = badge.parentElement; + const onlyBadge = wrapper?.children.length === 1 && wrapper.textContent?.trim() === badge.textContent?.trim(); + mark(next, onlyBadge ? wrapper : badge, 'data-bskyplus-unroll-number'); + break; } + } - if (posts.length > 0) { - openReaderView(posts); - } else { - if (showToast) showToast('Could not find thread to unroll'); + function compactAnchorChrome(post, controls, next) { + const badge = [...post.querySelectorAll('span[aria-label^="Post "]')] + .find(span => NUMBER_LABEL.test(span.getAttribute('aria-label') || '') && span.closest(POST_SELECTOR) === post); + const controlsWrapper = controls?.parentElement; + const content = controlsWrapper?.parentElement; + if (!badge || !content || !post.contains(content)) return; + mark(next, content, 'data-bskyplus-unroll-anchor-content'); + + // ExpandedPostDetails, aggregate counts, and KnownLikers are siblings + // between the actual post content and its native action toolbar. + const children = [...content.children]; + const contentIndex = children.findIndex(child => child.contains(badge)); + const controlsIndex = children.indexOf(controlsWrapper); + if (contentIndex < 0 || controlsIndex <= contentIndex) return; + for (const extra of children.slice(contentIndex + 1, controlsIndex)) { + mark(next, extra, 'data-bskyplus-unroll-chrome'); } } - // -------------------------------------------------------------------------- - // 3-Dot Post Menu Injection - // -------------------------------------------------------------------------- - function injectUnrollMenuItem(menu) { - if (!isFeatureActive()) return; - if (!menu || menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const postContext = lastInteractedPost; - - const menuItem = createEl('div', { - role: 'menuitem', - tabIndex: 0, - className: 'bskyplus-unroll-menu-item', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll Thread' }) - ]); - - menuItem.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - - // Dismiss the menu - const esc = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }); - menu.dispatchEvent(esc); - document.dispatchEvent(esc); - - handleUnrollClick(postContext); - }); + function compactReplyPrompt(scope, next) { + for (const prompt of scope.querySelectorAll(REPLY_PROMPT_SELECTOR)) { + if (prompt.closest(POST_SELECTOR) || prompt.closest('[role="dialog"], dialog')) continue; - menuItem.addEventListener('keydown', (e) => { - if (e.key === 'Enter' || e.key === ' ') { - e.preventDefault(); - e.stopPropagation(); - menuItem.click(); - } - }); - - const firstItem = menu.querySelector('[role="menuitem"], button, div'); - if (firstItem && firstItem.parentElement === menu) { - firstItem.after(menuItem); - } else { - menu.prepend(menuItem); + const wrapper = prompt.parentElement; + if (!wrapper || wrapper === scope) continue; + mark(next, wrapper, 'data-bskyplus-unroll-chrome'); } } - function scanForDropdownMenus() { - if (!isFeatureActive()) return; - - const menus = document.querySelectorAll( - 'div[role="menu"], [data-testid*="dropdownMenu"], [data-radix-menu-content]' - ); - - menus.forEach(menu => { - if (menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const text = menu.textContent || ''; - const isPostMenu = - text.includes('Translate') || - text.includes('Copy link') || - text.includes('Quote') || - text.includes('Mute') || - text.includes('Report') || - text.includes('Pin') || - text.includes('Embed') || - lastInteractedPost !== null; - - if (isPostMenu) { - injectUnrollMenuItem(menu); + function reconcile(next) { + for (const [element, attrs] of marked) { + const wanted = next.get(element); + for (const name of attrs.keys()) { + if (!wanted?.has(name)) element.removeAttribute(name); } - }); + } + + for (const [element, attrs] of next) { + for (const [name, value] of attrs) { + if (element.getAttribute(name) !== value) element.setAttribute(name, value); + } + } + marked = next; } - // -------------------------------------------------------------------------- - // Direct Thread Header Button - // -------------------------------------------------------------------------- - function attachUnrollButton(container) { - if (!isFeatureActive()) return; - if (container.querySelector('.bskyplus-unroll-btn')) return; - - const btn = createEl('button', { - type: 'button', - className: 'bskyplus-unroll-btn', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll' }) - ]); - - btn.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - handleUnrollClick(container); + function makeToggle() { + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'bskyplus-thread-unroll-toggle'; + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('width', '19'); + icon.setAttribute('height', '19'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('stroke', 'currentColor'); + icon.setAttribute('stroke-width', '1.8'); + icon.setAttribute('stroke-linecap', 'round'); + icon.setAttribute('stroke-linejoin', 'round'); + + for (const pathData of ['M5 5h14', 'M5 10h14', 'M5 15h10', 'M5 20h10']) { + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('d', pathData); + icon.append(path); + } + button.append(icon); + button.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + active = !active; + scan(); }); - - container.appendChild(btn); + return button; } - function scanForThreads() { - if (!isFeatureActive()) return; + function scan() { + if (route !== location.pathname) { + route = location.pathname; + active = false; + } - if (window.location.pathname.includes('/post/')) { - const headers = document.querySelectorAll('[data-testid*="postThreadItem"] [data-testid="postHeader"], div[data-testid*="post"] [data-testid="postHeader"]'); - if (headers.length > 0) { - attachUnrollButton(headers[0]); - } + const thread = findThread(); + if (!thread) { + toggle?.remove(); + reconcile(new Map()); + return; + } - const actionBars = document.querySelectorAll('[role="group"][aria-label*="post" i], [data-testid*="post-actions"]'); - if (actionBars.length > 0 && !document.querySelector('.bskyplus-unroll-btn')) { - attachUnrollButton(actionBars[0]); - } + if (!toggle) toggle = makeToggle(); + if (toggle.nextElementSibling !== thread.menu) thread.menu.before(toggle); + const label = active ? 'Restore thread' : 'Unroll thread'; + if (toggle.getAttribute('aria-label') !== label) toggle.setAttribute('aria-label', label); + toggle.setAttribute('title', active ? 'Restore thread' : `Unroll ${thread.total} posts`); + toggle.setAttribute('aria-pressed', String(active)); + + const next = new Map(); + mark(next, thread.menu.parentElement, 'data-bskyplus-unroll-header-controls'); + if (active) { + thread.posts.forEach((post, index) => { + mark(next, post, 'data-bskyplus-unroll-post', String(index + 1)); + if (post.parentElement && post.parentElement.querySelectorAll(POST_SELECTOR).length === 1) { + mark(next, post.parentElement, 'data-bskyplus-unroll-outer'); + } + compactNumber(post, next); + const controls = controlRow(post, next); + if (isExpandedAnchor(post)) compactAnchorChrome(post, controls, next); + if (index > 0) compactFollowup(post, next); + }); + compactReplyPrompt(thread.scope, next); } + reconcile(next); } - const observer = new MutationObserver(() => { - scanForThreads(); - scanForDropdownMenus(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); + function scheduleScan() { + if (scanQueued) return; + scanQueued = true; + requestAnimationFrame(() => { + scanQueued = false; + scan(); }); } - window.BskyPlusThreadUnroll = { - scanForThreads, - scanForDropdownMenus, - injectUnrollMenuItem, - handleUnrollClick, - openReaderView, - generateMarkdown, - extractLinearAuthorThread - }; + new MutationObserver(scheduleScan).observe(document, { + childList: true, + subtree: true, + attributes: true, + attributeFilter: ['aria-label', 'data-testid'] + }); + window.addEventListener('popstate', scheduleScan); + window.navigation?.addEventListener('navigatesuccess', scheduleScan); + setInterval(() => { + if (route !== location.pathname) scheduleScan(); + }, 1000); + scheduleScan(); })(); diff --git a/extension/shared/account-age.js b/extension/shared/account-age.js index 70a87cb..46852cf 100644 --- a/extension/shared/account-age.js +++ b/extension/shared/account-age.js @@ -6,7 +6,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const DB_NAME = 'bskyplus_db'; const STORE_NAME = 'account_ages'; @@ -51,7 +51,7 @@ // -------------------------------------------------------------------------- function openDatabase() { if (!dbPromise) { - dbPromise = new Promise((resolve, reject) => { + dbPromise = new Promise(resolve => { if (!window.indexedDB) { return resolve(null); } @@ -140,8 +140,6 @@ rateLimitBackoffUntil = Date.now() + 30000; console.warn('Bsky+ AccountAge: rate limited, backing off 30s'); batch.forEach(h => queue.add(h)); - isProcessing = false; - scheduleQueueProcessing(); return; } @@ -212,7 +210,7 @@ title: `Fresh account! Created on ${formattedDate} (${days} days ago)` }, [ Icons.sprout ? Icons.sprout() : document.createTextNode('🌱'), - document.createTextNode(isBrandNew ? `New (${days}d)` : `New (${days}d)`) + document.createTextNode(`New (${days}d)`) ]); linkEl.insertAdjacentElement('afterend', badge); @@ -265,19 +263,7 @@ links.forEach(link => checkHandleElement(link)); } - const observer = new MutationObserver(() => { - scanHandles(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanHandles(); - }); - } + observeDom(scanHandles); window.BskyPlusAccountAge = { scanHandles, diff --git a/extension/shared/appview-config.js b/extension/shared/appview-config.js new file mode 100644 index 0000000..86f4877 --- /dev/null +++ b/extension/shared/appview-config.js @@ -0,0 +1,42 @@ +// AppView routing policy shared by the page adapter and extension settings. +(() => { + 'use strict'; + // Temporarily allow any PDS; retain the provider eligibility policy below. + const ENFORCE_MATCHING_PDS = false; + const PRESETS = { + 'api.eurosky.network': { name: 'Eurosky', pds: ['eurosky.social'] }, + 'api.blacksky.community': { name: 'Blacksky', pds: ['blacksky.app', 'myatproto.social', 'cryptoanarchy.network'] }, + }; + const APPVIEW_HOSTS = ['api.bsky.app', 'public.api.bsky.app', ...Object.keys(PRESETS)]; + + function normalizeHostname(value) { + if (typeof value !== 'string') throw new Error('Enter an AppView hostname.'); + const authority = value.trim().replace(/^https:\/\//i, '').replace(/\/$/, ''); + if (!authority) return ''; + if (/[\s:/\\@?#%]/.test(authority)) throw new Error('Enter a hostname without a path, port, or login details.'); + let hostname; + try { hostname = new URL('https://' + authority).hostname.toLowerCase().replace(/\.$/, ''); } + catch { throw new Error('Enter a valid AppView hostname.'); } + if (hostname.length > 253 || !hostname.includes('.') || !hostname.split('.').every(label => + /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label))) throw new Error('Enter a valid AppView hostname.'); + return ['api.bsky.app', 'public.api.bsky.app'].includes(hostname) ? '' : hostname; + } + + function eligible(hostname, pds) { + if (!ENFORCE_MATCHING_PDS) return true; + const preset = PRESETS[hostname]; + if (!preset) return true; + let host; + try { host = new URL(pds).hostname; } catch { return false; } + return preset.pds.some(domain => host === domain || host.endsWith('.' + domain)); + } + + function isAppview(url) { + // Video uploads use a separate service. Repo writes, identity, sessions, + // chat, and moderation authorities must stay on their own services. + return url.protocol === 'https:' && /^\/xrpc\/app\.bsky\.(?!video\.)[A-Za-z0-9.]+$/.test(url.pathname) && + !/^\/xrpc\/app\.bsky\.actor\.(getPreferences|putPreferences)$/.test(url.pathname); + } + + globalThis.BskyPlusAppviewConfig = { PRESETS, APPVIEW_HOSTS, normalizeHostname, eligible, isAppview, ENFORCE_MATCHING_PDS }; +})(); diff --git a/extension/shared/appview-page.js b/extension/shared/appview-page.js new file mode 100644 index 0000000..3ddf4be --- /dev/null +++ b/extension/shared/appview-page.js @@ -0,0 +1,130 @@ +// Runs before the app captures fetch. Session credentials stay on the PDS. +(() => { + 'use strict'; + const config = window.BskyPlusAppviewConfig; + const channel = document.currentScript?.dataset.bskyplusChannel; + if (!config || !channel) return; + const nativeFetch = window.fetch.bind(window); + let hostname = ''; + let bookmarksAppview = ''; + let account = null; + let configured; + const ready = new Promise(resolve => { configured = resolve; }); + const startupTimeout = setTimeout(configured, 1500); + + function state() { + const allowed = Object.fromEntries(Object.keys(config.PRESETS).map(host => [host, config.eligible(host, account?.pds)])); + const enabled = !!hostname && config.eligible(hostname, account?.pds); + return { hostname, enabled, pds: account?.pds || '', allowed, + reason: hostname && !enabled ? 'This AppView requires an account on its matching PDS. Bluesky routing is unchanged.' : '' }; + } + + function claims(request) { + const auth = request.headers.get('authorization'); + if (!auth?.startsWith('Bearer ')) return null; + try { return JSON.parse(atob(auth.slice(7).split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))); } + catch { return null; } + } + + function observeAccount(request, url) { + const token = claims(request); + if (token?.scope === 'com.atproto.access' && typeof token.sub === 'string' && + token.sub.startsWith('did:') && url.protocol === 'https:' && + !config.APPVIEW_HOSTS.includes(url.hostname) && url.pathname.startsWith('/xrpc/')) { + account = { did: token.sub, pds: url.origin }; + } + } + + async function observeSession(response, url) { + if (!response.ok) return; + if (url.pathname === '/xrpc/com.atproto.server.deleteSession') { account = null; return; } + if (!/^\/xrpc\/com\.atproto\.server\.(getSession|createSession|refreshSession)$/.test(url.pathname)) return; + try { + const session = await response.clone().json(); + const service = session.didDoc?.service?.find(item => + item.type === 'AtprotoPersonalDataServer' && item.id.endsWith('#atproto_pds')); + if (!session.did?.startsWith('did:') || !service?.serviceEndpoint) return; + const pds = new URL(service.serviceEndpoint); + if (pds.protocol === 'https:' && !pds.username && !pds.password) account = { did: session.did, pds: pds.origin }; + } catch {} + } + + window.addEventListener('message', event => { + const message = event.data; + if (event.source !== window || event.origin !== location.origin || message?.channel !== channel || + message.direction !== 'request') return; + try { + if (message.action === 'configure') { + hostname = config.normalizeHostname(message.hostname || ''); + bookmarksAppview = message.bookmarksAppview === 'bluesky' ? 'bluesky' : ''; + clearTimeout(startupTimeout); + configured(); + window.dispatchEvent(new Event('bskyplus:appview-change')); + } else if (message.action !== 'state') return; + window.postMessage({ channel, direction: 'response', requestId: message.requestId, state: state() }, location.origin); + } catch (error) { + window.postMessage({ channel, direction: 'response', requestId: message.requestId, error: error.message }, location.origin); + } + }); + + function bookmarkHostname() { + if (bookmarksAppview === 'bluesky') return 'api.bsky.app'; + return hostname && config.eligible(hostname, account?.pds) ? hostname : 'api.bsky.app'; + } + + window.BskyPlusAppviewRouting = { + async bookmarkSource(request) { + await ready; + observeAccount(request, new URL(request.url)); + return bookmarkHostname(); + }, + }; + + window.fetch = async (input, init) => { + let request; + let url; + try { + url = new URL(input instanceof Request ? input.url : input, location.href); + if (url.protocol !== 'https:' || !url.pathname.startsWith('/xrpc/')) return nativeFetch(input, init); + request = new Request(input instanceof Request ? input.clone() : url, init); + } catch { return nativeFetch(input, init); } + observeAccount(request, url); + // Preferences and chat declarations belong on the PDS. Some clients + // attach their AppView proxy header to these requests too. + const preferences = /^\/xrpc\/app\.bsky\.actor\.(getPreferences|putPreferences)$/.test(url.pathname); + const chatDeclaration = request.method === 'GET' && + url.pathname === '/xrpc/com.atproto.repo.getRecord' && + url.searchParams.get('collection') === 'chat.bsky.actor.declaration'; + if (account?.pds === url.origin && (preferences || chatDeclaration) && + request.headers.get('atproto-proxy')?.endsWith('#bsky_appview')) { + const headers = new Headers(request.headers); + headers.delete('atproto-proxy'); + return nativeFetch(new Request(request, { headers })); + } + if (config.isAppview(url)) { + await ready; + const targetHostname = url.pathname.startsWith('/xrpc/app.bsky.bookmark.') && bookmarksAppview === 'bluesky' + ? 'api.bsky.app' : hostname; + if (targetHostname && config.eligible(targetHostname, account?.pds)) { + const auth = request.headers.has('authorization') || request.headers.has('dpop'); + const proxy = request.headers.get('atproto-proxy'); + if (auth && account?.pds === url.origin && (!proxy || /#bsky_(appview|notif)$/.test(proxy))) { + const headers = new Headers(request.headers); + const service = proxy?.endsWith('#bsky_notif') ? 'bsky_notif' : 'bsky_appview'; + headers.set('atproto-proxy', 'did:web:' + targetHostname + '#' + service); + return nativeFetch(new Request(request, { headers })); + } + if (!auth && request.method === 'GET' && config.APPVIEW_HOSTS.includes(url.hostname)) { + const target = new URL(request.url); + target.hostname = targetHostname; + return nativeFetch(new Request(target, { method: 'GET', headers: request.headers, + credentials: 'omit', signal: request.signal, mode: 'cors', redirect: 'error' })); + } + } + } + const response = await nativeFetch(input, init); + await observeSession(response, url); + return response; + }; + window.postMessage({ channel, direction: 'ready' }, location.origin); +})(); diff --git a/extension/shared/appview-settings.js b/extension/shared/appview-settings.js new file mode 100644 index 0000000..aaf81db --- /dev/null +++ b/extension/shared/appview-settings.js @@ -0,0 +1,168 @@ +// AppView controls shared by the popup and full extension settings page. +(() => { + 'use strict'; + const api = globalThis.browser || globalThis.chrome; + const config = globalThis.BskyPlusAppviewConfig; + const section = document.createElement('section'); + section.className = 'section'; + section.id = 'appviewSection'; + function element(tag, text, className) { + const node = document.createElement(tag); + if (text) node.textContent = text; + if (className) node.className = className; + return node; + } + section.append(element('div', 'AppView', 'section-title'), + element('p', 'Choose the service that supplies Bluesky feeds and social data. ' + + (config.ENFORCE_MATCHING_PDS ? 'Eurosky and Blacksky require a matching account PDS. ' : '') + + 'Authenticated requests remain on your PDS, which proxies them to the selected service.', 'toggle-desc')); + const select = element('select', '', 'bskyplus-llm-input'); + select.id = 'appviewProvider'; + select.setAttribute('aria-label', 'AppView provider'); + for (const [value, label] of [['', 'Bluesky (default)'], ...Object.entries(config.PRESETS).map(([host, preset]) => [host, preset.name]), ['custom', 'Custom']]) { + const option = element('option', label); + option.value = value; + select.append(option); + } + const label = element('div', '', 'bskyplus-llm-field'); + const providerRow = element('div', '', 'bskyplus-appview-provider-row'); + providerRow.append(select); + label.append(providerRow); + const input = element('input', '', 'bskyplus-llm-input'); + input.type = 'text'; + input.placeholder = 'api.example.com'; + input.autocomplete = 'off'; + input.spellcheck = false; + const custom = element('label', '', 'bskyplus-llm-field'); + custom.append(element('span', 'Custom hostname', 'bskyplus-llm-label'), + input, element('span', 'Requires HTTPS, public-read CORS, and a did:web AppView service on this hostname.', 'toggle-desc')); + const status = element('p', '', 'toggle-desc'); + status.setAttribute('role', 'status'); + const save = element('button', 'Save AppView', 'secondary-btn'); + save.type = 'button'; + select.disabled = true; + save.disabled = true; + providerRow.append(save); + section.append(label, custom, status); + document.querySelector('.footer')?.before(section); + if (!section.isConnected) document.body.append(section); + const popupRow = globalThis.BskyPlusFeatureRow?.(section, 'AppView', 'Choose your feed provider', 'appviewEnabledToggle', + document.getElementById('infrastructureSection') ? 'infrastructureSection' : 'featuresSection'); + if (popupRow) { + popupRow.addTooltip('Choose the service that supplies feeds, profiles, search, and other Bluesky social data. ' + + 'Your PDS forwards signed-in requests to the selected AppView. Account settings, posting, chat, and video uploads keep their existing services. ' + + 'Bookmarks follow this choice unless you select Bluesky in Local bookmarks. Reload Bluesky after changing providers to refresh existing feeds.'); + popupRow.toggle.disabled = true; + popupRow.toggle.addEventListener('change', async () => { + if (popupRow.toggle.checked) return; + popupRow.toggle.disabled = true; + try { + await api.storage.local.set({ appviewHostname: '' }); + select.value = ''; + showCustom(); + status.textContent = 'Bluesky routing restored.'; + showRestartPrompt(); + } catch (error) { + popupRow.setEnabled(true); + status.textContent = error.message; + } finally { popupRow.toggle.disabled = false; } + }); + } + + async function send(action, hostname) { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + if (!tab?.id) throw new Error('Open Bluesky to connect AppView settings.'); + const result = await api.tabs.sendMessage(tab.id, { type: 'BSKYPLUS_APPVIEW', action, hostname }); + if (!result?.success) throw new Error(result?.error || 'Refresh Bluesky to connect AppView settings.'); + return result; + } + function showCustom() { custom.hidden = select.value !== 'custom'; } + function showRestartPrompt() { + if (window.parent !== window) { + window.parent.postMessage({ type: 'BSKYPLUS_APPVIEW_RESTART' }, 'https://bsky.app'); + return; + } + + const dialog = element('dialog', '', 'bskyplus-appview-restart-dialog'); + const form = element('form'); + form.method = 'dialog'; + form.append(element('h2', 'Restart Bluesky', 'bskyplus-appview-restart-title'), + element('p', 'The AppView changed. Bluesky needs to restart to use the new provider.', + 'bskyplus-appview-restart-message')); + const actions = element('div', '', 'bskyplus-appview-restart-actions'); + const confirm = element('button', 'OK', 'preset-btn'); + confirm.type = 'submit'; + confirm.value = 'ok'; + actions.append(confirm); + form.append(actions); + dialog.append(form); + dialog.addEventListener('cancel', event => event.preventDefault()); + dialog.addEventListener('close', () => { + const confirmed = dialog.returnValue === 'ok'; + dialog.remove(); + if (confirmed) void reloadActiveTab(); + }, { once: true }); + document.body.append(dialog); + dialog.showModal(); + confirm.focus(); + } + async function reloadActiveTab() { + try { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + if (tab?.id) await api.tabs.reload(tab.id); + else status.textContent = 'Refresh Bluesky to use the new AppView.'; + } catch { + status.textContent = 'Refresh Bluesky to use the new AppView.'; + } + } + function showPds(state) { + const description = section.querySelector('.toggle-info .toggle-desc'); + if (description) description.textContent = 'Choose your feed provider' + + (state.pds ? ' (Your PDS is ' + new URL(state.pds).hostname + ')' : ''); + } + function availability(state) { + for (const option of select.options) { + if (!config.PRESETS[option.value]) continue; + option.disabled = config.ENFORCE_MATCHING_PDS && !state?.allowed?.[option.value]; + option.textContent = config.PRESETS[option.value].name + (option.disabled ? ' (matching PDS required)' : ''); + } + } + availability(null); + select.addEventListener('change', showCustom); + showCustom(); + (async () => { + const stored = await api.storage.local.get('appviewHostname'); + const hostname = config.normalizeHostname(stored.appviewHostname || ''); + select.value = !hostname || config.PRESETS[hostname] ? hostname : 'custom'; + input.value = hostname; + popupRow?.setEnabled(!!hostname); + showCustom(); + try { + const state = await send('state'); + availability(state); + showPds(state); + status.textContent = state.reason || ''; + } catch { status.textContent = 'Refresh Bluesky while signed in to connect AppView settings.'; } + })().catch(error => { status.textContent = error.message; }).finally(() => { + select.disabled = false; + save.disabled = false; + if (popupRow) popupRow.toggle.disabled = false; + }); + save.addEventListener('click', async () => { + save.disabled = true; + try { + const hostname = config.normalizeHostname(select.value === 'custom' ? input.value : select.value); + if (select.value === 'custom' && !input.value.trim()) throw new Error('Enter an AppView hostname.'); + const stored = await api.storage.local.get('appviewHostname'); + const previousHostname = config.normalizeHostname(stored.appviewHostname || ''); + if (!hostname) await api.storage.local.set({ appviewHostname: '' }); + else showPds(await send('save', hostname)); + popupRow?.setEnabled(!!hostname); + if (hostname !== previousHostname) { + status.textContent = 'AppView changed.'; + showRestartPrompt(); + } else status.textContent = 'AppView is unchanged.'; + } catch (error) { status.textContent = error.message; } + finally { save.disabled = false; } + }); +})(); diff --git a/extension/shared/appview.js b/extension/shared/appview.js new file mode 100644 index 0000000..a349acd --- /dev/null +++ b/extension/shared/appview.js @@ -0,0 +1,88 @@ +// Extension storage and page-world adapter bridge. Only non-secret metadata crosses it. +(() => { + 'use strict'; + const api = globalThis.browser || globalThis.chrome; + const config = globalThis.BskyPlusAppviewConfig; + const channel = crypto.randomUUID(); + const pending = new Map(); + let pageReady = false; + let savedHostname = ''; + let bookmarksAppview = ''; + let storageChanged = false; + const loaded = api.storage.local.get(['appviewHostname', 'bookmarksAppview']).then(value => { + if (storageChanged) return; + try { savedHostname = config.normalizeHostname(value.appviewHostname || ''); } catch {} + bookmarksAppview = value.bookmarksAppview === 'bluesky' ? 'bluesky' : ''; + }); + let initialize; + const ready = new Promise(resolve => { initialize = resolve; }); + + function request(action, hostname) { + return new Promise((resolve, reject) => { + const requestId = crypto.randomUUID(); + const timer = setTimeout(() => { pending.delete(requestId); reject(new Error('Refresh Bluesky to connect AppView settings.')); }, 4000); + pending.set(requestId, { resolve, reject, timer }); + window.postMessage({ channel, direction: 'request', requestId, action, hostname, bookmarksAppview }, location.origin); + }); + } + + window.addEventListener('message', event => { + const message = event.data; + if (event.source !== window || event.origin !== location.origin || message?.channel !== channel) return; + if (message.direction === 'ready') { + pageReady = true; + loaded.catch(() => {}).then(() => request('configure', savedHostname)).then(initialize, () => initialize()); + } else if (message.direction === 'response') { + const entry = pending.get(message.requestId); + if (!entry) return; + pending.delete(message.requestId); + clearTimeout(entry.timer); + if (message.error) entry.reject(new Error(message.error)); + else entry.resolve(message.state); + } + }); + + api.storage.onChanged.addListener((changes, area) => { + if (area !== 'local' || (!changes.appviewHostname && !changes.bookmarksAppview)) return; + storageChanged = true; + if (changes.appviewHostname) { + try { savedHostname = config.normalizeHostname(changes.appviewHostname.newValue || ''); } catch { savedHostname = ''; } + } + if (changes.bookmarksAppview) bookmarksAppview = changes.bookmarksAppview.newValue === 'bluesky' ? 'bluesky' : ''; + if (pageReady) void request('configure', savedHostname).catch(() => {}); + }); + + api.runtime.onMessage.addListener((message, sender, respond) => { + if (sender.id !== api.runtime.id || !sender.url?.startsWith(api.runtime.getURL('')) || + message?.type !== 'BSKYPLUS_APPVIEW' || !['state', 'save'].includes(message.action)) return; + (async () => { + if (!pageReady) throw new Error('Refresh Bluesky to connect AppView settings.'); + await ready; + const state = await request('state'); + if (message.action === 'state') return { success: true, ...state }; + const hostname = config.normalizeHostname(message.hostname || ''); + if (!config.eligible(hostname, state.pds)) throw new Error('Choose an AppView matching your account’s PDS.'); + await api.storage.local.set({ appviewHostname: hostname }); + savedHostname = hostname; + return { success: true, ...await request('configure', hostname) }; + })().then(respond, error => respond({ success: false, error: error.message })); + return true; + }); + + const mount = () => { + if (!document.documentElement) return false; + for (const file of ['appview-config.js', 'appview-page.js']) { + const script = document.createElement('script'); + script.async = false; + script.dataset.bskyplusChannel = channel; + script.src = api.runtime.getURL('shared/' + file); + script.onload = () => script.remove(); + document.documentElement.append(script); + } + return true; + }; + if (!mount()) { + const observer = new MutationObserver(() => { if (mount()) observer.disconnect(); }); + observer.observe(document, { childList: true }); + } +})(); diff --git a/extension/shared/bookmarks-page.js b/extension/shared/bookmarks-page.js new file mode 100644 index 0000000..6d37f50 --- /dev/null +++ b/extension/shared/bookmarks-page.js @@ -0,0 +1,1197 @@ +// Private snapshots are separated by account DID and bookmark AppView. +// Native rendering remains responsible for moderation, embeds and post actions. +(() => { + 'use strict'; + const originalFetch = window.fetch.bind(window); + const prefix = '/xrpc/app.bsky.bookmark.'; + const contexts = new Map(); + const syncBypass = new Map(); + const controlKey = '__bskyplus_bookmarks_control__'; + let invalidationGeneration = 0; + let bookmarkChannel; + try { bookmarkChannel = new BroadcastChannel('bskyplus-bookmarks'); } catch {} + let active; + let panel; + let headerActions; + let actionHeader; + let database; + const channel = document.currentScript?.dataset.bskyplusChannel; + let searchTimer; + let syncToast; + let toastTimer; + let closeAuthorSuggestions = () => {}; + let closeContentDropdown = () => {}; + + function showSyncToast(context, message, kind = 'progress') { + if (active !== context) return; + clearTimeout(toastTimer); + if (!syncToast?.isConnected) { + syncToast = document.createElement('div'); + syncToast.className = 'bskyplus-bookmarks-toast'; + const text = document.createElement('span'); + text.setAttribute('role', 'status'); + text.setAttribute('aria-live', 'polite'); + const dismiss = document.createElement('button'); + dismiss.type = 'button'; + dismiss.textContent = '×'; + dismiss.setAttribute('aria-label', 'Dismiss bookmark sync notification'); + dismiss.onclick = () => { clearTimeout(toastTimer); syncToast?.remove(); }; + syncToast.append(text, dismiss); + document.body.append(syncToast); + } + syncToast.dataset.did = context.did; + syncToast.dataset.kind = kind; + syncToast.firstElementChild.textContent = message; + if (kind !== 'progress') toastTimer = setTimeout(() => syncToast?.remove(), kind === 'error' ? 8000 : 5000); + } + + function syncButtonState(button, context) { + const syncing = !!context.pendingSync; + button.disabled = syncing; + button.textContent = syncing ? 'Syncing…' : 'Sync now'; + button.title = context.status || ''; + button.setAttribute('aria-busy', String(syncing)); + } + + const defaultFilters = { query: '', author: '', type: 'all', after: '', before: '', order: 'newest' }; + const emptyFilters = () => ({ ...defaultFilters }); + const normalize = value => String(value || '').normalize('NFKD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + const hasFilters = context => Object.entries(context.filters).some(([key, value]) => value !== defaultFilters[key]); + + function filteredBookmarks(bookmarks, filters) { + const terms = normalize(filters.query).trim().split(/\s+/).filter(Boolean); + const author = normalize(filters.author).replace(/^@/, '').trim(); + const after = filters.after ? Date.parse(filters.after + 'T00:00:00') : null; + const beforeDate = filters.before ? new Date(filters.before + 'T00:00:00') : null; + const before = beforeDate ? beforeDate.setDate(beforeDate.getDate() + 1) : null; + const results = bookmarks.filter(bookmark => { + const post = bookmark.item || {}; + const record = post.record || {}; + const embed = post.embed?.media || post.embed || record.embed?.media || record.embed || {}; + const images = embed.images || []; + const video = embed.$type?.includes('#video') || embed.$type?.includes('.video') || !!embed.playlist; + const external = embed.external || {}; + const links = (record.facets || []).flatMap(facet => facet.features || []) + .map(feature => feature.uri || '').filter(Boolean); + const hasLink = !!external.uri || links.length > 0 || /https?:\/\//i.test(record.text || ''); + if (filters.type === 'images' && !images.length) return false; + if (filters.type === 'video' && !video) return false; + if (filters.type === 'links' && !hasLink) return false; + if (filters.type === 'text' && (images.length || video || hasLink)) return false; + const authorText = normalize([post.author?.handle, post.author?.displayName, post.author?.did].join(' ')); + if (author && !authorText.includes(author)) return false; + const text = normalize([record.text, authorText, ...images.map(image => image.alt), + external.title, external.description, external.uri, ...links].join(' ')); + if (!terms.every(term => text.includes(term))) return false; + const saved = Date.parse(bookmark.createdAt); + if (after !== null && (!Number.isFinite(saved) || saved < after)) return false; + if (before !== null && (!Number.isFinite(saved) || saved >= before)) return false; + return true; + }); + return filters.order === 'oldest' ? results.reverse() : results; + } + + // Bluesky's saved list uses the ['bookmarks'] infinite query. Locate its + // provider through React's fiber ancestry, as the composer bridge does. + function bookmarksClient() { + const main = document.querySelector('main, [role="main"]'); + const isClient = value => typeof value?.getQueryCache === 'function' && + typeof value.resetQueries === 'function' && typeof value.refetchQueries === 'function' && + typeof value.cancelQueries === 'function'; + const visited = new Set(); + for (const element of [main, main?.firstElementChild, + ...(main?.querySelectorAll('#content, [data-testid], h1, [role="heading"]') || [])]) { + if (!element) continue; + const key = Object.keys(element).find(name => name.startsWith('__reactFiber$')); + let fiber = element[key]; + if (!fiber) continue; + // DOM fiber pointers can refer to the previous committed tree. Follow + // the current branch, especially after switching accounts. + let root = fiber; + const roots = new Set(); + while (root.return && !roots.has(root)) { + roots.add(root); + root = root.return; + } + const useAlternate = root.stateNode?.current && root.stateNode.current !== root; + for (; fiber && !visited.has(fiber); fiber = fiber.return) { + visited.add(fiber); + const node = useAlternate ? fiber.alternate : fiber; + if (!node) continue; + // QueryClientProvider uses value; PersistQueryClientProvider uses + // client. Both may sit more than 100 ancestors above the native list. + for (const value of [node.memoizedProps?.value, node.memoizedProps?.client]) { + if (isClient(value)) return value; + } + const dependencies = new Set(); + for (let dependency = node.dependencies?.firstContext; + dependency && !dependencies.has(dependency); dependency = dependency.next) { + dependencies.add(dependency); + if (isClient(dependency.memoizedValue)) return dependency.memoizedValue; + } + } + } + return null; + } + + async function refreshResults(context) { + if (active !== context || !context.enabled || location.pathname !== '/saved') return; + const generation = ++context.generation; + const status = panel?.querySelector('[data-bookmark-results]'); + try { + const snapshot = await stored(context.key); + if (active !== context || generation !== context.generation) return; + if (!snapshot?.bookmarks) throw new Error('Finish syncing bookmarks before searching.'); + const count = filteredBookmarks(snapshot.bookmarks, context.filters).length; + if (status) status.textContent = `${count.toLocaleString()} of ${snapshot.bookmarks.length.toLocaleString()} bookmarks`; + const client = bookmarksClient(); + if (!client) throw new Error('Could not refresh the saved feed. Reload Bluesky and try again.'); + await client.cancelQueries({ queryKey: ['bookmarks'], exact: true }); + if (active !== context || generation !== context.generation) return; + // Keep the previous infinite-query data while recomputing local results. + // Resetting it returns Bluesky's list to its initial loading skeleton. + await client.refetchQueries({ queryKey: ['bookmarks'], exact: true, type: 'active' }); + } catch (error) { + if (active === context && generation === context.generation && status) status.textContent = error.message; + } + } + + // Both editable author suggestions and fixed-choice filters use the same + // anchored top-layer menu, including the fallback for older browsers. + function anchoredDropdown(control, list, onClose) { + list.hidden = true; + const overlay = typeof list.showPopover === 'function'; + if (overlay) list.setAttribute('popover', 'manual'); + control.setAttribute('role', 'combobox'); + control.setAttribute('aria-controls', list.id); + control.setAttribute('aria-expanded', 'false'); + const position = () => { + if (list.hidden || !overlay) return; + if (!control.isConnected) { close(); return; } + const rect = control.getBoundingClientRect(); + if (rect.bottom <= 0 || rect.top >= innerHeight) { close(); return; } + const width = Math.min(rect.width, innerWidth - 16); + const below = Math.max(0, innerHeight - rect.bottom - 12); + const above = Math.max(0, rect.top - 12); + const upwards = below < 160 && above > below; + // Override popover centering from browser and page styles. All offsets + // use viewport coordinates, matching the control's bounding rectangle. + const layout = { + position: 'fixed', inset: 'auto', margin: '0', transform: 'none', translate: 'none', + width: width + 'px', + left: Math.max(8, Math.min(rect.left, innerWidth - width - 8)) + 'px', + 'max-height': Math.min(280, upwards ? above : below) + 'px', + }; + for (const [property, value] of Object.entries(layout)) list.style.setProperty(property, value, 'important'); + list.style.setProperty('top', (upwards ? rect.top - list.getBoundingClientRect().height - 4 : rect.bottom + 4) + 'px', 'important'); + }; + const close = () => { + if (overlay && list.matches(':popover-open')) list.hidePopover(); + list.hidden = true; + window.removeEventListener('scroll', position, true); + window.removeEventListener('resize', position); + control.setAttribute('aria-expanded', 'false'); + control.removeAttribute('aria-activedescendant'); + onClose(); + }; + const open = () => { + list.hidden = false; + if (overlay && !list.matches(':popover-open')) list.showPopover(); + control.setAttribute('aria-expanded', 'true'); + window.addEventListener('scroll', position, true); + window.addEventListener('resize', position); + position(); + }; + control.addEventListener('blur', close); + return { open, close }; + } + + function authorSuggestions(input, wrapper, context) { + const list = document.createElement('div'); + list.className = 'bskyplus-bookmarks-authors'; + list.id = 'bskyplus-authors-' + crypto.randomUUID(); + list.setAttribute('role', 'listbox'); + list.setAttribute('aria-label', 'Authors in saved bookmarks'); + wrapper.append(list); + input.setAttribute('aria-autocomplete', 'list'); + input.autocomplete = 'off'; + let version = 0; + let selected = -1; + let matches = []; + const { open, close } = anchoredDropdown(input, list, () => { version++; selected = -1; }); + closeAuthorSuggestions = close; + const highlight = index => { + selected = index; + [...list.children].forEach((option, i) => option.setAttribute('aria-selected', String(i === index))); + if (list.children[index]) input.setAttribute('aria-activedescendant', list.children[index].id); + }; + const choose = index => { + const author = matches[index]; + if (!author) return; + input.value = author.handle || author.did; + context.filters.author = input.value; + clearTimeout(searchTimer); + close(); + input.blur(); + void refreshResults(context); + }; + const suggest = async () => { + const current = ++version; + try { + const snapshot = await stored(context.key); + if (current !== version || active !== context || !context.enabled || !input.isConnected || + document.activeElement !== input) return; + const authors = new Map(); + for (const bookmark of snapshot?.bookmarks || []) { + const author = bookmark.item?.author; + if (author?.handle || author?.did) authors.set(author.did || author.handle, author); + } + const query = normalize(input.value).trim().replace(/^@/, ''); + matches = [...authors.values()].filter(author => + normalize([author.handle, author.displayName, author.did].join(' ')).includes(query)) + .sort((a, b) => Number(normalize(b.handle).startsWith(query)) - Number(normalize(a.handle).startsWith(query)) || + (a.handle || a.did).localeCompare(b.handle || b.did)).slice(0, 8); + list.replaceChildren(); + selected = -1; + input.removeAttribute('aria-activedescendant'); + matches.forEach((author, index) => { + const option = document.createElement('div'); + option.id = list.id + '-' + index; + option.setAttribute('role', 'option'); + option.setAttribute('aria-selected', 'false'); + const avatar = document.createElement('div'); + avatar.className = 'bskyplus-bookmarks-author-avatar'; + avatar.setAttribute('aria-hidden', 'true'); + avatar.textContent = Array.from(author.displayName || author.handle || '?')[0].toUpperCase(); + if (typeof author.avatar === 'string' && /^https?:\/\//i.test(author.avatar)) { + const image = document.createElement('img'); + image.alt = ''; + image.src = author.avatar; + image.loading = 'lazy'; + image.decoding = 'async'; + image.referrerPolicy = 'no-referrer'; + image.addEventListener('error', () => image.remove(), { once: true }); + avatar.append(image); + } + const copy = document.createElement('div'); + copy.className = 'bskyplus-bookmarks-author-copy'; + const name = document.createElement('strong'); + name.textContent = author.displayName || author.handle || author.did; + const handle = document.createElement('span'); + handle.textContent = author.handle ? '@' + author.handle : author.did; + copy.append(name, handle); + option.append(avatar, copy); + option.onpointerdown = event => { event.preventDefault(); choose(index); }; + list.append(option); + }); + if (!matches.length) { close(); return; } + open(); + } catch { close(); } + }; + input.addEventListener('focus', () => void suggest()); + input.addEventListener('input', () => void suggest()); + input.addEventListener('keydown', event => { + if (event.key === 'Escape' && !list.hidden) { + event.preventDefault(); + close(); + input.blur(); + return; + } + if (list.hidden) return; + if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { + event.preventDefault(); + highlight(selected < 0 ? (event.key === 'ArrowDown' ? 0 : matches.length - 1) : + (selected + (event.key === 'ArrowDown' ? 1 : -1) + matches.length) % matches.length); + } else if (event.key === 'Enter' && selected >= 0) { + event.preventDefault(); + choose(selected); + } + }); + } + + function filterDropdown(button, label, choices) { + const list = document.createElement('div'); + list.className = 'bskyplus-bookmarks-options'; + list.id = 'bskyplus-' + button.name + '-' + crypto.randomUUID(); + list.dataset.bookmarkOptions = button.name; + list.setAttribute('role', 'listbox'); + list.setAttribute('aria-label', button.getAttribute('aria-label')); + label.append(list); + button.type = 'button'; + button.className = 'bskyplus-bookmarks-select'; + button.dataset.bookmarkSelect = ''; + if (button.name === 'type') button.dataset.bookmarkContent = ''; + else button.dataset.bookmarkOrder = ''; + button.setAttribute('aria-haspopup', 'listbox'); + let selected = 0; + let typed = ''; + let typedAt = 0; + const { open: show, close } = anchoredDropdown(button, list, () => { typed = ''; }); + const highlight = index => { + selected = index; + [...list.children].forEach((option, i) => option.setAttribute('aria-selected', String(i === index))); + button.setAttribute('aria-activedescendant', list.children[index].id); + list.children[index].scrollIntoView({ block: 'nearest' }); + }; + const update = () => { + button.textContent = choices.find(([value]) => value === button.value)?.[1] || choices[0][1]; + }; + const choose = index => { + button.value = choices[index][0]; + update(); + close(); + button.blur(); + button.dispatchEvent(new Event('change', { bubbles: true })); + }; + choices.forEach(([value, text], index) => { + const option = document.createElement('div'); + option.id = list.id + '-' + index; + option.dataset.value = value; + option.setAttribute('role', 'option'); + option.textContent = text; + option.addEventListener('pointerdown', event => event.preventDefault()); + option.addEventListener('click', event => { event.preventDefault(); choose(index); }); + list.append(option); + }); + const open = () => { + closeAuthorSuggestions(); + closeContentDropdown(); + closeContentDropdown = close; + show(); + highlight(Math.max(0, choices.findIndex(([value]) => value === button.value))); + }; + button.addEventListener('click', () => { + if (list.hidden) open(); + else { close(); button.blur(); } + }); + button.addEventListener('change', update); + button.addEventListener('keydown', event => { + const key = event.key; + if (key === 'Escape' && !list.hidden) { + event.preventDefault(); + event.stopPropagation(); + close(); + button.blur(); + return; + } + if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(key)) { + event.preventDefault(); + const wasHidden = list.hidden; + if (wasHidden) open(); + if (key === 'Home') highlight(0); + else if (key === 'End') highlight(choices.length - 1); + else if (!wasHidden) highlight((selected + (key === 'ArrowDown' ? 1 : -1) + choices.length) % choices.length); + } else if ((key === 'Enter' || key === ' ') && !list.hidden) { + event.preventDefault(); + choose(selected); + } else if (key.length === 1 && key !== ' ' && !event.ctrlKey && !event.metaKey && !event.altKey) { + event.preventDefault(); + if (list.hidden) open(); + typed = Date.now() - typedAt > 700 ? key : typed + key; + typedAt = Date.now(); + const index = choices.findIndex(([, text]) => text.toLowerCase().startsWith(typed.toLowerCase())); + if (index >= 0) highlight(index); + } + }); + update(); + return update; + } + + function searchControls(context) { + const form = document.createElement('form'); + form.className = 'bskyplus-bookmarks-search'; + form.setAttribute('aria-label', 'Search and filter saved bookmarks'); + form.onsubmit = event => { event.preventDefault(); clearTimeout(searchTimer); void refreshResults(context); }; + const fields = [ + ['query', 'Search bookmarks', 'search'], + ['author', 'Author', 'search'], + ['type', 'Content', [['all', 'All content'], ['images', 'Images'], ['video', 'Video'], ['links', 'Links'], ['text', 'Text only']]], + ['after', 'Saved from', 'date'], + ['before', 'Saved through', 'date'], + ['order', 'Order', [['newest', 'Newest first'], ['oldest', 'Oldest first']]], + ]; + const advancedFields = []; + const updateDropdowns = []; + for (const [key, title, kind] of fields) { + const label = document.createElement('label'); + label.textContent = title; + if (['after', 'before', 'order'].includes(key)) { + label.hidden = true; + advancedFields.push(label); + } + const input = document.createElement(Array.isArray(kind) ? 'button' : 'input'); + input.name = key; + input.setAttribute('aria-label', title); + if (Array.isArray(kind)) { + label.className = 'bskyplus-bookmarks-select-field'; + } else { + input.type = kind; + if (key === 'query') input.placeholder = 'Text, links, or image descriptions'; + if (key === 'author') input.placeholder = 'Name or @handle'; + } + input.value = context.filters[key]; + input.addEventListener(kind === 'search' ? 'input' : 'change', () => { + context.filters[key] = input.value; + clearTimeout(searchTimer); + searchTimer = setTimeout(() => void refreshResults(context), kind === 'search' ? 250 : 0); + }); + label.append(input); + if (Array.isArray(kind)) updateDropdowns.push(filterDropdown(input, label, kind)); + if (key === 'author') { + const wrapper = document.createElement('div'); + wrapper.className = 'bskyplus-bookmarks-author-field'; + wrapper.append(label); + form.append(wrapper); + authorSuggestions(input, wrapper, context); + } else form.append(label); + } + const clear = document.createElement('button'); + clear.type = 'button'; + clear.className = 'bskyplus-bookmarks-button'; + clear.textContent = 'Clear filters'; + clear.onclick = () => { + context.filters = emptyFilters(); + for (const input of form.querySelectorAll('input, [data-bookmark-select]')) input.value = context.filters[input.name]; + updateDropdowns.forEach(update => update()); + clearTimeout(searchTimer); + void refreshResults(context); + }; + const settings = document.createElement('button'); + settings.type = 'button'; + settings.className = 'bskyplus-bookmarks-button'; + settings.dataset.bookmarkAdvanced = ''; + settings.textContent = 'Advanced'; + settings.setAttribute('aria-label', 'Advanced search settings'); + settings.setAttribute('aria-haspopup', 'dialog'); + settings.onclick = () => { + closeAuthorSuggestions(); + closeContentDropdown(); + const dialog = document.createElement('dialog'); + dialog.className = 'bskyplus-bookmarks-dialog'; + const heading = document.createElement('h2'); + heading.id = 'bskyplus-bookmarks-dialog-title'; + heading.textContent = 'Advanced search'; + heading.tabIndex = -1; + heading.setAttribute('autofocus', ''); + dialog.setAttribute('aria-labelledby', heading.id); + const close = document.createElement('button'); + close.type = 'button'; + close.className = 'bskyplus-bookmarks-button'; + close.textContent = 'Done'; + close.setAttribute('aria-label', 'Close advanced search'); + close.onclick = () => dialog.close(); + const header = document.createElement('div'); + header.className = 'bskyplus-bookmarks-dialog-header'; + const actions = document.createElement('div'); + actions.className = 'bskyplus-bookmarks-dialog-actions'; + actions.append(close); + header.append(heading, actions); + // Keep a noninteractive copy in the feed while its live controls are in + // the modal. Native modal dialogs already make the background inert. + const anchor = form.cloneNode(true); + anchor.inert = true; + anchor.setAttribute('aria-hidden', 'true'); + anchor.dataset.bookmarkBackground = ''; + const sourceControls = [...form.querySelectorAll('input, button')]; + const backgroundControls = [...anchor.querySelectorAll('input, button')]; + const backgroundResults = anchor.querySelector('[data-bookmark-results]'); + backgroundResults.style.gridColumn = '1 / -1'; + anchor.querySelectorAll('[popover]').forEach(menu => menu.remove()); + anchor.querySelectorAll('*').forEach(element => { + for (const attribute of [...element.attributes]) { + if (attribute.name === 'id' || attribute.name === 'name' || + attribute.name === 'aria-controls' || attribute.name === 'aria-activedescendant' || + attribute.name.startsWith('data-bookmark')) element.removeAttribute(attribute.name); + } + }); + const syncBackground = () => { + sourceControls.forEach((source, index) => { + const target = backgroundControls[index]; + target.value = source.value; + if (source.tagName === 'BUTTON') target.textContent = source.textContent; + }); + backgroundResults.textContent = results.textContent; + }; + const backgroundObserver = new MutationObserver(syncBackground); + backgroundObserver.observe(form, { subtree: true, childList: true, characterData: true, attributes: true }); + form.addEventListener('input', syncBackground); + form.addEventListener('change', syncBackground); + clear.addEventListener('click', syncBackground); + form.parentNode.insertBefore(anchor, form); + actions.prepend(clear); + advancedFields.forEach(field => { field.hidden = false; }); + settings.hidden = true; + dialog.append(header, form); + panel.append(dialog); + dialog.addEventListener('close', () => { + backgroundObserver.disconnect(); + form.removeEventListener('input', syncBackground); + form.removeEventListener('change', syncBackground); + clear.removeEventListener('click', syncBackground); + closeAuthorSuggestions(); + closeContentDropdown(); + advancedFields.forEach(field => { field.hidden = true; }); + settings.hidden = false; + form.insertBefore(clear, settings); + if (anchor.isConnected) anchor.replaceWith(form); + dialog.remove(); + if (settings.isConnected) settings.focus(); + }, { once: true }); + dialog.addEventListener('click', event => { + const rect = dialog.getBoundingClientRect(); + if (event.target === dialog && (event.clientX < rect.left || event.clientX > rect.right || + event.clientY < rect.top || event.clientY > rect.bottom)) dialog.close(); + }); + dialog.addEventListener('keydown', event => { + if (event.key === 'Escape' && !event.defaultPrevented) { + event.preventDefault(); + event.stopPropagation(); + dialog.close(); + } + }); + dialog.showModal(); + heading.focus({ preventScroll: true }); + }; + const updateSettingsLabel = () => { + const count = Number(!!context.filters.after) + Number(!!context.filters.before) + + Number(context.filters.order !== 'newest'); + settings.textContent = count ? `Advanced · ${count}` : 'Advanced'; + }; + form.addEventListener('change', updateSettingsLabel); + clear.addEventListener('click', updateSettingsLabel); + updateSettingsLabel(); + const results = document.createElement('p'); + results.dataset.bookmarkResults = ''; + results.setAttribute('role', 'status'); + results.textContent = 'Search your entire local collection'; + form.append(clear, settings, results); + return form; + } + + function state() { + return { available: !!active, enabled: !!active?.enabled, + status: active?.status || (active ? '' : 'Open or refresh Bluesky to connect your account.') }; + } + + function sessionBundle() { + const main = document.querySelector('main, [role="main"]'); + const visited = new Set(); + for (const element of [main, main?.firstElementChild, + ...(main?.querySelectorAll('[data-testid], h1, [role="heading"]') || [])]) { + const key = element && Object.keys(element).find(name => name.startsWith('__reactFiber$')); + let fiber = key && element[key]; + let root = fiber; + const roots = new Set(); + while (root?.return && !roots.has(root)) { + roots.add(root); + root = root.return; + } + const useAlternate = root?.stateNode?.current && root.stateNode.current !== root; + while (fiber && !visited.has(fiber)) { + visited.add(fiber); + const node = useAlternate ? fiber.alternate || fiber : fiber; + const values = [node?.memoizedProps?.value, node?.memoizedProps?.client]; + const dependencies = new Set(); + for (let dependency = node?.dependencies?.firstContext; + dependency && !dependencies.has(dependency); dependency = dependency.next) { + dependencies.add(dependency); + values.push(dependency.memoizedValue); + } + const bundle = values.find(value => value?.pdsClient && value?.appviewClient && + Object.hasOwn(value, 'session')); + if (bundle) return bundle; + fiber = fiber.return; + } + } + return null; + } + + async function connectFromSession() { + const bundle = sessionBundle(); + if (!bundle) return active || null; + const agent = bundle.pdsClient?.agent; + let did; + try { did = agent?.did; } catch {} + if (!bundle.session || bundle.session.destroyed || !did?.startsWith('did:') || + typeof agent.fetchHandler !== 'function') { + active = undefined; + render(); + return null; + } + const service = new URL(bundle.service); + const url = new URL(prefix + 'getBookmarks', service); + const source = await bookmarkSource(new Request(url)); + const headers = new Headers({ 'atproto-proxy': `did:web:${source}#bsky_appview` }); + const transport = request => { + if (bundle.session.destroyed || agent.did !== did) throw new Error('Bluesky session changed. Retry syncing.'); + const url = new URL(request.url); + return agent.fetchHandler(url.pathname + url.search, + { method: 'GET', headers: new Headers(headers), signal: request.signal }); + }; + return contextForIdentity(did, source, url, headers, transport); + } + + async function setEnabled(context, enabled) { + if (!enabled) { + invalidateContexts('Clearing local bookmarks…'); + bookmarkChannel?.postMessage({ type: 'clear-all' }); + try { + await clearAllSnapshots(); + bookmarkChannel?.postMessage({ type: 'clear-all' }); + if (active) active.status = 'Local bookmarks cleared.'; + } catch (error) { + if (active) active.status = error.message; + } + render(); + const client = bookmarksClient(); + if (client) await client.resetQueries({ queryKey: ['bookmarks'], exact: true }); + return; + } + context.ready = false; + try { + const generation = invalidationGeneration; + const epoch = await saveEnabled(context, generation); + if (epoch === null || generation !== invalidationGeneration) return; + context.clearEpoch = epoch; + context.enabled = true; + await sync(context); + } catch (error) { report(context, error.message); } + render(); + } + + window.addEventListener('message', async event => { + const message = event.data; + if (!channel || event.source !== window || event.origin !== location.origin || + message?.channel !== channel || message.direction !== 'request' || + !['state', 'enable', 'disable', 'sync'].includes(message.action)) return; + try { await connectFromSession(); } catch {} + if (active) await active.loaded; + if (active && message.action === 'enable') await setEnabled(active, true); + if (active && message.action === 'disable') await setEnabled(active, false); + if (active?.enabled && message.action === 'sync') await sync(active, true); + window.postMessage({ channel, direction: 'response', requestId: message.requestId, state: state() }, location.origin); + }); + + function openDatabase() { + if (!database) database = new Promise((resolve, reject) => { + const request = indexedDB.open('bskyplus-bookmarks', 1); + request.onupgradeneeded = () => request.result.createObjectStore('accounts', { keyPath: 'did' }); + request.onsuccess = () => resolve(request.result); + request.onerror = () => reject(request.error); + request.onblocked = () => reject(new Error('Close other Bluesky tabs and retry.')); + }).catch(error => { database = undefined; throw error; }); + return database; + } + + async function stored(did, value) { + const db = await openDatabase(); + return new Promise((resolve, reject) => { + const tx = db.transaction('accounts', value ? 'readwrite' : 'readonly'); + const store = tx.objectStore('accounts'); + const request = value ? store.put({ ...value, did }) : store.get(did); + tx.oncomplete = () => resolve(value || request.result); + tx.onerror = tx.onabort = () => reject(tx.error || new Error('Local bookmark storage failed.')); + }); + } + + async function loadStoredContext(key) { + const db = await openDatabase(); + return new Promise((resolve, reject) => { + const tx = db.transaction('accounts', 'readonly'); + const store = tx.objectStore('accounts'); + const value = store.get(key); + const control = store.get(controlKey); + tx.oncomplete = () => resolve({ value: value.result, + epoch: Number(control.result?.epoch) || 0 }); + tx.onerror = tx.onabort = () => reject(tx.error || new Error('Local bookmark storage failed.')); + }); + } + + async function saveEnabled(context, generation = invalidationGeneration, expectedEpoch = null) { + const db = await openDatabase(); + return new Promise((resolve, reject) => { + const tx = db.transaction('accounts', 'readwrite'); + const store = tx.objectStore('accounts'); + const control = store.get(controlKey); + let epoch = 0; + let invalidated = false; + control.onsuccess = () => { + epoch = Number(control.result?.epoch) || 0; + if (generation !== invalidationGeneration || (expectedEpoch !== null && epoch !== expectedEpoch)) { + invalidated = true; + tx.abort(); + return; + } + store.put({ did: context.key, enabled: true }); + }; + tx.oncomplete = () => resolve(epoch); + tx.onerror = () => reject(tx.error || new Error('Local bookmark storage failed.')); + tx.onabort = () => invalidated ? resolve(null) : reject(tx.error || new Error('Local bookmark storage failed.')); + }); + } + + async function clearAllSnapshots() { + const db = await openDatabase(); + return new Promise((resolve, reject) => { + const tx = db.transaction('accounts', 'readwrite'); + const store = tx.objectStore('accounts'); + const control = store.get(controlKey); + let epoch = 0; + control.onsuccess = () => { + epoch = (Number(control.result?.epoch) || 0) + 1; + store.clear(); + store.put({ did: controlKey, epoch }); + }; + tx.oncomplete = () => resolve(epoch); + tx.onerror = tx.onabort = () => reject(tx.error || new Error('Local bookmark storage failed.')); + }); + } + + function isCurrentSync(context, generation, epoch) { + return context.enabled && context.syncGeneration === generation && context.clearEpoch === epoch; + } + + async function writeSnapshot(context, snapshot, generation, epoch) { + const db = await openDatabase(); + return new Promise((resolve, reject) => { + const tx = db.transaction('accounts', 'readwrite'); + const store = tx.objectStore('accounts'); + const control = store.get(controlKey); + const enabled = store.get(context.key); + let controlLoaded = false; + let enabledLoaded = false; + let controlEpoch = 0; + let enabledRecord; + let written = false; + const maybeWrite = () => { + if (!controlLoaded || !enabledLoaded || written) return; + if (!isCurrentSync(context, generation, epoch) || controlEpoch !== epoch || enabledRecord?.enabled !== true) return; + written = true; + store.put({ ...snapshot, did: context.key, enabled: true }); + }; + control.onsuccess = () => { + controlEpoch = Number(control.result?.epoch) || 0; + controlLoaded = true; + maybeWrite(); + }; + enabled.onsuccess = () => { + enabledRecord = enabled.result; + enabledLoaded = true; + maybeWrite(); + }; + tx.oncomplete = () => resolve(written); + tx.onerror = tx.onabort = () => reject(tx.error || new Error('Local bookmark storage failed.')); + }); + } + + function invalidateContexts(message) { + invalidationGeneration++; + for (const context of contexts.values()) { + context.enabled = false; + context.ready = false; + context.generation++; + context.syncGeneration++; + context.filters = emptyFilters(); + context.status = message; + } + clearTimeout(searchTimer); + closeAuthorSuggestions(); + closeContentDropdown(); + render(); + } + + bookmarkChannel?.addEventListener('message', event => { + if (event.data?.type !== 'clear-all') return; + invalidateContexts('Local bookmarks cleared in another tab.'); + const client = bookmarksClient(); + if (client) void client.resetQueries({ queryKey: ['bookmarks'], exact: true }).catch(() => {}); + }); + + function identify(request) { + const authorization = request.headers.get('authorization'); + if (!authorization?.startsWith('Bearer ')) return null; + try { + const payload = authorization.slice(7).split('.')[1]; + const did = JSON.parse(atob(payload.replace(/-/g, '+').replace(/_/g, '/'))).sub; + return typeof did === 'string' && did.startsWith('did:') ? did : null; + } catch { return null; } + } + + function enqueue(context, operation) { + const work = context.queue.then(operation); + context.queue = work.catch(() => {}); + return work; + } + + function report(context, message) { + context.status = message; + if (context.notifySync) showSyncToast(context, message); + render(); + } + + async function synchronize(context, generation, epoch) { + if (!isCurrentSync(context, generation, epoch)) return false; + context.ready = false; + report(context, 'Downloading bookmarks…'); + const origin = context.origin; + const headers = new Headers(context.headers); + const transport = context.fetchBookmarks; + const bookmarks = new Map(); + const cursors = new Set(); + let cursor; + do { + if (!isCurrentSync(context, generation, epoch)) return false; + const url = new URL(prefix + 'getBookmarks', origin); + url.searchParams.set('limit', '100'); + if (cursor) url.searchParams.set('cursor', cursor); + const request = new Request(url, { headers }); + if (await bookmarkSource(request) !== context.source) throw new Error('Bookmark source changed. Sync the selected source.'); + if (!isCurrentSync(context, generation, epoch)) return false; + // The live session may call our fetch wrapper again. Let only this + // download pass through, avoiding a sync that waits on itself. + const bypassKey = context.did + '|' + url.pathname + url.search + '|' + headers.get('atproto-proxy'); + syncBypass.set(bypassKey, (syncBypass.get(bypassKey) || 0) + 1); + let response; + try { response = await transport(request); } + finally { + const count = syncBypass.get(bypassKey); + if (count === 1) syncBypass.delete(bypassKey); + else syncBypass.set(bypassKey, count - 1); + } + if (!isCurrentSync(context, generation, epoch)) return false; + if (await bookmarkSource(request) !== context.source) throw new Error('Bookmark source changed. Sync the selected source.'); + if (!isCurrentSync(context, generation, epoch)) return false; + if (!response.ok) throw new Error(`Bookmark download failed (${response.status}). Retry to finish syncing.`); + const data = await response.json(); + if (!isCurrentSync(context, generation, epoch)) return false; + if (!Array.isArray(data.bookmarks)) throw new Error('Unexpected bookmark response.'); + for (const bookmark of data.bookmarks) { + if (!bookmark.subject?.uri) throw new Error('Invalid bookmark response.'); + bookmarks.set(bookmark.subject.uri, bookmark); + } + report(context, `Downloaded ${bookmarks.size.toLocaleString()} bookmarks…`); + cursor = data.cursor; + if (cursor && cursors.has(cursor)) throw new Error('Bookmark pagination stalled. Retry syncing.'); + cursors.add(cursor); + } while (cursor); + if (!isCurrentSync(context, generation, epoch)) return false; + const rows = [...bookmarks.values()]; + const bytes = new Blob([JSON.stringify(rows)]).size; + const written = await writeSnapshot(context, { bookmarks: rows, bytes, syncedAt: Date.now() }, generation, epoch); + if (!written || !isCurrentSync(context, generation, epoch)) return false; + context.ready = true; + report(context, `${rows.length.toLocaleString()} bookmarks · ${(bytes / 1048576).toFixed(2)} MB of data`); + if (hasFilters(context) || context.notifySync) setTimeout(() => void refreshResults(context), 0); + return true; + } + + function sync(context, notify = false) { + const generation = context.syncGeneration; + const epoch = context.clearEpoch; + context.pendingSync = (context.pendingSync || 0) + 1; + if (notify) showSyncToast(context, 'Syncing local bookmarks…'); + render(); + return enqueue(context, async () => { + context.notifySync = notify; + try { + const completed = await synchronize(context, generation, epoch); + if (notify && completed && isCurrentSync(context, generation, epoch)) showSyncToast(context, context.enabled + ? `Sync complete. ${context.status}` + : 'Sync stopped. Local bookmarks are disabled.', 'success'); + } catch (error) { + if (isCurrentSync(context, generation, epoch)) { + context.ready = false; + report(context, `${error.message} Bluesky’s online bookmarks remain available.`); + if (notify) showSyncToast(context, error.message, 'error'); + } + } finally { + context.notifySync = false; + } + }).finally(() => { + context.pendingSync--; + render(); + }); + } + + async function bookmarkSource(request) { + return window.BskyPlusAppviewRouting ? window.BskyPlusAppviewRouting.bookmarkSource(request) : 'api.bsky.app'; + } + + window.addEventListener('bskyplus:appview-change', async () => { + if (!active) return; + try { + const previous = active; + const bundle = sessionBundle(); + let context; + if (bundle) context = await connectFromSession(); + else { + const request = new Request(new URL(prefix + 'getBookmarks', previous.origin), { headers: previous.headers }); + context = await contextFor(request, new URL(request.url)); + } + if (context !== previous) { + const client = bookmarksClient(); + if (client) await client.resetQueries({ queryKey: ['bookmarks'], exact: true }); + } + } catch {} + }); + + async function contextFor(request, url) { + const did = identify(request); + if (!did) { active = undefined; render(); return null; } + const source = await bookmarkSource(request); + return contextForIdentity(did, source, url, request.headers, request => originalFetch(request)); + } + + async function contextForIdentity(did, source, url, headers, transport) { + const key = source === 'api.bsky.app' ? did : did + '|' + source; + let context = contexts.get(key); + if (!context) { + const loadedAtGeneration = invalidationGeneration; + const inheritedContext = active?.did === did && active.enabled ? active : null; + context = { did, key, source, enabled: false, ready: false, queue: Promise.resolve(), filters: emptyFilters(), generation: 0, + syncGeneration: 0, clearEpoch: 0 }; + contexts.set(key, context); + context.loaded = loadStoredContext(key).then(async ({ value, epoch }) => { + context.clearEpoch = epoch; + if (loadedAtGeneration !== invalidationGeneration) { + context.enabled = false; + return; + } + context.enabled = value?.enabled === true; + if (!value && inheritedContext?.clearEpoch === epoch) { + const inheritedEpoch = await saveEnabled(context, loadedAtGeneration, epoch); + if (inheritedEpoch !== null && loadedAtGeneration === invalidationGeneration) { + context.clearEpoch = inheritedEpoch; + context.enabled = true; + } + } + }); + } + context.origin = url.origin; + context.headers = new Headers(headers); + context.headers.delete('content-type'); + context.headers.delete('content-length'); + context.fetchBookmarks = transport; + active = context; + await context.loaded; + render(); + return context; + } + + window.fetch = async function (input, init) { + let request; + let url; + try { + url = new URL(input instanceof Request ? input.url : input, location.href); + if (!url.pathname.startsWith('/xrpc/app.bsky.')) return originalFetch(input, init); + request = new Request(input instanceof Request ? input.clone() : input, init); + } catch { return originalFetch(input, init); } + if (request.method === 'GET' && + syncBypass.has(identify(request) + '|' + url.pathname + url.search + '|' + + request.headers.get('atproto-proxy'))) { + return originalFetch(input, init); + } + let context; + // Settings may open before Saved. Existing authenticated app requests give + // us the same account and service headers without reading persisted tokens. + if (!url.pathname.startsWith(prefix) && !identify(request)) return originalFetch(input, init); + try { context = await contextFor(request, url); } + catch { return originalFetch(input, init); } + const method = url.pathname.slice(prefix.length); + if (!url.pathname.startsWith(prefix) || !context) return originalFetch(input, init); + + if (method === 'getBookmarks' && context.enabled && location.pathname === '/saved') { + try { + if (!context.ready) await sync(context); + await context.queue; + if (context.enabled) { + const snapshot = await stored(context.key); + if (!snapshot?.bookmarks) throw new Error('Local bookmarks are not ready. Sync and try again.'); + const cursor = url.searchParams.get('cursor'); + // Filtering always precedes slicing, including results beyond the + // native feed's loaded pages. A changed query resets its cursor. + const match = /^bskyplus:(\d+):(\d+)$/.exec(cursor || ''); + const offset = match && Number(match[1]) === context.generation ? Number(match[2]) : 0; + const limit = Math.min(100, Math.max(1, Number(url.searchParams.get('limit')) || 50)); + const results = filteredBookmarks(snapshot.bookmarks, context.filters); + const count = active === context && panel?.querySelector('[data-bookmark-results]'); + if (count) count.textContent = `${results.length.toLocaleString()} of ${snapshot.bookmarks.length.toLocaleString()} bookmarks`; + const bookmarks = results.slice(offset, offset + limit); + const next = offset + bookmarks.length; + return new Response(JSON.stringify({ bookmarks, + ...(next < results.length ? { cursor: `bskyplus:${context.generation}:${next}` } : {}) + }), { headers: { 'content-type': 'application/json' } }); + } + } catch (error) { context.ready = false; report(context, error.message); } + if (hasFilters(context)) { + return new Response(JSON.stringify({ error: 'LocalBookmarksUnavailable', message: 'Sync local bookmarks before searching.' }), + { status: 503, headers: { 'content-type': 'application/json' } }); + } + // A local cursor is meaningless to the server when storage/sync fails. + if (url.searchParams.get('cursor')?.startsWith('bskyplus:')) { + url.searchParams.delete('cursor'); + return originalFetch(url, { headers: request.headers, signal: request.signal }); + } + } + + const response = await originalFetch(input, init); + if (response.ok && context.enabled && ['createBookmark', 'deleteBookmark'].includes(method)) { + // A full refresh also hydrates newly saved posts, and preserves server order. + // Serialize with an in-flight initial import so mutations cannot be lost. + context.ready = false; + void sync(context); + } + return response; + }; + + function feedHost() { + const main = document.querySelector('main') || document.querySelector('[role="main"]'); + if (!main) return null; + // Bluesky's main spans the viewport. Mount inside its bounded feed column + // so native transforms and the user's feed-width setting apply together. + const content = main.querySelector('#content') || main; + return [...content.querySelectorAll('[data-bskyplus-feed-column], div[style*="max-width"]')] + .find(element => { + const width = parseFloat(getComputedStyle(element).maxWidth); + return width >= 500 && element.getBoundingClientRect().width > 0 && + !element.closest('header, nav, [role="navigation"], [data-bskyplus-bookmarks]'); + }) || content; + } + + function savedHeader() { + const screen = document.querySelector('[data-testid="bookmarksScreen"]') || + document.querySelector('main, [role="main"]'); + if (!screen) return null; + const back = [...screen.querySelectorAll('[aria-label="Go back"], button, [role="button"]')] + .find(element => !element.closest('[data-bskyplus-bookmarks], [data-bskyplus-bookmark-actions]')); + for (let element = back?.parentElement; element && element !== screen; element = element.parentElement) { + const style = getComputedStyle(element); + if ((style.position === 'sticky' || style.flexDirection === 'row') && + element.getBoundingClientRect().width >= 300) return element; + } + return screen.querySelector('header, h1, [role="heading"]'); + } + + function alignPanel(header) { + if (header) { + const style = getComputedStyle(header); + panel.style.transform = style.transform; + panel.style.width = header.getBoundingClientRect().width + 'px'; + } else { + panel.style.removeProperty('transform'); + panel.style.removeProperty('width'); + } + // Match the feed surface, not the translucent sticky header. Composite + // ancestor surfaces onto an opaque base for controls, menus, and dialogs. + const canvas = document.createElement('canvas'); + canvas.width = canvas.height = 1; + const paint = canvas.getContext('2d'); + paint.fillStyle = matchMedia('(prefers-color-scheme: dark)').matches ? '#161e27' : '#ffffff'; + paint.fillRect(0, 0, 1, 1); + const layers = []; + for (let element = panel.parentElement; element; element = element.parentElement) { + layers.unshift(getComputedStyle(element).backgroundColor); + } + for (const color of layers) { + paint.fillStyle = color; + paint.fillRect(0, 0, 1, 1); + } + const [red, green, blue] = paint.getImageData(0, 0, 1, 1).data; + const background = `rgb(${red}, ${green}, ${blue})`; + panel.style.setProperty('--bskyplus-bookmarks-background', background); + panel.style.setProperty('--bskyplus-bookmarks-foreground', getComputedStyle(panel).color); + panel.style.colorScheme = red * 0.2126 + green * 0.7152 + blue * 0.0722 < 140 ? 'dark' : 'light'; + } + + function render() { + if (syncToast && syncToast.dataset.did !== active?.did) { + clearTimeout(toastTimer); + syncToast.remove(); + } + if (location.pathname !== '/saved') { + closeAuthorSuggestions(); + closeContentDropdown(); + panel?.remove(); + headerActions?.remove(); + actionHeader?.removeAttribute('data-bskyplus-bookmark-header'); + panel = headerActions = actionHeader = undefined; + return; + } + const host = feedHost(); + if (!host) return; + const header = savedHeader(); + if (!panel?.isConnected) { + panel = document.createElement('section'); + panel.setAttribute('aria-label', 'Bsky+ bookmark browser'); + panel.dataset.bskyplusBookmarks = ''; + } + // Header.Outer is a flex row, not a feed container. Keep its native back + // button/title intact and insert a separate, aligned row immediately below. + if (header) { + if (header.nextElementSibling !== panel) header.after(panel); + } else if (panel.parentElement !== host) host.prepend(panel); + alignPanel(header); + if (!headerActions) { + headerActions = document.createElement('div'); + headerActions.dataset.bskyplusBookmarkActions = ''; + headerActions.setAttribute('role', 'group'); + headerActions.setAttribute('aria-label', 'Local bookmark actions'); + } + const nextHeader = header && getComputedStyle(header).flexDirection === 'row' ? header : null; + if (actionHeader !== nextHeader) { + actionHeader?.removeAttribute('data-bskyplus-bookmark-header'); + actionHeader = nextHeader; + } + if (actionHeader) { + actionHeader.dataset.bskyplusBookmarkHeader = ''; + if (headerActions.parentElement !== actionHeader) actionHeader.append(headerActions); + } else if (headerActions.parentElement !== panel) panel.prepend(headerActions); + headerActions.style.color = getComputedStyle(panel).color; + headerActions.style.setProperty('--bskyplus-bookmarks-background', panel.style.getPropertyValue('--bskyplus-bookmarks-background')); + const context = active; + const signature = `${context?.key}:${context?.enabled}`; + if (panel.dataset.state === signature) { + panel.querySelector('.bskyplus-bookmarks-status').textContent = context?.status || ''; + const retry = headerActions.querySelector('[data-bookmark-sync]'); + if (retry) syncButtonState(retry, context); + return; + } + closeAuthorSuggestions(); + panel.dataset.state = signature; + closeContentDropdown(); + const status = document.createElement('p'); + status.className = 'bskyplus-bookmarks-status'; + status.setAttribute('role', 'status'); + status.textContent = context?.status || (context ? 'Ready to download your bookmarks.' : 'Waiting for an authenticated Bluesky request. Refresh if needed.'); + panel.replaceChildren(status); + headerActions.replaceChildren(); + if (!context?.enabled) { + const toggle = document.createElement('button'); + toggle.className = 'bskyplus-bookmarks-button'; + toggle.type = 'button'; + toggle.disabled = !context; + toggle.textContent = 'Enable local bookmarks'; + toggle.title = 'Enable local bookmarks. Storage details are in Bsky+ settings.'; + toggle.onclick = async () => { + toggle.disabled = true; + await setEnabled(context, true); + }; + headerActions.append(toggle); + } + if (!actionHeader) panel.prepend(headerActions); + if (context?.enabled) { + const retry = document.createElement('button'); + retry.className = 'bskyplus-bookmarks-button'; + retry.type = 'button'; + retry.dataset.bookmarkSync = ''; + syncButtonState(retry, context); + retry.onclick = () => { void sync(context, true); }; + headerActions.append(retry); + panel.append(searchControls(context)); + } + } + + // Covers client-side navigation and React replacing the saved-page container. + setInterval(render, 1000); + window.addEventListener('resize', render); +})(); diff --git a/extension/shared/bookmarks-settings.js b/extension/shared/bookmarks-settings.js new file mode 100644 index 0000000..ed194b3 --- /dev/null +++ b/extension/shared/bookmarks-settings.js @@ -0,0 +1,134 @@ +// Shared by the toolbar popup and the embedded extension settings page. +(() => { + 'use strict'; + const section = document.getElementById('bookmarksSection'); + if (!section) return; + const api = globalThis.browser || globalThis.chrome; + const actions = document.createElement('div'); + actions.className = 'bskyplus-llm-actions'; + actions.style.cssText = 'justify-content:flex-start;flex-wrap:wrap;gap:8px;margin-top:12px;'; + const toggle = document.createElement('button'); + toggle.type = 'button'; + toggle.className = 'secondary-btn'; + toggle.textContent = 'Enable local bookmarks'; + const sync = document.createElement('button'); + sync.type = 'button'; + sync.className = 'secondary-btn'; + sync.textContent = 'Sync now'; + const status = document.createElement('p'); + status.className = 'bskyplus-llm-notice'; + status.setAttribute('role', 'status'); + actions.append(toggle, sync); + section.append(actions, status); + const explanation = section.querySelector('p.toggle-desc'); + const explanationText = explanation?.textContent; + const isPopup = globalThis.location?.pathname === '/popup/popup.html'; + const popupRow = globalThis.BskyPlusFeatureRow?.(section, 'Local bookmarks', 'Save and search bookmarks on this device', 'bookmarksEnabledToggle'); + if (popupRow) { + explanation?.remove(); + if (explanationText) popupRow.addTooltip(explanationText, 'bskyplusBookmarksTooltip'); + toggle.hidden = true; + actions.style.marginTop = '4px'; + // Keep connection errors visible when the settings controls are collapsed. + section.append(status); + status.style.padding = '0 12px 8px'; + status.style.marginTop = '0'; + popupRow.toggle.addEventListener('change', () => run(popupRow.toggle.checked ? 'enable' : 'disable')); + } + let state = { available: false, enabled: false }; + let busy = false; + let requestVersion = 0; + const sourceField = document.createElement('label'); + sourceField.className = 'bskyplus-llm-field'; + const sourceLabel = document.createElement('span'); + sourceLabel.className = 'bskyplus-llm-label'; + sourceLabel.textContent = 'Bookmarks AppView'; + sourceField.append(sourceLabel); + const sourceSelect = document.createElement('select'); + sourceSelect.id = 'bookmarksAppview'; + sourceSelect.className = 'bskyplus-llm-input'; + for (const [value, text] of [['', 'Use selected AppView'], ['bluesky', 'Bluesky']]) { + const option = document.createElement('option'); + option.value = value; + option.textContent = text; + sourceSelect.append(option); + } + sourceField.append(sourceSelect); + sourceField.hidden = true; + actions.before(sourceField); + if (isPopup) { + sync.remove(); + status.remove(); + if (popupRow) actions.remove(); + } + let sourceEdited = false; + api.storage.local.get(['appviewHostname', 'bookmarksAppview']).then(value => { + if (sourceEdited) return; + sourceField.hidden = !value.appviewHostname; + sourceSelect.value = value.bookmarksAppview === 'bluesky' ? 'bluesky' : ''; + }); + api.storage.onChanged.addListener((changes, area) => { + if (area !== 'local') return; + if (changes.appviewHostname) sourceField.hidden = !changes.appviewHostname.newValue; + if (changes.bookmarksAppview) sourceSelect.value = changes.bookmarksAppview.newValue === 'bluesky' ? 'bluesky' : ''; + }); + sourceSelect.addEventListener('change', async () => { + sourceEdited = true; + sourceSelect.disabled = true; + try { + await api.storage.local.set({ bookmarksAppview: sourceSelect.value }); + await refresh(); + } catch { status.textContent = 'Could not save the bookmarks AppView. Try again.'; } + finally { sourceSelect.disabled = false; } + }); + + function render() { + if (popupRow) { + popupRow.setEnabled(busy === 'enable' || !!state.enabled); + popupRow.toggle.disabled = !!busy || !state.available; + } + toggle.textContent = state.enabled ? 'Disable and clear local bookmarks' : 'Enable local bookmarks'; + toggle.disabled = busy || !state.available; + sync.disabled = busy || !state.available || !state.enabled; + status.textContent = busy ? (busy === 'disable' ? 'Clearing local bookmarks…' : 'Syncing local bookmarks…') : state.status || 'Connecting to Bluesky…'; + for (const button of [toggle, sync]) { + button.style.opacity = button.disabled ? '0.45' : ''; + button.style.cursor = button.disabled ? 'not-allowed' : ''; + } + } + + async function request(action) { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + if (!tab?.id) throw new Error('Open Bluesky to manage local bookmarks.'); + const response = await api.tabs.sendMessage(tab.id, { type: 'BSKYPLUS_BOOKMARKS', action }); + if (!response || typeof response.available !== 'boolean') throw new Error('Bookmark controls are unavailable.'); + return response; + } + + async function refresh() { + if (busy) return; + const version = ++requestVersion; + try { + const next = await request('state'); + if (version === requestVersion) state = next; + } catch { + if (version === requestVersion) state = { available: false, status: 'Open or refresh Bluesky to manage local bookmarks.' }; + } + render(); + } + + async function run(action) { + requestVersion++; + busy = action; + render(); + try { state = await request(action); } + catch { state = { available: false, status: 'Could not reach Bluesky. Refresh the page and try again.' }; } + finally { busy = false; render(); } + } + + toggle.onclick = () => run(state.enabled ? 'disable' : 'enable'); + sync.onclick = () => run('sync'); + render(); + void refresh(); + setInterval(refresh, 1500); +})(); diff --git a/extension/shared/bookmarks.css b/extension/shared/bookmarks.css new file mode 100644 index 0000000..c33dbb8 --- /dev/null +++ b/extension/shared/bookmarks.css @@ -0,0 +1,355 @@ +.bskyplus-bookmarks-toast { + position: fixed; + z-index: 2147483647; + bottom: max(24px, env(safe-area-inset-bottom)); + left: 50%; + transform: translateX(-50%); + box-sizing: border-box; + display: flex; + align-items: center; + gap: 16px; + width: max-content; + max-width: min(520px, calc(100vw - 32px)); + padding: 14px 16px; + border: 1px solid #1083fe; + border-radius: 12px; + background: #1c232d; + color: #f1f3f5; + box-shadow: 0 8px 32px #0005; + font: 500 14px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; +} + +.bskyplus-bookmarks-toast[data-kind="error"] { + border-color: #ff6b6b; +} + +.bskyplus-bookmarks-toast button { + flex-shrink: 0; + border: 0; + border-radius: 4px; + background: transparent; + color: inherit; + cursor: pointer; + padding: 4px 8px; + font-size: 20px; +} + +.bskyplus-bookmarks-toast button:focus-visible { + outline: 2px solid #1083fe; +} + +[data-bskyplus-bookmark-actions] { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 6px; + margin-inline-start: auto; + max-width: 55%; +} + +[data-bskyplus-bookmark-actions] .bskyplus-bookmarks-button { + min-width: 0; + min-height: 32px; + padding: 6px 8px; + font-size: 12px; +} + +[data-bskyplus-bookmark-actions] [data-bookmark-sync] { + flex-shrink: 0; +} + +[data-bskyplus-bookmark-header] > :nth-last-child(2):empty { + display: none; +} + +[data-bskyplus-bookmarks] { + box-sizing: border-box; + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 8px; + width: 100%; + max-width: min(100%, var(--bskyplus-feed-width, 600px)); + margin: 0 auto; + padding: 12px 16px; + color: var(--bskyplus-theme-text, inherit); +} + +.bskyplus-bookmarks-button { + appearance: none; + min-height: 36px; + padding: 8px 12px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 999px; + background: rgb(34, 46, 63); + color: inherit; + font: 600 13px/1.4 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; + cursor: pointer; + transition: border-color 0.15s ease; +} + +.bskyplus-bookmarks-button:hover:not(:disabled) { + border-color: color-mix(in srgb, currentColor 30%, transparent); +} + +.bskyplus-bookmarks-button:focus-visible { + outline: 2px solid #1083fe; + outline-offset: 3px; +} + +.bskyplus-bookmarks-button:disabled { + opacity: 0.45; + cursor: not-allowed; +} + +/* Keep progress available to assistive technology and in the sync tooltip. */ +.bskyplus-bookmarks-status { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip-path: inset(50%); + white-space: nowrap; + border: 0; +} + +.bskyplus-bookmarks-search { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 12px; + width: 100%; + margin-top: 4px; +} + +.bskyplus-bookmarks-search label { + display: flex; + flex-direction: column; + gap: 6px; + min-width: 0; + font: 600 12px/1.4 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; +} + +.bskyplus-bookmarks-search label:first-child { + grid-column: 1 / -1; +} + +.bskyplus-bookmarks-search input, +.bskyplus-bookmarks-search .bskyplus-bookmarks-select { + box-sizing: border-box; + width: 100%; + min-width: 0; + min-height: 38px; + padding: 8px 10px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 10px; + background: var(--bskyplus-bookmarks-background, #ffffff); + color: inherit; + font: 400 14px/1.4 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; +} + +.bskyplus-bookmarks-select-field { + position: relative; +} + +.bskyplus-bookmarks-select-field::after { + content: ""; + position: absolute; + right: 15px; + bottom: 17px; + width: 7px; + height: 7px; + border-right: 2px solid currentColor; + border-bottom: 2px solid currentColor; + transform: rotate(45deg); + opacity: 0.7; + pointer-events: none; +} + +.bskyplus-bookmarks-search .bskyplus-bookmarks-select { + appearance: none; + padding-right: 38px; + text-align: left; + cursor: pointer; + transition: border-color 0.15s ease; +} + +.bskyplus-bookmarks-search .bskyplus-bookmarks-select:hover { + border-color: color-mix(in srgb, currentColor 35%, transparent); +} + +.bskyplus-bookmarks-author-field { + position: relative; + min-width: 0; +} + +.bskyplus-bookmarks-authors, +.bskyplus-bookmarks-options { + box-sizing: border-box; + position: absolute; + top: calc(100% + 4px); + left: 0; + right: 0; + z-index: 20; + max-height: 280px; + overflow-y: auto; + border: 1px solid color-mix(in srgb, currentColor 22%, transparent); + border-radius: 8px; + background: var(--bskyplus-bookmarks-background, #ffffff); + color: var(--bskyplus-bookmarks-foreground, #1c232d); + box-shadow: 0 6px 20px #0003; +} + +.bskyplus-bookmarks-authors[popover], +.bskyplus-bookmarks-options[popover] { + position: fixed; + inset: auto; + margin: 0; +} + +.bskyplus-bookmarks-authors[hidden], +.bskyplus-bookmarks-options[hidden] { + display: none !important; +} + +.bskyplus-bookmarks-authors [role="option"], +.bskyplus-bookmarks-options [role="option"] { + display: flex; + flex-direction: column; + gap: 3px; + padding: 10px 12px; + cursor: pointer; + overflow-wrap: anywhere; + font-size: 13px; +} + +.bskyplus-bookmarks-authors [role="option"] { + flex-direction: row; + align-items: center; + gap: 10px; + padding-left: 6px; +} + +.bskyplus-bookmarks-author-avatar { + position: relative; + display: flex; + align-items: center; + justify-content: center; + flex: 0 0 32px; + width: 32px; + height: 32px; + max-width: 32px; + max-height: 32px; + overflow: hidden; + border-radius: 50%; + background: color-mix(in srgb, currentColor 12%, transparent); + font-weight: 600; +} + +.bskyplus-bookmarks-author-avatar img { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + max-width: 100%; + max-height: 100%; + object-fit: cover; +} + +.bskyplus-bookmarks-author-copy { + display: flex; + flex: 1; + flex-direction: column; + gap: 3px; + min-width: 0; +} + +.bskyplus-bookmarks-author-copy > * { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.bskyplus-bookmarks-authors [role="option"] span { + opacity: 0.7; + font-size: 12px; +} + +.bskyplus-bookmarks-authors [role="option"]:hover, +.bskyplus-bookmarks-authors [aria-selected="true"], +.bskyplus-bookmarks-options [role="option"]:hover, +.bskyplus-bookmarks-options [aria-selected="true"] { + background: color-mix(in srgb, currentColor 12%, transparent); +} + +.bskyplus-bookmarks-search input::placeholder { + color: inherit; + opacity: 0.6; +} + +.bskyplus-bookmarks-search input:focus-visible, +.bskyplus-bookmarks-search .bskyplus-bookmarks-select:focus-visible { + outline: 2px solid #1083fe; + outline-offset: 2px; +} + +.bskyplus-bookmarks-search [data-bookmark-results] { + grid-column: 1 / -1; + align-self: center; + margin: 0; + font-size: 12px; + line-height: 1.4; +} + +@media (max-width: 360px) { + .bskyplus-bookmarks-search { + grid-template-columns: minmax(0, 1fr); + } +} + +.bskyplus-bookmarks-search [hidden] { + display: none !important; +} + +.bskyplus-bookmarks-dialog { + box-sizing: border-box; + width: min(560px, calc(100vw - 32px)); + max-height: calc(100dvh - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, var(--bskyplus-bookmarks-foreground) 20%, transparent); + border-radius: 16px; + background: var(--bskyplus-bookmarks-background, #ffffff); + color: var(--bskyplus-bookmarks-foreground, #1c232d); + box-shadow: 0 16px 60px #0006; +} + +.bskyplus-bookmarks-dialog::backdrop { + background: #0009; +} + +.bskyplus-bookmarks-dialog-header { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 16px; + margin-bottom: 20px; +} + +.bskyplus-bookmarks-dialog-actions { + display: flex; + align-items: center; + gap: 8px; + margin-inline-start: auto; +} + +.bskyplus-bookmarks-dialog-header h2:focus { + outline: none; +} + +.bskyplus-bookmarks-dialog-header h2 { + margin: 0; + font: 600 20px/1.3 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; +} diff --git a/extension/shared/bookmarks.js b/extension/shared/bookmarks.js new file mode 100644 index 0000000..eec24aa --- /dev/null +++ b/extension/shared/bookmarks.js @@ -0,0 +1,45 @@ +// Load the network adapter in the page world, including on browsers without MAIN. +(() => { + 'use strict'; + const api = globalThis.browser || globalThis.chrome; + const script = document.createElement('script'); + script.async = false; + const channel = crypto.randomUUID(); + const pending = new Map(); + script.dataset.bskyplusChannel = channel; + window.addEventListener('message', event => { + const message = event.data; + if (event.source !== window || event.origin !== location.origin || + message?.channel !== channel || message.direction !== 'response') return; + const request = pending.get(message.requestId); + if (!request) return; + clearTimeout(request.timer); + pending.delete(message.requestId); + request.respond(message.state); + }); + api.runtime.onMessage.addListener((message, sender, respond) => { + if (sender.id !== api.runtime.id || message?.type !== 'BSKYPLUS_BOOKMARKS' || + !['state', 'enable', 'disable', 'sync'].includes(message.action)) return; + const requestId = crypto.randomUUID(); + const timer = setTimeout(() => { + pending.delete(requestId); + respond({ available: false, status: 'Bookmark controls did not respond. Refresh Bluesky and try again.' }); + }, message.action === 'state' ? 3000 : 300000); + pending.set(requestId, { respond, timer }); + window.postMessage({ channel, direction: 'request', requestId, action: message.action }, location.origin); + return true; + }); + script.src = api.runtime.getURL('shared/bookmarks-page.js'); + script.onload = () => script.remove(); + const mount = () => { + if (!document.documentElement) return false; + document.documentElement.append(script); + return true; + }; + if (!mount()) { + const observer = new MutationObserver(() => { + if (mount()) observer.disconnect(); + }); + observer.observe(document, { childList: true }); + } +})(); diff --git a/extension/shared/cdn-background.js b/extension/shared/cdn-background.js index 0a4a02a..54129c5 100644 --- a/extension/shared/cdn-background.js +++ b/extension/shared/cdn-background.js @@ -52,12 +52,18 @@ api.permissions.onAdded.addListener(refresh); api.permissions.onRemoved.addListener(refresh); api.runtime.onMessage.addListener((message, sender, sendResponse) => { - if (message?.action !== 'APPLY_IMAGE_CDN') return; + if (!['APPLY_IMAGE_CDN', 'REQUEST_IMAGE_CDN_ACCESS'].includes(message?.action)) return; if (sender.id !== api.runtime.id || !sender.url?.startsWith(api.runtime.getURL(''))) { sendResponse({ success: false, error: 'Open Bsky+ settings to change the CDN.' }); return false; } - apply().then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); + apply().then(async result => { + if (message.action === 'REQUEST_IMAGE_CDN_ACCESS' && result.hostname && !result.enabled) { + await api.tabs.create({ url: api.runtime.getURL('shared/cdn-permissions.html') }); + return { success: true, opened: true }; + } + return result; + }).then(sendResponse, () => sendResponse({ success: false, error: 'Could not apply the image CDN. Try saving again.' })); return true; }); refresh(); diff --git a/extension/shared/cdn-config.js b/extension/shared/cdn-config.js index 6e38532..164efc7 100644 --- a/extension/shared/cdn-config.js +++ b/extension/shared/cdn-config.js @@ -2,6 +2,7 @@ 'use strict'; const SOURCE_HOST = 'cdn.bsky.app'; const IMAGE_PATTERN = '^https://cdn\\.bsky\\.app/img/(feed_thumbnail|feed_fullsize|avatar_thumbnail)/plain/'; + const IMAGE_URL = new RegExp(IMAGE_PATTERN); const RULE_ID = 2001; function normalizeHostname(value) { @@ -43,7 +44,7 @@ } function redirectUrl(url, hostname) { - if (!hostname || !new RegExp(IMAGE_PATTERN).test(url)) return undefined; + if (!hostname || !IMAGE_URL.test(url)) return undefined; return `https://${hostname}${url.slice(`https://${SOURCE_HOST}`.length)}`; } diff --git a/extension/shared/cdn-permissions.html b/extension/shared/cdn-permissions.html new file mode 100644 index 0000000..3d164cf --- /dev/null +++ b/extension/shared/cdn-permissions.html @@ -0,0 +1,28 @@ + + + + + + Bsky+ image CDN access + + + + + +
+

Image CDN access

+

Loading the saved CDN…

+ + +

+
+ + diff --git a/extension/shared/cdn-permissions.js b/extension/shared/cdn-permissions.js new file mode 100644 index 0000000..b5f4b63 --- /dev/null +++ b/extension/shared/cdn-permissions.js @@ -0,0 +1,101 @@ +// Standalone permission page for Firefox, where an embedded extension iframe +// does not expose browser.permissions. +(() => { + 'use strict'; + + const api = typeof browser !== 'undefined' ? browser : chrome; + const config = globalThis.BskyPlusCdnConfig; + const description = document.getElementById('description'); + const originsText = document.getElementById('origins'); + const grant = document.getElementById('grant'); + const status = document.getElementById('status'); + let hostname = ''; + let origins = []; + let busy = false; + + function setStatus(message, error = false) { + status.textContent = message; + status.classList.toggle('error', error); + } + + function readHostname() { + return api.storage.local.get('imageCdnHostname').then(data => { + const value = data && typeof data.imageCdnHostname === 'string' + ? data.imageCdnHostname : ''; + return config.normalizeHostname(value); + }); + } + + function verifyCurrentHostname() { + return readHostname().then(current => { + if (current !== hostname) throw new Error('The saved CDN changed. Close this page and save again.'); + return current; + }); + } + + function applySavedCdn() { + return api.runtime.sendMessage({ action: 'APPLY_IMAGE_CDN' }).then(response => { + if (!response || response.success !== true || response.hostname !== hostname || response.enabled !== true) { + throw new Error(response && response.error ? response.error : 'The image CDN could not be enabled.'); + } + return response; + }); + } + + function setBusy(value) { + busy = value; + grant.disabled = value || !hostname; + } + + function grantAccess() { + if (busy || !hostname) return; + setBusy(true); + // Call request synchronously from this click handler so Firefox retains + // the user gesture needed to show its optional-host-permission prompt. + let request; + try { + request = api.permissions.request({ origins }); + } catch (error) { + request = Promise.reject(error); + } + Promise.resolve(request).then(granted => { + if (!granted) throw new Error('Access was not granted.'); + return verifyCurrentHostname(); + }).then(applySavedCdn).then(() => { + // Older backgrounds ignore this notification. Keep the notification + // best-effort so a missing listener cannot hide a successful apply. + return Promise.resolve(api.runtime.sendMessage({ + action: 'IMAGE_CDN_ACCESS_GRANTED', hostname, + })).catch(() => undefined); + }).then(() => { + setStatus('Image CDN is active. You may close this page.'); + }).catch(error => { + setStatus(error && error.message ? error.message : 'Could not grant image CDN access.', true); + }).finally(() => setBusy(false)); + } + + function mount() { + if (!api || !api.storage || !api.storage.local || !api.permissions || + typeof api.permissions.request !== 'function') { + setStatus('Image CDN permissions are unavailable in this page.', true); + return; + } + readHostname().then(value => { + hostname = value; + if (!hostname) throw new Error('No CDN hostname is saved. Close this page and save a CDN first.'); + origins = config.permissionOrigins(hostname); + description.textContent = `Grant access so Bsky+ can use ${hostname} for image requests.`; + originsText.textContent = `Access requested for: ${origins.join(' and ')}`; + originsText.hidden = false; + grant.hidden = false; + setBusy(false); + }).catch(error => { + grant.hidden = true; + setStatus(error && error.message ? error.message : 'Could not load image CDN settings.', true); + }); + grant.addEventListener('click', grantAccess); + } + + if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', mount); + else mount(); +})(); diff --git a/extension/shared/cdn-settings.js b/extension/shared/cdn-settings.js index e63bfa6..43d8fc9 100644 --- a/extension/shared/cdn-settings.js +++ b/extension/shared/cdn-settings.js @@ -19,21 +19,13 @@ }, function () { return {}; }); } - function storageSet(api, value) { + async function storageSet(api, value) { if (!api || !api.storage || !api.storage.local || typeof api.storage.local.set !== 'function') { - return Promise.reject(new Error('Settings storage is unavailable.')); + throw new Error('Settings storage is unavailable.'); } - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') result.then(resolve, reject); - else reject(new Error('Storage did not confirm the write.')); - }); + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + throw new Error('Storage did not confirm the write.'); } function makeField(labelText, input) { @@ -71,7 +63,38 @@ input.placeholder = 'luna.danielmorrisey.com'; input.autocomplete = 'off'; input.spellcheck = false; - section.appendChild(makeField('CDN hostname', input)); + var customField = makeField('CDN hostname', input); + var provider = null; + if (globalThis.BskyPlusFeatureRow) { + provider = document.createElement('select'); + provider.id = 'bskyplusCdnProvider'; + provider.setAttribute('aria-label', 'CDN provider'); + provider.className = 'bskyplus-llm-input'; + [['', 'Bluesky (default)'], ['luna.danielmorrisey.com', 'Luna'], ['custom', 'Custom']].forEach(function (item) { + var option = document.createElement('option'); + option.value = item[0]; + option.textContent = item[1]; + provider.appendChild(option); + }); + provider.addEventListener('change', function () { + customField.hidden = provider.value !== 'custom'; + }); + var providerField = document.createElement('div'); + providerField.className = 'bskyplus-llm-field'; + providerField.appendChild(provider); + section.appendChild(providerField); + customField.hidden = true; + } + section.appendChild(customField); + + function displayHostname(hostname) { + input.value = hostname; + if (provider) { + provider.value = !hostname || hostname === 'luna.danielmorrisey.com' ? hostname : 'custom'; + customField.hidden = provider.value !== 'custom'; + } + if (popupRow) popupRow.setEnabled(!!hostname); + } var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -109,12 +132,27 @@ var before = llmSection || footer; if (before && before.parentElement) before.parentElement.insertBefore(section, before); else document.body.appendChild(section); + var popupRow = globalThis.BskyPlusFeatureRow?.(section, 'Image CDN', 'Choose where images load from', 'cdnEnabledToggle', + document.getElementById('infrastructureSection') ? 'infrastructureSection' : 'featuresSection'); + if (popupRow) { + popupRow.addTooltip(() => notice.textContent); + notice.remove(); + resetButton.hidden = true; + popupRow.toggle.addEventListener('change', function () { + if (!popupRow.toggle.checked) reset(); + }); + } function setStatus(message, isError) { status.textContent = message; status.classList.toggle('bskyplus-llm-status-error', !!isError); } + function showApplied(hostname) { + grantButton.hidden = true; + setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + } + function apply(hostname) { if (!api || !api.runtime || typeof api.runtime.sendMessage !== 'function') { return Promise.reject(new Error('Image CDN could not be applied.')); @@ -135,6 +173,8 @@ function setBusy(value) { saving = value; input.disabled = value; + if (provider) provider.disabled = value; + if (popupRow) popupRow.toggle.disabled = value; saveButton.disabled = value; resetButton.disabled = value; grantButton.disabled = value; @@ -142,7 +182,16 @@ function requestAccess(hostname) { var origins = config.permissionOrigins(hostname); - if (!origins.length || !api || !api.permissions || typeof api.permissions.request !== 'function') return Promise.resolve(true); + if (!origins.length) return Promise.resolve(true); + // Firefox's embedded extension pages cannot use the permissions API. + if (!api || !api.permissions || typeof api.permissions.request !== 'function') { + return Promise.resolve().then(function () { + return api.runtime.sendMessage({ action: 'REQUEST_IMAGE_CDN_ACCESS' }); + }).then(function (response) { + if (!response || !response.success) throw new Error('Could not open the CDN permission page.'); + return response.opened ? null : response.enabled === true && response.hostname === hostname; + }); + } try { return Promise.resolve(api.permissions.request({ origins: origins })); } catch (err) { @@ -166,17 +215,21 @@ var saved = false; storageSet(api, { imageCdnHostname: hostname }).then(function () { saved = true; - input.value = hostname; + displayHostname(hostname); return requestAccess(hostname); }).then(function (granted) { + if (granted === null) { + grantButton.hidden = false; + setStatus('CDN saved. Grant access in the opened tab, then return here.', false); + return; + } if (!granted) { grantButton.hidden = !hostname; setStatus('CDN saved. Access was not granted. Choose Grant access to try again.', true); return; } return apply(hostname).then(function () { - grantButton.hidden = true; - setStatus(hostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + showApplied(hostname); }); }).catch(function (err) { grantButton.hidden = !(saved && hostname); @@ -187,11 +240,15 @@ } function save() { - saveValue(input.value); + if (provider && provider.value === 'custom' && !input.value.trim()) { + setStatus('Enter a CDN hostname.', true); + return; + } + saveValue(provider && provider.value !== 'custom' ? provider.value : input.value); } function reset() { - input.value = ''; + displayHostname(''); saveValue(''); } @@ -199,11 +256,15 @@ if (saving) return; setBusy(true); requestAccess(pendingHostname).then(function (granted) { + if (granted === null) { + setStatus('Grant access in the opened tab, then return here.', false); + return null; + } if (!granted) throw new Error('Access was not granted. Choose Grant access to try again.'); return apply(pendingHostname); - }).then(function () { - grantButton.hidden = true; - setStatus(pendingHostname ? 'Image CDN is active.' : 'Image CDN disabled.', false); + }).then(function (response) { + if (response === null) return; + showApplied(pendingHostname); }).catch(function (err) { grantButton.hidden = !pendingHostname; setStatus(err && err.message ? err.message : 'Could not apply image CDN.', true); @@ -215,14 +276,26 @@ saveButton.addEventListener('click', save); resetButton.addEventListener('click', reset); grantButton.addEventListener('click', retry); + function refreshAccess() { + if (saving || !pendingHostname || grantButton.hidden) return; + apply(pendingHostname).then(function () { + showApplied(pendingHostname); + }).catch(function () {}); + } + window.addEventListener('focus', refreshAccess); + if (api && api.runtime && api.runtime.onMessage) { + api.runtime.onMessage.addListener(function (message, sender) { + if (sender.id === api.runtime.id && message.action === 'IMAGE_CDN_ACCESS_GRANTED') refreshAccess(); + }); + } setBusy(true); storageGet(api, STORAGE_KEY).then(function (result) { var value = result && typeof result[STORAGE_KEY] === 'string' ? result[STORAGE_KEY] : ''; try { - input.value = config.normalizeHostname(value); + displayHostname(config.normalizeHostname(value)); pendingHostname = input.value; } catch (err) { - input.value = ''; + displayHostname(''); pendingHostname = ''; } }).catch(function () { diff --git a/extension/shared/composer.js b/extension/shared/composer.js index 87b73c5..55863fd 100644 --- a/extension/shared/composer.js +++ b/extension/shared/composer.js @@ -154,12 +154,31 @@ button.type = 'button'; button.className = 'bskyplus-preview-action'; button.dataset.method = method; - button.textContent = `+${method}`; button.setAttribute('aria-label', `Generate alt text with ${method}`); - button.innerHTML = ` - -
${method}
- ` + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('width', '10'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('height', '10'); + icon.setAttribute('style', 'color: rgb(255, 255, 255);'); + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('fill', '#FFFFFF'); + path.setAttribute('stroke', 'none'); + path.setAttribute('stroke-width', '0'); + path.setAttribute('stroke-linecap', 'butt'); + path.setAttribute('stroke-linejoin', 'miter'); + path.setAttribute('fill-rule', 'evenodd'); + path.setAttribute('clip-rule', 'evenodd'); + path.setAttribute('d', 'M12 3a1 1 0 0 1 1 1v7h7a1 1 0 1 1 0 2h-7v7a1 1 0 1 1-2 0v-7H4a1 1 0 1 1 0-2h7V4a1 1 0 0 1 1-1Z'); + icon.append(path); + + const label = document.createElement('div'); + label.dir = 'auto'; + label.className = 'css-146c3p1'; + label.setAttribute('style', 'font-size: 12px; letter-spacing: 1px; color: rgb(255, 255, 255); line-height: 16px; font-weight: 600; font-family: InterVariable, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; font-variant: no-contextual unicode;'); + label.textContent = method; + button.append(icon, label); button.addEventListener('click', event => { event.preventDefault(); event.stopPropagation(); diff --git a/extension/shared/dom-utils.js b/extension/shared/dom-utils.js index 24e1e5a..d701cb2 100644 --- a/extension/shared/dom-utils.js +++ b/extension/shared/dom-utils.js @@ -51,33 +51,30 @@ return el; } + function outlineIcon(children, strokeWidth = 2) { + return svgEl('svg', { + viewBox: '0 0 24 24', + fill: 'none', + stroke: 'currentColor', + 'stroke-width': strokeWidth, + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round' + }, children); + } + // Common SVG Icons const Icons = { download() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4' }), svgEl('polyline', { points: '7 10 12 15 17 10' }), svgEl('line', { x1: '12', y1: '15', x2: '12', y2: '3' }) ]); }, check() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2.5', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '20 6 9 17 4 12' }) - ]); + ], 2.5); }, pip() { // Font Awesome Free v7.3.1 by Fonticons, Inc. https://fontawesome.com/license/free @@ -92,68 +89,33 @@ ]); }, book() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M4 19.5A2.5 2.5 0 0 1 6.5 17H20' }), svgEl('path', { d: 'M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z' }) ]); }, markdown() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '2', y: '4', width: '20', height: '16', rx: '2' }), svgEl('path', { d: 'M6 16V8l3 4 3-4v8' }), svgEl('path', { d: 'M17 12l-2.5 3.5h5L17 12z' }) ]); }, printer() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('polyline', { points: '6 9 6 2 18 2 18 9' }), svgEl('path', { d: 'M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2' }), svgEl('rect', { x: '6', y: '14', width: '12', height: '8' }) ]); }, copy() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('rect', { x: '9', y: '9', width: '13', height: '13', rx: '2', ry: '2' }), svgEl('path', { d: 'M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1' }) ]); }, sprout() { - return svgEl('svg', { - viewBox: '0 0 24 24', - fill: 'none', - stroke: 'currentColor', - 'stroke-width': '2', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round' - }, [ + return outlineIcon([ svgEl('path', { d: 'M7 20h10' }), svgEl('path', { d: 'M12 20v-8' }), svgEl('path', { d: 'M12 12a5 5 0 0 1 5-5h3v3a5 5 0 0 1-5 5h-3z' }), @@ -162,6 +124,28 @@ } }; + function observeDom(scan) { + const observer = new MutationObserver(scan); + const start = () => { + observer.observe(document.body, { childList: true, subtree: true }); + scan(); + }; + if (document.body) start(); + else document.addEventListener('DOMContentLoaded', start, { once: true }); + return observer; + } + + function downloadBlob(blob, filename) { + const url = URL.createObjectURL(blob); + const link = createEl('a', { href: url, download: filename, style: 'display: none;' }); + document.body.appendChild(link); + link.click(); + setTimeout(() => { + link.remove(); + URL.revokeObjectURL(url); + }, 1000); + } + // Toast Notification Helper function showToast(message, duration = 3000) { let container = document.getElementById('bskyplus-toast-container'); @@ -186,6 +170,8 @@ createEl, svgEl, Icons, + observeDom, + downloadBlob, showToast }; })(); diff --git a/extension/shared/downloader.js b/extension/shared/downloader.js index 48ed18e..aa7191f 100644 --- a/extension/shared/downloader.js +++ b/extension/shared/downloader.js @@ -5,7 +5,7 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const { createEl, Icons, showToast, observeDom, downloadBlob } = utils; let enabled = true; @@ -81,7 +81,7 @@ const res = await fetch(fullUrl, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename); + downloadBlob(blob, filename); } async function downloadHlsVideo(videoEl, filename) { @@ -93,7 +93,7 @@ const res = await fetch(src, { mode: 'cors' }); if (!res.ok) throw new Error(`HTTP ${res.status}`); const blob = await res.blob(); - triggerDownload(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); + downloadBlob(blob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); return; } @@ -150,32 +150,8 @@ segmentBuffers.push(buf); } - // Calculate total length and concatenate - const totalLength = segmentBuffers.reduce((acc, b) => acc + b.byteLength, 0); - const combined = new Uint8Array(totalLength); - let offset = 0; - for (const buf of segmentBuffers) { - combined.set(new Uint8Array(buf), offset); - offset += buf.byteLength; - } - - const videoBlob = new Blob([combined], { type: 'video/mp4' }); - triggerDownload(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); - } - - function triggerDownload(blob, filename) { - const objectUrl = URL.createObjectURL(blob); - const a = createEl('a', { - href: objectUrl, - download: filename, - style: 'display: none;' - }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(objectUrl); - }, 1000); + const videoBlob = new Blob(segmentBuffers, { type: 'video/mp4' }); + downloadBlob(videoBlob, filename.endsWith('.mp4') ? filename : `${filename}.mp4`); } async function handleMediaDownload(mediaEl, btn) { @@ -278,19 +254,7 @@ } // Observe DOM for newly rendered posts and media - const observer = new MutationObserver(() => { - scanForMedia(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForMedia(); - }); - } + observeDom(scanForMedia); window.BskyPlusDownloader = { scanForMedia, diff --git a/extension/shared/edit-post-page.js b/extension/shared/edit-post-page.js new file mode 100644 index 0000000..c87ac6f --- /dev/null +++ b/extension/shared/edit-post-page.js @@ -0,0 +1,497 @@ +// Runs in the page world so authenticated repo requests use Bluesky's session. +(() => { + 'use strict'; + + const channel = document.currentScript?.dataset.bskyplusChannel; + if (!channel) return; + const nativeFetch = window.fetch.bind(window); + const collection = 'app.bsky.feed.post'; + // Bluesky allows one edit within ten minutes of creating a post. + const enforceAgeLimit = true; + const enforceSingleEdit = true; + const windowMs = 10 * 60 * 1000; + const encoder = new TextEncoder(); + const decoder = new TextDecoder(); + let enabled = false; + let account; + let lastPost; + let composer; + let previousFocus; + let previousOverflow; + const inspectedMenus = new WeakMap(); + + function element(tag, className, text) { + const node = document.createElement(tag); + if (className) node.className = className; + if (text !== undefined) node.textContent = text; + return node; + } + + function notify(message) { + const toast = element('div', 'bskyplus-edit-toast', message); + toast.setAttribute('role', 'status'); + document.body.append(toast); + setTimeout(() => toast.remove(), 4000); + } + + function editIcon(nativeIcon) { + const icon = nativeIcon?.cloneNode(false) || + document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('width', '20'); + icon.setAttribute('height', '20'); + icon.setAttribute('aria-hidden', 'true'); + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + const nativeFill = nativeIcon?.querySelector('path')?.getAttribute('fill'); + path.setAttribute('fill', nativeFill && nativeFill !== 'none' ? nativeFill : '#ABB8C9'); + path.setAttribute('d', 'M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25Zm17.71-10.21a1 1 0 0 0 0-1.42l-2.34-2.34a1 1 0 0 0-1.42 0l-1.83 1.83 3.75 3.75 1.84-1.82Z'); + icon.append(path); + return icon; + } + + function createMenuAction(menu, deleteAction) { + const template = [...menu.querySelectorAll('[role="menuitem"]')] + .find(item => item !== deleteAction && item.tagName === 'DIV' && + item.children.length === 2 && item.querySelector(':scope > [dir="auto"]') && + item.querySelector(':scope > div > svg')); + const action = template?.cloneNode(true) || element('div'); + action.classList.add('bskyplus-edit-menu-item'); + action.setAttribute('aria-label', 'Edit post'); + action.setAttribute('role', 'menuitem'); + action.tabIndex = 0; + for (const node of [action, ...action.querySelectorAll('[id], [data-testid]')]) { + node.removeAttribute('id'); + node.removeAttribute('data-testid'); + } + + let label = action.querySelector(':scope > [dir="auto"]'); + if (!label) { + label = element('div', 'bskyplus-edit-menu-label'); + label.dir = 'auto'; + action.append(label); + } + label.textContent = 'Edit post'; + + let iconContainer = [...action.children] + .find(child => child !== label && child.querySelector(':scope > svg')); + if (!iconContainer) { + iconContainer = element('div', 'bskyplus-edit-menu-icon'); + action.append(iconContainer); + } + iconContainer.querySelector('svg')?.remove(); + iconContainer.append(editIcon(template?.querySelector('svg'))); + return action; + } + + function claims(header) { + if (!header?.startsWith('Bearer ')) return null; + try { + const payload = header.slice(7).split('.')[1].replace(/-/g, '+').replace(/_/g, '/'); + return JSON.parse(atob(payload)); + } catch { return null; } + } + + window.fetch = function (input, init) { + try { + const url = new URL(input instanceof Request ? input.url : input, location.href); + if (url.protocol !== 'https:' || !url.pathname.startsWith('/xrpc/')) return nativeFetch(input, init); + const request = new Request(input instanceof Request ? input.clone() : input, init); + const authorization = request.headers.get('authorization'); + const token = claims(authorization); + if (token?.sub?.startsWith('did:') && !String(token.scope).includes('refresh') && + url.pathname !== '/xrpc/com.atproto.server.refreshSession' && + !['api.bsky.app', 'public.api.bsky.app'].includes(url.hostname) && + (request.headers.has('atproto-proxy') || url.pathname.startsWith('/xrpc/com.atproto.'))) { + // A proxy header identifies a request to the account's PDS. Never send + // this credential to an AppView or across the content-script boundary. + if (!account || account.did !== token.sub || request.headers.has('atproto-proxy') || + url.pathname.startsWith('/xrpc/com.atproto.')) { + account = { did: token.sub, origin: url.origin, authorization }; + if (enabled) queueMicrotask(scanMenus); + } + } + } catch {} + return nativeFetch(input, init); + }; + + function postFromButton(button) { + const container = button.closest('[data-testid*="postThreadItem"], [data-testid*="feedItem"], article') || + button.closest('[data-testid="post"]'); + const links = [...(container?.querySelectorAll('a[href*="/post/"]') || [])]; + const permalink = links.find(link => link.querySelector('time')) || links[0]; + const path = permalink ? new URL(permalink.href).pathname : location.pathname; + const match = /^\/profile\/([^/]+)\/post\/([a-zA-Z0-9._~-]+)\/?$/.exec(path); + return match ? { rkey: match[2], container, button } : null; + } + + function sessionBundle(post) { + for (const element of [post?.button, post?.container]) { + const key = element && Object.keys(element).find(name => name.startsWith('__reactFiber$')); + let fiber = key && element[key]; + let root = fiber; + const roots = new Set(); + while (root?.return && !roots.has(root)) { + roots.add(root); + root = root.return; + } + const useAlternate = root?.stateNode?.current && root.stateNode.current !== root; + const seen = new Set(); + while (fiber && !seen.has(fiber)) { + seen.add(fiber); + const node = useAlternate ? fiber.alternate || fiber : fiber; + const values = [node.memoizedProps?.value]; + const dependencies = new Set(); + for (let dependency = node.dependencies?.firstContext; + dependency && !dependencies.has(dependency); dependency = dependency.next) { + dependencies.add(dependency); + values.push(dependency.memoizedValue); + } + const bundle = values.find(value => value?.pdsClient?.agent?.fetchHandler); + if (bundle) return bundle; + fiber = fiber.return; + } + } + return null; + } + + function sessionFor(post) { + const bundle = sessionBundle(post); + if (bundle) { + const agent = bundle.pdsClient.agent; + let did; + try { did = agent.did || bundle.session?.did; } catch {} + if (bundle.session && !bundle.session.destroyed && did?.startsWith('did:')) { + return { did, fetch: (path, init) => agent.fetchHandler(path, init) }; + } + throw new Error('Bluesky session is not ready. Reload and try again.'); + } + if (!account) throw new Error('Bluesky session is not ready. Reload and try again.'); + const captured = account; + return { + did: captured.did, + fetch(path, init) { + const headers = new Headers(init.headers); + headers.set('authorization', captured.authorization); + return nativeFetch(new URL(path, captured.origin), { ...init, headers }); + }, + }; + } + + function editable(record, did) { + const value = record?.value; + const created = Date.parse(value?.createdAt); + const age = Date.now() - created; + return record?.uri === `at://${did}/${collection}/${record?.rkey}` && + value?.$type === collection && typeof value.text === 'string' && + Number.isFinite(created) && (!enforceAgeLimit || (age >= 0 && age <= windowMs)) && + (!enforceSingleEdit || (!Object.hasOwn(value, 'originalText') && !Object.hasOwn(value, 'updatedAt'))); + } + + async function request(session, method, path, body) { + const headers = { accept: 'application/json' }; + if (body !== undefined) headers['content-type'] = 'application/json'; + const response = await session.fetch('/xrpc/' + path, { + method, + headers, + ...(body !== undefined ? { body: JSON.stringify(body) } : {}), + }); + const result = await response.json().catch(() => ({})); + if (!response.ok) throw new Error(result.message || `Bluesky returned ${response.status}.`); + return result; + } + + async function getRecord(rkey, session) { + const query = new URLSearchParams({ repo: session.did, collection, rkey }); + const record = await request(session, 'GET', `com.atproto.repo.getRecord?${query}`); + record.rkey = rkey; + return record; + } + + function facetRanges(original, edited) { + const ranges = []; + const source = encoder.encode(original.text); + for (const facet of original.facets || []) { + const start = facet.index?.byteStart; + const end = facet.index?.byteEnd; + if (!Number.isInteger(start) || !Number.isInteger(end) || start < 0 || end > source.length || start >= end) continue; + const fragment = decoder.decode(source.slice(start, end)); + const position = edited.indexOf(fragment); + if (position < 0 || edited.indexOf(fragment, position + 1) !== -1) continue; + ranges.push({ start: position, end: position + fragment.length, features: facet.features }); + } + return ranges; + } + + function updatedFacets(original, edited) { + const ranges = facetRanges(original, edited); + const overlaps = (start, end) => ranges.some(range => start < range.end && end > range.start); + for (const match of edited.matchAll(/https?:\/\/[^\s<>"']+/gi)) { + const uri = match[0].replace(/[.,!?;:)}\]]+$/, ''); + const start = match.index; + const end = start + uri.length; + if (!uri || overlaps(start, end)) continue; + try { + new URL(uri); + ranges.push({ start, end, features: [{ $type: 'app.bsky.richtext.facet#link', uri }] }); + } catch {} + } + for (const match of edited.matchAll(/(^|[^\p{L}\p{N}_])#([\p{L}\p{N}_]+)/gu)) { + const start = match.index + match[1].length; + const end = start + match[2].length + 1; + if (overlaps(start, end) || encoder.encode(match[2]).length > 640 || + [...match[2]].length > 64) continue; + ranges.push({ start, end, features: [{ $type: 'app.bsky.richtext.facet#tag', tag: match[2] }] }); + } + return ranges.sort((a, b) => a.start - b.start).map(range => ({ + index: { + byteStart: encoder.encode(edited.slice(0, range.start)).length, + byteEnd: encoder.encode(edited.slice(0, range.end)).length, + }, + features: range.features, + })); + } + + function closeComposer() { + if (!composer) return; + composer.remove(); + composer = undefined; + document.body.style.overflow = previousOverflow; + previousFocus?.focus(); + } + + function openComposer(record, post) { + closeComposer(); + const backdrop = element('div', 'bskyplus-edit-backdrop'); + const dialog = element('div', 'bskyplus-edit-dialog'); + dialog.setAttribute('role', 'dialog'); + dialog.setAttribute('aria-modal', 'true'); + dialog.setAttribute('aria-label', 'Edit post'); + if (post?.container) { + dialog.style.color = getComputedStyle(post.container).color; + for (let node = post.container; node; node = node.parentElement) { + const background = getComputedStyle(node).backgroundColor; + if (background && background !== 'transparent' && background !== 'rgba(0, 0, 0, 0)') { + dialog.style.backgroundColor = background; + break; + } + } + } + const header = element('div', 'bskyplus-edit-header'); + const cancel = element('button', 'bskyplus-edit-cancel', 'Cancel'); + cancel.type = 'button'; + cancel.onclick = closeComposer; + const title = element('strong', 'bskyplus-edit-title', 'Edit post'); + const save = element('button', 'bskyplus-edit-save', 'Save'); + save.type = 'button'; + header.append(cancel, title, save); + const editor = element('textarea', 'bskyplus-edit-text'); + editor.value = record.value.text; + editor.rows = 6; + editor.setAttribute('aria-label', 'Post text'); + editor.setAttribute('placeholder', "What's up?"); + const composeRow = element('div', 'bskyplus-edit-compose-row'); + const avatar = post?.container?.querySelector('a[href^="/profile/"]:not([href*="/post/"]) img'); + if (avatar) { + const portrait = element('img', 'bskyplus-edit-avatar'); + portrait.src = avatar.src; + portrait.alt = ''; + composeRow.append(portrait); + } + composeRow.append(editor); + const attachments = element('div', 'bskyplus-edit-attachments'); + if (record.value.embed) { + attachments.append(element('span', 'bskyplus-edit-attachment-note', 'Existing attachments will stay on this post.')); + const images = post?.container?.querySelectorAll('img[src*="feed_thumbnail"], img[src*="feed_fullsize"]') || []; + for (const image of [...images].slice(0, 4)) { + const preview = element('img', 'bskyplus-edit-image'); + preview.src = image.src; + preview.alt = image.alt || 'Attached image'; + attachments.append(preview); + } + } + const footer = element('div', 'bskyplus-edit-footer'); + const message = element('span', 'bskyplus-edit-message'); + message.setAttribute('role', 'status'); + const counter = element('div', 'bskyplus-edit-counter'); + const count = element('span', 'bskyplus-edit-count'); + const ring = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + ring.setAttribute('class', 'bskyplus-edit-ring'); + ring.setAttribute('viewBox', '0 0 36 36'); + ring.setAttribute('aria-hidden', 'true'); + const track = document.createElementNS('http://www.w3.org/2000/svg', 'circle'); + track.setAttribute('class', 'bskyplus-edit-ring-track'); + track.setAttribute('cx', '18'); + track.setAttribute('cy', '18'); + track.setAttribute('r', '15'); + const progress = track.cloneNode(); + progress.setAttribute('class', 'bskyplus-edit-ring-progress'); + progress.setAttribute('pathLength', '100'); + ring.append(track, progress); + counter.append(count, ring); + footer.append(message, counter); + dialog.append(header, composeRow, attachments, footer); + backdrop.append(dialog); + previousFocus = document.activeElement; + previousOverflow = document.body.style.overflow; + document.body.style.overflow = 'hidden'; + document.body.append(backdrop); + composer = backdrop; + + const length = text => globalThis.Intl?.Segmenter + ? [...new Intl.Segmenter(undefined, { granularity: 'grapheme' }).segment(text)].length + : [...text].length; + const update = () => { + const graphemes = length(editor.value); + const remaining = 300 - graphemes; + count.textContent = String(remaining); + count.setAttribute('aria-label', remaining < 0 + ? `${-remaining} characters over the limit` + : `${remaining} characters remaining`); + count.classList.toggle('bskyplus-edit-over-limit', graphemes > 300); + progress.style.strokeDashoffset = String(100 - Math.min(100, graphemes / 3)); + progress.classList.toggle('bskyplus-edit-over-limit', graphemes > 300); + save.disabled = graphemes > 300 || encoder.encode(editor.value).length > 3000 || + editor.value === record.value.text || (!editor.value && !record.value.embed); + }; + editor.addEventListener('input', () => { message.textContent = ''; update(); }); + editor.addEventListener('keydown', event => { + if (event.key === 'Enter' && (event.ctrlKey || event.metaKey) && !save.disabled) { + event.preventDefault(); + save.click(); + } + }); + update(); + editor.focus(); + editor.setSelectionRange(editor.value.length, editor.value.length); + + backdrop.addEventListener('click', event => { + if (event.target === backdrop && save.textContent === 'Save') closeComposer(); + }); + backdrop.addEventListener('keydown', event => { + if (event.key === 'Escape' && save.textContent === 'Save') { event.preventDefault(); closeComposer(); } + if (event.key !== 'Tab') return; + const controls = [cancel, editor, save].filter(control => !control.disabled); + const next = controls.indexOf(document.activeElement) + (event.shiftKey ? -1 : 1); + if (next < 0 || next >= controls.length) { + event.preventDefault(); + controls[(next + controls.length) % controls.length].focus(); + } + }); + + save.addEventListener('click', async () => { + if (save.disabled) return; + save.disabled = true; + cancel.disabled = true; + save.textContent = 'Saving…'; + message.textContent = ''; + try { + if (!enabled) throw new Error('Post editing is disabled.'); + const session = sessionFor(post); + if (session.did !== record.uri.split('/')[2]) throw new Error('The signed-in account changed.'); + const current = await getRecord(record.rkey, session); + if (!editable(current, session.did) || current.cid !== record.cid) { + throw new Error('This post changed or can no longer be edited.'); + } + if (encoder.encode(editor.value).length > 3000 || length(editor.value) > 300 || + (!editor.value && !current.value.embed) || editor.value === current.value.text) { + throw new Error('Enter a changed post of up to 300 characters.'); + } + const value = { + ...current.value, + text: editor.value, + originalText: current.value.originalText ?? current.value.text, + updatedAt: new Date().toISOString(), + }; + delete value.entities; + const facets = updatedFacets(current.value, editor.value); + if (facets.length) value.facets = facets; + else delete value.facets; + await request(session, 'POST', 'com.atproto.repo.applyWrites', { + repo: session.did, + validate: true, + writes: [ + { $type: 'com.atproto.repo.applyWrites#delete', collection, rkey: record.rkey }, + { $type: 'com.atproto.repo.applyWrites#create', collection, rkey: record.rkey, value }, + ], + }); + closeComposer(); + notify('Post edited. Updating view…'); + setTimeout(() => location.reload(), 900); + } catch (error) { + message.textContent = error.message || 'Could not edit this post.'; + save.textContent = 'Save'; + cancel.disabled = false; + update(); + } + }); + } + + async function addMenuAction(menu) { + if (!enabled || !lastPost || inspectedMenus.get(menu) === lastPost) return; + const deleteAction = [...menu.querySelectorAll('[role="menuitem"], button')] + .find(item => /^delete post$/i.test(item.textContent.trim())); + if (!deleteAction) return; + menu.querySelector('.bskyplus-edit-menu-item')?.remove(); + const post = lastPost; + inspectedMenus.set(menu, post); + if (enforceAgeLimit || enforceSingleEdit) { + try { + const session = sessionFor(post); + const record = await getRecord(post.rkey, session); + if (!enabled || !menu.isConnected || post !== lastPost || !editable(record, session.did)) return; + } catch { return; } + } + const action = createMenuAction(menu, deleteAction); + action.addEventListener('click', async event => { + event.preventDefault(); + event.stopPropagation(); + const escape = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }); + menu.dispatchEvent(escape); + document.dispatchEvent(escape); + try { + const session = sessionFor(post); + const record = await getRecord(post.rkey, session); + if (!editable(record, session.did)) throw new Error('This post can no longer be edited.'); + openComposer(record, post); + } catch (error) { + notify(error.message || 'Could not open this post for editing.'); + } + }); + action.addEventListener('keydown', event => { + if (event.key === 'Enter' || event.key === ' ') { + event.preventDefault(); + action.click(); + } + }); + deleteAction.before(action); + } + + function scanMenus() { + if (!enabled || !lastPost) return; + document.querySelectorAll('[role="menu"], [data-testid*="dropdownMenu"], [data-radix-menu-content]') + .forEach(menu => { void addMenuAction(menu); }); + } + + document.addEventListener('click', event => { + const button = event.target.closest?.('button[aria-label="Open post options menu"]'); + if (!button) return; + lastPost = postFromButton(button); + queueMicrotask(scanMenus); + }, true); + const observe = () => new MutationObserver(scanMenus).observe(document.body, { childList: true, subtree: true }); + if (document.body) observe(); + else document.addEventListener('DOMContentLoaded', observe, { once: true }); + + window.addEventListener('message', event => { + const message = event.data; + if (event.source !== window || event.origin !== location.origin || + message?.channel !== channel || message.direction !== 'configure') return; + enabled = message.enabled === true; + if (!enabled) { + document.querySelectorAll('.bskyplus-edit-menu-item').forEach(item => item.remove()); + closeComposer(); + lastPost = undefined; + } else scanMenus(); + }); +})(); diff --git a/extension/shared/edit-post.css b/extension/shared/edit-post.css new file mode 100644 index 0000000..86eeb91 --- /dev/null +++ b/extension/shared/edit-post.css @@ -0,0 +1,221 @@ +.bskyplus-edit-menu-item { + display: flex; + flex-direction: row; + align-items: center; + gap: 16px; + min-height: 32px; + padding: 8px 10px; + overflow: hidden; + border-radius: 4px; + color: inherit; + cursor: pointer; +} + +.bskyplus-edit-menu-label { + flex: 1 1 0%; + font: 600 13.1px/17px InterVariable, system-ui, sans-serif; +} + +.bskyplus-edit-menu-icon { + flex: none; + margin-right: -2px; + margin-left: 12px; +} + +.bskyplus-edit-menu-item:hover, +.bskyplus-edit-menu-item:focus-visible { + background: color-mix(in srgb, currentColor 10%, transparent); + outline: none; +} + +.bskyplus-edit-backdrop { + position: fixed; + inset: 0; + z-index: 2147483646; + display: flex; + justify-content: center; + align-items: flex-start; + overflow-y: auto; + padding: min(12vh, 96px) 16px 24px; + background: rgba(0, 0, 0, 0.65); +} + +.bskyplus-edit-dialog { + box-sizing: border-box; + width: min(600px, 100%); + overflow: hidden; + border-radius: 16px; + background: #fff; + color: #101824; + box-shadow: 0 20px 60px rgba(0, 0, 0, 0.35); + font-family: InterVariable, system-ui, sans-serif; +} + +.theme--dim .bskyplus-edit-dialog, +.theme--dark .bskyplus-edit-dialog { + background: #151d28; + color: #f1f3f5; +} + +.bskyplus-edit-header { + display: grid; + grid-template-columns: 1fr auto 1fr; + align-items: center; + gap: 12px; + padding: 12px 18px; + border-bottom: 1px solid color-mix(in srgb, currentColor 14%, transparent); +} + +.bskyplus-edit-title { + font-size: 17px; +} + +.bskyplus-edit-header button { + border: 0; + font: 600 15px/20px InterVariable, system-ui, sans-serif; + cursor: pointer; +} + +.bskyplus-edit-cancel { + justify-self: start; + padding: 8px 0; + background: transparent; + color: #1083fe; +} + +.bskyplus-edit-save { + justify-self: end; + min-width: 70px; + padding: 8px 16px; + border-radius: 999px; + background: #1083fe; + color: white; +} + +.bskyplus-edit-save:disabled { + opacity: 0.5; + cursor: default; +} + +.bskyplus-edit-compose-row { + display: flex; + align-items: flex-start; + gap: 12px; + margin: 18px; +} + +.bskyplus-edit-avatar { + flex: none; + width: 42px; + height: 42px; + border-radius: 50%; + object-fit: cover; +} + +.bskyplus-edit-text { + box-sizing: border-box; + display: block; + flex: 1; + min-width: 0; + min-height: 180px; + padding: 0; + resize: vertical; + border: 0; + outline: none; + background: transparent; + color: inherit; + font: 400 18px/26px InterVariable, system-ui, sans-serif; +} + +.bskyplus-edit-text::placeholder { + color: color-mix(in srgb, currentColor 55%, transparent); +} + +.bskyplus-edit-attachments { + display: flex; + flex-wrap: wrap; + gap: 8px; + margin: 0 18px 16px; +} + +.bskyplus-edit-attachments:empty { + display: none; +} + +.bskyplus-edit-attachment-note { + width: 100%; + opacity: 0.7; + font-size: 13px; +} + +.bskyplus-edit-image { + width: 96px; + height: 96px; + object-fit: cover; + border-radius: 10px; +} + +.bskyplus-edit-footer { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + min-height: 40px; + padding: 0 18px 14px; + font-size: 13px; +} + +.bskyplus-edit-counter { + display: flex; + align-items: center; + gap: 12px; + color: inherit; + font: 400 15px/20px InterVariable, system-ui, sans-serif; +} + +.bskyplus-edit-ring { + width: 36px; + height: 36px; + transform: rotate(-90deg); +} + +.bskyplus-edit-ring circle { + fill: none; + stroke-width: 3; +} + +.bskyplus-edit-ring-track { + stroke: currentColor; + opacity: 0.18; +} + +.bskyplus-edit-ring-progress { + stroke: #1682fe; + stroke-dasharray: 100; + stroke-dashoffset: 100; + stroke-linecap: round; + transition: stroke-dashoffset 150ms ease; +} + +.bskyplus-edit-ring-progress.bskyplus-edit-over-limit { + stroke: #d52d52; +} + +.bskyplus-edit-message, +.bskyplus-edit-over-limit { + color: #d52d52; +} + +.bskyplus-edit-toast { + position: fixed; + bottom: 24px; + left: 50%; + z-index: 2147483647; + transform: translateX(-50%); + padding: 12px 18px; + border-radius: 999px; + background: #263342; + color: white; + font: 600 14px/20px InterVariable, system-ui, sans-serif; + box-shadow: 0 8px 28px rgba(0, 0, 0, 0.3); +} diff --git a/extension/shared/edit-post.js b/extension/shared/edit-post.js new file mode 100644 index 0000000..044ed9d --- /dev/null +++ b/extension/shared/edit-post.js @@ -0,0 +1,30 @@ +// Post records and authenticated requests stay in Bluesky's page. +(() => { + 'use strict'; + + const api = globalThis.browser || globalThis.chrome; + const channel = crypto.randomUUID(); + const script = document.createElement('script'); + script.async = false; + script.dataset.bskyplusChannel = channel; + script.src = api.runtime.getURL('shared/edit-post-page.js'); + + const configure = () => window.postMessage({ + channel, + direction: 'configure', + enabled: true, + }, location.origin); + + script.onload = () => { script.remove(); configure(); }; + const mount = () => { + if (!document.documentElement) return false; + document.documentElement.append(script); + return true; + }; + if (!mount()) { + const observer = new MutationObserver(() => { + if (mount()) observer.disconnect(); + }); + observer.observe(document, { childList: true }); + } +})(); diff --git a/extension/shared/emoji-picker.js b/extension/shared/emoji-picker.js index 4794c97..9f31a99 100644 --- a/extension/shared/emoji-picker.js +++ b/extension/shared/emoji-picker.js @@ -568,17 +568,11 @@ document.addEventListener('keydown', (e) => { if (!activePicker || activePicker.style.display === 'none' || activeMatches.length === 0) return; - if (e.key === 'ArrowDown') { + if (e.key === 'ArrowDown' || e.key === 'ArrowUp') { e.preventDefault(); e.stopPropagation(); - selectedIndex = (selectedIndex + 1) % activeMatches.length; - renderPickerItems(); - const selectedEl = activePicker.querySelector('.bskyplus-selected'); - if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); - } else if (e.key === 'ArrowUp') { - e.preventDefault(); - e.stopPropagation(); - selectedIndex = (selectedIndex - 1 + activeMatches.length) % activeMatches.length; + const direction = e.key === 'ArrowDown' ? 1 : -1; + selectedIndex = (selectedIndex + direction + activeMatches.length) % activeMatches.length; renderPickerItems(); const selectedEl = activePicker.querySelector('.bskyplus-selected'); if (selectedEl) selectedEl.scrollIntoView({ block: 'nearest' }); diff --git a/extension/shared/feature-flags.js b/extension/shared/feature-flags.js index 94bb4b7..9bb56d6 100644 --- a/extension/shared/feature-flags.js +++ b/extension/shared/feature-flags.js @@ -25,7 +25,7 @@ enabled: true, stage: 'release', name: 'Quick Emoji Suggestions', - desc: ': (color) & emoji autocomplete like Slack' + desc: ': emoji autocomplete like Slack' }, feedWidth: { enabled: true, @@ -39,24 +39,12 @@ name: 'Fresh Account Badge', desc: 'Spot new accounts <30d, cached in IndexedDB' }, - threadUnroll: { - enabled: true, - stage: 'alpha', - name: 'Thread Unroll & Reader View', - desc: 'Distraction-free reading from 3-dot menu, export Markdown/PDF' - }, skeetMode: { enabled: true, stage: 'release', name: 'Skeet Mode', desc: 'Replaces "post" with "skeet"' }, - accentColor: { - enabled: true, - stage: 'release', - name: 'Custom Accent Color', - desc: 'Pride flag palette & custom hex accent colors' - }, localOcr: { enabled: true, stage: 'release', diff --git a/extension/shared/features.css b/extension/shared/features.css index 9f8e3db..94200db 100644 --- a/extension/shared/features.css +++ b/extension/shared/features.css @@ -2,8 +2,11 @@ Bsky+ Extended Features Stylesheet ========================================================================== */ -/* Keep embedded media and galleries contained when the feed is widened. */ -div[data-testid="contentHider-post"] > div:last-child { +/* Limit post media without constraining text or text-only quote cards. */ +[data-bskyplus-feed-column] div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] img, +div[data-testid="contentHider-post"] video, +[data-bskyplus-post-media] { max-width: min(100%, 600px) !important; } @@ -39,7 +42,7 @@ div[data-testid="contentHider-post"] > div:last-child { .bskyplus-media-dl-btn:hover { opacity: 1 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; border-color: rgba(255, 255, 255, 0.4) !important; transform: translateY(-1px); } @@ -73,18 +76,112 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-speed-select { - field-sizing: content; + appearance: none !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + gap: 5px !important; min-width: 0 !important; background: transparent !important; color: #fff !important; border: none !important; border-radius: 4px !important; min-height: 28px !important; + padding: 4px 7px !important; + font: inherit !important; + font-size: 12px !important; + cursor: pointer !important; +} + +.bskyplus-speed-select:hover, +.bskyplus-speed-select[aria-expanded="true"] { + background-color: rgba(255, 255, 255, 0.12) !important; +} + +.bskyplus-speed-select:focus-visible { + outline: 2px solid rgba(255, 255, 255, 0.75) !important; + outline-offset: 1px !important; +} + +.bskyplus-speed-chevron { + width: 0 !important; + height: 0 !important; + border-left: 3px solid transparent !important; + border-right: 3px solid transparent !important; + border-top: 4px solid currentColor !important; + opacity: 0.75 !important; +} + +.bskyplus-speed-menu { + position: fixed !important; + inset: auto !important; + z-index: 2147483647 !important; + min-width: 96px !important; + max-height: min(220px, calc(100vh - 16px)) !important; + overflow-y: auto !important; + flex-direction: column !important; + gap: 2px !important; + margin: 0 !important; padding: 4px !important; + background-color: #1e2936 !important; + color: #f1f3f5 !important; + border: 1px solid #2b394a !important; + border-radius: 8px !important; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.42) !important; + box-sizing: border-box !important; +} + +.bskyplus-speed-menu:not([popover]):not([hidden]) { + display: flex !important; +} + +.bskyplus-speed-menu[popover]:popover-open { + display: flex !important; +} + +.bskyplus-speed-menu[hidden] { + display: none !important; +} + +.bskyplus-speed-option { + appearance: none !important; + display: flex !important; + align-items: center !important; + justify-content: space-between !important; + width: 100% !important; + min-height: 30px !important; + margin: 0 !important; + padding: 5px 8px !important; + color: #f1f3f5 !important; + background-color: transparent !important; + border: 0 !important; + border-radius: 5px !important; font: inherit !important; font-size: 12px !important; + text-align: left !important; cursor: pointer !important; - color-scheme: dark; + box-sizing: border-box !important; +} + +.bskyplus-speed-option:hover, +.bskyplus-speed-option:focus-visible, +.bskyplus-speed-option[aria-checked="true"] { + background-color: #263342 !important; +} + +.bskyplus-speed-option:focus-visible { + outline: 2px solid #71859b !important; + outline-offset: -2px !important; +} + +.bskyplus-speed-option-check::before { + content: "✓"; + color: #f1f3f5 !important; + opacity: 0; +} + +.bskyplus-speed-option[aria-checked="true"] .bskyplus-speed-option-check::before { + opacity: 1; } .bskyplus-toolbar-btn { @@ -106,7 +203,7 @@ div[data-testid="contentHider-post"] > div:last-child { } .bskyplus-toolbar-btn[aria-pressed="true"] { - background-color: var(--bskyplus-accent, #1083fe) !important; + background-color: #1083fe !important; color: #ffffff !important; } @@ -216,260 +313,3 @@ div[data-testid="contentHider-post"] > div:last-child { color: #fbbf24 !important; border-color: rgba(251, 191, 36, 0.4) !important; } - -/* -------------------------------------------------------------------------- - 6. Thread Unroll / Reader View - -------------------------------------------------------------------------- */ -.bskyplus-unroll-btn { - display: inline-flex !important; - align-items: center !important; - gap: 5px !important; - background: transparent !important; - border: 1px solid rgba(140, 158, 181, 0.3) !important; - color: #8c9eb5 !important; - padding: 3px 8px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - margin-left: 8px !important; - transition: all 0.15s ease !important; - user-select: none !important; -} - -.bskyplus-unroll-btn:hover { - background: rgba(16, 131, 254, 0.12) !important; - color: #1083fe !important; - border-color: #1083fe !important; -} - -.bskyplus-unroll-btn svg { - width: 13px !important; - height: 13px !important; -} - -/* 3-Dot Post Dropdown Menu Item */ -.bskyplus-unroll-menu-item { - display: flex !important; - align-items: center !important; - gap: 12px !important; - padding: 10px 14px !important; - cursor: pointer !important; - border-radius: 6px !important; - font-size: 14px !important; - font-weight: 500 !important; - color: inherit !important; - transition: background-color 0.15s ease !important; - user-select: none !important; - outline: none !important; -} - -.bskyplus-unroll-menu-item:hover, -.bskyplus-unroll-menu-item:focus { - background-color: rgba(128, 128, 128, 0.15) !important; -} - -.bskyplus-unroll-menu-item svg { - width: 18px !important; - height: 18px !important; - flex-shrink: 0 !important; -} - -/* Reader Modal Backdrop */ -.bskyplus-reader-backdrop { - position: fixed !important; - inset: 0 !important; - z-index: 2147483646 !important; - background-color: rgba(0, 0, 0, 0.75) !important; - backdrop-filter: blur(5px) !important; - display: flex !important; - justify-content: center !important; - align-items: flex-start !important; - overflow-y: auto !important; - padding: 40px 16px !important; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif !important; -} - -.bskyplus-reader-modal { - width: 100% !important; - max-width: 680px !important; - background-color: #161e27 !important; - color: #f1f3f5 !important; - border-radius: 14px !important; - border: 1px solid #2b394a !important; - box-shadow: 0 16px 48px rgba(0, 0, 0, 0.7) !important; - overflow: hidden !important; - display: flex !important; - flex-direction: column !important; -} - -.bskyplus-reader-header { - display: flex !important; - align-items: center !important; - justify-content: space-between !important; - padding: 16px 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-title { - font-size: 18px !important; - font-weight: 700 !important; - color: #fff !important; -} - -.bskyplus-reader-meta { - font-size: 12px !important; - color: #8c9eb5 !important; - margin-top: 2px !important; -} - -.bskyplus-reader-close { - background: transparent !important; - border: none !important; - color: #8c9eb5 !important; - font-size: 24px !important; - cursor: pointer !important; - padding: 4px 8px !important; - border-radius: 6px !important; - line-height: 1 !important; -} - -.bskyplus-reader-close:hover { - background-color: #263342 !important; - color: #fff !important; -} - -.bskyplus-reader-actions { - display: flex !important; - gap: 8px !important; - padding: 12px 20px !important; - background-color: #1e2936 !important; - border-bottom: 1px solid #2b394a !important; - flex-wrap: wrap !important; -} - -.bskyplus-reader-action-btn { - display: inline-flex !important; - align-items: center !important; - gap: 6px !important; - background-color: #263342 !important; - border: 1px solid #2b394a !important; - color: #f1f3f5 !important; - padding: 6px 12px !important; - border-radius: 6px !important; - font-size: 12px !important; - font-weight: 600 !important; - cursor: pointer !important; - transition: background-color 0.15s ease !important; -} - -.bskyplus-reader-action-btn:hover { - background-color: #324357 !important; - color: #fff !important; -} - -.bskyplus-reader-action-btn svg { - width: 14px !important; - height: 14px !important; - fill: currentColor !important; -} - -.bskyplus-reader-content { - padding: 24px 20px !important; - max-height: 75vh !important; - overflow-y: auto !important; -} - -.bskyplus-reader-post { - padding-bottom: 20px !important; - margin-bottom: 20px !important; - border-bottom: 1px solid #2b394a !important; -} - -.bskyplus-reader-post:last-child { - border-bottom: none !important; - margin-bottom: 0 !important; - padding-bottom: 0 !important; -} - -.bskyplus-reader-post-header { - display: flex !important; - align-items: center !important; - gap: 8px !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-post-num { - font-size: 11px !important; - font-weight: 700 !important; - background-color: var(--bskyplus-accent, #1083fe) !important; - color: #fff !important; - padding: 2px 7px !important; - border-radius: 10px !important; -} - -.bskyplus-reader-post-author { - font-size: 13px !important; - font-weight: 600 !important; - color: #8c9eb5 !important; -} - -.bskyplus-reader-post-text { - font-size: 15px !important; - line-height: 1.55 !important; - color: #f1f3f5 !important; - white-space: pre-wrap !important; - word-break: break-word !important; -} - -.bskyplus-reader-post-media { - margin-top: 12px !important; - border-radius: 8px !important; - overflow: hidden !important; -} - -.bskyplus-reader-img { - max-width: 100% !important; - max-height: 480px !important; - border-radius: 8px !important; - display: block !important; - margin-bottom: 8px !important; -} - -.bskyplus-reader-video { - max-width: 100% !important; - border-radius: 8px !important; - display: block !important; -} - -/* Clean Print / PDF Export Styling */ -@media print { - body * { - visibility: hidden !important; - } - .bskyplus-reader-backdrop, - .bskyplus-reader-modal, - .bskyplus-reader-modal * { - visibility: visible !important; - } - .bskyplus-reader-backdrop { - position: absolute !important; - inset: 0 !important; - background: #ffffff !important; - padding: 0 !important; - } - .bskyplus-reader-modal { - box-shadow: none !important; - border: none !important; - background: #ffffff !important; - color: #000000 !important; - max-width: 100% !important; - } - .bskyplus-reader-actions, - .bskyplus-reader-close { - display: none !important; - } - .bskyplus-reader-post-text { - color: #000000 !important; - } -} diff --git a/extension/shared/feed-width.js b/extension/shared/feed-width.js index 07b2c56..e6a8244 100644 --- a/extension/shared/feed-width.js +++ b/extension/shared/feed-width.js @@ -7,9 +7,68 @@ 'use strict'; const STYLE_ID = 'bskyplus-feed-width-style'; + const TRANSITION_STYLE_ID = 'bskyplus-feed-width-transition-style'; + const TRANSITION_ATTRIBUTE = 'data-bskyplus-feed-width-animating'; + const TRANSITION_DURATION = 800; + const TRANSITION_TARGETS = [ + 'div[style*="max-width: 600px"]', + 'div[style*="max-width:600px"]', + 'div[style*="max-width: 550px"]', + 'div[style*="max-width:550px"]', + '[data-bskyplus-feed-column]', + '[role="tablist"]', + '[data-bskyplus-tablist]', + '[data-bskyplus-center-borders]', + 'div[style*="width: 602px"]', + 'div[style*="width:602px"]', + '[data-bskyplus-left-nav]', + 'div[role="navigation"]:not([style*="bottom:"])', + 'nav[role="navigation"]:not([style*="bottom:"])', + '[data-bskyplus-right-nav]', + 'div[style*="translateX(300px)"]', + 'div[style*="translateX(195px)"]', + '[data-bskyplus-settings-page]' + ].join(', '); let currentConfiguredWidth = 600; let currentEffectiveWidth = 600; let hasLiveWidthUpdate = false; + let transitionTimeout; + + function startWidthTransition() { + if (!isFeatureActive() || window.matchMedia?.('(prefers-reduced-motion: reduce)').matches) return; + + let style = document.getElementById(TRANSITION_STYLE_ID); + if (!style) { + style = document.createElement('style'); + style.id = TRANSITION_STYLE_ID; + style.textContent = ` + @media (prefers-reduced-motion: no-preference) { + html[${TRANSITION_ATTRIBUTE}] :is(${TRANSITION_TARGETS}) { + transition: max-width ${TRANSITION_DURATION}ms ease, + width ${TRANSITION_DURATION}ms ease, + margin-left ${TRANSITION_DURATION}ms ease, + margin-right ${TRANSITION_DURATION}ms ease !important; + } + } + `; + (document.head || document.documentElement).appendChild(style); + } + + const root = document.documentElement; + if (root.getAttribute(TRANSITION_ATTRIBUTE) === null) { + root.setAttribute(TRANSITION_ATTRIBUTE, ''); + // Apply the transition before changing widths, including the first live update. + document.querySelectorAll(TRANSITION_TARGETS).forEach(element => { + window.getComputedStyle(element).transitionDuration; + }); + } + + if (transitionTimeout) window.clearTimeout?.(transitionTimeout); + transitionTimeout = window.setTimeout?.(() => { + root.removeAttribute(TRANSITION_ATTRIBUTE); + transitionTimeout = undefined; + }, TRANSITION_DURATION + 50); + } function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -55,6 +114,17 @@ return document.querySelector('div[role="navigation"]:not([style*="bottom:"]), nav[role="navigation"]:not([style*="bottom:"])'); } + function findFixedAncestor(element) { + let parent = element?.parentElement; + while (parent && parent !== document.body && parent !== document.documentElement) { + const style = parent.getAttribute('style') || ''; + if (style.includes('position: fixed') || style.includes('position:fixed') || style.includes('translateX') || + window.getComputedStyle?.(parent)?.position === 'fixed') return parent; + parent = parent.parentElement; + } + return null; + } + function findRightNav() { // 1. Direct match on Bluesky's desktop fixed right column transform const direct = document.querySelector('div[style*="translateX(300px)"], div[style*="translateX( 300px)"], div[style*="translateX(195px)"], div[style*="translateX( 195px)"]'); @@ -73,50 +143,17 @@ // 2. Check via desktop search input const searchInput = document.querySelector('input[placeholder*="Search" i], input[aria-label*="Search" i]'); - if (searchInput) { - let parent = searchInput.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } + const searchNav = findFixedAncestor(searchInput); + if (searchNav) return searchNav; // 3. Check via desktop right sidebar links (privacy policy, terms, etc.) const privacyLink = document.querySelector('a[href*="privacy-policy"], a[href*="tos"], a[href*="zendesk.com"]'); - if (privacyLink) { - let parent = privacyLink.parentElement; - while (parent && parent !== document.body && parent !== document.documentElement) { - const styleAttr = parent.getAttribute('style') || ''; - if (styleAttr.includes('position: fixed') || styleAttr.includes('position:fixed') || styleAttr.includes('translateX')) { - return parent; - } - if (typeof window.getComputedStyle === 'function') { - const cs = window.getComputedStyle(parent); - if (cs && cs.position === 'fixed') { - return parent; - } - } - parent = parent.parentElement; - } - } - - return null; + return findFixedAncestor(privacyLink); } function findCenterBorders() { - const borders = document.querySelectorAll('div[style*="602px"], div[style*="602 px"]'); - for (const el of borders) { - return el; - } + const borders = document.querySelector('div[style*="602px"], div[style*="602 px"]'); + if (borders) return borders; const borderCandidates = document.querySelectorAll('div[style*="border-left-width"][style*="border-right-width"], div[style*="translateX(-50%)"]'); for (const el of borderCandidates) { if (el.children.length === 0) { @@ -184,8 +221,11 @@ } function clearLayoutTags() { - const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist]'); + const tagged = document.querySelectorAll('[data-bskyplus-left-nav], [data-bskyplus-right-nav], [data-bskyplus-center-borders], [data-bskyplus-feed-column], [data-bskyplus-tablist], [data-bskyplus-post-media]'); tagged.forEach(el => { + if (el.dataset && el.dataset.bskyplusPostMedia) { + delete el.dataset.bskyplusPostMedia; + } if (el.dataset && el.dataset.bskyplusLeftNav) { if (el.style && el.style.removeProperty) el.style.removeProperty('margin-left'); delete el.dataset.bskyplusLeftNav; @@ -238,6 +278,30 @@ } } + function setColumnWidth(element, width) { + if (!element.style?.setProperty) return; + element.style.setProperty('max-width', `${width}px`, 'important'); + element.style.setProperty('margin-left', 'auto', 'important'); + element.style.setProperty('margin-right', 'auto', 'important'); + element.style.setProperty('width', '100%', 'important'); + } + + function tagPostMedia() { + document.querySelectorAll('[data-testid="contentHider-post"]').forEach(post => { + for (const child of post.children) { + const hasMedia = !child.querySelector('[data-testid="postText"]') && ( + child.querySelector('video') || + Array.from(child.querySelectorAll('img')).some(image => !image.closest('[data-testid="userAvatarImage"]')) + ); + if (hasMedia) { + child.dataset.bskyplusPostMedia = 'true'; + } else if (child.dataset.bskyplusPostMedia) { + delete child.dataset.bskyplusPostMedia; + } + } + }); + } + function scanAndTagLayout(effectiveWidth) { if (!isFeatureActive() || effectiveWidth === 600) { clearLayoutTags(); @@ -285,12 +349,7 @@ } el.dataset.bskyplusFeedColumn = 'true'; } - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - el.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(el, effectiveWidth); } }); @@ -298,12 +357,7 @@ const tablists = document.querySelectorAll('div[role="tablist"], [role="tablist"]'); tablists.forEach(el => { if (el.dataset) el.dataset.bskyplusTablist = 'true'; - if (el.style && el.style.setProperty) { - el.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - el.style.setProperty('width', '100%', 'important'); - el.style.setProperty('margin-left', 'auto', 'important'); - el.style.setProperty('margin-right', 'auto', 'important'); - } + setColumnWidth(el, effectiveWidth); // Check parent header wrappers and feed column parents let parent = el.parentElement; @@ -312,12 +366,7 @@ const pStyle = parent.getAttribute('style') || ''; if (isTagged || /max-width:\s*(550|600)px/i.test(pStyle)) { if (parent.dataset) parent.dataset.bskyplusFeedColumn = 'true'; - if (parent.style && parent.style.setProperty) { - parent.style.setProperty('max-width', `${effectiveWidth}px`, 'important'); - parent.style.setProperty('margin-left', 'auto', 'important'); - parent.style.setProperty('margin-right', 'auto', 'important'); - parent.style.setProperty('width', '100%', 'important'); - } + setColumnWidth(parent, effectiveWidth); } if (parent.getAttribute('data-bskyplus-left-nav') || parent.getAttribute('data-bskyplus-right-nav')) { break; @@ -326,6 +375,8 @@ } }); + tagPostMedia(); + // Child positions differ between feeds and notifications. The column's // width constraint above identifies it without resizing avatar columns. } @@ -403,6 +454,7 @@ function applyLiveFeedWidth(width) { hasLiveWidthUpdate = true; + startWidthTransition(); // A live reset to 600 breaks the layout. Keep the saved default for reloads. updateFeedWidthStyle(width === 600 ? 599 : width); if (isFeatureActive() && width) currentConfiguredWidth = width; diff --git a/extension/shared/hide-liked-by.js b/extension/shared/hide-liked-by.js new file mode 100644 index 0000000..0c59cbf --- /dev/null +++ b/extension/shared/hide-liked-by.js @@ -0,0 +1,39 @@ +// Optional post-view cleanup. CSS also covers links added after hydration. +(() => { + 'use strict'; + const api = globalThis.browser || globalThis.chrome; + const key = 'hideLikedByEnabled'; + let enabled = false; + let changed = false; + const style = document.createElement('style'); + style.textContent = 'html[data-bskyplus-hide-liked-by] a[aria-label^="Liked by "] { display: none !important; }'; + + function update() { + const root = document.documentElement; + if (!root) return; + if (!style.isConnected) root.append(style); + const postView = /^\/profile\/[^/]+\/post\/[^/]+\/?$/.test(location.pathname); + const hide = enabled && postView; + if (root.hasAttribute('data-bskyplus-hide-liked-by') !== hide) { + root.toggleAttribute('data-bskyplus-hide-liked-by', hide); + } + } + + api.storage.local.get({ [key]: false }).then(settings => { + if (!changed) enabled = settings[key] === true; + update(); + }, update); + api.storage.onChanged.addListener((changes, area) => { + if (area !== 'local' || !changes[key]) return; + changed = true; + enabled = changes[key].newValue === true; + update(); + }); + + new MutationObserver(update).observe(document, { childList: true, subtree: true }); + window.addEventListener('popstate', update); + window.navigation?.addEventListener('navigatesuccess', update); + // Fallback for SPA history updates that do not immediately change the DOM. + setInterval(update, 1000); + update(); +})(); diff --git a/extension/shared/integrated-settings-rules.json b/extension/shared/integrated-settings-rules.json index 82644b1..9653c25 100644 --- a/extension/shared/integrated-settings-rules.json +++ b/extension/shared/integrated-settings-rules.json @@ -10,5 +10,29 @@ "regexFilter": "^https://bsky\\.app/bskyplus/?(\\?.*)?$", "resourceTypes": ["main_frame"] } + }, + { + "id": 3, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=infrastructure" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/infrastructure/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } + }, + { + "id": 2, + "priority": 1, + "action": { + "type": "redirect", + "redirect": { "url": "https://bsky.app/settings?bskyplus=theme" } + }, + "condition": { + "regexFilter": "^https://bsky\\.app/bskyplus/theme/?(\\?.*)?$", + "resourceTypes": ["main_frame"] + } } ] diff --git a/extension/shared/integrated-settings.css b/extension/shared/integrated-settings.css index b397a81..0fd4dcd 100644 --- a/extension/shared/integrated-settings.css +++ b/extension/shared/integrated-settings.css @@ -90,6 +90,23 @@ color-scheme: normal; } +[data-bskyplus-theme-link] { + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + min-height: 56px; + padding: 8px 20px; + border-bottom: 1px solid color-mix(in srgb, currentColor 15%, transparent); + color: var(--bskyplus-theme-text, inherit); + font-size: 15px; + text-decoration: none; +} + +[data-bskyplus-theme-link]:hover { + background: color-mix(in srgb, currentColor 6%, transparent); +} + [data-bskyplus-settings-page] header a { display: grid; place-items: center; @@ -106,3 +123,35 @@ outline: 2px solid currentColor; outline-offset: -2px; } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: inherit; + background: #151d28; + box-shadow: 0 12px 48px #0008; + font: 14px/1.5 InterVariable, system-ui, sans-serif; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-dialog h2 { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-dialog p { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } diff --git a/extension/shared/integrated-settings.js b/extension/shared/integrated-settings.js index 0863650..ce8d3f8 100644 --- a/extension/shared/integrated-settings.js +++ b/extension/shared/integrated-settings.js @@ -8,14 +8,31 @@ let scheduled = false; let settingsFrame; let nativeCenter; + let nativeTitle; let centerObserver; - let bootstrapRequested = location.pathname === '/settings' && - new URLSearchParams(location.search).get('bskyplus') === '1'; + function bootstrapPath() { + const value = new URLSearchParams(location.search).get('bskyplus'); + return value === 'theme' ? '/bskyplus/theme' : ['1', 'infrastructure'].includes(value) ? '/bskyplus' : null; + } + let bootstrapRequested = location.pathname === '/settings' ? bootstrapPath() : null; + + function settingsReference() { + return document.querySelector('a[href="/settings/about"]') || + document.querySelector('a[href="/settings/account"]'); + } + + function navigate(event, path) { + if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; + event.preventDefault(); + history.pushState(history.state, '', path); + update(); + page?.querySelector('h1')?.focus(); + window.scrollTo(0, 0); + } function addSettingsLink() { if (document.querySelector('[data-bskyplus-settings-link]')) return; - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + const reference = settingsReference(); if (!reference) return; const link = document.createElement('a'); @@ -55,15 +72,16 @@ label.dataset.bskyplusSettingsLabel = ''; label.textContent = 'Bsky+'; const nativeLabel = reference.querySelector('[dir="auto"]') || reference; - link.style.color = getComputedStyle(nativeLabel).color; + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(nativeLabel).color})`; const chevron = document.createElement('div'); chevron.dataset.bskyplusSettingsChevron = ''; chevron.setAttribute('aria-hidden', 'true'); const nativeChevron = reference.querySelector('svg:last-child'); const nativeIcons = reference.querySelectorAll('svg'); - chevron.style.color = nativeIcons.length > 1 + const chevronColor = nativeIcons.length > 1 ? getComputedStyle(nativeIcons[nativeIcons.length - 1]).color : getComputedStyle(nativeChevron || nativeLabel).color; + chevron.style.color = `var(--bskyplus-theme-muted, ${chevronColor})`; const arrow = document.createElementNS(svgNamespace, 'svg'); arrow.setAttribute('viewBox', '0 0 24 24'); arrow.setAttribute('width', '18'); @@ -79,32 +97,37 @@ iconWrapper.append(icon); row.append(iconWrapper, label, chevron); link.append(row); - link.addEventListener('click', event => { - if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return; - event.preventDefault(); - history.pushState(history.state, '', '/bskyplus'); - update(); - page?.querySelector('h1')?.focus(); - window.scrollTo(0, 0); - }); + link.addEventListener('click', event => navigate(event, '/bskyplus')); const firstRow = Array.from(reference.parentElement.children) .find(element => element.matches('a[href^="/settings/"]')) || reference; firstRow.before(link); } function unmountPage() { + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: null })); centerObserver?.disconnect(); centerObserver = nativeCenter = undefined; host?.removeAttribute('data-bskyplus-settings-host'); page?.remove(); settingsFrame = undefined; - if (previousTitle !== undefined && document.title === 'Bsky+ — Bluesky') { + if (previousTitle !== undefined && ['Bsky+ — Bluesky', 'Theme editor — Bsky+'].includes(document.title)) { document.title = previousTitle; } - host = page = undefined; + host = page = nativeTitle = undefined; previousTitle = undefined; } + function syncSettingsLinkColors() { + const link = document.querySelector('[data-bskyplus-settings-link]'); + const reference = settingsReference(); + if (!link || !reference) return; + const label = reference.querySelector('[dir="auto"]') || reference; + const icons = reference.querySelectorAll('svg'); + link.style.color = `var(--bskyplus-theme-text, ${getComputedStyle(label).color})`; + const chevron = link.querySelector('[data-bskyplus-settings-chevron]'); + chevron.style.color = `var(--bskyplus-theme-muted, ${getComputedStyle(icons.length > 1 ? icons[icons.length - 1] : label).color})`; + } + function findNativeCenter(reference) { const content = reference?.closest('#content'); let candidate; @@ -133,38 +156,54 @@ syncAlignment(); } - function mountPage() { - const reference = document.querySelector('a[href="/settings/about"]') || - document.querySelector('a[href="/settings/account"]'); + function mountPage(path) { + const themePage = path === '/bskyplus/theme'; + const pageTitle = themePage ? 'Theme editor' : 'Bsky+'; + const reference = settingsReference(); const screen = reference?.closest('#content')?.parentElement || document.querySelector('[data-testid="notFoundView"]'); if (!screen) return; - if (host !== screen || !page?.isConnected) { + if (host !== screen || !page?.isConnected || page.dataset.bskyplusSettingsPage !== path) { unmountPage(); host = screen; previousTitle = document.title; - const nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); + nativeTitle = host.querySelector('[role="heading"], h1, [dir="auto"]'); page = document.createElement('section'); - page.dataset.bskyplusSettingsPage = ''; - page.setAttribute('aria-label', 'Bsky+'); - if (nativeTitle) page.style.color = getComputedStyle(nativeTitle).color; + page.dataset.bskyplusSettingsPage = path; + page.setAttribute('aria-label', pageTitle); + syncPageColor(); const header = document.createElement('header'); const back = document.createElement('a'); - back.href = '/settings'; + back.href = themePage ? '/bskyplus' : '/settings'; + if (themePage) back.addEventListener('click', event => navigate(event, '/bskyplus')); back.textContent = '←'; - back.setAttribute('aria-label', 'Back to Settings'); + back.setAttribute('aria-label', themePage ? 'Back to Bsky+ settings' : 'Back to Settings'); const title = document.createElement('h1'); - title.textContent = 'Bsky+'; + title.textContent = pageTitle; title.tabIndex = -1; header.append(back, title); page.append(header); + if (!themePage) { + const themeLink = document.createElement('a'); + themeLink.href = '/bskyplus/theme'; + themeLink.dataset.bskyplusThemeLink = ''; + const label = document.createElement('span'); + label.textContent = 'Theme editor'; + const arrow = document.createElement('span'); + arrow.textContent = '›'; + arrow.setAttribute('aria-hidden', 'true'); + themeLink.append(label, arrow); + themeLink.addEventListener('click', event => navigate(event, '/bskyplus/theme')); + page.append(themeLink); + } const api = typeof browser !== 'undefined' ? browser : globalThis.chrome; if (api?.runtime?.getURL) { settingsFrame = document.createElement('iframe'); settingsFrame.dataset.bskyplusSettingsFrame = ''; - settingsFrame.title = 'Bsky+ settings'; - settingsFrame.src = api.runtime.getURL('shared/settings-frame.html'); + settingsFrame.title = themePage ? 'Bsky+ ' + pageTitle : 'Bsky+ settings'; + settingsFrame.src = api.runtime.getURL('shared/settings-frame.html') + + (themePage ? '?section=theme' : ''); settingsFrame.referrerPolicy = 'no-referrer'; settingsFrame.addEventListener('load', sendTheme); page.append(settingsFrame); @@ -173,11 +212,22 @@ host.append(page); } trackNativeCenter(findNativeCenter(reference) || screen.firstElementChild); - if (document.title !== 'Bsky+ — Bluesky') document.title = 'Bsky+ — Bluesky'; + const title = themePage ? pageTitle + ' — Bsky+' : 'Bsky+ — Bluesky'; + if (document.title !== title) document.title = title; + } + + function syncPageColor() { + if (!page) return; + // The sampled heading may already be themed. Use the palette variable so + // the runtime cannot translate that resolved color a second time. + const fallback = nativeTitle?.isConnected ? getComputedStyle(nativeTitle).color : 'inherit'; + const color = `var(--bskyplus-theme-text, ${fallback})`; + if (page.style.color !== color) page.style.color = color; } function sendTheme() { if (!settingsFrame?.contentWindow || !page) return; + syncPageColor(); let background = 'rgb(255, 255, 255)'; for (let element = page; element; element = element.parentElement) { const value = getComputedStyle(element).backgroundColor; @@ -191,27 +241,81 @@ }, '*'); } + function showAppviewRestartPrompt() { + if (document.querySelector('dialog[data-bskyplus-appview-restart]')) return; + const dialog = document.createElement('dialog'); + dialog.className = 'bskyplus-appview-restart-dialog'; + dialog.dataset.bskyplusAppviewRestart = ''; + dialog.setAttribute('aria-labelledby', 'bskyplusAppviewRestartTitle'); + const form = document.createElement('form'); + form.method = 'dialog'; + const title = document.createElement('h2'); + title.id = 'bskyplusAppviewRestartTitle'; + title.textContent = 'Restart Bluesky'; + const message = document.createElement('p'); + message.textContent = 'The AppView changed. Bluesky needs to restart to use the new provider.'; + const actions = document.createElement('div'); + actions.className = 'bskyplus-appview-restart-actions'; + const confirm = document.createElement('button'); + confirm.type = 'submit'; + confirm.value = 'ok'; + confirm.textContent = 'OK'; + actions.append(confirm); + form.append(title, message, actions); + dialog.append(form); + dialog.addEventListener('cancel', event => event.preventDefault()); + dialog.addEventListener('close', () => { + const confirmed = dialog.returnValue === 'ok'; + dialog.remove(); + if (confirmed) window.location.reload(); + }, { once: true }); + const foreground = page ? getComputedStyle(page).color : ''; + if (foreground) dialog.style.color = foreground; + for (let node = page; node; node = node.parentElement) { + const background = getComputedStyle(node).backgroundColor; + if (background && background !== 'transparent' && background !== 'rgba(0, 0, 0, 0)') { + dialog.style.backgroundColor = background; + break; + } + } + document.body.append(dialog); + dialog.showModal(); + confirm.focus(); + } + window.addEventListener('message', event => { - if (!settingsFrame || event.source !== settingsFrame.contentWindow || - event.data?.type !== 'BSKYPLUS_SETTINGS_HEIGHT') return; - const height = event.data.height; - if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { - settingsFrame.style.height = `${Math.ceil(height)}px`; + if (!settingsFrame || event.source !== settingsFrame.contentWindow) return; + if (event.data?.type === 'BSKYPLUS_SETTINGS_HEIGHT') { + const height = event.data.height; + if (typeof height === 'number' && Number.isFinite(height) && height >= 100 && height <= 12000) { + settingsFrame.style.height = `${Math.ceil(height)}px`; + } + } else if (event.data?.type === 'BSKYPLUS_APPVIEW_RESTART') { + showAppviewRestartPrompt(); + } else if (event.data?.type === 'BSKYPLUS_THEME_PREVIEW') { + const model = globalThis.BskyPlusThemes; + if (!model) return; + let theme = null; + if (event.data.theme !== null) { + try { theme = model.validateTheme(event.data.theme); } + catch { return; } + } + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: theme })); } }); function update() { scheduled = false; const path = location.pathname.replace(/\/$/, ''); - const bootstrap = path === '/settings' && (bootstrapRequested || - new URLSearchParams(location.search).get('bskyplus') === '1'); - if (path === '/bskyplus' || bootstrap) { - mountPage(); + const bootstrap = path === '/settings' && (bootstrapRequested || bootstrapPath()); + if (path === '/bskyplus' || path === '/bskyplus/theme' || path === '/bskyplus/infrastructure' || bootstrap) { + const targetPath = path === '/bskyplus/infrastructure' ? '/bskyplus' : bootstrap || path; + mountPage(targetPath); // Let Bluesky mount its Settings screen before claiming the URL. A // request rule bootstraps hard loads because the server rejects /bskyplus. - if (bootstrap && page?.isConnected) { - bootstrapRequested = false; - history.replaceState(history.state, '', '/bskyplus'); + if ((bootstrap || path === '/bskyplus/infrastructure') && page?.isConnected) { + bootstrapRequested = null; + history.replaceState(history.state, '', targetPath); } } else { @@ -231,8 +335,12 @@ childList: true, subtree: true, }); - window.addEventListener('popstate', scheduleUpdate); + window.addEventListener('popstate', update); window.addEventListener('pageshow', scheduleUpdate); window.addEventListener('resize', scheduleUpdate); + window.addEventListener('bskyplus:theme-changed', () => { + syncSettingsLinkColors(); + sendTheme(); + }); scheduleUpdate(); })(); diff --git a/extension/shared/llm-permissions.html b/extension/shared/llm-permissions.html new file mode 100644 index 0000000..8d6d803 --- /dev/null +++ b/extension/shared/llm-permissions.html @@ -0,0 +1,27 @@ + + + + + + Bsky+ LLM access + + + + + +
+

LLM endpoint access

+

Loading the saved endpoint…

+ +

+
+ + diff --git a/extension/shared/llm-permissions.js b/extension/shared/llm-permissions.js new file mode 100644 index 0000000..c6ba61a --- /dev/null +++ b/extension/shared/llm-permissions.js @@ -0,0 +1,119 @@ +// Standalone permission page for settings frames that do not expose +// browser.permissions, such as the embedded Firefox settings frame. +(() => { + 'use strict'; + + const api = typeof browser !== 'undefined' ? browser : chrome; + const llm = globalThis.BskyPlusLLM; + const description = document.getElementById('description'); + const grant = document.getElementById('grant'); + const status = document.getElementById('status'); + let endpoint = ''; + let permissionRequest = null; + let busy = false; + + function setStatus(message, error = false) { + status.textContent = message; + status.classList.toggle('error', error); + } + + function readSettings() { + return api.storage.local.get('llm').then(data => llm.normalizeSettings(data && data.llm)); + } + + function buildRequest(settings, target, supportsDataConsent) { + const request = { origins: [target.originPattern] }; + if (supportsDataConsent) request.data_collection = llm.requiredDataCollection(settings); + return request; + } + + function sameRequestConfig(settings, target, request) { + if (settings.endpoint !== endpoint || target.originPattern !== request.origins[0]) return false; + if (!request.data_collection) return true; + return JSON.stringify(request.data_collection) === JSON.stringify(llm.requiredDataCollection(settings)); + } + + function verifyCurrentConfig() { + return readSettings().then(settings => { + const target = llm.validateEndpoint(settings.endpoint); + if (!target.ok || !sameRequestConfig(settings, target, permissionRequest)) { + throw new Error('The saved LLM settings changed. Close this page and save again.'); + } + return settings; + }); + } + + function hasRequiredAccess(request) { + const checks = [api.permissions.contains({ origins: request.origins })]; + if (request.data_collection) { + checks.push(api.permissions.contains({ data_collection: request.data_collection })); + } + return Promise.all(checks).then(results => results.every(Boolean)); + } + + function setBusy(value) { + busy = value; + grant.disabled = value || !permissionRequest; + } + + function grantAccess() { + if (busy || !permissionRequest) return; + setBusy(true); + // Keep the permission request directly inside this click handler so + // Firefox can associate its consent prompt with the user's action. + let request; + try { + request = api.permissions.request(permissionRequest); + } catch (error) { + request = Promise.reject(error); + } + Promise.resolve(request).then(granted => { + if (granted !== true) throw new Error('Access was not granted. You can try again.'); + return verifyCurrentConfig(); + }).then(() => hasRequiredAccess(permissionRequest)).then(granted => { + if (!granted) throw new Error('LLM access could not be confirmed. Try granting access again.'); + grant.hidden = true; + setStatus('LLM endpoint access is active. You may close this page.'); + }).catch(error => { + setStatus(error && error.message ? error.message : 'Could not grant LLM access.', true); + }).finally(() => setBusy(false)); + } + + function mount() { + if (!api || !api.storage || !api.storage.local || !api.runtime || + !api.permissions || typeof api.permissions.request !== 'function' || + typeof api.permissions.contains !== 'function' || !llm) { + setStatus('LLM permissions are unavailable in this page.', true); + return; + } + readSettings().then(settings => { + endpoint = settings.endpoint; + const target = llm.validateEndpoint(endpoint); + if (!target.ok) throw new Error('No valid LLM endpoint is saved. Close this page and save one first.'); + return llm.detectDataConsentSupport( + api, + typeof navigator !== 'undefined' && /android/i.test(navigator.userAgent || '') + ).then(supportsDataConsent => ({ settings, target, supportsDataConsent })); + }).then(({ settings, target, supportsDataConsent }) => { + permissionRequest = buildRequest(settings, target, supportsDataConsent); + description.textContent = supportsDataConsent + ? `Grant Bsky+ access to ${target.url.origin} and consent to the data sent to your saved LLM endpoint.` + : `Grant Bsky+ access to ${target.url.origin} for your saved LLM endpoint.`; + grant.hidden = false; + setBusy(false); + return hasRequiredAccess(permissionRequest); + }).then(granted => { + if (granted) { + grant.hidden = true; + setStatus('LLM endpoint access is already active. You may close this page.'); + } + }).catch(error => { + grant.hidden = true; + setStatus(error && error.message ? error.message : 'Could not load LLM settings.', true); + }); + grant.addEventListener('click', grantAccess); + } + + if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', mount); + else mount(); +})(); diff --git a/extension/shared/llm-settings.css b/extension/shared/llm-settings.css index 0f37884..f84f5b4 100644 --- a/extension/shared/llm-settings.css +++ b/extension/shared/llm-settings.css @@ -32,7 +32,43 @@ } .bskyplus-llm-input:focus { - border-color: var(--accent-default, #1083fe); + border-color: #1083fe; +} + +.bskyplus-llm-prompt-heading { + display: flex; + align-items: center; + justify-content: flex-start; + gap: 5px; +} + +.bskyplus-llm-prompt-heading .switch { + width: 32px; + height: 18px; + border-radius: 999px; +} + +.bskyplus-llm-prompt-heading .switch::before { + top: 3px; + left: 3px; + width: 12px; + height: 12px; +} + +.bskyplus-llm-prompt-heading .switch:checked::before { + transform: translateX(14px); +} + +.bskyplus-llm-prompt-input { + box-sizing: border-box; + min-height: 0; + overflow-y: hidden; + line-height: 1.45; + resize: none; +} + +.bskyplus-llm-prompt-input:disabled { + cursor: not-allowed; } .bskyplus-llm-actions { @@ -41,15 +77,44 @@ margin-top: 2px; } -.bskyplus-llm-save { - min-width: 72px; +.bskyplus-llm-key-row, +.bskyplus-appview-provider-row { + display: grid; + align-items: stretch; + gap: 8px; +} + +.bskyplus-llm-key-row { + grid-template-columns: minmax(0, 4fr) minmax(0, 1fr); +} + +.bskyplus-appview-provider-row { + grid-template-columns: minmax(0, 7fr) minmax(0, 3fr); +} + +.bskyplus-appview-provider-row > select, +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > input, +.bskyplus-llm-key-row > .bskyplus-llm-save { + min-width: 0; + width: 100%; +} + +.bskyplus-appview-provider-row > button, +.bskyplus-llm-key-row > .bskyplus-llm-save { + padding-inline: 4px; + border-radius: 8px; +} + +.bskyplus-appview-provider-row > button { + white-space: nowrap; } .bskyplus-llm-status { min-height: 14px; margin-top: 8px; font-size: 11px; - color: var(--accent-default, #1083fe); + color: #1083fe; } .bskyplus-llm-status-error { @@ -62,3 +127,94 @@ line-height: 1.4; color: var(--text-secondary, #8c9eb5); } + +.bskyplus-appview-restart-dialog { + box-sizing: border-box; + width: min(420px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid color-mix(in srgb, currentColor 18%, transparent); + border-radius: 16px; + color: var(--text-primary, #f1f3f5); + background: var(--bg-primary, #151d28); + box-shadow: 0 12px 48px #0008; + font-size: 14px; + line-height: 1.5; +} + +.bskyplus-appview-restart-dialog::backdrop { background: #0008; } +.bskyplus-appview-restart-dialog form { display: grid; gap: 12px; } +.bskyplus-appview-restart-title { margin: 0; font-size: 18px; } +.bskyplus-appview-restart-message { margin: 0; } +.bskyplus-appview-restart-actions { display: flex; justify-content: flex-end; margin-top: 4px; } +.bskyplus-appview-restart-actions > button { + min-height: 40px; + padding: 0 18px; + border: 0; + border-radius: 999px; + color: #fff; + background: #1083fe; + font: inherit; + font-weight: 600; + cursor: pointer; +} +.bskyplus-appview-restart-actions > button:focus-visible { outline: 2px solid currentColor; outline-offset: 3px; } + +/* Shared controls must retain native hidden behavior in flex field layouts. */ +.bskyplus-llm-field[hidden] { + display: none; +} + +select.bskyplus-llm-input option { + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); +} + +.bskyplus-popup-feature .toggle-label { + column-gap: 0; +} + +.bskyplus-bookmarks-info { + display: inline-flex; + align-items: center; + justify-content: center; + flex: 0 0 12px; + width: 12px; + height: 12px; + padding: 0; + margin-left: 3px; + transform: translateY(-9%); + border: 1px solid var(--text-secondary, #8c9eb5); + border-radius: 50%; + background: transparent; + color: var(--text-secondary, #8c9eb5); + font-size: 9px; + font-weight: 600; + line-height: 1; + cursor: help; +} + +.bskyplus-bookmarks-info:hover, +.bskyplus-bookmarks-info:focus-visible { + color: var(--text-primary, #f1f3f5); + border-color: currentColor; +} + +.bskyplus-bookmarks-tooltip { + position: fixed; + z-index: 1000; + width: min(360px, calc(100vw - 16px)); + max-height: calc(100vh - 16px); + overflow: auto; + padding: 12px; + border: 1px solid var(--border-color, #2b394a); + border-radius: 10px; + background: var(--bg-secondary, #1e2936); + color: var(--text-primary, #f1f3f5); + box-shadow: 0 6px 24px #0005; + font-size: 12px; + font-weight: 400; + line-height: 1.5; + user-select: text; +} diff --git a/extension/shared/llm-settings.js b/extension/shared/llm-settings.js index 82f61bd..3e8c084 100644 --- a/extension/shared/llm-settings.js +++ b/extension/shared/llm-settings.js @@ -26,7 +26,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -108,25 +111,13 @@ .then(function (res) { return res || {}; }, function () { return {}; }); } - function storageSet(api, value) { - return new Promise(function (resolve, reject) { - var result; - try { - result = api.storage.local.set(value); - } catch (err) { - reject(err); - return; - } - if (result && typeof result.then === 'function') { - result.then(resolve, reject); - return; - } - if (api.runtime && api.runtime.lastError) { - reject(new Error(api.runtime.lastError.message || 'Storage write failed')); - return; - } - reject(new Error('Storage did not confirm the write')); - }); + async function storageSet(api, value) { + var result = api.storage.local.set(value); + if (result && typeof result.then === 'function') return result; + if (api.runtime && api.runtime.lastError) { + throw new Error(api.runtime.lastError.message || 'Storage write failed'); + } + throw new Error('Storage did not confirm the write'); } function field(labelText, input) { @@ -140,6 +131,17 @@ return row; } + function makeInput(type, id, placeholder) { + var input = document.createElement('input'); + input.type = type; + input.id = id; + input.className = 'bskyplus-llm-input'; + input.placeholder = placeholder; + input.autocomplete = 'off'; + input.spellcheck = false; + return input; + } + function mount() { if (document.querySelector('.bskyplus-llm-section')) return null; @@ -158,33 +160,83 @@ subtitle.textContent = 'OpenAI-compatible vision chat/completions endpoint'; section.appendChild(subtitle); - var endpointInput = document.createElement('input'); - endpointInput.type = 'url'; - endpointInput.id = 'bskyplusLlmEndpoint'; - endpointInput.className = 'bskyplus-llm-input'; - endpointInput.placeholder = 'https://api.openai.com/v1/chat/completions'; - endpointInput.autocomplete = 'off'; - endpointInput.spellcheck = false; - - var modelInput = document.createElement('input'); - modelInput.type = 'text'; - modelInput.id = 'bskyplusLlmModel'; - modelInput.className = 'bskyplus-llm-input'; - modelInput.placeholder = 'gpt-4o-mini (optional)'; - modelInput.autocomplete = 'off'; - modelInput.spellcheck = false; - - var apiKeyInput = document.createElement('input'); - apiKeyInput.type = 'password'; - apiKeyInput.id = 'bskyplusLlmApiKey'; - apiKeyInput.className = 'bskyplus-llm-input'; - apiKeyInput.placeholder = 'API key (optional)'; - apiKeyInput.autocomplete = 'off'; - apiKeyInput.spellcheck = false; + var endpointInput = makeInput('url', 'bskyplusLlmEndpoint', 'https://api.openai.com/v1/chat/completions'); + var modelInput = makeInput('text', 'bskyplusLlmModel', 'gpt-4o-mini (optional)'); + var apiKeyInput = makeInput('password', 'bskyplusLlmApiKey', 'API key (optional)'); + var customPromptToggle = document.createElement('input'); + customPromptToggle.type = 'checkbox'; + customPromptToggle.id = 'bskyplusLlmUseCustomPrompt'; + customPromptToggle.className = 'switch'; + customPromptToggle.setAttribute('aria-label', 'Enable custom prompt'); + var customPromptPlaceholder = 'Write instructions for describing the image'; + var savedCustomPrompt = ''; + var customPromptInput = document.createElement('textarea'); + customPromptInput.id = 'bskyplusLlmCustomPrompt'; + customPromptInput.className = 'bskyplus-llm-input bskyplus-llm-prompt-input'; + customPromptInput.rows = 2; + customPromptInput.disabled = true; + customPromptInput.placeholder = ''; + customPromptInput.spellcheck = true; + var customPromptField = document.createElement('div'); + customPromptField.className = 'bskyplus-llm-field'; + var customPromptHeading = document.createElement('div'); + customPromptHeading.className = 'bskyplus-llm-prompt-heading'; + var customPromptTitle = document.createElement('span'); + customPromptTitle.id = 'bskyplusLlmCustomPromptTitle'; + customPromptTitle.className = 'bskyplus-llm-label'; + customPromptTitle.textContent = 'Custom prompt'; + customPromptInput.setAttribute('aria-labelledby', customPromptTitle.id); + customPromptToggle.setAttribute('aria-controls', customPromptInput.id); + customPromptHeading.append(customPromptTitle, customPromptToggle); + customPromptField.append(customPromptHeading, customPromptInput); + function resizeCustomPrompt() { + if (!customPromptInput.isConnected) return; + customPromptInput.style.height = 'auto'; + var styles = window.getComputedStyle(customPromptInput); + var borders = parseFloat(styles.borderTopWidth) + parseFloat(styles.borderBottomWidth); + customPromptInput.style.height = (customPromptInput.scrollHeight + borders) + 'px'; + } + function updateCustomPromptAvailability() { + var enabled = customPromptToggle.checked; + customPromptInput.disabled = !enabled; + customPromptInput.value = enabled ? savedCustomPrompt : ''; + customPromptInput.placeholder = enabled ? customPromptPlaceholder : ''; + resizeCustomPrompt(); + } + customPromptToggle.addEventListener('change', function () { + if (!customPromptToggle.checked) savedCustomPrompt = customPromptInput.value; + updateCustomPromptAvailability(); + }); + customPromptInput.addEventListener('input', function () { + savedCustomPrompt = customPromptInput.value; + resizeCustomPrompt(); + }); + window.addEventListener('resize', resizeCustomPrompt); + if (typeof ResizeObserver === 'function') { + var promptFieldWidth = 0; + var promptFieldObserver = new ResizeObserver(function (entries) { + var width = entries[0]?.contentRect.width || 0; + if (width === promptFieldWidth) return; + promptFieldWidth = width; + resizeCustomPrompt(); + }); + promptFieldObserver.observe(customPromptField); + } section.appendChild(field('Endpoint URL', endpointInput)); section.appendChild(field('Model', modelInput)); - section.appendChild(field('API key', apiKeyInput)); + var apiKeyField = document.createElement('div'); + apiKeyField.className = 'bskyplus-llm-field'; + var apiKeyLabel = document.createElement('label'); + apiKeyLabel.className = 'bskyplus-llm-label'; + apiKeyLabel.htmlFor = apiKeyInput.id; + apiKeyLabel.textContent = 'API key'; + var apiKeyRow = document.createElement('div'); + apiKeyRow.className = 'bskyplus-llm-key-row'; + apiKeyRow.appendChild(apiKeyInput); + apiKeyField.append(apiKeyLabel, apiKeyRow); + section.appendChild(apiKeyField); + section.appendChild(customPromptField); var actions = document.createElement('div'); actions.className = 'bskyplus-llm-actions'; @@ -194,7 +246,7 @@ saveButton.className = 'secondary-btn bskyplus-llm-save'; saveButton.textContent = 'Save'; saveButton.disabled = true; - actions.appendChild(saveButton); + apiKeyRow.appendChild(saveButton); var grantButton = document.createElement('button'); grantButton.type = 'button'; grantButton.className = 'secondary-btn bskyplus-llm-grant'; @@ -202,6 +254,92 @@ grantButton.hidden = true; actions.appendChild(grantButton); var pendingPermissionRequest = null; + var saveQueue = Promise.resolve(); + var editVersion = 0; + var dirtyFields = Object.create(null); + var draftRevisions = Object.create(null); + var settingsReady = Promise.resolve(); + + function queueSettingsSave(patch, message) { + if (!api) return Promise.reject(new Error('Settings storage is unavailable')); + var version = editVersion; + var revisions = Object.assign({}, draftRevisions); + saveQueue = saveQueue.catch(function () {}).then(async function () { + await settingsReady; + var saved = await storageGet(api, STORAGE_KEY); + var settings = normalizeSettings(saved[STORAGE_KEY]); + if (featureRow && typeof settings.enabled !== 'boolean') { + settings.enabled = validateEndpoint(settings.endpoint).ok; + } + Object.keys(patch).forEach(function (key) { settings[key] = patch[key]; }); + await storageSet(api, { llm: settings }); + Object.keys(patch).forEach(function (key) { + if (dirtyFields[key] && revisions[key] === draftRevisions[key]) dirtyFields[key] = false; + }); + if (version === editVersion) setStatus(message || '', false); + return settings; + }); + return saveQueue; + } + + function persistField(key, value) { + editVersion += 1; + return queueSettingsSave({ [key]: value }, 'Draft saved.'); + } + + function persistDraft() { + var patch = {}; + Object.keys(dirtyFields).forEach(function (key) { + if (dirtyFields[key]) patch[key] = draftValue(key); + }); + if (!Object.keys(patch).length) return Promise.resolve(); + editVersion += 1; + return queueSettingsSave(patch, 'Draft saved.'); + } + + function draftValue(key) { + if (key === 'endpoint') return endpointInput.value.trim(); + if (key === 'model') return modelInput.value.trim(); + if (key === 'apiKey') return apiKeyInput.value; + if (key === 'useCustomPrompt') return customPromptToggle.checked; + if (key === 'customPrompt') return savedCustomPrompt; + return undefined; + } + + function trackDraft(input, key) { + function markDirty() { + dirtyFields[key] = true; + draftRevisions[key] = (draftRevisions[key] || 0) + 1; + editVersion += 1; + } + input.addEventListener('input', markDirty); + input.addEventListener('change', markDirty); + input.addEventListener('blur', function () { + if (!dirtyFields[key]) return; + persistField(key, draftValue(key)).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + } + + trackDraft(endpointInput, 'endpoint'); + trackDraft(modelInput, 'model'); + trackDraft(apiKeyInput, 'apiKey'); + trackDraft(customPromptInput, 'customPrompt'); + customPromptToggle.addEventListener('change', function () { + dirtyFields.useCustomPrompt = true; + draftRevisions.useCustomPrompt = (draftRevisions.useCustomPrompt || 0) + 1; + editVersion += 1; + persistField('useCustomPrompt', customPromptToggle.checked).catch(function () { + setStatus('Could not save LLM settings.', true); + }); + }); + window.addEventListener('blur', function () { persistDraft().catch(function () {}); }); + window.addEventListener('pagehide', function () { persistDraft().catch(function () {}); }); + document.addEventListener('visibilitychange', function () { + if (document.hidden) persistDraft().catch(function () {}); + }); + section.appendChild(actions); var status = document.createElement('p'); @@ -227,12 +365,47 @@ document.body.appendChild(section); } + var featureRow = globalThis.BskyPlusFeatureRow?.(section, 'AI Alt Text (LLM)', 'Generate image descriptions with AI', 'llmEnabledToggle', 'altTextSection'); + if (featureRow) { + featureRow.addTooltip(() => notice.textContent); + notice.remove(); + featureRow.toggle.disabled = true; + featureRow.toggle.addEventListener('change', async function () { + var enabled = featureRow.toggle.checked; + featureRow.toggle.disabled = true; + saveButton.disabled = true; + try { + await queueSettingsSave({ enabled: enabled }, ''); + setStatus('', false); + } catch { + featureRow.setEnabled(!enabled); + setStatus('Could not change LLM settings. Try again.', true); + } finally { + featureRow.toggle.disabled = false; + saveButton.disabled = false; + } + }); + api?.storage?.onChanged?.addListener(function (changes, area) { + if (area !== 'local' || !changes.llm) return; + var settings = normalizeSettings(changes.llm.newValue); + featureRow.setEnabled(settings.enabled ?? validateEndpoint(settings.endpoint).ok); + }); + } + if (api) { - storageGet(api, STORAGE_KEY).then(function (res) { + settingsReady = storageGet(api, STORAGE_KEY).then(function (res) { var stored = normalizeSettings(res && res[STORAGE_KEY]); - endpointInput.value = stored.endpoint; - modelInput.value = stored.model; - apiKeyInput.value = stored.apiKey; + if (!dirtyFields.endpoint) endpointInput.value = stored.endpoint; + if (!dirtyFields.model) modelInput.value = stored.model; + if (!dirtyFields.apiKey) apiKeyInput.value = stored.apiKey; + if (!dirtyFields.useCustomPrompt) customPromptToggle.checked = stored.useCustomPrompt; + if (!dirtyFields.customPrompt) savedCustomPrompt = stored.customPrompt; + updateCustomPromptAvailability(); + resizeCustomPrompt(); + if (featureRow) { + featureRow.setEnabled(stored.enabled ?? validateEndpoint(stored.endpoint).ok); + featureRow.toggle.disabled = false; + } }); } @@ -252,31 +425,31 @@ var endpoint = endpointInput.value.trim(); var model = modelInput.value.trim(); var apiKey = apiKeyInput.value; - - if (endpoint === '') { - saveSettings({ endpoint: '', model: '', apiKey: '' }, 'LLM endpoint cleared.').catch(function () { - setStatus('Could not save LLM settings.', true); - }); - return; - } - + var useCustomPrompt = customPromptToggle.checked; + var customPrompt = savedCustomPrompt; var target = validateEndpoint(endpoint); - if (!target.ok) { - setStatus(target.error, true); - return; - } - var dataTypes = ['websiteContent']; if (apiKey) dataTypes.push('authenticationInfo'); saveButton.disabled = true; - saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey }, 'Settings saved. Requesting access…').then(function () { + if (featureRow) featureRow.toggle.disabled = true; + saveSettings({ endpoint: endpoint, model: model, apiKey: apiKey, useCustomPrompt: useCustomPrompt, customPrompt: customPrompt }, 'Draft saved.').then(function () { + if (!target.ok) { + setStatus(endpoint ? target.error : 'LLM endpoint cleared. Other settings are saved.', !endpoint ? false : true); + return; + } + if (useCustomPrompt && !customPrompt.trim()) { + setStatus('Settings saved. Enter a custom prompt or turn the custom prompt off.', true); + return; + } pendingPermissionRequest = buildPermissionRequest(target.originPattern, dataConsentSupported, dataTypes); + setStatus('Settings saved. Requesting access…', false); return requestSavedPermissions(); }).catch(function () { setStatus('Could not save LLM settings.', true); }).finally(function () { saveButton.disabled = false; + if (featureRow) featureRow.toggle.disabled = false; }); }); @@ -287,6 +460,7 @@ function requestSavedPermissions() { if (!pendingPermissionRequest) return Promise.resolve(); var permissionPromise; + var usingPermissionBroker = false; grantButton.disabled = true; if (api && api.permissions && api.permissions.request) { try { @@ -295,11 +469,31 @@ permissionPromise = Promise.reject(err); } } else { - permissionPromise = Promise.resolve(true); + usingPermissionBroker = true; + try { + permissionPromise = api && api.runtime && typeof api.runtime.sendMessage === 'function' + ? api.runtime.sendMessage({ action: 'REQUEST_LLM_ACCESS' }) + : Promise.reject(new Error('LLM permissions are unavailable.')); + } catch (err) { + permissionPromise = Promise.reject(err); + } } return Promise.resolve(permissionPromise).then(function (granted) { - if (!granted) { + if (usingPermissionBroker) { + if (granted && granted.success === true && granted.opened === true) { + grantButton.hidden = false; + setStatus('Settings saved. Finish granting LLM access in the permissions page.', false); + return; + } + if (granted && granted.success === true && granted.granted === true) { + grantButton.hidden = true; + setStatus('LLM endpoint saved.', false); + return; + } + throw new Error(granted && granted.error ? granted.error : 'LLM permissions are unavailable.'); + } + if (granted !== true) { grantButton.hidden = false; setStatus('Settings saved. Access was not granted. Choose Grant access to enable LLM.', true); return; @@ -320,10 +514,10 @@ return Promise.reject(new Error('Settings storage is unavailable')); } // Content/composer observes storage.onChanged and calls GET_LLM_STATUS; - // never broadcast the endpoint or API key. - return storageSet(api, { llm: settings }).then(function () { - setStatus(message, false); - }); + // never broadcast the endpoint or API key. Merge through the same queue + // as blur saves so an older write cannot replace a later draft. + editVersion += 1; + return queueSettingsSave(settings, message); } return { endpointInput: endpointInput, modelInput: modelInput, apiKeyInput: apiKeyInput, saveButton: saveButton, status: status }; diff --git a/extension/shared/llm.js b/extension/shared/llm.js index f6513c0..835b322 100644 --- a/extension/shared/llm.js +++ b/extension/shared/llm.js @@ -7,7 +7,8 @@ // content scripts: GET_LLM_STATUS only reports whether an endpoint is set. // // Storage contract: a single chrome.storage.local key "llm" holding -// { endpoint, model, apiKey }. An empty endpoint means the feature is off. +// { endpoint, model, apiKey, enabled, useCustomPrompt, customPrompt }. An +// empty endpoint means the feature is off. (function (global) { 'use strict'; @@ -23,7 +24,6 @@ var FIREFOX_DATA_CONSENT_DESKTOP = 140; var FIREFOX_DATA_CONSENT_ANDROID = 142; var DEFAULT_SYSTEM_PROMPT = 'Write concise, accurate alt text for this image for blind and low-vision readers. Include meaningful visible text. Do not invent detail. Output only the alt text, under 2000 characters.'; - var DEFAULT_USER_PROMPT = 'Write alt text for this image.'; function getBrowserApi() { // Prefer the promise-based namespace; Firefox/Safari expose `browser`. @@ -37,7 +37,10 @@ return { endpoint: typeof src.endpoint === 'string' ? src.endpoint.trim() : '', model: typeof src.model === 'string' ? src.model.trim() : '', - apiKey: typeof src.apiKey === 'string' ? src.apiKey : '' + apiKey: typeof src.apiKey === 'string' ? src.apiKey : '', + useCustomPrompt: src.useCustomPrompt === true, + customPrompt: typeof src.customPrompt === 'string' ? src.customPrompt : '', + ...(typeof src.enabled === 'boolean' ? { enabled: src.enabled } : {}) }; } @@ -69,7 +72,7 @@ } function isEnabled(raw) { - return validateEndpoint(normalizeSettings(raw).endpoint).ok; + return raw?.enabled !== false && validateEndpoint(normalizeSettings(raw).endpoint).ok; } // RUN_LLM may only come from this extension's own top frame on bsky.app or a @@ -88,6 +91,15 @@ return host === 'bsky.app' || host.endsWith('.bsky.app'); } + function isAllowedSettingsSender(sender, ownId, api) { + if (!sender || typeof sender !== 'object' || !ownId || sender.id !== ownId || + typeof sender.url !== 'string' || !api || !api.runtime || + typeof api.runtime.getURL !== 'function') return false; + var extensionRoot = api.runtime.getURL(''); + return typeof extensionRoot === 'string' && extensionRoot !== '' && + sender.url.indexOf(extensionRoot) === 0; + } + function isAndroidPlatform() { try { return typeof navigator !== 'undefined' && /android/i.test(navigator.userAgent || ''); @@ -181,17 +193,16 @@ } function buildRequestBody(settings, prompt, image) { - var systemText = (prompt && typeof prompt.system === 'string' && prompt.system.trim()) - ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT; - var userText = (prompt && typeof prompt.user === 'string' && prompt.user.trim()) - ? prompt.user.trim() : DEFAULT_USER_PROMPT; + var promptText = (settings && settings.useCustomPrompt && typeof settings.customPrompt === 'string' && settings.customPrompt.trim()) + ? settings.customPrompt.trim() + : ((prompt && typeof prompt.system === 'string' && prompt.system.trim()) + ? prompt.system.trim() : DEFAULT_SYSTEM_PROMPT); var body = { messages: [ - { role: 'system', content: systemText }, { role: 'user', content: [ - { type: 'text', text: userText }, + { type: 'text', text: promptText }, { type: 'image_url', image_url: { url: image } } ] } @@ -310,7 +321,7 @@ }); }; - function sendRequest(settings, prompt, image, target) { + async function sendRequest(settings, prompt, image, target) { var body = buildRequestBody(settings, prompt, image); var headers = { 'Content-Type': 'application/json' }; if (settings.apiKey) headers.Authorization = 'Bearer ' + settings.apiKey; @@ -318,37 +329,29 @@ var controller = typeof AbortController === 'function' ? new AbortController() : null; var timeoutId = controller ? setTimeout(function () { controller.abort(); }, env.timeoutMs || REQUEST_TIMEOUT_MS) : null; - function clear() { - if (timeoutId) clearTimeout(timeoutId); - } - - return fetchFn(target.url.toString(), { - method: 'POST', - headers: headers, - body: JSON.stringify(body), - credentials: 'omit', - redirect: 'error', - signal: controller ? controller.signal : undefined - }).then(function (response) { + try { + const response = await fetchFn(target.url.toString(), { + method: 'POST', + headers: headers, + body: JSON.stringify(body), + credentials: 'omit', + redirect: 'error', + signal: controller ? controller.signal : undefined + }); if (!response) throw safeError('LLM request failed'); if (!response.ok) throw safeError('LLM endpoint returned HTTP ' + response.status); - return response.text(); - }).then(function (raw) { + const raw = await response.text(); if (typeof raw !== 'string' || raw.trim() === '') { throw safeError('LLM endpoint returned an empty response'); } - var data; try { - data = JSON.parse(raw); + return JSON.parse(raw); } catch (err) { throw safeError('LLM endpoint returned an invalid response'); } - clear(); - return data; - }, function (err) { - clear(); - throw err; - }); + } finally { + if (timeoutId) clearTimeout(timeoutId); + } } function runLlm(message, sender) { @@ -366,6 +369,7 @@ .then(function () { return getSettings(); }) .then(function (rawSettings) { var settings = normalizeSettings(rawSettings); + if (settings.enabled === false) return { success: false, error: 'LLM is disabled' }; var target = validateEndpoint(settings.endpoint); if (!target.ok) { return { success: false, error: 'LLM endpoint is not configured' }; @@ -396,12 +400,8 @@ if (!text) throw safeError('The LLM endpoint returned no alt text'); return { success: true, text: text }; }) - .then(function (result) { - delete inFlight[key]; - return result; - }, function (err) { + .finally(function () { delete inFlight[key]; - return { success: false, error: cleanError(err) }; }); }) .catch(function (err) { @@ -415,8 +415,50 @@ .then(function (raw) { return { enabled: isEnabled(raw) }; }, function () { return { enabled: false }; }); } + function openPermissionPage(sender) { + if (!isAllowedSettingsSender(sender, getOwnId(), api)) { + return Promise.resolve({ success: false, error: 'Open Bsky+ settings to grant LLM access.' }); + } + if (!api.tabs || typeof api.tabs.create !== 'function' || + !api.runtime || typeof api.runtime.getURL !== 'function') { + return Promise.resolve({ success: false, error: 'LLM permissions are unavailable in this browser.' }); + } + return Promise.resolve() + .then(function () { return getSettings(); }) + .then(function (rawSettings) { + var settings = normalizeSettings(rawSettings); + var target = validateEndpoint(settings.endpoint); + if (!target.ok) { + return { success: false, error: 'Save a valid LLM endpoint before granting access.' }; + } + var originRequest = { origins: [target.originPattern] }; + return Promise.all([ + permissionsContains(api, originRequest), + getSupportsDataConsent().then(function (supported) { + return supported + ? permissionsContains(api, { data_collection: requiredDataCollection(settings) }) + : true; + }) + ]).then(function (grants) { + if (grants[0] && grants[1]) return { success: true, granted: true }; + return Promise.resolve(api.tabs.create({ + url: api.runtime.getURL('shared/llm-permissions.html') + })).then(function () { return { success: true, opened: true }; }); + }); + }) + .catch(function () { + return { success: false, error: 'Could not open LLM permissions. Try saving again.' }; + }); + } + function onMessage(message, sender, sendResponse) { if (!message || typeof message.action !== 'string') return undefined; + if (message.action === 'REQUEST_LLM_ACCESS') { + openPermissionPage(sender).then(sendResponse, function () { + sendResponse({ success: false, error: 'Could not open LLM permissions. Try saving again.' }); + }); + return true; + } if (message.action === 'RUN_LLM') { runLlm(message, sender).then(sendResponse, function () { sendResponse({ success: false, error: 'LLM request failed' }); @@ -463,7 +505,6 @@ STORAGE_KEY: STORAGE_KEY, PROMPT_PATH: PROMPT_PATH, DEFAULT_SYSTEM_PROMPT: DEFAULT_SYSTEM_PROMPT, - DEFAULT_USER_PROMPT: DEFAULT_USER_PROMPT, MAX_IMAGE_BYTES: MAX_IMAGE_BYTES, DATA_COLLECTION_TYPES: DATA_COLLECTION_TYPES, normalizeSettings: normalizeSettings, @@ -485,7 +526,8 @@ global.BskyPlusLLM = BskyPlusLLM; if (typeof module !== 'undefined' && module.exports) module.exports = BskyPlusLLM; - // Auto-wire when loaded as a background dependency. register() is idempotent, - // so hosts may also call BskyPlusLLM.register() themselves. - register(); + // Auto-wire when loaded as a background dependency. Standalone pages may + // load the helper library without registering a second message listener. + var currentScript = global.document && global.document.currentScript; + if (!currentScript || !currentScript.hasAttribute('data-no-register')) register(); })(typeof globalThis !== 'undefined' ? globalThis : this); diff --git a/extension/shared/media-viewer.js b/extension/shared/media-viewer.js index 432f1bd..8185335 100644 --- a/extension/shared/media-viewer.js +++ b/extension/shared/media-viewer.js @@ -5,11 +5,14 @@ 'use strict'; const utils = window.BskyPlusUtils || {}; - const { createEl, Icons } = utils; + const { createEl, Icons, observeDom } = utils; const SPEEDS = [0.5, 1, 1.25, 1.5, 2]; - let rememberedSpeed = 1; let enabled = true; + let nextSpeedMenuId = 0; + let activeSpeedControl = null; + const speedControls = new Set(); + const videoSources = new WeakMap(); function isFeatureActive() { const flags = window.BskyPlusFeatureFlags; @@ -19,12 +22,10 @@ // Load initial settings if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['mediaViewerEnabled', 'videoSpeed'], (res) => { + chrome.storage.local.get(['mediaViewerEnabled'], (res) => { if (res) { if (res.mediaViewerEnabled !== undefined) enabled = res.mediaViewerEnabled; - if (res.videoSpeed !== undefined) rememberedSpeed = res.videoSpeed; } - applyToAllVideos(); scanVideos(); }); @@ -33,6 +34,7 @@ if (changes.mediaViewerEnabled || changes.enableAlphaFeatures) { if (changes.mediaViewerEnabled) enabled = changes.mediaViewerEnabled.newValue; if (!isFeatureActive()) { + disposeAllSpeedControls(); document.querySelectorAll('.bskyplus-video-toolbar').forEach(t => t.remove()); } else { scanVideos(); @@ -42,33 +44,213 @@ }); } - function saveSpeedState(speed) { - rememberedSpeed = speed; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.set({ videoSpeed: speed }); + function updateSpeedControl(trigger, speed) { + if (!trigger) return; + const value = String(speed); + trigger.value = value; + const label = trigger.querySelector('.bskyplus-speed-value'); + if (label) label.textContent = `${value}x`; + trigger.setAttribute('aria-label', `Playback speed ${value}x`); + const menu = document.getElementById(trigger.getAttribute('aria-controls')); + menu?.querySelectorAll('[data-speed]').forEach(option => { + option.setAttribute('aria-checked', String(option.dataset.speed === value)); + }); + } + + function getVideoControlsSibling(video) { + const figure = video.parentElement; + if (figure?.tagName !== 'FIGURE') return null; + const sibling = figure.nextElementSibling; + if (sibling?.tagName === 'DIV') return sibling; + return sibling?.nextElementSibling?.tagName === 'DIV' ? sibling.nextElementSibling : null; + } + + function getVideoToolbarContainer(video) { + const sibling = getVideoControlsSibling(video); + const container = sibling?.lastElementChild?.lastElementChild; + return container?.tagName === 'DIV' ? container : null; + } + + function eventIsInsideSpeedControl(event, control) { + const path = typeof event.composedPath === 'function' ? event.composedPath() : []; + return path.includes(control.trigger) || path.includes(control.menu) || + control.trigger.contains(event.target) || control.menu.contains(event.target); + } + + function getSpeedMenuMountRoot(trigger) { + const fullscreenRoot = document.fullscreenElement || document.webkitFullscreenElement; + const dialogRoot = trigger.closest('dialog[open], [role="dialog"], [aria-modal="true"]'); + if (fullscreenRoot?.contains(trigger)) { + return dialogRoot && fullscreenRoot.contains(dialogRoot) ? dialogRoot : fullscreenRoot; } + return dialogRoot || document.body; + } + + function mountSpeedMenu(control) { + const root = getSpeedMenuMountRoot(control.trigger); + if (root && control.menu.parentElement !== root) root.appendChild(control.menu); + } + + function positionSpeedMenu(control) { + const triggerRect = control.trigger.getBoundingClientRect(); + const menuRect = control.menu.getBoundingClientRect(); + const margin = 8; + const below = window.innerHeight - triggerRect.bottom; + const above = triggerRect.top; + const top = below >= menuRect.height + margin || below >= above + ? triggerRect.bottom + margin + : triggerRect.top - menuRect.height - margin; + const left = Math.max(margin, Math.min( + triggerRect.right - menuRect.width, + window.innerWidth - menuRect.width - margin + )); + const maxTop = Math.max(margin, window.innerHeight - menuRect.height - margin); + control.menu.style.setProperty('top', `${Math.max(margin, Math.min(top, maxTop))}px`, 'important'); + control.menu.style.setProperty('left', `${left}px`, 'important'); + } + + function closeSpeedMenu(control = activeSpeedControl, restoreFocus = false) { + if (!control) return; + const hadFocus = control.menu.contains(document.activeElement) || control.trigger === document.activeElement; + if (activeSpeedControl === control) activeSpeedControl = null; + control.trigger.setAttribute('aria-expanded', 'false'); + if (control.isPopoverOpen && typeof control.menu.hidePopover === 'function') { + try { control.menu.hidePopover(); } catch (_) { /* Already closed. */ } + } else { + control.menu.hidden = true; + } + control.isPopoverOpen = false; + mountSpeedMenu(control); + if (restoreFocus && hadFocus && control.trigger.isConnected) control.trigger.focus(); + } + + function openSpeedMenu(control) { + if (!control.trigger.isConnected || !isFeatureActive()) return; + if (activeSpeedControl && activeSpeedControl !== control) { + closeSpeedMenu(activeSpeedControl, false); + } + mountSpeedMenu(control); + activeSpeedControl = control; + control.trigger.setAttribute('aria-expanded', 'true'); + if (typeof control.menu.showPopover === 'function' && control.menu.hasAttribute('popover')) { + try { + control.menu.showPopover(); + control.isPopoverOpen = true; + } catch (_) { + control.menu.removeAttribute('popover'); + control.menu.hidden = false; + } + } else { + control.menu.hidden = false; + } + positionSpeedMenu(control); + const selected = control.menu.querySelector('[aria-checked="true"]'); + (selected || control.menu.querySelector('[data-speed]'))?.focus(); + } + + function moveSpeedMenuFocus(control, key) { + const options = Array.from(control.menu.querySelectorAll('[data-speed]')); + if (!options.length) return; + if (key === 'Home') { + options[0].focus(); + return; + } + if (key === 'End') { + options[options.length - 1].focus(); + return; + } + const current = options.indexOf(document.activeElement); + const direction = key === 'ArrowDown' ? 1 : -1; + const next = current < 0 + ? (direction > 0 ? 0 : options.length - 1) + : (current + direction + options.length) % options.length; + options[next].focus(); + } + + function focusOutsideSpeedMenu(control, backwards) { + const selector = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])'; + const focusables = Array.from(document.querySelectorAll(selector)).filter(element => { + if (control.menu.contains(element) || element.tabIndex < 0 || element.closest('[hidden]')) return false; + return typeof element.getClientRects !== 'function' || element.getClientRects().length > 0; + }); + const index = focusables.indexOf(control.trigger); + const destination = focusables[index + (backwards ? -1 : 1)]; + closeSpeedMenu(control, false); + if (destination) destination.focus(); + } + + document.addEventListener('pointerdown', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('focusin', event => { + if (activeSpeedControl && !eventIsInsideSpeedControl(event, activeSpeedControl)) { + closeSpeedMenu(activeSpeedControl, false); + } + }); + document.addEventListener('scroll', event => { + if (activeSpeedControl && !activeSpeedControl.menu.contains(event.target)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + document.addEventListener('fullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('webkitfullscreenchange', () => closeSpeedMenu(), true); + document.addEventListener('close', event => { + if (event.target?.tagName === 'DIALOG' && activeSpeedControl && + event.target.contains(activeSpeedControl.trigger)) { + closeSpeedMenu(activeSpeedControl, false); + } + }, true); + window.addEventListener('resize', () => closeSpeedMenu()); + + function disposeSpeedControl(control) { + if (activeSpeedControl === control) closeSpeedMenu(control, false); + control.menu.remove(); + speedControls.delete(control); + } + + function disposeAllSpeedControls() { + Array.from(speedControls).forEach(disposeSpeedControl); + } + + function cleanupDisconnectedSpeedControls() { + Array.from(speedControls).forEach(control => { + if (!control.video.isConnected || !control.trigger.isConnected) disposeSpeedControl(control); + }); + } + + function getVideoSourceKey(video) { + const sources = Array.from(video.querySelectorAll('source'), source => source.getAttribute('src') || ''); + return JSON.stringify([video.getAttribute('src') || '', ...sources]); + } + + function resetSpeedForChangedSource(video) { + const source = getVideoSourceKey(video); + const previousSource = videoSources.get(video); + if (previousSource === undefined || previousSource !== source) { + video.playbackRate = 1; + updateSpeedControl(getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'), 1); + } + videoSources.set(video, source); } function setupVideo(video) { if (!isFeatureActive()) return; - const figure = video.parentElement; - if (figure?.tagName !== 'FIGURE') return; - const container = figure.nextElementSibling?.lastElementChild?.lastElementChild; - if (!container || container.tagName !== 'DIV') return; + const container = getVideoToolbarContainer(video); + if (!container) return; + + resetSpeedForChangedSource(video); if (!video.dataset.bskyplusViewerSetup) { video.dataset.bskyplusViewerSetup = 'true'; - video.playbackRate = rememberedSpeed; - - video.addEventListener('play', () => { - if (isFeatureActive()) video.playbackRate = rememberedSpeed; - }); + video.addEventListener('loadstart', () => resetSpeedForChangedSource(video)); video.addEventListener('ratechange', () => { - const chooser = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-speed-select'); - if (chooser) chooser.value = String(video.playbackRate); + const chooser = getVideoControlsSibling(video)?.querySelector('.bskyplus-speed-select'); + updateSpeedControl(chooser, video.playbackRate); }); const updatePipButton = () => { - const button = video.parentElement?.nextElementSibling?.querySelector('.bskyplus-pip-btn'); + const button = getVideoControlsSibling(video)?.querySelector('.bskyplus-pip-btn'); if (button) button.setAttribute('aria-pressed', String(document.pictureInPictureElement === video)); }; video.addEventListener('enterpictureinpicture', updatePipButton); @@ -79,37 +261,90 @@ const toolbar = createEl('div', { className: 'bskyplus-video-toolbar' }); - const chooser = createEl('select', { + const chooser = createEl('button', { + type: 'button', className: 'bskyplus-speed-select', - 'aria-label': 'Playback speed', + 'aria-label': `Playback speed ${video.playbackRate}x`, + 'aria-haspopup': 'menu', + 'aria-expanded': 'false', title: 'Playback speed' }); - SPEEDS.forEach((spd) => { - chooser.appendChild(createEl('option', { value: spd, textContent: `${spd}x` })); + const valueLabel = createEl('span', { + className: 'bskyplus-speed-value', + textContent: `${video.playbackRate}x` + }); + chooser.appendChild(valueLabel); + chooser.appendChild(createEl('span', { className: 'bskyplus-speed-chevron', 'aria-hidden': 'true' })); + + const menu = createEl('div', { + className: 'bskyplus-speed-menu', + role: 'menu', + 'aria-label': 'Playback speed' + }); + const menuId = `bskyplus-speed-menu-${++nextSpeedMenuId}`; + menu.id = menuId; + chooser.setAttribute('aria-controls', menuId); + if (typeof menu.showPopover === 'function') menu.setAttribute('popover', 'manual'); + else menu.hidden = true; + + const control = { video, trigger: chooser, menu, isPopoverOpen: false }; + SPEEDS.forEach(speed => { + const option = createEl('button', { + type: 'button', + className: 'bskyplus-speed-option', + role: 'menuitemradio', + 'aria-checked': String(String(speed) === String(video.playbackRate)) + }); + option.dataset.speed = String(speed); + option.appendChild(createEl('span', { textContent: `${speed}x` })); + option.appendChild(createEl('span', { className: 'bskyplus-speed-option-check', 'aria-hidden': 'true' })); + option.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + if (!SPEEDS.includes(speed)) return; + video.playbackRate = speed; + updateSpeedControl(chooser, speed); + closeSpeedMenu(control, true); + }); + menu.appendChild(option); }); - chooser.value = String(video.playbackRate); - ['click', 'pointerdown', 'keydown'].forEach(type => { - chooser.addEventListener(type, e => e.stopPropagation()); + mountSpeedMenu(control); + speedControls.add(control); + + chooser.addEventListener('click', event => { + event.stopPropagation(); + if (activeSpeedControl === control) closeSpeedMenu(control, false); + else openSpeedMenu(control); }); - // Selecting the current option closes the picker without a change event. - const blurClosedChooser = () => { - setTimeout(() => { - if (!chooser.matches(':open')) chooser.blur(); - }, 0); - }; - chooser.addEventListener('click', blurClosedChooser); - chooser.addEventListener('keyup', e => { - e.stopPropagation(); - if (['Enter', 'Escape', ' '].includes(e.key)) blurClosedChooser(); + chooser.addEventListener('pointerdown', event => event.stopPropagation()); + chooser.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { + event.preventDefault(); + openSpeedMenu(control); + } else if (event.key === 'Escape' && activeSpeedControl === control) { + event.preventDefault(); + closeSpeedMenu(control, true); + } }); - chooser.addEventListener('change', e => { - e.stopPropagation(); - const speed = Number(chooser.value); - if (!SPEEDS.includes(speed)) return; - video.playbackRate = speed; - saveSpeedState(speed); - chooser.blur(); + chooser.addEventListener('keyup', event => event.stopPropagation()); + menu.addEventListener('pointerdown', event => event.stopPropagation()); + menu.addEventListener('click', event => event.stopPropagation()); + menu.addEventListener('keydown', event => { + event.stopPropagation(); + if (event.key === 'Escape') { + event.preventDefault(); + closeSpeedMenu(control, true); + } else if (['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) { + event.preventDefault(); + moveSpeedMenuFocus(control, event.key); + } else if (event.key === 'Tab') { + event.preventDefault(); + focusOutsideSpeedMenu(control, event.shiftKey); + } }); + menu.addEventListener('keyup', event => event.stopPropagation()); + updateSpeedControl(chooser, video.playbackRate); toolbar.appendChild(chooser); // Picture-in-Picture Button @@ -150,32 +385,21 @@ } function applyToAllVideos() { - if (!isFeatureActive()) return; - const videos = document.querySelectorAll('video'); - videos.forEach(v => { - v.playbackRate = rememberedSpeed; - }); + scanVideos(); } function scanVideos() { - if (!isFeatureActive()) return; + cleanupDisconnectedSpeedControls(); + if (!isFeatureActive()) { + disposeAllSpeedControls(); + document.querySelectorAll('.bskyplus-video-toolbar').forEach(toolbar => toolbar.remove()); + return; + } const videos = document.querySelectorAll('video'); videos.forEach(v => setupVideo(v)); } - const observer = new MutationObserver(() => { - scanVideos(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanVideos(); - }); - } + observeDom(scanVideos); window.BskyPlusMediaViewer = { scanVideos, diff --git a/extension/shared/popup-theme.js b/extension/shared/popup-theme.js new file mode 100644 index 0000000..16fd823 --- /dev/null +++ b/extension/shared/popup-theme.js @@ -0,0 +1,249 @@ +// Theme selection for the extension popup. +(() => { + 'use strict'; + + const api = globalThis.browser || globalThis.chrome; + const model = globalThis.BskyPlusThemes; + const picker = document.querySelector('.theme-picker'); + const trigger = document.getElementById('themeSelect'); + const options = document.getElementById('themeOptions'); + const status = document.getElementById('themeStatus'); + const editButton = document.getElementById('editThemeButton'); + if (!api?.storage?.local || !model || !picker || !trigger || !options || !status) return; + + let library = model.normalizeLibrary(null); + let ready = false; + let saving = false; + let isOpen = false; + let changeSequence = 0; + + const nativeTheme = { + id: '', + name: 'Bluesky default (native)', + colors: { background: '#FFFFFF', primary: '#0085FF', text: '#161E27', textMuted: '#667B99' } + }; + + function createPreview(colors) { + const preview = document.createElement('span'); + preview.className = 'theme-option-preview'; + preview.setAttribute('aria-hidden', 'true'); + preview.style.setProperty('--theme-option-background', colors.background); + preview.style.setProperty('--theme-option-primary', colors.primary); + preview.style.setProperty('--theme-option-text', colors.text); + preview.style.setProperty('--theme-option-text-muted', colors.textMuted); + + const bar = document.createElement('span'); + bar.className = 'theme-option-preview-bar'; + const body = document.createElement('span'); + body.className = 'theme-option-preview-body'; + const avatar = document.createElement('span'); + avatar.className = 'theme-option-preview-avatar'; + const copy = document.createElement('span'); + copy.className = 'theme-option-preview-copy'; + const mainLine = document.createElement('span'); + mainLine.className = 'theme-option-preview-line'; + const mutedLine = document.createElement('span'); + mutedLine.className = 'theme-option-preview-line theme-option-preview-line-muted'; + + copy.append(mainLine, mutedLine); + body.append(avatar, copy); + preview.append(bar, body); + return preview; + } + + function createOption(theme) { + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'theme-option'; + button.setAttribute('data-theme-option', theme.id); + button.setAttribute('aria-pressed', String(theme.id === (library.activeId || ''))); + button.disabled = !ready || saving; + + const name = document.createElement('span'); + name.className = 'theme-option-name'; + name.textContent = theme.name; + const check = document.createElement('span'); + check.className = 'theme-option-check'; + check.setAttribute('aria-hidden', 'true'); + check.textContent = '✓'; + check.hidden = theme.id !== (library.activeId || ''); + + button.append(createPreview(theme.colors), name, check); + button.addEventListener('click', () => selectTheme(theme.id)); + return button; + } + + function createGroup(label, themes) { + const group = document.createElement('div'); + group.className = 'theme-option-group'; + const heading = document.createElement('div'); + heading.className = 'theme-option-group-label'; + heading.textContent = label; + group.append(heading); + for (const theme of themes) group.append(createOption(theme)); + return group; + } + + function setOpen(open) { + if (open && (!ready || saving)) return; + isOpen = open; + options.hidden = !isOpen; + trigger.setAttribute('aria-expanded', String(isOpen)); + } + + function activeTheme() { + if (!library.activeId) return nativeTheme; + return model.availableBuiltinThemes(library).find(theme => theme.id === library.activeId) || + library.themes.find(theme => theme.id === library.activeId) || nativeTheme; + } + + function render() { + const focusedOption = document.activeElement?.closest?.('[data-theme-option]'); + const focusedOptionId = focusedOption?.getAttribute('data-theme-option'); + const scrollTop = options.scrollTop; + + const theme = activeTheme(); + const name = document.createElement('span'); + name.className = 'theme-select-name'; + name.textContent = theme.name; + const chevron = document.createElement('span'); + chevron.className = 'theme-select-chevron'; + chevron.setAttribute('aria-hidden', 'true'); + trigger.replaceChildren(createPreview(theme.colors), name, chevron); + trigger.disabled = !ready || saving; + trigger.setAttribute('aria-label', `Color theme: ${theme.name}`); + trigger.setAttribute('aria-expanded', String(isOpen)); + options.hidden = !isOpen; + + const groups = [createGroup('Included themes', [nativeTheme, ...model.availableBuiltinThemes(library)])]; + if (library.themes.length) groups.push(createGroup('Saved themes', library.themes)); + options.replaceChildren(...groups); + options.scrollTop = scrollTop; + + if (focusedOption && isOpen) { + const next = [...options.querySelectorAll('[data-theme-option]')] + .find(button => button.getAttribute('data-theme-option') === focusedOptionId); + if (next && !next.disabled) next.focus(); + else trigger.focus(); + } + } + + function setStatus(message) { + status.textContent = message; + } + + async function readLibrary() { + const stored = await api.storage.local.get(model.STORAGE_KEY); + return model.normalizeLibrary(stored?.[model.STORAGE_KEY]); + } + + async function load() { + const sequence = changeSequence; + try { + const next = await readLibrary(); + if (sequence !== changeSequence) return; + library = next; + ready = true; + render(); + } catch (error) { + console.error('Could not load saved themes:', error); + setStatus('Could not load themes. Reopen the popup to try again.'); + } + } + + async function selectTheme(requestedValue) { + if (!ready || saving) return; + const requestedId = requestedValue || null; + const focusedOption = document.activeElement?.closest?.('[data-theme-option]'); + const focusTarget = picker.contains(document.activeElement) + ? focusedOption + ? { optionId: focusedOption.getAttribute('data-theme-option'), element: focusedOption } + : document.activeElement === trigger ? { trigger: true, element: trigger } : null + : null; + saving = true; + render(); + setStatus('Applying theme…'); + let applied = false; + try { + let sequence = changeSequence; + let latest = await readLibrary(); + if (sequence !== changeSequence) { + sequence = changeSequence; + latest = await readLibrary(); + } + if (requestedId && !model.availableBuiltinThemes(latest).some(theme => theme.id === requestedId) && + !latest.themes.some(theme => theme.id === requestedId)) { + throw new Error('That saved theme is no longer available.'); + } + const updated = { ...latest, activeId: requestedId }; + await api.storage.local.set({ [model.STORAGE_KEY]: updated }); + if (sequence === changeSequence) library = updated; + ready = true; + setStatus('Theme applied.'); + applied = true; + } catch (error) { + console.error('Could not apply theme:', error); + setStatus(error.message === 'That saved theme is no longer available.' + ? error.message : 'Could not apply that theme. Try again.'); + } finally { + saving = false; + const recoverFocus = focusTarget && + (document.activeElement === focusTarget.element || document.activeElement === document.body || + picker.contains(document.activeElement)); + if (applied) setOpen(false); + render(); + if (recoverFocus) { + if (applied || focusTarget.trigger) trigger.focus(); + else { + const option = [...options.querySelectorAll('[data-theme-option]')] + .find(button => button.getAttribute('data-theme-option') === focusTarget.optionId); + (option || trigger).focus(); + } + } + } + } + + trigger.addEventListener('click', () => setOpen(!isOpen)); + document.addEventListener('keydown', event => { + if (event.key !== 'Escape' || !isOpen) return; + event.preventDefault(); + setOpen(false); + trigger.focus(); + }); + document.addEventListener('click', event => { + const eventPath = event.composedPath?.(); + if (!isOpen || (eventPath ? eventPath.includes(picker) : picker.contains(event.target))) return; + const recoverFocus = options.contains(document.activeElement); + setOpen(false); + if (recoverFocus) trigger.focus(); + }); + + api.storage.onChanged?.addListener((changes, area) => { + if (area !== 'local' || !changes[model.STORAGE_KEY]) return; + changeSequence += 1; + library = model.normalizeLibrary(changes[model.STORAGE_KEY].newValue); + ready = true; + render(); + }); + + editButton?.addEventListener('click', async () => { + editButton.disabled = true; + try { + const [tab] = await api.tabs.query({ active: true, currentWindow: true }); + const url = 'https://bsky.app/settings?bskyplus=theme'; + if (tab?.url?.startsWith('https://bsky.app/')) { + await api.tabs.update(tab.id, { url }); + } else { + await api.tabs.create({ url }); + } + window.close(); + } catch (error) { + console.error('Could not open theme editor:', error); + setStatus('Could not open the theme editor. Try again.'); + editButton.disabled = false; + } + }); + + render(); + load(); +})(); diff --git a/extension/shared/settings-frame.css b/extension/shared/settings-frame.css index 5cefbe1..6930530 100644 --- a/extension/shared/settings-frame.css +++ b/extension/shared/settings-frame.css @@ -37,6 +37,10 @@ body { gap: 12px; } +.bskyplus-feature-expanded > .toggle-row { + padding-bottom: 10px; +} + .toggle-info { min-width: 0; } @@ -47,8 +51,7 @@ body { gap: 6px; } -.slider-header, -.custom-color-row { +.slider-header { flex-wrap: wrap; gap: 12px; } @@ -66,12 +69,6 @@ body { min-height: 36px; } -.palette-container { - justify-content: flex-start; - flex-wrap: wrap; - gap: 12px; -} - .bskyplus-llm-input { font-size: 15px; padding: 10px 12px; @@ -89,11 +86,20 @@ body { input:focus-visible, button:focus-visible { - outline: 2px solid var(--accent-default); + outline: 2px solid #1083fe; outline-offset: 3px; } @media (max-width: 400px) { body { padding: 16px; } .toggle-row { padding: 12px; } + .bskyplus-feature-expanded > .toggle-row { padding-bottom: 9px; } +} +#appviewSection [hidden] { + display: none; +} + +#appviewProvider option { + background: var(--bg-secondary); + color: var(--text-primary); } diff --git a/extension/shared/settings-frame.html b/extension/shared/settings-frame.html index ad6dc29..681f1f4 100644 --- a/extension/shared/settings-frame.html +++ b/extension/shared/settings-frame.html @@ -7,6 +7,7 @@ + diff --git a/extension/shared/settings-frame.js b/extension/shared/settings-frame.js index 95031f9..ed8a1da 100644 --- a/extension/shared/settings-frame.js +++ b/extension/shared/settings-frame.js @@ -36,21 +36,36 @@ } async function mount() { + if (new URLSearchParams(location.search).get('section') === 'theme') { + document.body.replaceChildren(); + await loadScript('shared/theme-model.js'); + await loadScript('shared/theme-editor.js'); + new ResizeObserver(reportHeight).observe(document.body); + reportHeight(); + return; + } // This is packaged, trusted markup, not content supplied by the website. const response = await fetch(api.runtime.getURL('popup/popup.html')); if (!response.ok) throw new Error('Could not load settings.'); const template = new DOMParser().parseFromString(await response.text(), 'text/html'); template.querySelectorAll('script').forEach(script => script.remove()); document.body.replaceChildren(...Array.from(template.body.children, node => document.importNode(node, true))); + document.getElementById('moreSettingsButton')?.remove(); document.getElementById('feedWidthSlider')?.setAttribute('aria-label', 'Feed column width'); - document.getElementById('colorPicker')?.setAttribute('aria-label', 'Accent color'); - document.getElementById('hexInput')?.setAttribute('aria-label', 'Hex color'); - await loadScript('shared/feature-flags.js'); - await loadScript('popup/popup.js'); - await loadScript('shared/llm-settings.js'); - await loadScript('shared/cdn-config.js'); - await loadScript('shared/cdn-settings.js'); + for (const script of [ + 'shared/feature-flags.js', + 'shared/theme-model.js', + 'popup/popup.js', + 'shared/popup-theme.js', + 'popup/feature-row.js', + 'shared/llm-settings.js', + 'shared/bookmarks-settings.js', + 'shared/cdn-config.js', + 'shared/cdn-settings.js', + 'shared/appview-config.js', + 'shared/appview-settings.js', + ]) await loadScript(script); // Keep this long-lived page current when another extension view saves. api.storage.onChanged.addListener((changes, area) => { diff --git a/extension/shared/theme-editor.css b/extension/shared/theme-editor.css new file mode 100644 index 0000000..dfbbde5 --- /dev/null +++ b/extension/shared/theme-editor.css @@ -0,0 +1,450 @@ +/* Theme editor stays readable in the extension settings frame. */ +.bskyplus-theme-editor { + --theme-panel: color-mix(in srgb, var(--bg-secondary) 88%, transparent); + --theme-line: color-mix(in srgb, var(--border-color) 82%, transparent); +} + +.bskyplus-theme-editor details { + overflow-anchor: none; +} + +.bskyplus-theme-section-reveal { + display: grid; + grid-template-rows: 0fr; + opacity: 0; + transition: grid-template-rows 300ms ease, opacity 180ms ease; +} + +[data-theme-expanded="true"] > .bskyplus-theme-section-reveal { + grid-template-rows: 1fr; + opacity: 1; +} + +.bskyplus-theme-section-content { + min-height: 0; + min-width: 0; + overflow: hidden; +} + +@media (prefers-reduced-motion: reduce) { + .bskyplus-theme-section-reveal { + transition: none; + } +} + +.bskyplus-theme-controls, +.bskyplus-theme-actions { + display: flex; + flex-wrap: wrap; + gap: 10px; + align-items: end; +} + +.bskyplus-theme-controls { margin: 14px 0; } + +.bskyplus-theme-name-field { + display: grid; + gap: 5px; + flex: 1 1 180px; + color: var(--text-secondary); + font-size: 14px; + font-weight: 600; +} + +.bskyplus-theme-name, +.bskyplus-theme-witchsky-uri, +.bskyplus-theme-field input[type='text'] { + width: 100%; + min-height: 34px; + border: 1px solid var(--border-color); + border-radius: 7px; + padding: 7px 9px; + color: var(--text-primary); + background: var(--bg-primary); + font: inherit; +} + +.bskyplus-theme-library { + margin-top: 14px; + border: 1px solid var(--theme-line); + border-radius: 10px; + background: var(--theme-panel); +} + +.bskyplus-theme-library > summary { + padding: 12px; + cursor: pointer; + color: var(--text-primary); + font-size: 14px; + font-weight: 600; +} + +.bskyplus-theme-library-grid { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 12px; + padding: 0 12px 12px; +} + +.bskyplus-theme-library-empty { + padding: 0 12px 12px; + color: var(--text-secondary); + font-size: 13px; + line-height: 1.5; +} + +.bskyplus-theme-card { + min-width: 0; + display: flex; + flex-direction: column; + gap: 6px; +} + +.bskyplus-theme-card-heading { + display: flex; + flex-wrap: wrap; + align-items: baseline; + gap: 2px 8px; +} + +.bskyplus-theme-card-name { + color: var(--text-primary); + font-size: 13px; + font-weight: 600; + overflow-wrap: anywhere; +} + +.bskyplus-theme-card-status { + color: var(--text-secondary); + font-size: 11px; +} + +.bskyplus-theme-card-preview { + margin-top: auto; + cursor: pointer; +} + +.bskyplus-theme-card-preview .bskyplus-theme-preview-bar, +.bskyplus-theme-card-preview .bskyplus-theme-preview-post { + padding: 8px 10px; +} + +.bskyplus-theme-card[data-theme-selected='true'] .bskyplus-theme-card-preview { + outline: 2px solid var(--text-primary); + outline-offset: 2px; +} + +.bskyplus-theme-skeleton-copy { + display: grid; + gap: 7px; + flex: 1; + min-width: 0; +} + +.bskyplus-theme-skeleton-line { + display: block; + width: 85%; + height: 6px; + border-radius: 4px; + background: var(--bskyplus-preview-text); +} + +.bskyplus-theme-preview-bar .bskyplus-theme-skeleton-line { width: 35%; } +.bskyplus-theme-skeleton-link { background: var(--bskyplus-preview-link); } +.bskyplus-theme-skeleton-muted { width: 100%; background: var(--bskyplus-preview-textMuted); } +.bskyplus-theme-skeleton-short { width: 60%; background: var(--bskyplus-preview-textMuted); } +.bskyplus-theme-skeleton-reactions { display: flex; gap: 8px; margin-top: 3px; } +.bskyplus-theme-skeleton-reactions span { width: 7px; height: 7px; border-radius: 50%; } + +.bskyplus-theme-card-preview .bskyplus-theme-preview-button:hover { + background: var(--bskyplus-preview-primaryHover); +} + +.bskyplus-theme-card-preview .bskyplus-theme-preview-button:focus-visible { + outline: 2px solid var(--bskyplus-preview-focus); + outline-offset: 2px; +} + +.bskyplus-theme-preview-toggle { + display: flex; + align-items: center; + gap: 7px; + color: var(--text-primary); + font-size: 13px; + font-weight: 600; +} + +.bskyplus-theme-preview-toggle input { margin: 0; } + +.bskyplus-theme-preview-toggle .switch { + background: var(--bg-hover); + border: 1px solid var(--border-color); +} + +.bskyplus-theme-preview-toggle .switch::before { + top: 2px; + left: 2px; + background: var(--text-secondary); +} + +.bskyplus-theme-preview-toggle .switch:checked { + background: var(--text-primary); + border-color: var(--text-primary); +} + +.bskyplus-theme-preview-toggle .switch:checked::before { + background: var(--bg-primary); +} + +.bskyplus-theme-preview-toggle .switch:focus-visible { + outline: 2px solid var(--text-primary); + outline-offset: 3px; +} + +.bskyplus-theme-contrast-warning { + margin: 8px 0 12px; + padding: 10px 12px; + border: 1px solid var(--border-color); + border-left: 3px solid #d69b26; + border-radius: 8px; + color: var(--text-primary); + background: var(--bg-secondary); + font-size: 13px; + line-height: 1.5; +} + +.bskyplus-theme-contrast-warning summary { + cursor: pointer; + font-weight: 600; +} + +.bskyplus-theme-contrast-warning p { margin-top: 6px; } + +.bskyplus-theme-contrast-item { + margin: 10px 0; +} + +.bskyplus-theme-contrast-advice { + display: block; + margin-top: 3px; + color: var(--text-secondary); + font-size: 12px; +} + +.bskyplus-theme-contrast-edit { + display: block; + margin-top: 5px; + padding: 4px 0; + border: 0; + background: transparent; + color: var(--text-primary); + font: inherit; + font-weight: 600; + text-decoration: underline; + text-underline-offset: 3px; + cursor: pointer; +} + +.bskyplus-theme-field.bskyplus-theme-field-highlight { + background: color-mix(in srgb, #ef5350 18%, var(--bg-primary)); + box-shadow: inset 0 0 0 2px #ef5350; + scroll-margin-block: 20px; + animation: bskyplus-contrast-highlight 3s ease-out forwards; +} + +@keyframes bskyplus-contrast-highlight { + from { + background: color-mix(in srgb, #ef5350 18%, var(--bg-primary)); + box-shadow: inset 0 0 0 2px #ef5350; + } + to { + background: color-mix(in srgb, var(--bg-primary) 62%, transparent); + box-shadow: inset 0 0 0 2px transparent; + } +} + +@media (prefers-reduced-motion: reduce) { + .bskyplus-theme-field.bskyplus-theme-field-highlight { + animation: none; + } +} + +.bskyplus-theme-contrast-warning ul, +.bskyplus-theme-dialog ul { padding-left: 20px; } + +.bskyplus-theme-dialog { + width: min(440px, calc(100% - 32px)); + max-height: calc(100% - 32px); + margin: auto; + padding: 20px; + border: 1px solid var(--border-color); + border-radius: 12px; + color: var(--text-primary); + background: var(--bg-primary); + box-shadow: 0 12px 48px #0006; + font-size: 14px; + line-height: 1.5; +} + +.bskyplus-theme-dialog::backdrop { background: #0008; } +.bskyplus-theme-dialog form { display: grid; gap: 12px; } +.bskyplus-theme-dialog h2 { font-size: 18px; } + +.bskyplus-theme-dialog .bskyplus-theme-actions { + justify-content: flex-end; + margin-top: 4px; +} + + +.bskyplus-theme-witchsky { + display: flex; + flex: 1 1 100%; + gap: 8px; +} + +.bskyplus-theme-witchsky-uri { flex: 1 1 280px; } +.bskyplus-theme-witchsky button { flex: 0 0 auto; } + +.bskyplus-theme-hue { + flex: 1 1 100%; + min-width: 0; + display: grid; + gap: 8px; + padding: 12px; + border: 1px solid var(--theme-line); + border-radius: 8px; + background: var(--theme-panel); +} + +.bskyplus-theme-hue-header { + display: flex; + align-items: center; + gap: 10px; + color: var(--text-primary); + font-size: 14px; + font-weight: 600; +} + +.bskyplus-theme-hue-header output { + margin-left: auto; + color: var(--text-secondary); + font-variant-numeric: tabular-nums; +} + +.bskyplus-theme-hue .range-slider { + width: 100%; + margin: 6px 0; +} + +.bskyplus-theme-preview { + overflow: hidden; + border: 1px solid var(--bskyplus-preview-border); + border-radius: 10px; + background: var(--bskyplus-preview-background); + color: var(--bskyplus-preview-text); + box-shadow: 0 4px 14px color-mix(in srgb, var(--bskyplus-preview-shadow) 28%, transparent); +} + +.bskyplus-theme-preview-bar { + display: flex; + justify-content: space-between; + gap: 12px; + padding: 10px; + background: var(--bskyplus-preview-surface); + border-bottom: 1px solid var(--bskyplus-preview-border); + font-size: 12px; + font-weight: 700; +} + +.bskyplus-theme-preview-post { + display: flex; + gap: 8px; + padding: 10px; + border-bottom: 1px solid var(--bskyplus-preview-border); + font-size: 14px; +} + +.bskyplus-theme-preview-avatar { + width: 22px; + height: 22px; + flex: none; + border-radius: 50%; + background: var(--bskyplus-preview-primaryMuted); + border: 2px solid var(--bskyplus-preview-primary); +} + +.bskyplus-theme-preview-button { + width: calc(100% - 20px); + margin: 10px; + border: 0; + border-radius: 999px; + padding: 7px 4px; + color: var(--bskyplus-preview-onPrimary); + background: var(--bskyplus-preview-primary); + font: inherit; + font-size: 12px; + font-weight: 700; + cursor: pointer; +} + +.bskyplus-theme-contrast, +.bskyplus-theme-status { + min-height: 18px; + margin: 7px 0 10px; + color: var(--text-secondary); + font-size: 12px; +} + +.bskyplus-theme-groups { display: grid; gap: 7px; } + +.bskyplus-theme-group { + border: 1px solid var(--theme-line); + border-radius: 8px; + background: var(--theme-panel); +} + +.bskyplus-theme-group summary { + cursor: pointer; + padding: 10px 12px; + color: var(--text-primary); + font-size: 13px; + font-weight: 700; +} + +.bskyplus-theme-group-fields { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(min(100%, 270px), 1fr)); + gap: 7px; + padding: 0 9px 9px; +} + +.bskyplus-theme-field { + display: flex; + min-width: 0; + align-items: center; + gap: 8px; + padding: 8px; + border-radius: 7px; + background: color-mix(in srgb, var(--bg-primary) 62%, transparent); +} + +.bskyplus-theme-field-copy { min-width: 0; flex: 1; } +.bskyplus-theme-field-label { display: block; color: var(--text-primary); font-size: 13px; font-weight: 600; } +.bskyplus-theme-field-description { display: block; margin-top: 2px; color: var(--text-secondary); font-size: 12px; line-height: 1.4; } + +.bskyplus-theme-color-inputs { display: flex; flex: none; gap: 5px; align-items: center; } +.bskyplus-theme-field input[type='color'] { width: 28px; height: 28px; padding: 1px; border: 1px solid var(--border-color); border-radius: 6px; background: transparent; cursor: pointer; } +.bskyplus-theme-field input[type='text'] { width: 74px; min-height: 28px; padding: 4px 5px; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 11px; } +.bskyplus-theme-field input[aria-invalid='true'] { border-color: #ef5350; } + +.bskyplus-theme-actions { margin-top: 12px; } +.bskyplus-theme-actions .preset-btn { flex: 0 1 auto; min-height: 34px; } +.bskyplus-theme-delete { color: #ef5350; } +.bskyplus-theme-actions button:disabled { opacity: .5; cursor: not-allowed; } + +@media (max-width: 460px) { + .bskyplus-theme-group-fields { grid-template-columns: 1fr; } + .bskyplus-theme-actions > * { flex: 1 1 calc(50% - 5px); } + .bskyplus-theme-witchsky { flex-wrap: wrap; } + .bskyplus-theme-witchsky button { flex: 1 1 100%; } +} diff --git a/extension/shared/theme-editor.js b/extension/shared/theme-editor.js new file mode 100644 index 0000000..ce23875 --- /dev/null +++ b/extension/shared/theme-editor.js @@ -0,0 +1,805 @@ +// Local theme library editor. Theme application is handled by the page theme runtime. +(() => { + 'use strict'; + + const api = typeof browser !== 'undefined' ? browser : chrome; + const model = window.BskyPlusThemes; + if (!model || document.querySelector('[data-bskyplus-theme-editor]')) return; + + const { + GROUPS, BUILTIN_THEMES, isBuiltinTheme, availableBuiltinThemes, STORAGE_KEY, createTheme, validateTheme, normalizeLibrary, parseWitchSkyUri, + witchSkyThemes, exportTheme, contrastRatio, contrastIssues, shiftHue, + } = model; + const HEX = /^#[0-9a-f]{6}$/i; + const MAX_IMPORT_BYTES = 256 * 1024; + const LIVE_PREVIEW_DELAY_MS = 100; + const fieldsByKey = new Map(GROUPS.flatMap(group => + group.fields.map(field => [field.key, { ...field, group: group.name }]))); + let library = normalizeLibrary(null); + let draft = null; + let selectedId = null; + let dirty = false; + let queue = Promise.resolve(); + let notice = ''; + let storageUnavailable = false; + let busy = false; + let previewEnabled = true; + let previewActivated = false; + let hueBaseColors = null; + let highlightedContrastPair = null; + let contrastHighlightTimer; + let previewTimer = 0; + + function el(tag, attributes = {}, ...children) { + const node = document.createElement(tag); + for (const [name, value] of Object.entries(attributes)) { + if (value === null || value === undefined) continue; + if (name === 'className') node.className = value; + else if (name === 'text') node.textContent = value; + else if (name.startsWith('on')) node.addEventListener(name.slice(2).toLowerCase(), value); + else node.setAttribute(name, value); + } + node.append(...children.filter(Boolean)); + return node; + } + + const sectionAnimations = new WeakMap(); + + function sectionOpen(details) { + return sectionAnimations.get(details)?.pending ?? details.open; + } + + function setSectionOpen(details, expanded) { + const controller = sectionAnimations.get(details); + if (controller) controller.setOpen(expanded); + else details.open = expanded; + } + + function animateSection(details) { + const summary = details.querySelector(':scope > summary'); + const content = el('div', { className: 'bskyplus-theme-section-content' }); + content.append(...[...details.children].filter(child => child !== summary)); + const reveal = el('div', { className: 'bskyplus-theme-section-reveal' }, content); + details.append(reveal); + let timer; + let frame; + const dispose = () => { clearTimeout(timer); cancelAnimationFrame(frame); }; + const controller = { pending: null, setOpen, dispose }; + sectionAnimations.set(details, controller); + + const sync = expanded => { + details.dataset.themeExpanded = String(expanded); + summary.setAttribute('aria-expanded', String(expanded)); + content.inert = !expanded; + }; + const finish = () => { + if (controller.pending === null) return; + const expanded = controller.pending; + controller.pending = null; + clearTimeout(timer); + details.open = expanded; + }; + function setOpen(expanded) { + if (sectionOpen(details) === expanded && details.open === expanded) return; + dispose(); + controller.pending = expanded; + if (!expanded && content.contains(document.activeElement)) summary.focus(); + const reducedMotion = matchMedia('(prefers-reduced-motion: reduce)').matches; + const wasClosed = !details.open; + if (expanded && !details.open) { + details.open = true; + } + content.inert = !expanded; + summary.setAttribute('aria-expanded', String(expanded)); + const start = () => { + sync(expanded); + if (reducedMotion) finish(); + else timer = setTimeout(finish, 340); + }; + // Native details hides its contents completely. Paint the zero-height + // wrapper first so opening has a rendered starting point to animate from. + if (expanded && wasClosed && !reducedMotion) { + reveal.style.transition = 'none'; + details.dataset.themeExpanded = 'false'; + void reveal.offsetHeight; + reveal.style.removeProperty('transition'); + frame = requestAnimationFrame(() => { + void reveal.offsetHeight; + start(); + }); + } else start(); + } + summary.addEventListener('click', event => { + event.preventDefault(); + setOpen(!sectionOpen(details)); + }); + reveal.addEventListener('transitionend', event => { + if (event.target === reveal && event.propertyName === 'grid-template-rows') finish(); + }); + // Keep direct changes to the native details state in sync as well. + details.addEventListener('toggle', () => { + if (!details.open) { + dispose(); + controller.pending = null; + } + if (controller.pending === null) sync(details.open); + }); + sync(details.open); + } + + function makeDraft(base = 'dark') { + return createTheme('Untitled theme', base); + } + + function begin(theme) { + draft = theme ? validateTheme(theme) : makeDraft(); + selectedId = library.themes.some(saved => saved.id === theme?.id) || + availableBuiltinThemes(library).some(saved => saved.id === theme?.id) ? theme.id : null; + dirty = false; + notice = ''; + render(); + } + + function setDirty(live = false) { + dirty = true; + previewActivated = true; + updateDirty(); + if (live) { + if (!previewTimer) previewTimer = setTimeout(() => { + previewTimer = 0; + updatePreview(); + }, LIVE_PREVIEW_DELAY_MS); + } else { + if (previewTimer) clearTimeout(previewTimer); + previewTimer = 0; + updatePreview(); + } + } + + function updateDirty() { + const save = editor.querySelector('[data-theme-save]'); + if (save) save.textContent = dirty || !selectedId ? 'Save and apply' : 'Apply'; + const status = editor.querySelector('[data-theme-status]'); + if (status) status.textContent = notice || (dirty ? 'Unsaved changes' : !selectedId ? 'New theme' : selectedId === library.activeId ? 'Active theme · saved locally' : 'Saved locally'); + editor.querySelectorAll('[data-theme-write], [data-theme-import], [data-theme-witchsky-import]').forEach(button => { + button.disabled = busy || storageUnavailable || + (button.hasAttribute('data-theme-save-as') && (!dirty || !selectedId)) || + (button.classList.contains('bskyplus-theme-delete') && !selectedId); + }); + editor.querySelectorAll('.bskyplus-theme-controls input, .bskyplus-theme-preview-toggle input, [data-theme-select], .bskyplus-theme-hue button, .bskyplus-theme-group input').forEach(control => { + control.disabled = busy; + }); + } + + function setBusy(next) { + busy = next; + updateDirty(); + } + + function colorValue(key) { + return draft?.colors[key] || '#000000'; + } + + function updatePreview() { + if (!draft) return; + const colors = draft.colors; + const textRatio = contrastRatio(colors.text, colors.background).toFixed(1); + const buttonRatio = contrastRatio(colors.onPrimary, colors.primary).toFixed(1); + const hint = editor.querySelector('[data-theme-contrast]'); + if (hint) hint.textContent = `Text ${textRatio}:1 · Button ${buttonRatio}:1`; + const warning = editor.querySelector('[data-theme-contrast-warning]'); + if (warning) { + const issues = contrastIssues(colors); + warning.hidden = !issues.length; + warning.querySelector('summary').textContent = issues.length + ' low-contrast combinations'; + warning.querySelector('ul').replaceChildren(...contrastRecommendations(issues)); + if (highlightedContrastPair && !issues.some(issue => + issue.foreground === highlightedContrastPair.foreground && issue.background === highlightedContrastPair.background)) { + clearContrastHighlight(); + } + } + updatePagePreview(); + } + + function clearContrastHighlight() { + clearTimeout(contrastHighlightTimer); + highlightedContrastPair = null; + editor.querySelectorAll('.bskyplus-theme-field-highlight').forEach(field => + field.classList.remove('bskyplus-theme-field-highlight')); + } + + function showContrastSettings(issue) { + const fields = [issue.foreground, issue.background].map(key => + editor.querySelector(`[data-theme-field="${key}"]`)); + if (fields.some(field => !field)) return; + clearContrastHighlight(); + highlightedContrastPair = { foreground: issue.foreground, background: issue.background }; + for (const field of fields) { + setSectionOpen(field.closest('[data-theme-group]'), true); + // Restart the fade even when the same pair is selected again. + void field.offsetWidth; + field.classList.add('bskyplus-theme-field-highlight'); + } + contrastHighlightTimer = setTimeout(clearContrastHighlight, 3000); + requestAnimationFrame(() => { + const field = fields[0]; + field.querySelector('[data-theme-hex]').focus({ preventScroll: true }); + field.scrollIntoView({ block: 'center', behavior: matchMedia('(prefers-reduced-motion: reduce)').matches ? 'instant' : 'smooth' }); + }); + } + + function contrastRecommendations(issues, dialog = null) { + // Keep advice consistent when one text color fails on several surfaces. + const directions = new Map(); + for (const { foreground } of issues) { + if (directions.has(foreground)) continue; + const backgrounds = issues.filter(pair => pair.foreground === foreground) + .map(pair => draft.colors[pair.background]); + const worstContrast = color => Math.min(...backgrounds.map(background => contrastRatio(color, background))); + directions.set(foreground, worstContrast('#000000') > worstContrast('#FFFFFF') ? 'Darken' : 'Lighten'); + } + return issues.map(issue => { + const field = fieldsByKey.get(issue.foreground); + const backgroundField = fieldsByKey.get(issue.background); + return el('li', { className: 'bskyplus-theme-contrast-item' }, + el('span', { text: issue.label + ': ' + issue.ratio.toFixed(1) + ':1' }), + el('span', { className: 'bskyplus-theme-contrast-advice', + text: directions.get(issue.foreground) + ' “' + field.label + '” in ' + field.group + ', or adjust “' + + backgroundField.label + '” in ' + backgroundField.group + '. Aim for above 4:1.' }), + el('button', { type: 'button', className: 'bskyplus-theme-contrast-edit', + 'data-theme-contrast-edit': field.key, 'data-theme-contrast-background': issue.background, + text: 'Edit both colors', + onclick: () => { + dialog?.close(); + showContrastSettings(issue); + } }) + ); + }); + } + + function updatePagePreview() { + let theme = null; + if (previewEnabled && previewActivated && draft) { + try { theme = validateTheme(draft); } + catch { return; /* Keep the last valid page styling while a field is invalid. */ } + } + parent.postMessage({ type: 'BSKYPLUS_THEME_PREVIEW', theme }, 'https://bsky.app'); + } + + function confirmAction({ title, message, confirmLabel, cancelLabel = 'Cancel' }) { + if (editor.querySelector('dialog')) return Promise.resolve(false); + return new Promise(resolve => { + const dialog = el('dialog', { + className: 'bskyplus-theme-dialog', 'data-theme-confirm': '', + 'aria-labelledby': 'bskyplusThemeConfirmTitle', + }); + dialog.append(el('form', { method: 'dialog' }, + el('h2', { id: 'bskyplusThemeConfirmTitle', text: title }), + el('p', { text: message }), + el('div', { className: 'bskyplus-theme-actions' }, + el('button', { type: 'submit', value: 'cancel', className: 'secondary-btn', + 'data-theme-confirm-cancel': '', text: cancelLabel }), + el('button', { type: 'submit', value: 'confirm', className: 'preset-btn', + 'data-theme-confirm-accept': '', text: confirmLabel }) + ) + )); + dialog.addEventListener('close', () => { + const confirmed = dialog.returnValue === 'confirm'; + dialog.remove(); + resolve(confirmed); + }, { once: true }); + editor.append(dialog); + dialog.showModal(); + dialog.querySelector('[data-theme-confirm-cancel]').focus(); + }); + } + + function confirmDiscard() { + if (!dirty) return true; + return confirmAction({ + title: 'Discard unsaved theme changes?', + message: 'Your edits to this theme will be lost.', + confirmLabel: 'Discard changes', + cancelLabel: 'Keep editing', + }); + } + + function withStorage(task) { + queue = queue.then(task, task); + return queue; + } + + async function readLibrary() { + const stored = await api.storage.local.get(STORAGE_KEY); + library = normalizeLibrary(stored[STORAGE_KEY]); + const active = library.themes.find(theme => theme.id === library.activeId) || + availableBuiltinThemes(library).find(theme => theme.id === library.activeId); + begin(active || library.themes[0] || null); + } + + async function saveLibrary(change) { + await withStorage(async () => { + const stored = await api.storage.local.get(STORAGE_KEY); + const latest = normalizeLibrary(stored[STORAGE_KEY]); + const nextLibrary = change(latest); + await api.storage.local.set({ [STORAGE_KEY]: nextLibrary }); + library = normalizeLibrary(nextLibrary); + }); + } + + function openSaveDialog(copyName = null, issues = contrastIssues(draft.colors)) { + if (editor.querySelector('dialog')) return; + const copying = copyName !== null; + const nameInput = copying ? el('input', { + type: 'text', className: 'bskyplus-theme-name', id: 'bskyplusThemeCopyName', + value: copyName || draft.name + ' copy', maxlength: '80', required: '', + }) : null; + const dialog = el('dialog', { className: 'bskyplus-theme-dialog', 'aria-labelledby': 'bskyplusThemeDialogTitle' }); + const form = el('form', { onsubmit: event => { + event.preventDefault(); + if (nameInput && !nameInput.value.trim()) { + nameInput.setCustomValidity('Enter a theme name.'); + nameInput.reportValidity(); + return; + } + const name = nameInput ? nameInput.value.trim() : null; + dialog.close(); + saveDraft(name, true); + } }, + el('h2', { id: 'bskyplusThemeDialogTitle', text: copying ? 'Save theme as…' : 'Low contrast warning' }), + copying ? el('label', { className: 'bskyplus-theme-name-field', for: 'bskyplusThemeCopyName' }, + el('span', { text: 'New theme name' }), nameInput) : null, + issues.length ? el('p', { text: issues.length + ' text or indicator combinations have contrast below 3.0:1 and may be hard to read. Aim for above 4:1. You can still save this theme.' }) : null, + issues.length ? el('ul', {}, ...contrastRecommendations(issues, dialog)) : null, + el('div', { className: 'bskyplus-theme-actions' }, + el('button', { type: 'button', className: 'secondary-btn', text: 'Cancel', onclick: () => dialog.close() }), + el('button', { type: 'submit', className: 'preset-btn', text: issues.length ? 'Save anyway' : 'Save' }) + ) + ); + nameInput?.addEventListener('input', () => nameInput.setCustomValidity('')); + dialog.append(form); + dialog.addEventListener('close', () => dialog.remove()); + editor.append(dialog); + dialog.showModal(); + if (nameInput) { nameInput.focus(); nameInput.select(); } + } + + async function saveDraft(copyName = null, allowLowContrast = false) { + if (!draft) return; + if (copyName === null && !dirty && isBuiltinTheme(selectedId)) { + setBusy(true); + try { + await saveLibrary(latest => ({ ...latest, activeId: selectedId })); + notice = 'Saved and applied'; + render(); + } catch { notice = 'Could not update the active theme.'; updateDirty(); } + finally { setBusy(false); } + return; + } + let theme; + try { + theme = validateTheme({ ...draft, + id: copyName === null && !isBuiltinTheme(draft.id) ? draft.id : createTheme().id, + name: copyName === null ? draft.name.trim() || 'Untitled theme' : copyName, + }); + } catch (error) { + notice = error.message || 'Fix the theme values before saving.'; + updateDirty(); + return; + } + const issues = contrastIssues(theme.colors); + if (issues.length && !allowLowContrast) { + openSaveDialog(copyName, issues); + return; + } + setBusy(true); + try { + await saveLibrary(latest => { + const themes = latest.themes.filter(item => item.id !== theme.id); + if (themes.length >= 100) throw new Error('You can save up to 100 themes. Delete one before saving another.'); + themes.push(theme); + return { ...latest, themes, activeId: theme.id }; + }); + draft = theme; + selectedId = theme.id; + dirty = false; + previewActivated = true; + notice = 'Saved and applied'; + render(); + } catch (error) { + notice = error.message?.startsWith('You can') ? error.message : 'Could not save the theme. Try again.'; + dirty = true; + updateDirty(); + } finally { + setBusy(false); + } + } + + async function selectTheme(id) { + if (busy) return; + if (id === selectedId && !dirty) { + previewActivated = true; + updatePagePreview(); + return; + } + if (!(await confirmDiscard())) return; + const theme = library.themes.find(item => item.id === id) || + availableBuiltinThemes(library).find(item => item.id === id); + previewActivated = true; + begin(theme || null); + editor.querySelector(`[data-theme-select="${id}"]`)?.focus({ preventScroll: true }); + } + + async function importTheme(event) { + const input = event.currentTarget; + const file = input.files?.[0]; + input.value = ''; + if (!file) return; + if (file.size > MAX_IMPORT_BYTES) { + notice = 'Theme files must be 256 KB or smaller.'; + updateDirty(); + return; + } + + setBusy(true); + try { + let theme = validateTheme(JSON.parse(await file.text())); + if (!(await confirmDiscard())) return; + const importedAsCopy = isBuiltinTheme(theme.id) || library.themes.some(saved => saved.id === theme.id); + if (importedAsCopy) theme = { ...theme, id: createTheme(theme.name, theme.base).id }; + draft = theme; + selectedId = null; + dirty = true; + previewActivated = true; + notice = importedAsCopy ? 'Imported as a copy · review, then save' : 'Imported theme · review, then save'; + render(); + } catch (error) { + notice = error instanceof SyntaxError ? 'The selected file is not valid JSON.' : (error.message || 'Could not import the theme.'); + updateDirty(); + } finally { + setBusy(false); + } + } + + async function fetchJson(url, message) { + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), 10000); + try { + const response = await fetch(url, { signal: controller.signal, credentials: 'omit', cache: 'no-store', referrerPolicy: 'no-referrer' }); + if (!response.ok) throw new Error(message); + const text = await response.text(); + if (text.length > MAX_IMPORT_BYTES) throw new Error('The WitchSky response is too large.'); + return JSON.parse(text); + } catch (error) { + if (error.name === 'AbortError') throw new Error('The WitchSky request timed out.'); + if (error instanceof SyntaxError) throw new Error('WitchSky returned an invalid response.'); + throw error; + } finally { + clearTimeout(timeout); + } + } + + async function importWitchSky(input) { + let target; + try { target = parseWitchSkyUri(input.value); } + catch (error) { notice = error.message; updateDirty(); return; } + let permissionRequest; + if (target.didDocumentUrl && api.permissions && typeof api.permissions.request === 'function') { + const origin = new URL(target.didDocumentUrl).origin; + try { permissionRequest = api.permissions.request({ origins: [origin + '/*'] }); } + catch { + notice = 'Could not request access to the did:web repository. Check the browser permission settings and try again.'; + updateDirty(); + return; + } + try { + if (!(await permissionRequest)) { + notice = 'Access to the did:web repository was not granted.'; + updateDirty(); + return; + } + } catch { + notice = 'Could not request access to the did:web repository. Check the browser permission settings and try again.'; + updateDirty(); + return; + } + } + if (!(await confirmDiscard())) return; + + setBusy(true); + try { + const did = await fetchJson(target.didDocumentUrl || 'https://plc.directory/' + encodeURIComponent(target.repo), 'Could not resolve the WitchSky theme repository.'); + if (target.didDocumentUrl && did.id !== target.repo) throw new Error('The did:web document does not match the WitchSky repository.'); + const service = did.service?.find(item => item?.id === '#atproto_pds' || item?.type === 'AtprotoPersonalDataServer'); + if (typeof service?.serviceEndpoint !== 'string') throw new Error('The WitchSky repository does not publish a PDS endpoint.'); + const endpoint = new URL(service?.serviceEndpoint); + if (endpoint.protocol !== 'https:' || endpoint.username || endpoint.password || endpoint.hash) { + throw new Error('The WitchSky repository has an invalid PDS endpoint.'); + } + const recordUrl = new URL('/xrpc/com.atproto.repo.getRecord', endpoint.origin); + recordUrl.searchParams.set('repo', target.repo); + recordUrl.searchParams.set('collection', 'app.witchsky.theme.colors'); + recordUrl.searchParams.set('rkey', target.rkey); + const response = await fetchJson(recordUrl, 'Could not load that WitchSky theme record.'); + if (response.uri !== target.uri) throw new Error('WitchSky returned a different theme record.'); + const themes = witchSkyThemes(response.value); + await saveLibrary(latest => { + if (latest.themes.length + themes.length > 100) throw new Error('You can save up to 100 themes. Delete some before importing this palette.'); + return { ...latest, themes: [...latest.themes, ...themes] }; + }); + draft = themes[0]; + selectedId = themes[0].id; + dirty = false; + previewActivated = true; + input.value = ''; + notice = `Imported ${themes.length} WitchSky ${themes.length === 1 ? 'theme' : 'themes'}`; + render(); + } catch (error) { + notice = error.message || 'Could not import the WitchSky theme.'; + updateDirty(); + } finally { + setBusy(false); + } + } + + function resetHueBaseline() { + hueBaseColors = { ...draft.colors }; + const slider = editor.querySelector('[data-theme-hue]'); + if (slider) slider.value = '0'; + const output = editor.querySelector('[data-theme-hue-value]'); + if (output) output.textContent = '0°'; + } + + function updateHue(degrees) { + // Always use the original palette so dragging back to zero is lossless. + draft.colors = shiftHue(hueBaseColors, degrees); + editor.querySelector('[data-theme-hue]').value = String(degrees); + editor.querySelector('[data-theme-hue-value]').textContent = (degrees > 0 ? '+' : '') + degrees + '°'; + for (const [key, color] of Object.entries(draft.colors)) { + editor.querySelector(`[data-theme-picker="${key}"]`).value = color; + const hex = editor.querySelector(`[data-theme-hex="${key}"]`); + hex.value = color; + hex.removeAttribute('aria-invalid'); + } + notice = ''; + setDirty(); + } + + function blurHueSliderAfterPointer(slider, pointerId) { + const release = event => { + if (event.pointerId !== pointerId) return; + window.removeEventListener('pointerup', release, true); + window.removeEventListener('pointercancel', release, true); + slider.blur(); + }; + window.addEventListener('pointerup', release, true); + window.addEventListener('pointercancel', release, true); + } + + function updateColor(key, value, live = false) { + if (!HEX.test(value)) return; + draft.colors[key] = value.toLowerCase(); + const picker = editor.querySelector(`[data-theme-picker="${key}"]`); + const hex = editor.querySelector(`[data-theme-hex="${key}"]`); + if (picker && picker.value !== value) picker.value = value; + if (hex && hex.value !== value) hex.value = value; + hex?.removeAttribute('aria-invalid'); + resetHueBaseline(); + setDirty(live); + } + + function field(field) { + const value = colorValue(field.key); + const picker = el('input', { + type: 'color', value, 'aria-label': `${field.label} color`, 'data-theme-picker': field.key, + oninput: event => updateColor(field.key, event.target.value, true), + onchange: event => updateColor(field.key, event.target.value) + }); + const hex = el('input', { + type: 'text', value, inputmode: 'text', autocomplete: 'off', spellcheck: 'false', maxlength: '7', + 'aria-label': `${field.label} hex value`, 'data-theme-hex': field.key, + oninput: event => { + const next = event.target.value.trim(); + if (HEX.test(next)) updateColor(field.key, next); + else event.target.setAttribute('aria-invalid', 'true'); + }, + onchange: event => { + if (!HEX.test(event.target.value.trim())) { + event.target.value = colorValue(field.key); + event.target.removeAttribute('aria-invalid'); + } + } + }); + return el('label', { className: 'bskyplus-theme-field', 'data-theme-field': field.key }, + el('span', { className: 'bskyplus-theme-field-copy' }, + el('span', { className: 'bskyplus-theme-field-label', text: field.label }), + el('span', { className: 'bskyplus-theme-field-description', text: field.description }) + ), + el('span', { className: 'bskyplus-theme-color-inputs' }, picker, hex) + ); + } + + function themeCard(theme) { + const selected = theme.id === selectedId; + const active = theme.id === library.activeId; + const cardPreview = el('div', { className: 'bskyplus-theme-preview bskyplus-theme-card-preview', + onclick: () => selectTheme(theme.id) }, + el('div', { className: 'bskyplus-theme-skeleton', 'aria-hidden': 'true' }, + el('div', { className: 'bskyplus-theme-preview-bar' }, + el('span', { className: 'bskyplus-theme-skeleton-line' }), + el('span', { className: 'bskyplus-theme-skeleton-line bskyplus-theme-skeleton-link' }) + ), + el('div', { className: 'bskyplus-theme-preview-post' }, + el('div', { className: 'bskyplus-theme-preview-avatar' }), + el('div', { className: 'bskyplus-theme-skeleton-copy' }, + el('span', { className: 'bskyplus-theme-skeleton-line' }), + el('span', { className: 'bskyplus-theme-skeleton-line bskyplus-theme-skeleton-short' }), + el('div', { className: 'bskyplus-theme-skeleton-reactions' }, + ...['textSubtle', 'like', 'positive', 'negative'].map(color => + el('span', { style: `background: var(--bskyplus-preview-${color})` })) + ) + ) + ) + ), + el('button', { + type: 'button', className: 'bskyplus-theme-preview-button', text: 'Select theme', + 'data-theme-select': theme.id, 'aria-label': 'Select theme: ' + theme.name, + 'aria-pressed': String(selected), + }) + ); + for (const [key, value] of Object.entries(theme.colors)) { + cardPreview.style.setProperty(`--bskyplus-preview-${key}`, value); + } + return el('article', { className: 'bskyplus-theme-card', 'data-theme-card': theme.id, 'data-theme-selected': String(selected) }, + el('div', { className: 'bskyplus-theme-card-heading' }, + el('span', { className: 'bskyplus-theme-card-name', text: theme.name }), + selected || active || isBuiltinTheme(theme.id) ? el('span', { className: 'bskyplus-theme-card-status', + text: selected ? active ? 'Active · editing' : isBuiltinTheme(theme.id) ? 'Included · editing' : 'Editing' : active ? 'Active' : 'Included' }) : null + ), + cardPreview + ); + } + + function render() { + if (previewTimer) clearTimeout(previewTimer); + previewTimer = 0; + clearContrastHighlight(); + hueBaseColors = { ...draft.colors }; + const groupStates = new Map([...editor.querySelectorAll('[data-theme-group]')] + .map(group => [group.dataset.themeGroup, sectionOpen(group)])); + const previousLibrary = editor.querySelector('[data-theme-library]'); + const libraryOpen = previousLibrary ? sectionOpen(previousLibrary) : true; + editor.querySelectorAll('details').forEach(details => sectionAnimations.get(details)?.dispose()); + editor.replaceChildren(); + const themeLibrary = el('details', { className: 'bskyplus-theme-library', 'data-theme-library': '', open: libraryOpen ? '' : null }, + el('summary', { text: 'Select a theme (' + (library.themes.length + availableBuiltinThemes(library).length) + ')' }), + el('div', { className: 'bskyplus-theme-library-grid' }, ...availableBuiltinThemes(library).map(themeCard), ...library.themes.map(themeCard)) + ); + const name = el('input', { + type: 'text', className: 'bskyplus-theme-name', value: draft.name, maxlength: '80', + 'aria-label': 'Theme name', placeholder: 'Theme name', + oninput: event => { draft.name = event.target.value; setDirty(); } + }); + const previewToggle = el('label', { className: 'bskyplus-theme-preview-toggle' }, + el('input', { type: 'checkbox', className: 'switch', checked: previewEnabled ? '' : null, onchange: event => { previewEnabled = event.target.checked; if (previewEnabled) previewActivated = true; updatePagePreview(); } }), + el('span', { text: 'Preview changes on this page' }) + ); + const controls = el('div', { className: 'bskyplus-theme-controls' }, + el('label', { className: 'bskyplus-theme-name-field' }, el('span', { text: 'Theme name' }), name) + ); + const witchSkyInput = el('input', { + type: 'url', className: 'bskyplus-theme-witchsky-uri', 'data-theme-witchsky-uri': '', + placeholder: 'at://did:plc:… or at://did:web:…/app.witchsky.theme.colors/…', 'aria-label': 'WitchSky theme AT URI', + spellcheck: 'false', autocomplete: 'off', + }); + const witchSkyImport = el('button', { + type: 'button', className: 'secondary-btn', 'data-theme-witchsky-import': '', text: 'Import WitchSky palette', + onclick: () => importWitchSky(witchSkyInput), + }); + controls.append(el('div', { className: 'bskyplus-theme-witchsky' }, witchSkyInput, witchSkyImport)); + controls.append(el('div', { className: 'bskyplus-theme-hue' }, + el('div', { className: 'bskyplus-theme-hue-header' }, + el('label', { for: 'bskyplusThemeHue', text: 'Hue shift' }), + el('output', { for: 'bskyplusThemeHue', 'data-theme-hue-value': '', text: '0°' }), + el('button', { type: 'button', className: 'secondary-btn', text: 'Reset hue', onclick: () => updateHue(0) }) + ), + el('input', { type: 'range', id: 'bskyplusThemeHue', 'data-theme-hue': '', className: 'range-slider', + min: '-180', max: '180', step: '1', value: '0', 'aria-describedby': 'bskyplusThemeHueHint', + oninput: event => updateHue(Number(event.target.value)), + onpointerdown: event => blurHueSliderAfterPointer(event.currentTarget, event.pointerId) }), + el('p', { id: 'bskyplusThemeHueHint', className: 'bskyplus-theme-field-description', + text: 'Shift all colors together, keeping saturation and lightness. Black, white, and gray stay unchanged.' }) + )); + const groups = el('div', { className: 'bskyplus-theme-groups' }, ...GROUPS.map((group, index) => { + const open = groupStates.has(group.name) ? groupStates.get(group.name) : index === 0; + return el('details', { className: 'bskyplus-theme-group', 'data-theme-group': group.name, open: open ? '' : null }, + el('summary', { text: group.name }), + el('div', { className: 'bskyplus-theme-group-fields' }, ...group.fields.map(field)) + ); + })); + const save = el('button', { type: 'button', className: 'preset-btn bskyplus-theme-apply', 'data-theme-write': '', 'data-theme-save': '', text: 'Save and apply', onclick: () => saveDraft() }); + const saveAs = el('button', { type: 'button', className: 'secondary-btn', 'data-theme-write': '', 'data-theme-save-as': '', text: 'Save as…', onclick: () => openSaveDialog('') }); + const defaultButton = el('button', { type: 'button', className: 'secondary-btn', text: 'Use Bluesky default', onclick: async () => { + setBusy(true); + try { + await saveLibrary(latest => ({ ...latest, activeId: null })); + previewEnabled = false; + notice = 'Using Bluesky default'; + render(); + } catch { notice = 'Could not update the active theme.'; updateDirty(); } + finally { setBusy(false); } + }}); + defaultButton.setAttribute('data-theme-write', ''); + defaultButton.setAttribute('data-theme-default', ''); + const deleteButton = el('button', { type: 'button', className: 'secondary-btn bskyplus-theme-delete', 'data-theme-write': '', text: 'Delete', disabled: selectedId ? null : '', onclick: async () => { + if (!selectedId || !(await confirmAction({ + title: `Delete “${draft.name}”?`, + message: 'This theme will be removed from your library.', + confirmLabel: 'Delete theme', + }))) return; + setBusy(true); + try { + const deletedId = selectedId; + const deletingBuiltin = isBuiltinTheme(deletedId); + await saveLibrary(latest => deletingBuiltin + ? { ...latest, deletedBuiltinIds: [...(latest.deletedBuiltinIds || []), deletedId], activeId: latest.activeId === deletedId ? null : latest.activeId } + : { ...latest, themes: latest.themes.filter(theme => theme.id !== deletedId), activeId: latest.activeId === deletedId ? null : latest.activeId }); + if (deletingBuiltin) { + previewActivated = false; + begin(null); + } else begin(library.themes[0] || null); + } catch { notice = 'Could not delete the theme.'; updateDirty(); } + finally { setBusy(false); } + }}); + const exportButton = el('button', { type: 'button', className: 'secondary-btn', text: 'Export JSON', onclick: () => { + let theme; + try { theme = validateTheme(draft); } catch (error) { notice = error.message || 'Fix the theme values before exporting.'; updateDirty(); return; } + const url = URL.createObjectURL(new Blob([exportTheme(theme)], { type: 'application/json' })); + const anchor = el('a', { href: url, download: `${theme.name.trim().replace(/[^a-z0-9]+/gi, '-').replace(/^-|-$/g, '') || 'bskyplus-theme'}.json` }); + document.body.append(anchor); anchor.click(); anchor.remove(); setTimeout(() => URL.revokeObjectURL(url), 0); + }}); + const importInput = el('input', { + type: 'file', accept: '.json,application/json', hidden: '', 'data-theme-import-input': '', onchange: importTheme + }); + const importButton = el('button', { + type: 'button', className: 'secondary-btn', 'data-theme-import': '', text: 'Import JSON', onclick: () => importInput.click() + }); + const actions = el('div', { className: 'bskyplus-theme-actions' }, save, saveAs, defaultButton, deleteButton, importInput, importButton, exportButton); + const status = el('p', { className: 'bskyplus-theme-status', 'data-theme-status': '', role: 'status' }); + if (storageUnavailable) notice = 'Saved themes are unavailable. Editing and export still work.'; + const contrastWarning = el('details', { className: 'bskyplus-theme-contrast-warning', 'data-theme-contrast-warning': '', hidden: '' }, + el('summary'), el('p', { text: 'Below 3.0:1 can be hard to read. Aim for above 4:1.' }), el('ul')); + editor.append(previewToggle, themeLibrary, controls, el('p', { className: 'bskyplus-theme-contrast', 'data-theme-contrast': '' }), contrastWarning, groups, actions, status); + editor.querySelectorAll('details').forEach(animateSection); + updatePreview(); + updateDirty(); + } + + const editor = el('section', { className: 'section bskyplus-theme-editor', 'data-bskyplus-theme-editor': '' }); + const firstSection = document.querySelector('.section'); + firstSection?.before(editor); + if (!editor.isConnected) document.body.prepend(editor); + + api.storage.onChanged.addListener((changes, area) => { + if (area !== 'local' || !changes[STORAGE_KEY]) return; + if (dirty) { notice = 'Saved themes changed in another Bsky+ window.'; updateDirty(); return; } + library = normalizeLibrary(changes[STORAGE_KEY].newValue); + const availableBuiltins = availableBuiltinThemes(library); + if (isBuiltinTheme(selectedId) && !availableBuiltins.some(theme => theme.id === selectedId)) { + previewActivated = false; + begin(null); + return; + } + const selected = library.themes.find(theme => theme.id === selectedId) || + availableBuiltins.find(theme => theme.id === selectedId) || + library.themes.find(theme => theme.id === library.activeId) || availableBuiltins.find(theme => theme.id === library.activeId); + begin(selected || null); + }); + + readLibrary().catch(() => { + storageUnavailable = true; + notice = 'Saved themes are unavailable. Editing and export still work.'; + draft = makeDraft(); + render(); + }); +})(); diff --git a/extension/shared/theme-model.js b/extension/shared/theme-model.js new file mode 100644 index 0000000..f76020a --- /dev/null +++ b/extension/shared/theme-model.js @@ -0,0 +1,540 @@ +// Palette snapshot: @bsky.app/alf 0.1.15. See docs/theme-color-audit.md. +(() => { + 'use strict'; + + const STORAGE_KEY = 'bskyplusThemes'; + const SOURCE = { + "light": { + "contrast_0": "#FFFFFF", + "contrast_25": "#F9FAFB", + "contrast_50": "#EFF2F6", + "contrast_100": "#DCE2EA", + "contrast_200": "#C0CAD8", + "contrast_300": "#A5B2C5", + "contrast_400": "#8798B0", + "contrast_500": "#667B99", + "contrast_600": "#526580", + "contrast_700": "#405168", + "contrast_800": "#313F54", + "contrast_900": "#232E3E", + "contrast_950": "#19222E", + "contrast_975": "#111822", + "contrast_1000": "#000000", + "primary_25": "#F5F9FF", + "primary_50": "#E5F0FF", + "primary_100": "#CCE1FF", + "primary_200": "#A8CCFF", + "primary_300": "#75AFFF", + "primary_400": "#4291FF", + "primary_500": "#006AFF", + "primary_600": "#0059D6", + "primary_700": "#0048AD", + "primary_800": "#00398A", + "primary_900": "#002861", + "primary_950": "#001E47", + "primary_975": "#001533", + "positive_25": "#ECFEF5", + "positive_50": "#D3FDE8", + "positive_100": "#A3FACF", + "positive_200": "#6AF6B0", + "positive_300": "#2CF28F", + "positive_400": "#0DD370", + "positive_500": "#09B35E", + "positive_600": "#04904A", + "positive_700": "#036D38", + "positive_800": "#04522B", + "positive_900": "#033F21", + "positive_950": "#032A17", + "positive_975": "#021D0F", + "negative_25": "#FFF5F7", + "negative_50": "#FEE7EC", + "negative_100": "#FDD3DD", + "negative_200": "#FBBBCA", + "negative_300": "#F891A9", + "negative_400": "#F65A7F", + "negative_500": "#E91646", + "negative_600": "#CA123D", + "negative_700": "#A71134", + "negative_800": "#7F0B26", + "negative_900": "#5F071C", + "negative_950": "#430413", + "negative_975": "#30030D" + }, + "subdued": { + "contrast_0": "#FFFFFF", + "contrast_25": "#F9FAFB", + "contrast_50": "#F2F4F8", + "contrast_100": "#E2E7EE", + "contrast_200": "#C3CDDA", + "contrast_300": "#ABB8C9", + "contrast_400": "#8D9DB4", + "contrast_500": "#6F839F", + "contrast_600": "#586C89", + "contrast_700": "#485B75", + "contrast_800": "#394960", + "contrast_900": "#2C3A4E", + "contrast_950": "#222E3F", + "contrast_975": "#1C2736", + "contrast_1000": "#151D28", + "primary_25": "#F5F9FF", + "primary_50": "#EBF3FF", + "primary_100": "#D6E7FF", + "primary_200": "#ADCFFF", + "primary_300": "#80B5FF", + "primary_400": "#4D97FF", + "primary_500": "#0F73FF", + "primary_600": "#0661E0", + "primary_700": "#0A52B8", + "primary_800": "#0E4490", + "primary_900": "#123464", + "primary_950": "#122949", + "primary_975": "#122136", + "positive_25": "#ECFEF5", + "positive_50": "#D8FDEB", + "positive_100": "#A8FAD1", + "positive_200": "#6FF6B3", + "positive_300": "#31F291", + "positive_400": "#0EDD75", + "positive_500": "#0AC266", + "positive_600": "#049F52", + "positive_700": "#038142", + "positive_800": "#056636", + "positive_900": "#04522B", + "positive_950": "#053D21", + "positive_975": "#052917", + "negative_25": "#FFF5F7", + "negative_50": "#FEEBEF", + "negative_100": "#FDD8E1", + "negative_200": "#FCC0CE", + "negative_300": "#F99AB0", + "negative_400": "#F76486", + "negative_500": "#EB2452", + "negative_600": "#D81341", + "negative_700": "#BA1239", + "negative_800": "#910D2C", + "negative_900": "#6F0B22", + "negative_950": "#500B1C", + "negative_975": "#3E0915" + } +}; + const GROUPS = [ + { name: 'Surfaces', fields: [ + ['background', 'Page background', 'Feed, navigation, and page canvas'], + ['surface', 'Subtle surface', 'Cards and grouped settings'], + ['surfaceRaised', 'Raised surface', 'Secondary buttons, menus, and inputs'], + ['hover', 'Hover and selection', 'Neutral hovered and selected controls'], + ] }, + { name: 'Text and icons', fields: [ + ['text', 'Main text', 'Post text, headings, and primary icons'], + ['textMuted', 'Secondary text', 'Handles, timestamps, and descriptions'], + ['textSubtle', 'Subtle text', 'Placeholders and disabled icons'], + ['textInverse', 'Inverse text', 'Text on inverted neutral surfaces'], + ] }, + { name: 'Borders and focus', fields: [ + ['border', 'Subtle border', 'Post dividers and input outlines'], + ['borderStrong', 'Strong border', 'Emphasized borders'], + ['focus', 'Focus ring', 'Keyboard focus outlines'], + ] }, + { name: 'Links and primary controls', fields: [ + ['primary', 'Primary control', 'Compose, follow, and selected controls'], + ['primaryHover', 'Primary hover', 'Hovered primary controls'], + ['primaryMuted', 'Primary soft surface', 'Subtle primary and disabled backgrounds'], + ['link', 'Link text', 'Links and mentions'], + ['onPrimary', 'Text on colored controls', 'Text and icons on solid colored buttons'], + ] }, + { name: 'Status and reactions', fields: [ + ['positive', 'Success and reposts', 'Positive feedback and repost icons'], + ['positiveMuted', 'Success soft surface', 'Positive notices and subtle controls'], + ['negative', 'Danger and errors', 'Destructive actions and error messages'], + ['negativeMuted', 'Danger soft surface', 'Error notices and subtle controls'], + ['like', 'Likes', 'Liked hearts and pink indicators'], + ['warning', 'Warnings', 'Yellow warnings and highlights'], + ] }, + { name: 'Overlays and shadows', fields: [ + ['overlay', 'Overlay tint', 'Modal backdrops; original opacity is preserved'], + ['shadow', 'Shadow tint', 'UI shadows; original opacity is preserved'], + ] }, + ].map(group => ({ ...group, fields: group.fields.map(([key, label, description]) => ({ key, label, description })) })); + const FIELD_LABELS = Object.fromEntries(GROUPS.flatMap(group => + group.fields.map(field => [field.key, field.label]))); + const KEYS = Object.keys(FIELD_LABELS); + const CONTRAST_PAIRS = [ + ...['text', 'textMuted', 'link'].flatMap(foreground => + ['background', 'surface', 'surfaceRaised', 'hover'].map(background => [foreground, background])), + ['onPrimary', 'primary'], ['onPrimary', 'primaryHover'], ['textInverse', 'text'], + ...['primaryMuted', 'positiveMuted', 'negativeMuted'].map(background => ['text', background]), + ...['positive', 'negative', 'like', 'warning'].map(foreground => [foreground, 'background']), + ]; + + function palette(mode, subdued = mode === 'dim') { + const base = SOURCE[subdued ? 'subdued' : 'light']; + if (mode === 'light') return { ...base }; + return Object.fromEntries(Object.entries(base).map(([key]) => { + const [family, step] = key.split('_'); + return [key, base[family + '_' + (1000 - Number(step))]]; + })); + } + + function preset(mode) { + const p = palette(mode); + return { + background: p.contrast_0, surface: p.contrast_25, surfaceRaised: p.contrast_50, + hover: p.contrast_100, text: p.contrast_1000, textMuted: p.contrast_700, + textSubtle: p.contrast_400, textInverse: p.contrast_0, border: p.contrast_100, + borderStrong: p.contrast_200, primary: p.primary_500, + primaryHover: p.primary_600, primaryMuted: p.primary_50, + link: mode === 'light' ? p.primary_500 : p.primary_600, onPrimary: '#FFFFFF', + positive: p.positive_500, positiveMuted: p.positive_50, + negative: p.negative_500, negativeMuted: p.negative_50, + like: '#EC4899', warning: '#FFC404', overlay: '#000000', shadow: '#000000', + focus: mode === 'light' ? p.primary_500 : p.primary_600, + }; + } + + const PRESETS = Object.fromEntries(['light', 'dim', 'dark'].map(mode => [mode, preset(mode)])); + const IMPORTED_BUILTINS = [ + { + schemaVersion: 1, id: 'bskyplus-coffee-espresso-light', name: 'Coffee / Espresso — Light', base: 'light', + colors: { + background: '#F7F2E9', surface: '#EFE3D0', surfaceRaised: '#FDF8F0', hover: '#7B3D11', + text: '#1C1310', textMuted: '#1C1310', textSubtle: '#1C1310', textInverse: '#F7F2E9', + border: '#2E2018', borderStrong: '#2E2018', focus: '#A55A1F', + primary: '#A55A1F', primaryHover: '#A55A1F', primaryMuted: '#7B3D11', link: '#A55A1F', onPrimary: '#F7F2E9', + positive: '#4CAF7D', positiveMuted: '#D3FDE8', negative: '#E06C6C', negativeMuted: '#FEE7EC', + like: '#E06C6C', warning: '#E2B76F', overlay: '#000000', shadow: '#000000', + }, + }, + { + schemaVersion: 1, id: 'bskyplus-floras-moat-floras-moat', name: "Flora's Moat — Flora's Moat", base: 'dark', + colors: { + background: '#333333', surface: '#222222', surfaceRaised: '#333333', hover: '#574C56', + text: '#EEEEEE', textMuted: '#EEEEEE', textSubtle: '#EEEEEE', textInverse: '#333333', + border: '#444444', borderStrong: '#444444', focus: '#E0759C', + primary: '#E0759C', primaryHover: '#E0759C', primaryMuted: '#574C56', link: '#E0759C', onPrimary: '#333333', + positive: '#9DBF8A', positiveMuted: '#032A17', negative: '#C97A7A', negativeMuted: '#430413', + like: '#E0759C', warning: '#D9B27C', overlay: '#000000', shadow: '#000000', + }, + }, + { + schemaVersion: 1, id: 'bskyplus-witchsky-mu-pink-midnight', name: 'Witchsky + mu Pink — Midnight', base: 'dark', + colors: { + background: '#150B08', surface: '#2A1A15', surfaceRaised: '#3E2B21', hover: '#75295E', + text: '#FEFBFB', textMuted: '#C0BBB9', textSubtle: '#C0BBB9', textInverse: '#FEFBFB', + border: '#624C43', borderStrong: '#624C43', focus: '#DB4AA6', + primary: '#DB4AA6', primaryHover: '#DB4AA6', primaryMuted: '#75295E', link: '#DB4AA6', onPrimary: '#FEFBFB', + positive: '#09B35E', positiveMuted: '#032A17', negative: '#E91646', negativeMuted: '#430413', + like: '#EC4899', warning: '#FFC404', overlay: '#000000', shadow: '#000000', + }, + }, + { + schemaVersion: 1, id: 'bskyplus-snuffbait-dark-coven', name: 'snuffbait dark — Coven', base: 'dark', + colors: { + background: '#231825', surface: '#2A1E2B', surfaceRaised: '#393140', hover: '#514453', + text: '#FFE0FF', textMuted: '#C0BBB9', textSubtle: '#C0BBB9', textInverse: '#FEFBFB', + border: '#624C43', borderStrong: '#624C43', focus: '#B09FB4', + primary: '#B09FB4', primaryHover: '#B09FB4', primaryMuted: '#514453', link: '#B09FB4', onPrimary: '#FEFBFB', + positive: '#0AC266', positiveMuted: '#032A17', negative: '#EB2452', negativeMuted: '#430413', + like: '#DD5E8F', warning: '#FFC404', overlay: '#000000', shadow: '#000000', + }, + }, + { + schemaVersion: 1, id: 'bskyplus-latte-mauve', name: 'Latte — Mauve', base: 'light', + colors: { + background: '#EFF1F5', surface: '#E6E9EF', surfaceRaised: '#DCE0E8', hover: '#E6E9EF', + text: '#4C4F69', textMuted: '#6C6F85', textSubtle: '#6C6F85', textInverse: '#EFF1F5', + border: '#9CA0B0', borderStrong: '#9CA0B0', focus: '#8839EF', + primary: '#8839EF', primaryHover: '#8839EF', primaryMuted: '#E6E9EF', link: '#8839EF', onPrimary: '#EFF1F5', + positive: '#40A02B', positiveMuted: '#D3FDE8', negative: '#D20F39', negativeMuted: '#FEE7EC', + like: '#EA76CB', warning: '#DF8E1D', overlay: '#000000', shadow: '#000000', + }, + }, + ]; + const BUILTIN_THEMES = Object.freeze({ + ...Object.fromEntries(Object.entries(PRESETS).map(([base, colors]) => [ + 'bluesky-' + base, + Object.freeze({ schemaVersion: 1, id: 'bluesky-' + base, name: 'Bluesky ' + base[0].toUpperCase() + base.slice(1), base, colors: Object.freeze({ ...colors }) }), + ])), + ...Object.fromEntries(IMPORTED_BUILTINS.map(candidate => { + const theme = validateTheme(candidate); + return [theme.id, Object.freeze({ ...theme, colors: Object.freeze({ ...theme.colors }) })]; + })), + }); + const isBuiltinTheme = id => Object.hasOwn(BUILTIN_THEMES, id); + const availableBuiltinThemes = library => { + const deleted = new Set(library?.deletedBuiltinIds || []); + return Object.values(BUILTIN_THEMES).filter(theme => !deleted.has(theme.id)); + }; + + function validateTheme(value) { + if (!value || value.schemaVersion !== 1) throw new Error('Unsupported theme format.'); + if (typeof value.id !== 'string' || !/^[a-zA-Z0-9_-]{1,80}$/.test(value.id)) throw new Error('Invalid theme ID.'); + if (typeof value.name !== 'string' || !value.name.trim() || value.name.trim().length > 80) throw new Error('Use a theme name between 1 and 80 characters.'); + if (!Object.hasOwn(PRESETS, value.base)) throw new Error('Choose a light, dim, or dark base.'); + const colors = {}; + for (const key of KEYS) { + const color = value.colors?.[key]; + if (typeof color !== 'string' || !/^#[0-9a-f]{6}$/i.test(color)) throw new Error('Use a six-digit hex color for ' + key + '.'); + colors[key] = color.toUpperCase(); + } + return { schemaVersion: 1, id: value.id, name: value.name.trim(), base: value.base, colors }; + } + + function createTheme(name = 'My theme', base = 'dim') { + if (!Object.hasOwn(PRESETS, base)) base = 'dim'; + return { schemaVersion: 1, id: crypto.randomUUID(), name, base, colors: { ...PRESETS[base] } }; + } + + function normalizeLibrary(value) { + const themes = []; + const deletedBuiltinIds = []; + if (value?.schemaVersion === 1 && Array.isArray(value.themes)) { + for (const candidate of value.themes.slice(0, 100)) { + try { + const theme = validateTheme(candidate); + if (isBuiltinTheme(theme.id)) continue; + if (!themes.some(saved => saved.id === theme.id)) themes.push(theme); + } catch { /* A malformed entry cannot disable other saved themes. */ } + } + } + if (value?.schemaVersion === 1 && Array.isArray(value.deletedBuiltinIds)) { + for (const id of value.deletedBuiltinIds) { + if (typeof id === 'string' && isBuiltinTheme(id) && !deletedBuiltinIds.includes(id)) deletedBuiltinIds.push(id); + } + } + const activeId = themes.some(theme => theme.id === value?.activeId) || + (value?.schemaVersion === 1 && isBuiltinTheme(value?.activeId) && !deletedBuiltinIds.includes(value.activeId)) + ? value.activeId : null; + const library = { schemaVersion: 1, activeId, themes }; + if (deletedBuiltinIds.length) library.deletedBuiltinIds = deletedBuiltinIds; + return library; + } + + function parseWitchSkyUri(value) { + let text = typeof value === 'string' ? value.trim() : ''; + const explorer = 'https://pds.ls/'; + if (text.startsWith(explorer)) { + try { text = decodeURIComponent(text.slice(explorer.length)).split('#')[0]; } + catch { throw new Error('Enter a complete WitchSky theme at:// URI using a did:plc or did:web repository.'); } + } + const match = text.match(/^at:\/\/([^/]+)\/app\.witchsky\.theme\.colors\/([a-zA-Z0-9._~:-]{1,512})$/); + if (!match) throw new Error('Enter a complete WitchSky theme at:// URI using a did:plc or did:web repository.'); + const repo = match[1]; + if (/^did:plc:[a-z2-7]{24}$/.test(repo)) return { uri: text, repo, rkey: match[2] }; + const didWebDocumentUrl = resolveDidWebDocumentUrl(repo); + if (!didWebDocumentUrl) throw new Error('Enter a complete WitchSky theme at:// URI using a did:plc or did:web repository.'); + return { uri: text, repo, rkey: match[2], didDocumentUrl: didWebDocumentUrl }; + } + + function resolveDidWebDocumentUrl(repo) { + const parts = repo.split(':'); + if (parts.length < 3 || parts[0] !== 'did' || parts[1] !== 'web' || parts.length > 20) return null; + let host; + try { host = decodeURIComponent(parts[2]); } + catch { return null; } + if (!host || /[\\/?#@%\u0000-\u0020\u007f]/.test(host)) return null; + + let origin; + try { + const url = new URL('https://' + host + '/'); + if (!url.hostname || url.username || url.password || url.pathname !== '/' || url.search || url.hash) return null; + origin = url.origin; + } catch { return null; } + + const path = []; + for (const encodedPart of parts.slice(3)) { + let segment; + try { segment = decodeURIComponent(encodedPart); } + catch { return null; } + if (!segment || segment === '.' || segment === '..' || /[\\/?#@\u0000-\u001f\u007f]/.test(segment)) return null; + path.push(encodeURIComponent(segment)); + } + return origin + (path.length ? '/' + path.join('/') + '/did.json' : '/.well-known/did.json'); + } + + function witchSkyThemes(value) { + if (!value || value.$type !== 'app.witchsky.theme.colors' || typeof value.name !== 'string' || + !value.name.trim() || !value.base || typeof value.base !== 'object') { + throw new Error('The AT record is not a WitchSky color theme.'); + } + + const normalizeColors = colors => { + if (!colors || typeof colors !== 'object') throw new Error('The WitchSky theme has no color palette.'); + const output = {}; + for (const [key, color] of Object.entries(colors)) { + const parsed = typeof color === 'string' ? parseColor(color) : null; + if (!parsed || parsed.alpha !== 1) throw new Error('WitchSky color “' + key + '” must be opaque.'); + output[key] = parsed.hex; + } + return output; + }; + const baseColors = normalizeColors(value.base.colors); + for (const key of ['canvas', 'surface', 'surfaceRaised', 'text', 'textMuted', 'border', 'accent', + 'accentSoft', 'onAccent', 'positive', 'warning', 'critical', 'favorite']) { + if (!baseColors[key]) throw new Error('The WitchSky theme is missing the “' + key + '” color.'); + } + const sets = [{ name: value.base.name || 'Default', colors: baseColors }]; + if (value.variants !== undefined && !Array.isArray(value.variants)) throw new Error('The WitchSky theme variants are invalid.'); + for (const variant of (value.variants || []).slice(0, 11)) { + if (!variant || typeof variant.name !== 'string' || !variant.name.trim()) throw new Error('A WitchSky theme variant has no name.'); + sets.push({ name: variant.name, colors: { ...baseColors, ...normalizeColors(variant.colors || {}) } }); + } + + return sets.map(set => { + const wc = set.colors; + const base = contrastRatio(wc.canvas, '#000000') > contrastRatio(wc.canvas, '#FFFFFF') ? 'light' : 'dark'; + const name = (value.name.trim() + ' — ' + set.name.trim()).slice(0, 80); + return validateTheme({ + ...createTheme(name, base), + colors: { + ...PRESETS[base], + background: wc.canvas, + surface: wc.surface, + surfaceRaised: wc.surfaceRaised, + hover: wc.accentSoft, + text: wc.text, + textMuted: wc.textMuted, + textSubtle: wc.textMuted, + textInverse: wc.onAccent, + border: wc.border, + borderStrong: wc.border, + focus: wc.accent, + primary: wc.accent, + primaryHover: wc.accent, + primaryMuted: wc.accentSoft, + link: wc.accent, + onPrimary: wc.onAccent, + positive: wc.positive, + negative: wc.critical, + like: wc.favorite, + warning: wc.warning, + }, + }); + }); + } + + // Rotate HSL hue while preserving each color's saturation and lightness. + function shiftHue(colors, degrees) { + if (!Number.isFinite(degrees)) throw new Error('Use a finite hue shift.'); + const rotation = ((degrees % 360) + 360) % 360; + return Object.fromEntries(Object.entries(colors).map(([key, color]) => { + const [r, g, b] = color.slice(1).match(/../g).map(channel => parseInt(channel, 16)); + const min = Math.min(r, g, b); + const max = Math.max(r, g, b); + const chroma = max - min; + if (!chroma || !rotation) return [key, color.toUpperCase()]; + const hue = max === r ? (g - b) / chroma : max === g ? (b - r) / chroma + 2 : (r - g) / chroma + 4; + const sector = ((hue + rotation / 60) % 6 + 6) % 6; + const x = chroma * (1 - Math.abs(sector % 2 - 1)); + const rgb = sector < 1 ? [chroma, x, 0] : sector < 2 ? [x, chroma, 0] : + sector < 3 ? [0, chroma, x] : sector < 4 ? [0, x, chroma] : + sector < 5 ? [x, 0, chroma] : [chroma, 0, x]; + return [key, '#' + rgb.map(channel => Math.round(channel + min).toString(16).padStart(2, '0')).join('').toUpperCase()]; + })); + } + + function contrastRatio(a, b) { + const luminance = hex => { + const channels = hex.slice(1).match(/../g).map(value => parseInt(value, 16) / 255) + .map(value => value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4); + return channels[0] * 0.2126 + channels[1] * 0.7152 + channels[2] * 0.0722; + }; + const first = luminance(a), second = luminance(b); + return (Math.max(first, second) + 0.05) / (Math.min(first, second) + 0.05); + } + + function contrastIssues(colors) { + return CONTRAST_PAIRS.map(([foreground, background]) => ({ + foreground, background, label: FIELD_LABELS[foreground] + ' on ' + FIELD_LABELS[background], + ratio: contrastRatio(colors[foreground], colors[background]), + })).filter(pair => pair.ratio < 3).sort((a, b) => a.ratio - b.ratio); + } + + function mix(a, b, amount) { + return '#' + [1, 3, 5].map(offset => Math.round( + parseInt(a.slice(offset, offset + 2), 16) * (1 - amount) + + parseInt(b.slice(offset, offset + 2), 16) * amount + ).toString(16).padStart(2, '0')).join('').toUpperCase(); + } + + function ramp(step, anchors) { + const entries = Object.entries(anchors).map(([point, color]) => [Number(point), color]).sort((a, b) => a[0] - b[0]); + for (let i = 1; i < entries.length; i++) { + if (step <= entries[i][0]) { + const [low, a] = entries[i - 1], [high, b] = entries[i]; + return mix(a, b, (step - low) / (high - low)); + } + } + return entries.at(-1)[1]; + } + + // Property-aware mapping keeps borders distinct from surfaces with the same source color. + function tokenColor(token, property, colors) { + const [family, rawStep] = token.split('_'); + const step = Number(rawStep); + if (family === 'contrast') { + if (property.includes('border') || property === 'outline-color') { + return step <= 100 ? colors.border : colors.borderStrong; + } + if (property === 'color' || property === 'fill' || property === 'stroke' || property === 'caret-color' || property === 'text-decoration-color') { + return ramp(step, { 0: colors.textInverse, 400: colors.textSubtle, 700: colors.textMuted, 900: colors.text, 1000: colors.text }); + } + return ramp(step, { 0: colors.background, 25: colors.surface, 50: colors.surfaceRaised, 100: colors.hover, 400: colors.textSubtle, 700: colors.textMuted, 1000: colors.text }); + } + const base = colors[family]; + const soft = colors[family + 'Muted']; + if (!base || !soft) return null; + if (family === 'primary' && ['color', 'fill', 'stroke', 'text-decoration-color'].includes(property) && (step === 500 || step === 600)) return colors.link; + return ramp(step, { 0: colors.background, 50: soft, 500: base, 600: family === 'primary' ? colors.primaryHover : mix(base, colors.text, 0.12), 1000: colors.text }); + } + + function parseColor(value) { + let text = value.toLowerCase().trim(); + if (text === 'white') text = '#ffffff'; + if (text === 'black') text = '#000000'; + if (/^#[\da-f]{3,4}$/i.test(text)) text = '#' + [...text.slice(1)].map(c => c + c).join(''); + if (/^#[\da-f]{6}([\da-f]{2})?$/i.test(text)) { + return { hex: text.slice(0, 7).toUpperCase(), alpha: text.length === 9 ? parseInt(text.slice(7), 16) / 255 : 1 }; + } + const match = text.match(/^rgba?\(\s*([\d.]+)[,\s]+([\d.]+)[,\s]+([\d.]+)(?:\s*[,/]\s*([\d.]+%?))?\s*\)$/); + if (!match) return null; + const channels = match.slice(1, 4).map(Number); + if (channels.some(c => c < 0 || c > 255)) return null; + return { + hex: '#' + channels.map(c => Math.round(c).toString(16).padStart(2, '0')).join('').toUpperCase(), + alpha: match[4] ? parseFloat(match[4]) / (match[4].endsWith('%') ? 100 : 1) : 1, + }; + } + + function mapColor(value, property, theme, mode) { + const parsed = parseColor(value); + if (!parsed || parsed.alpha === 0) return null; + const { hex, alpha } = parsed; + const c = theme.colors; + let target; + if (property.includes('shadow')) target = c.shadow; + else if (hex === '#000000' && alpha < 1 && property.startsWith('background')) target = c.overlay; + else if (property === 'outline-color') target = c.focus; + else if (hex === '#EC4899') target = c.like; + else if (hex === '#FFC404') target = c.warning; + else { + // Check the native palette first; subdued aliases cover older dim deployments. + for (const p of [palette(mode), palette(mode, mode !== 'dim')]) { + const entry = Object.entries(p).find(([, color]) => color === hex); + if (entry) { target = tokenColor(entry[0], property, c); break; } + } + if (!target && ['#1083FE', '#0085FF', '#007AFF', '#0A7AFF', '#208BFE', '#2E93FE', '#127EF1'].includes(hex)) target = ['color', 'fill', 'stroke'].includes(property) ? c.link : c.primary; + if (!target && ['#20BC07', '#27F406'].includes(hex)) target = c.positive; + if (!target && ['#EC4868', '#D11043'].includes(hex)) target = c.negative; + } + if (!target) return null; + if (alpha >= 1) return target; + const rgb = target.slice(1).match(/../g).map(channel => parseInt(channel, 16)); + return 'rgba(' + rgb.join(', ') + ', ' + alpha + ')'; + } + + globalThis.BskyPlusThemes = { + STORAGE_KEY, GROUPS, KEYS, PRESETS, BUILTIN_THEMES, isBuiltinTheme, availableBuiltinThemes, SOURCE, palette, parseColor, mapColor, + createTheme, validateTheme, normalizeLibrary, parseWitchSkyUri, witchSkyThemes, contrastRatio, contrastIssues, shiftHue, + exportTheme: theme => JSON.stringify(validateTheme(theme), null, 2) + '\n', + }; +})(); diff --git a/extension/shared/theme-runtime.js b/extension/shared/theme-runtime.js new file mode 100644 index 0000000..361e156 --- /dev/null +++ b/extension/shared/theme-runtime.js @@ -0,0 +1,407 @@ +// Translate known Bluesky palette declarations without changing React-owned styles. +(() => { + 'use strict'; + + const model = globalThis.BskyPlusThemes; + const api = typeof browser !== 'undefined' ? browser : chrome; + const STYLE_ID = 'bskyplus-theme-style'; + const PREVIEW_STYLE_ID = 'bskyplus-theme-preview-style'; + const MARKER = 'data-bskyplus-theme-inline'; + const ROOT = 'data-bskyplus-theme-active'; + const PREVIEW_TRANSITION_MS = 1000; + const reducedMotion = matchMedia('(prefers-reduced-motion: reduce)'); + const COLORS = /#[\da-f]{8}\b|#[\da-f]{6}\b|#[\da-f]{4}\b|#[\da-f]{3}\b|rgba?\([^)]*\)|\bwhite\b|\bblack\b/gi; + const PROPERTIES = new Set([ + 'color', 'background-color', 'border-color', 'border-top-color', 'border-right-color', + 'border-bottom-color', 'border-left-color', 'outline-color', 'text-decoration-color', + 'fill', 'stroke', 'caret-color', 'box-shadow', 'text-shadow', 'background-image', + ]); + let theme = null; + let library = model.normalizeLibrary(null); + let previewTheme = null; + let mode = 'light'; + let style; + let viewTransition; + let observer; + let timer; + let scheduled = false; + let rescanSheets = false; + let sourceSignature = ''; + let inlineRules = new Map(); + const colorCache = new Map(); + const contextCache = new Map(); + const pending = new Set(); + let initialized = false; + + function nativeMode() { + const classes = document.documentElement.classList; + if (classes.contains('theme--dim')) return 'dim'; + if (classes.contains('theme--dark')) return 'dark'; + if (classes.contains('theme--light')) return 'light'; + return matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; + } + + function recolor(value, property) { + const key = property + ':' + value; + if (colorCache.has(key)) return colorCache.get(key); + let changed = false; + const output = value.replace(COLORS, color => { + const mapped = model.mapColor(color, property, theme, mode); + if (!mapped) return color; + changed = true; + const parsed = model.parseColor(color); + if (['color', 'fill', 'stroke'].includes(property) && parsed?.alpha === 1) { + if (parsed.hex === '#FFFFFF') return `var(--bskyplus-theme-white-text, ${mapped})`; + if (parsed.hex === '#000000') return `var(--bskyplus-theme-black-text, ${mapped})`; + } + return mapped; + }); + const result = changed ? output : null; + colorCache.set(key, result); + return result; + } + + function backgroundContext(value) { + if (contextCache.has(value)) return contextCache.get(value); + const parsed = model.parseColor(value); + if (!parsed) return ''; + if (parsed.hex === '#000000' && parsed.alpha >= 0.4 && parsed.alpha < 1) { + return `--bskyplus-theme-white-text:${theme.colors.onPrimary};--bskyplus-theme-black-text:${theme.colors.onPrimary};`; + } + if (parsed.alpha !== 1) return ''; + const palette = model.palette(mode); + const entry = Object.entries(palette).find(([, color]) => color === parsed.hex); + const colored = entry && /^(primary|positive|negative)_(400|500|600|700)$/.test(entry[0]); + const inverse = entry && /^contrast_(700|800|900|950|975|1000)$/.test(entry[0]); + const legacy = ['#1083FE', '#0085FF', '#20BC07', '#EC4868'].includes(parsed.hex); + const foreground = colored || legacy ? theme.colors.onPrimary : inverse ? theme.colors.textInverse : null; + const result = foreground ? `--bskyplus-theme-white-text:${foreground};--bskyplus-theme-black-text:${foreground};` : ''; + contextCache.set(value, result); + return result; + } + + function declarations(source, stylesheet = false) { + let result = ''; + for (const property of source) { + if (!PROPERTIES.has(property)) continue; + const value = source.getPropertyValue(property); + if (property === 'background-image') { + const stops = [...value.matchAll(COLORS)].map(match => model.parseColor(match[0])?.hex); + // Theme single-color UI fades; preserve multicolor artwork and image URLs. + if (!value.includes('gradient(') || value.includes('url(') || new Set(stops).size !== 1) continue; + } + const replacement = recolor(value, property); + if (replacement) { + // Keep explicit inline borders, text, and backgrounds above ordinary + // stylesheet rules while still mapping known inline palette colors. + const priority = stylesheet && (property.includes('border') || + property === 'color' || property === 'background-color') && + source.getPropertyPriority(property) !== 'important' ? '' : '!important'; + result += `${property}:${replacement}${priority};`; + } + if (property === 'background-color') result += backgroundContext(value); + } + return result; + } + + function stylesheetRules(rules) { + let output = ''; + for (const rule of rules) { + if (rule.selectorText && rule.style) { + const body = declarations(rule.style, true); + if (body) output += `${scopeSelector(rule.selectorText)}{${body}}\n`; + } else if (rule.cssRules && (rule.type === CSSRule.MEDIA_RULE || rule.type === CSSRule.SUPPORTS_RULE || rule.constructor.name === 'CSSLayerBlockRule')) { + const inner = stylesheetRules(rule.cssRules); + if (inner) output += `${rule.cssText.slice(0, rule.cssText.indexOf('{'))}{${inner}}\n`; + } else if (rule.type === CSSRule.IMPORT_RULE) { + try { + const inner = stylesheetRules(rule.styleSheet.cssRules); + output += rule.media.mediaText ? `@media ${rule.media.mediaText}{${inner}}` : inner; + } catch { /* Cross-origin sheets are not readable through CSSOM. */ } + } + } + return output; + } + + function scopeSelector(value) { + const selectors = []; + let start = 0, depth = 0, quote = ''; + for (let i = 0; i <= value.length; i++) { + const char = value[i]; + if (char === '\\') { i++; continue; } + if (quote) { if (char === quote) quote = ''; continue; } + if (char === '"' || char === "'") { quote = char; continue; } + if (char === '(' || char === '[') depth++; + if (char === ')' || char === ']') depth--; + if (i === value.length || (char === ',' && depth === 0)) { + const selector = value.slice(start, i).trim(); + selectors.push(/^(html|:root)(?=[\s.#:[>+~]|$)/.test(selector) + ? selector.replace(/^(html|:root)/, `html[${ROOT}]`) + : `html[${ROOT}] ${selector}`); + start = i + 1; + } + } + return selectors.join(','); + } + + function sheets() { + return [...document.styleSheets].filter(sheet => + sheet.ownerNode !== style && sheet.ownerNode?.id !== PREVIEW_STYLE_ID); + } + + function signature() { + return sheets().map(sheet => { + try { return `${sheet.href || ''}:${sheet.cssRules.length}`; } + catch { return sheet.href || 'unreadable'; } + }).join('|'); + } + + function buildStyle() { + if (!theme) return; + inlineRules = new Map(); + colorCache.clear(); + contextCache.clear(); + const c = theme.colors; + const white = model.mapColor('#FFFFFF', 'color', theme, mode) || c.text; + const black = model.mapColor('#000000', 'color', theme, mode) || c.text; + let css = `:root[${ROOT}]{--bskyplus-theme-white-text:${white};--bskyplus-theme-black-text:${black};color-scheme:${theme.base === 'light' ? 'light' : 'dark'};}\n`; + css += `:root[${ROOT}]{--text:${c.text}!important;--background:${c.background}!important;--backgroundLight:${c.surfaceRaised}!important;}\n`; + css += `:root[${ROOT}]{--bskyplus-theme-text:${c.text};--bskyplus-theme-muted:${c.textMuted};}\n`; + css += `html[${ROOT}],html[${ROOT}] body,html[${ROOT}] #root{background-color:${c.background};color:${c.text};}\n`; + css += `html[${ROOT}] :focus-visible{outline-color:${c.focus}!important;}\n`; + css += `html[${ROOT}] ::selection{background-color:${c.primary}!important;color:${c.onPrimary}!important;}\n`; + for (const sheet of sheets()) { + if (sheet.disabled) continue; + try { + const rules = stylesheetRules(sheet.cssRules); + css += sheet.media.mediaText ? `@media ${sheet.media.mediaText}{${rules}}` : rules; + } catch { /* Inline declarations still work when a sheet is cross-origin. */ } + } + style.textContent = css; + sourceSignature = signature(); + pending.add(document.documentElement); + } + + function skip(element) { + return ['IMG', 'VIDEO', 'CANVAS', 'IFRAME', 'STYLE', 'SCRIPT'].includes(element.tagName) || + element.closest('[data-bskyplus-theme-editor], [data-bskyplus-theme-ignore]') || + element.closest('svg')?.querySelector('image'); + } + + function updateInline(element) { + if (skip(element)) return; + let body = declarations(element.style); + if (element.tagName.toLowerCase() === 'svg' && element.querySelector('[fill="#fff"], [fill="#FFF"], [fill="#ffffff"], [fill="#FFFFFF"], [fill="white"]')) { + const backing = [...element.querySelectorAll('[fill]')].find(node => { + const value = node.getAttribute('fill'); + return value !== 'none' && !['#fff', '#ffffff', 'white'].includes(value.toLowerCase()); + }); + if (backing) { + const value = backing.getAttribute('fill'); + const context = backgroundContext(value); + const color = model.parseColor(value === 'currentColor' ? getComputedStyle(backing).fill : value)?.hex; + const foreground = [theme.colors.primary, theme.colors.link, theme.colors.negative, theme.colors.positive] + .includes(color) + ? theme.colors.onPrimary : theme.colors.textInverse; + body += context || `--bskyplus-theme-white-text:${foreground};`; + } + } + for (const property of ['fill', 'stroke']) { + // An inline CSS declaration takes precedence over SVG presentation attributes. + if (!element.style.getPropertyValue(property) && element.hasAttribute(property)) { + const value = recolor(element.getAttribute(property), property); + if (value) body += `${property}:${value}!important;`; + } + } + if (!body) { + element.removeAttribute(MARKER); + return; + } + let id = inlineRules.get(body); + if (!id) { + id = String(inlineRules.size + 1); + inlineRules.set(body, id); + style.sheet.insertRule(`html[${ROOT}] [${MARKER}="${id}"]{${body}}`, style.sheet.cssRules.length); + } + if (element.getAttribute(MARKER) !== id) element.setAttribute(MARKER, id); + } + + function flush() { + scheduled = false; + if (!theme) return; + if (mode !== nativeMode()) { mode = nativeMode(); rescanSheets = true; } + if (rescanSheets) { rescanSheets = false; buildStyle(); } + const roots = [...pending].filter(node => { + for (let ancestor = node.parentElement; ancestor; ancestor = ancestor.parentElement) { + if (pending.has(ancestor)) return false; + } + return true; + }); + pending.clear(); + for (const root of roots) { + if (!root.isConnected) continue; + updateInline(root); + for (const element of root.querySelectorAll('[style], [fill], [stroke], svg')) updateInline(element); + } + } + + function schedule() { + if (!scheduled) { scheduled = true; requestAnimationFrame(flush); } + } + + function stop() { + observer?.disconnect(); + clearInterval(timer); + pending.clear(); + style?.remove(); + document.documentElement.removeAttribute(ROOT); + document.querySelectorAll(`[${MARKER}]`).forEach(element => element.removeAttribute(MARKER)); + inlineRules.clear(); + style = undefined; + theme = null; + } + + function clearViewTransition() { + if (!viewTransition) return; + try { viewTransition.skipTransition(); } catch {} + viewTransition = undefined; + } + + function motionPreferenceChanged(event) { + if (event.matches) clearViewTransition(); + } + + if (typeof reducedMotion.addEventListener === 'function') { + reducedMotion.addEventListener('change', motionPreferenceChanged); + } else if (typeof reducedMotion.addListener === 'function') { + reducedMotion.addListener(motionPreferenceChanged); + } + + function ensurePreviewStyle() { + if (document.getElementById(PREVIEW_STYLE_ID)) return; + const previewStyle = document.createElement('style'); + previewStyle.id = PREVIEW_STYLE_ID; + previewStyle.textContent = `::view-transition-old(root),::view-transition-new(root){animation-duration:${PREVIEW_TRANSITION_MS}ms!important;}`; + (document.head || document.documentElement).append(previewStyle); + } + + function refreshPreview(animate) { + if (!animate || reducedMotion.matches || + typeof document.startViewTransition !== 'function') { + clearViewTransition(); + refresh(); + return; + } + ensurePreviewStyle(); + clearViewTransition(); + const transition = document.startViewTransition(refresh); + viewTransition = transition; + const finish = () => { + if (viewTransition === transition) viewTransition = undefined; + }; + transition.ready.catch(() => {}); + transition.finished.then(finish, finish); + } + + function refresh() { + const nextTheme = previewTheme || library.themes.find(item => item.id === library.activeId) || + model.BUILTIN_THEMES[library.activeId] || null; + if (JSON.stringify(nextTheme) === JSON.stringify(theme)) return; + stop(); + theme = nextTheme; + if (!theme) { + window.dispatchEvent(new Event('bskyplus:theme-changed')); + return; + } + mode = nativeMode(); + style = document.createElement('style'); + style.id = STYLE_ID; + (document.head || document.documentElement).append(style); + document.documentElement.setAttribute(ROOT, theme.id); + buildStyle(); + flush(); + window.dispatchEvent(new Event('bskyplus:theme-changed')); + observer = new MutationObserver(records => { + for (const record of records) { + if (record.target === style || record.target?.id === PREVIEW_STYLE_ID || style.contains(record.target)) continue; + if (record.type === 'attributes') { + if (record.target === document.documentElement && record.attributeName === 'class') rescanSheets = true; + else if (record.attributeName === 'class') continue; + pending.add(record.target); + if (record.target.tagName === 'LINK') rescanSheets = true; + } else { + if (record.target.nodeType === Node.ELEMENT_NODE && record.target.closest('style')) rescanSheets = true; + for (const node of record.addedNodes) { + if (node.nodeType !== Node.ELEMENT_NODE || node === style || node.id === PREVIEW_STYLE_ID) continue; + if (node.matches('style, link') || node.querySelector('style, link')) rescanSheets = true; + pending.add(node); + } + } + } + if (rescanSheets || pending.size) schedule(); + }); + observer.observe(document.documentElement, { + subtree: true, childList: true, characterData: true, attributes: true, + attributeFilter: ['style', 'fill', 'stroke', 'class', 'href', 'disabled'], + }); + // React Native Web can insert CSSOM rules without a DOM mutation. + timer = setInterval(() => { + if (signature() !== sourceSignature || mode !== nativeMode()) { rescanSheets = true; schedule(); } + }, 1500); + } + + function selectedTheme(value) { + return value.themes.find(item => item.id === value.activeId) || + model.BUILTIN_THEMES[value.activeId] || null; + } + + function paletteSignature(value) { + return Object.keys(value.colors).sort().map(key => `${key}:${value.colors[key]}`).join(';'); + } + + function selectionPaletteChanged(previous, next) { + const previousTheme = selectedTheme(previous); + const nextTheme = selectedTheme(next); + if (!previousTheme || !nextTheme) return previousTheme !== nextTheme; + return paletteSignature(previousTheme) !== paletteSignature(nextTheme); + } + + function apply(value) { + library = model.normalizeLibrary(value); + refresh(); + } + + window.addEventListener('bskyplus:theme-preview', event => { + if (event.detail === null) previewTheme = null; + else { + try { previewTheme = model.validateTheme(event.detail); } + catch { return; } + } + const colorsChanged = JSON.stringify(previewTheme?.colors) !== JSON.stringify(theme?.colors); + if (!previewTheme) { + clearViewTransition(); + document.getElementById(PREVIEW_STYLE_ID)?.remove(); + refresh(); + } else refreshPreview(colorsChanged); + }); + + let changed = false; + api.storage.onChanged.addListener((changes, area) => { + if (area === 'local' && changes[model.STORAGE_KEY]) { + changed = true; + const previous = library; + const next = model.normalizeLibrary(changes[model.STORAGE_KEY].newValue); + const animate = initialized && !previewTheme && next.activeId !== previous.activeId && + selectionPaletteChanged(previous, next); + library = next; + initialized = true; + if (previewTheme) return; + if (animate) refreshPreview(true); + else refresh(); + } + }); + api.storage.local.get(model.STORAGE_KEY).then(data => { + if (!changed) apply(data[model.STORAGE_KEY]); + initialized = true; + }).catch(() => { initialized = true; /* A failed read leaves native styling intact. */ }); +})(); diff --git a/extension/shared/thread-unroll.css b/extension/shared/thread-unroll.css new file mode 100644 index 0000000..bf43ece --- /dev/null +++ b/extension/shared/thread-unroll.css @@ -0,0 +1,137 @@ +.bskyplus-thread-unroll-toggle { + display: inline-flex; + align-items: center; + justify-content: center; + width: 34px; + height: 34px; + margin-inline-end: 4px; + padding: 0; + border: 0; + border-radius: 50%; + background: transparent; + color: inherit; + cursor: pointer; + flex: none; +} + +.bskyplus-thread-unroll-toggle:hover, +.bskyplus-thread-unroll-toggle[aria-pressed="true"] { + background: rgba(120, 150, 170, 0.18); +} + +.bskyplus-thread-unroll-toggle:focus-visible { + outline: 2px solid currentColor; + outline-offset: 2px; +} + +[data-bskyplus-unroll-header-controls] { + display: flex !important; + flex-direction: row !important; + flex: 0 0 auto !important; + width: auto !important; + align-items: center !important; + justify-content: center !important; + align-self: center !important; + flex-wrap: nowrap !important; +} + +[data-bskyplus-unroll-post] { + border-inline-start: 1px solid rgba(120, 150, 170, 0.38); + border-block: 0 !important; + cursor: default !important; +} + +[data-bskyplus-unroll-post] [data-testid="postText"], +[data-bskyplus-unroll-post] [data-word-wrap="1"] { + font-size: 16.9px !important; +} + +[data-bskyplus-unroll-post] [data-testid="postText"] :is(span, a), +[data-bskyplus-unroll-post] [data-word-wrap="1"] :is(span, a) { + font-size: inherit !important; +} + +[data-bskyplus-unroll-post="1"] { + padding-bottom: 0 !important; +} + +[data-bskyplus-unroll-anchor-content] { + padding-bottom: 0 !important; +} + +[data-bskyplus-unroll-followup] { + padding-top: 3px !important; + padding-bottom: 2px !important; +} + +[data-bskyplus-unroll-outer] { + border-top: 0 !important; + border-bottom: 0 !important; + padding-bottom: 0 !important; +} + +[data-bskyplus-unroll-line], +[data-bskyplus-unroll-avatar], +[data-bskyplus-unroll-author], +[data-bskyplus-unroll-number], +[data-bskyplus-unroll-secondary], +[data-bskyplus-unroll-chrome] { + display: none !important; +} + +[data-bskyplus-unroll-main] { + gap: 0 !important; +} + +[data-bskyplus-unroll-post="1"] a[aria-label^="Liked by "] { + display: none !important; +} + +[data-bskyplus-unroll-controls] { + justify-content: flex-end !important; + gap: 0 !important; + margin-block: 0 !important; + padding-block: 0 !important; +} + +[data-bskyplus-unroll-primary] { + flex: 0 0 auto !important; + width: auto !important; + max-width: none !important; + margin-block: 0 !important; + padding-block: 0 !important; + gap: 2px !important; +} + +[data-bskyplus-unroll-primary] > :nth-child(-n + 3) { + flex: 0 0 auto !important; + width: auto !important; + margin: 0 !important; +} + +[data-bskyplus-unroll-primary] > :nth-child(n + 4) { + display: none !important; +} + +[data-bskyplus-unroll-primary] [data-testid="replyBtn"], +[data-bskyplus-unroll-primary] [data-testid="likeBtn"], +[data-bskyplus-unroll-primary] [data-testid="repostBtn"], +[data-bskyplus-unroll-primary] :is(button, [role="button"])[aria-label*="repost" i] { + margin-block: 0 !important; + padding: 2px 3px !important; + min-width: 0 !important; + min-height: 0 !important; +} + +[data-bskyplus-unroll-primary] svg { + width: 14px !important; + height: 14px !important; +} + +[data-bskyplus-unroll-primary] [data-testid="replyBtn"] :is(span, div), +[data-bskyplus-unroll-primary] [data-testid="likeBtn"] :is(span, div), +[data-bskyplus-unroll-primary] [data-testid="repostBtn"] :is(span, div), +[data-bskyplus-unroll-primary] :is(button, [role="button"])[aria-label*="repost" i] :is(span, div) { + font-size: 11px !important; + line-height: 14px !important; +} diff --git a/extension/shared/thread-unroll.js b/extension/shared/thread-unroll.js index 0d1d47d..5f1ff8b 100644 --- a/extension/shared/thread-unroll.js +++ b/extension/shared/thread-unroll.js @@ -1,583 +1,320 @@ -// Bsky+ Thread Unroll & Reader View -// Concatenates connected skeets into a distraction-free reader view with Markdown and PDF export. - -(function () { +// Inline thread unroll for numbered Bluesky author threads. +(() => { 'use strict'; - const utils = window.BskyPlusUtils || {}; - const { createEl, svgEl, Icons, showToast } = utils; + const POST_SELECTOR = '[data-testid^="postThreadItem-by-"]'; + const MENU_SELECTOR = 'button[aria-label="Thread options"], [role="button"][aria-label="Thread options"]'; + const REPLY_PROMPT_SELECTOR = 'button[aria-label="Compose reply"], [role="button"][aria-label="Compose reply"]'; + const INTERACTIVE_SELECTOR = 'a[href], button, [role="button"], [role="link"], input, select, textarea, [contenteditable]:not([contenteditable="false"]), video, audio'; + const POST_ROUTE = /^\/profile\/[^/]+\/post\/[^/]+\/?$/; + const NUMBER_LABEL = /^Post ([1-9]\d*) of ([1-9]\d*)$/; + let active = false; + let route = location.pathname; + let toggle = null; + let marked = new Map(); + let scanQueued = false; - let enabled = true; - let activeModal = null; - let lastInteractedPost = null; + function guardPostActivation(event) { + if (!active || route !== location.pathname) return; - function isFeatureActive() { - const flags = window.BskyPlusFeatureFlags; - if (flags && !flags.isFeatureEnabled('threadUnroll')) return false; - return enabled; - } + const target = event.target; + if (!(target instanceof Element)) return; - if (typeof chrome !== 'undefined' && chrome.storage && chrome.storage.local) { - chrome.storage.local.get(['threadUnrollEnabled'], (res) => { - if (res && res.threadUnrollEnabled !== undefined) { - enabled = res.threadUnrollEnabled; - } - }); + const post = target.closest('[data-bskyplus-unroll-post]'); + if (!post) return; - chrome.storage.onChanged.addListener((changes, area) => { - if ((area === 'local' || area === 'sync') && changes.threadUnrollEnabled) { - enabled = changes.threadUnrollEnabled.newValue; - if (!isFeatureActive()) { - document.querySelectorAll('.bskyplus-unroll-btn, .bskyplus-unroll-menu-item').forEach(b => b.remove()); - closeReader(); - } else { - scanForThreads(); - scanForDropdownMenus(); - } - } - }); + const interactive = target.closest(INTERACTIVE_SELECTOR); + if (interactive && interactive !== post && post.contains(interactive)) return; + + event.preventDefault(); + event.stopPropagation(); } - // -------------------------------------------------------------------------- - // Track 3-Dot Button Interactions - // -------------------------------------------------------------------------- - document.addEventListener('click', (e) => { - const btn = e.target.closest ? e.target.closest('button, [role="button"]') : null; - if (!btn) return; - const label = (btn.getAttribute('aria-label') || '').toLowerCase(); - const testid = (btn.getAttribute('data-testid') || '').toLowerCase(); - const hasPopup = btn.getAttribute('aria-haspopup'); - - if ( - label.includes('more') || - label.includes('option') || - label.includes('menu') || - testid.includes('dropdown') || - testid.includes('more') || - hasPopup === 'menu' - ) { - lastInteractedPost = btn.closest ? btn.closest( - '[data-testid*="postThreadItem"], [data-testid*="feedItem"], [data-testid*="post"]' - ) : null; - } - }, true); - - // -------------------------------------------------------------------------- - // Thread Fetching & Tree Extraction - // -------------------------------------------------------------------------- - async function fetchThreadData(actor, rkey) { - try { - const atUri = `at://${actor}/app.bsky.feed.post/${rkey}`; - const res = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread?uri=${encodeURIComponent(atUri)}&depth=100`, { - headers: { 'Accept': 'application/json' } - }); - if (!res.ok) throw new Error(`HTTP ${res.status}`); - const data = await res.json(); - return data.thread; - } catch (err) { - console.warn('Bsky+ API thread fetch failed, falling back to DOM:', err); - return null; - } + function guardPostKeydown(event) { + if (event.key !== 'Enter' && event.key !== ' ') return; + guardPostActivation(event); } - function extractLinearAuthorThread(threadNode) { - if (!threadNode || !threadNode.post) return []; + window.addEventListener('click', guardPostActivation, true); + window.addEventListener('auxclick', guardPostActivation, true); + window.addEventListener('keydown', guardPostKeydown, true); - // Find root author - let current = threadNode; - while (current.parent && current.parent.post) { - current = current.parent; + function threadScope(menu, firstPost) { + let node = firstPost.parentElement; + while (node && node !== document.body && node !== document.documentElement) { + if (node.contains(menu)) return node; + node = node.parentElement; } - const rootAuthorDid = current.post.author.did; - - const posts = []; - - function collect(node) { - if (!node || !node.post) return; - if (node.post.author.did === rootAuthorDid) { - const p = node.post; - const images = []; - - if (p.embed && p.embed.images) { - p.embed.images.forEach(img => { - images.push({ - thumb: img.thumb, - fullsize: img.fullsize, - alt: img.alt || '' - }); - }); - } - - posts.push({ - uri: p.uri, - cid: p.cid, - author: { - handle: p.author.handle, - displayName: p.author.displayName || p.author.handle, - avatar: p.author.avatar || '' - }, - text: (p.record && p.record.text) ? p.record.text : '', - createdAt: (p.record && p.record.createdAt) ? p.record.createdAt : '', - images - }); - } + return null; + } - if (node.replies && Array.isArray(node.replies)) { - // Sort replies chronologically - const sorted = [...node.replies].sort((a, b) => { - const dateA = new Date(a.post?.record?.createdAt || 0).getTime(); - const dateB = new Date(b.post?.record?.createdAt || 0).getTime(); - return dateA - dateB; - }); - for (const reply of sorted) { - collect(reply); - } - } + function numberIn(post) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post) continue; + const match = NUMBER_LABEL.exec(badge.getAttribute('aria-label') || ''); + if (match) return { index: Number(match[1]), total: Number(match[2]) }; } - - collect(current); - return posts; + return null; } - function extractThreadFromDom() { - const threadPosts = []; - const postElements = document.querySelectorAll('[data-testid*="postThreadItem"], [data-testid*="feedItem"]'); - - postElements.forEach(item => { - const textEl = item.querySelector('[data-testid="postText"], div[dir="auto"]'); - const authorLink = item.querySelector('a[href^="/profile/"]'); - const timeEl = item.querySelector('time'); - const imgEls = item.querySelectorAll('img[src*="feed_thumbnail"], img[src*="feed_fullsize"]'); - - if (textEl || imgEls.length > 0) { - const handle = authorLink ? (authorLink.getAttribute('href') || '').replace('/profile/', '') : 'unknown'; - const images = []; - imgEls.forEach(img => { - images.push({ - thumb: img.getAttribute('src') || '', - fullsize: (img.getAttribute('src') || '').replace('/feed_thumbnail/', '/feed_fullsize/'), - alt: img.getAttribute('alt') || '' - }); - }); - - threadPosts.push({ - author: { handle, displayName: handle }, - text: textEl ? textEl.textContent.trim() : '', - createdAt: timeEl ? timeEl.getAttribute('datetime') || '' : '', - images - }); - } - }); - - return threadPosts; + function containsProfileLink(element) { + return !!element?.querySelector('a[href^="/profile/"]'); } - // -------------------------------------------------------------------------- - // Markdown & Export Generators - // -------------------------------------------------------------------------- - function generateMarkdown(posts) { - if (!posts || posts.length === 0) return ''; - const author = posts[0].author; - const dateStr = posts[0].createdAt ? new Date(posts[0].createdAt).toLocaleDateString() : ''; - - let md = `# Thread by ${author.displayName} (@${author.handle})\n`; - if (dateStr) md += `*Date: ${dateStr}*\n\n---\n\n`; - - posts.forEach((p, index) => { - md += `### ${index + 1}/${posts.length}\n\n`; - if (p.text) { - md += `${p.text}\n\n`; - } - if (p.images && p.images.length > 0) { - p.images.forEach(img => { - md += `![${img.alt || 'Post image'}](${img.fullsize || img.thumb})\n\n`; - }); - } - md += `---\n\n`; - }); - - return md; - } + function findThread() { + if (!POST_ROUTE.test(location.pathname)) return null; - function downloadFile(content, filename, type = 'text/markdown') { - const blob = new Blob([content], { type }); - const url = URL.createObjectURL(blob); - const a = createEl('a', { - href: url, - download: filename, - style: 'display: none;' + const menus = [...document.querySelectorAll(MENU_SELECTOR)]; + const firstPosts = [...document.querySelectorAll(POST_SELECTOR)].filter(post => { + if (post.parentElement?.closest(POST_SELECTOR)) return false; + const number = numberIn(post); + return number?.index === 1 && number.total >= 2; }); - document.body.appendChild(a); - a.click(); - setTimeout(() => { - a.remove(); - URL.revokeObjectURL(url); - }, 1000); - } - - // -------------------------------------------------------------------------- - // Reader View Modal - // -------------------------------------------------------------------------- - function openReaderView(posts) { - if (!posts || posts.length === 0) return; - closeReader(); - - const author = posts[0].author; - const totalWords = posts.reduce((sum, p) => sum + (p.text ? p.text.split(/\s+/).length : 0), 0); - const readingTimeMinutes = Math.max(1, Math.ceil(totalWords / 200)); - const backdrop = createEl('div', { className: 'bskyplus-reader-backdrop' }); - activeModal = backdrop; + for (const menu of menus) { + for (const firstPost of firstPosts) { + const scope = threadScope(menu, firstPost); + if (!scope) continue; - const card = createEl('div', { className: 'bskyplus-reader-modal' }); + const { total } = numberIn(firstPost); + const authorTestId = firstPost.getAttribute('data-testid'); + const posts = [firstPost]; + let expected = 2; - // Header - const header = createEl('div', { className: 'bskyplus-reader-header' }); + for (const post of scope.querySelectorAll(POST_SELECTOR)) { + if (post === firstPost) continue; + if (post.parentElement?.closest(POST_SELECTOR)) continue; + if (firstPost.compareDocumentPosition(post) & Node.DOCUMENT_POSITION_PRECEDING) continue; - const authorSection = createEl('div', { className: 'bskyplus-reader-meta' }); - if (author.avatar) { - authorSection.appendChild(createEl('img', { - className: 'bskyplus-reader-avatar', - src: author.avatar, - alt: author.handle - })); - } - - const nameCol = createEl('div'); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-name', - textContent: author.displayName || author.handle - })); - nameCol.appendChild(createEl('div', { - className: 'bskyplus-reader-sub', - textContent: `@${author.handle} · ${posts.length} skeets · ${readingTimeMinutes} min read` - })); - authorSection.appendChild(nameCol); - header.appendChild(authorSection); - - // Actions (Export MD, PDF, Copy, Close) - const actions = createEl('div', { className: 'bskyplus-reader-actions' }); - - const copyBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Copy as Markdown' - }, [ - Icons.copy ? Icons.copy() : document.createTextNode('📋'), - createEl('span', { textContent: 'Copy MD' }) - ]); - copyBtn.addEventListener('click', async () => { - const md = generateMarkdown(posts); - await navigator.clipboard.writeText(md); - if (showToast) showToast('Thread copied to clipboard as Markdown!'); - }); - - const exportMdBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn', - title: 'Export Markdown file' - }, [ - Icons.markdown ? Icons.markdown() : document.createTextNode('↓'), - createEl('span', { textContent: 'Export MD' }) - ]); - exportMdBtn.addEventListener('click', () => { - const md = generateMarkdown(posts); - const filename = `${author.handle}_thread_${Date.now()}.md`; - downloadFile(md, filename); - if (showToast) showToast('Exported thread as Markdown'); - }); + const number = numberIn(post); + if (!number || number.total !== total || post.getAttribute('data-testid') !== authorTestId) continue; + if (number.index !== expected) break; - const exportPdfBtn = createEl('button', { - type: 'button', - className: 'bskyplus-action-btn bskyplus-btn-primary', - title: 'Print / Save as PDF' - }, [ - Icons.printer ? Icons.printer() : document.createTextNode('🖨️'), - createEl('span', { textContent: 'Export PDF' }) - ]); - exportPdfBtn.addEventListener('click', () => { - window.print(); - }); - - const closeBtn = createEl('button', { - type: 'button', - className: 'bskyplus-reader-close', - title: 'Close reader' - }, [document.createTextNode('✕')]); - closeBtn.addEventListener('click', closeReader); - - actions.append(copyBtn, exportMdBtn, exportPdfBtn, closeBtn); - header.appendChild(actions); - card.appendChild(header); - - // Body: Skeets - const body = createEl('div', { className: 'bskyplus-reader-body' }); - posts.forEach((p, index) => { - const skeetCard = createEl('div', { className: 'bskyplus-reader-skeet' }); - - const skeetHeader = createEl('div', { className: 'bskyplus-skeet-header' }); - skeetHeader.appendChild(createEl('span', { - className: 'bskyplus-skeet-index', - textContent: `${index + 1} / ${posts.length}` - })); - if (p.createdAt) { - const timeStr = new Date(p.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }); - skeetHeader.appendChild(createEl('span', { textContent: timeStr })); - } - skeetCard.appendChild(skeetHeader); - - if (p.text) { - skeetCard.appendChild(createEl('div', { - className: 'bskyplus-skeet-text', - textContent: p.text - })); - } + posts.push(post); + expected += 1; + if (expected > total) break; + } - if (p.images && p.images.length > 0) { - const mediaContainer = createEl('div', { className: 'bskyplus-skeet-media' }); - p.images.forEach(img => { - const imgWrap = createEl('div'); - imgWrap.appendChild(createEl('img', { - className: 'bskyplus-skeet-img', - src: img.fullsize || img.thumb, - alt: img.alt || '' - })); - if (img.alt) { - imgWrap.appendChild(createEl('div', { - className: 'bskyplus-skeet-alt', - textContent: `Alt: ${img.alt}` - })); - } - mediaContainer.appendChild(imgWrap); - }); - skeetCard.appendChild(mediaContainer); + return { menu, posts, total, scope }; } + } - body.appendChild(skeetCard); - }); - - card.appendChild(body); - backdrop.appendChild(card); - - backdrop.addEventListener('click', (e) => { - if (e.target === backdrop) closeReader(); - }); - - document.body.appendChild(backdrop); + return null; } - function closeReader() { - if (activeModal) { - activeModal.remove(); - activeModal = null; + function mark(next, element, attribute, value = '') { + if (!element) return; + let attrs = next.get(element); + if (!attrs) { + attrs = new Map(); + next.set(element, attrs); } + attrs.set(attribute, value); } - document.addEventListener('keydown', (e) => { - if (e.key === 'Escape' && activeModal) { - closeReader(); + function controlRow(post, next) { + const ownControl = selector => [...post.querySelectorAll(selector)] + .find(button => button.closest(POST_SELECTOR) === post); + const reply = ownControl('[data-testid="replyBtn"]'); + const like = ownControl('[data-testid="likeBtn"]'); + const menu = ownControl('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]'); + if (!reply || !like || !menu) return null; + + let controls = reply.parentElement; + while (controls && controls !== post && (!controls.contains(like) || !controls.contains(menu))) { + controls = controls.parentElement; } - }); - - // -------------------------------------------------------------------------- - // Helper: Extract actor and rkey from element or URL - // -------------------------------------------------------------------------- - function getPostCoords(el) { - if (!el) return null; - const postLink = el.querySelector ? el.querySelector('a[href*="/post/"]') : null; - if (postLink) { - const href = postLink.getAttribute('href') || ''; - const match = href.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - return { actor: match[1], rkey: match[2] }; - } - } - return null; + if (!controls || controls === post) return null; + + // The native row contains a primary reply/repost/like group and a + // secondary bookmark/share/menu group. Keep the primary buttons in place. + const primary = [...controls.children].find(child => child.contains(reply) && child.contains(like)); + const secondary = [...controls.children].find(child => child.querySelector('[data-testid="postDropdownBtn"], [data-testid="postShareBtn"]')); + if (!primary || !secondary) return null; + + mark(next, controls, 'data-bskyplus-unroll-controls'); + mark(next, primary, 'data-bskyplus-unroll-primary'); + mark(next, secondary, 'data-bskyplus-unroll-secondary'); + return controls; } - async function handleUnrollClick(targetElement) { - if (showToast) showToast('Unrolling thread...'); - - let actor = null; - let rkey = null; + function compactFollowup(post, next) { + mark(next, post, 'data-bskyplus-unroll-followup'); - // 1. Check target element - if (targetElement) { - const coords = getPostCoords(targetElement); - if (coords) { - actor = coords.actor; - rkey = coords.rkey; - } + // The expanded anchor can be post 2 or later when the user opened a + // middle post. It has a full author header instead of the linear layout. + if (isExpandedAnchor(post)) { + mark(next, post.firstElementChild, 'data-bskyplus-unroll-author'); + return; } - // 2. Check current URL if on a post page - if (!actor || !rkey) { - const path = window.location.pathname; - const match = path.match(/\/profile\/([^/]+)\/post\/([^/?#]+)/); - if (match) { - actor = match[1]; - rkey = match[2]; + // ThreadItemPost starts with a 12px parent-reply line. Its next child is + // the avatar/content row. Work only inside this numbered post. + const first = post.firstElementChild; + const main = first?.nextElementSibling; + if (first && main && main.children.length >= 2) { + mark(next, first, 'data-bskyplus-unroll-line'); + mark(next, main, 'data-bskyplus-unroll-main'); + const avatar = main.firstElementChild; + const content = avatar?.nextElementSibling; + if (containsProfileLink(avatar) && content?.querySelector('[data-testid="replyBtn"]')) { + mark(next, avatar, 'data-bskyplus-unroll-avatar'); + + const meta = content.firstElementChild; + if (containsProfileLink(meta)) { + mark(next, meta, 'data-bskyplus-unroll-author'); + } } } + } - let posts = []; - if (actor && rkey) { - const threadNode = await fetchThreadData(actor, rkey); - if (threadNode) { - posts = extractLinearAuthorThread(threadNode); - } - } + function isExpandedAnchor(post) { + return containsProfileLink(post.firstElementChild) && + !!post.firstElementChild?.nextElementSibling?.querySelector('[data-testid="replyBtn"]'); + } - if (posts.length === 0) { - posts = extractThreadFromDom(); + function compactNumber(post, next) { + for (const badge of post.querySelectorAll('span[aria-label^="Post "]')) { + if (badge.closest(POST_SELECTOR) !== post || !NUMBER_LABEL.test(badge.getAttribute('aria-label') || '')) continue; + const wrapper = badge.parentElement; + const onlyBadge = wrapper?.children.length === 1 && wrapper.textContent?.trim() === badge.textContent?.trim(); + mark(next, onlyBadge ? wrapper : badge, 'data-bskyplus-unroll-number'); + break; } + } - if (posts.length > 0) { - openReaderView(posts); - } else { - if (showToast) showToast('Could not find thread to unroll'); + function compactAnchorChrome(post, controls, next) { + const badge = [...post.querySelectorAll('span[aria-label^="Post "]')] + .find(span => NUMBER_LABEL.test(span.getAttribute('aria-label') || '') && span.closest(POST_SELECTOR) === post); + const controlsWrapper = controls?.parentElement; + const content = controlsWrapper?.parentElement; + if (!badge || !content || !post.contains(content)) return; + mark(next, content, 'data-bskyplus-unroll-anchor-content'); + + // ExpandedPostDetails, aggregate counts, and KnownLikers are siblings + // between the actual post content and its native action toolbar. + const children = [...content.children]; + const contentIndex = children.findIndex(child => child.contains(badge)); + const controlsIndex = children.indexOf(controlsWrapper); + if (contentIndex < 0 || controlsIndex <= contentIndex) return; + for (const extra of children.slice(contentIndex + 1, controlsIndex)) { + mark(next, extra, 'data-bskyplus-unroll-chrome'); } } - // -------------------------------------------------------------------------- - // 3-Dot Post Menu Injection - // -------------------------------------------------------------------------- - function injectUnrollMenuItem(menu) { - if (!isFeatureActive()) return; - if (!menu || menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const postContext = lastInteractedPost; - - const menuItem = createEl('div', { - role: 'menuitem', - tabIndex: 0, - className: 'bskyplus-unroll-menu-item', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll Thread' }) - ]); - - menuItem.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - - // Dismiss the menu - const esc = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }); - menu.dispatchEvent(esc); - document.dispatchEvent(esc); - - handleUnrollClick(postContext); - }); + function compactReplyPrompt(scope, next) { + for (const prompt of scope.querySelectorAll(REPLY_PROMPT_SELECTOR)) { + if (prompt.closest(POST_SELECTOR) || prompt.closest('[role="dialog"], dialog')) continue; - menuItem.addEventListener('keydown', (e) => { - if (e.key === 'Enter' || e.key === ' ') { - e.preventDefault(); - e.stopPropagation(); - menuItem.click(); - } - }); - - const firstItem = menu.querySelector('[role="menuitem"], button, div'); - if (firstItem && firstItem.parentElement === menu) { - firstItem.after(menuItem); - } else { - menu.prepend(menuItem); + const wrapper = prompt.parentElement; + if (!wrapper || wrapper === scope) continue; + mark(next, wrapper, 'data-bskyplus-unroll-chrome'); } } - function scanForDropdownMenus() { - if (!isFeatureActive()) return; - - const menus = document.querySelectorAll( - 'div[role="menu"], [data-testid*="dropdownMenu"], [data-radix-menu-content]' - ); - - menus.forEach(menu => { - if (menu.querySelector('.bskyplus-unroll-menu-item')) return; - - const text = menu.textContent || ''; - const isPostMenu = - text.includes('Translate') || - text.includes('Copy link') || - text.includes('Quote') || - text.includes('Mute') || - text.includes('Report') || - text.includes('Pin') || - text.includes('Embed') || - lastInteractedPost !== null; - - if (isPostMenu) { - injectUnrollMenuItem(menu); + function reconcile(next) { + for (const [element, attrs] of marked) { + const wanted = next.get(element); + for (const name of attrs.keys()) { + if (!wanted?.has(name)) element.removeAttribute(name); } - }); + } + + for (const [element, attrs] of next) { + for (const [name, value] of attrs) { + if (element.getAttribute(name) !== value) element.setAttribute(name, value); + } + } + marked = next; } - // -------------------------------------------------------------------------- - // Direct Thread Header Button - // -------------------------------------------------------------------------- - function attachUnrollButton(container) { - if (!isFeatureActive()) return; - if (container.querySelector('.bskyplus-unroll-btn')) return; - - const btn = createEl('button', { - type: 'button', - className: 'bskyplus-unroll-btn', - title: 'Unroll thread into reader view' - }, [ - Icons.book ? Icons.book() : document.createTextNode('📖'), - createEl('span', { textContent: 'Unroll' }) - ]); - - btn.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - handleUnrollClick(container); + function makeToggle() { + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'bskyplus-thread-unroll-toggle'; + + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('width', '19'); + icon.setAttribute('height', '19'); + icon.setAttribute('fill', 'none'); + icon.setAttribute('stroke', 'currentColor'); + icon.setAttribute('stroke-width', '1.8'); + icon.setAttribute('stroke-linecap', 'round'); + icon.setAttribute('stroke-linejoin', 'round'); + + for (const pathData of ['M5 5h14', 'M5 10h14', 'M5 15h10', 'M5 20h10']) { + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('d', pathData); + icon.append(path); + } + button.append(icon); + button.addEventListener('click', event => { + event.preventDefault(); + event.stopPropagation(); + active = !active; + scan(); }); - - container.appendChild(btn); + return button; } - function scanForThreads() { - if (!isFeatureActive()) return; + function scan() { + if (route !== location.pathname) { + route = location.pathname; + active = false; + } - if (window.location.pathname.includes('/post/')) { - const headers = document.querySelectorAll('[data-testid*="postThreadItem"] [data-testid="postHeader"], div[data-testid*="post"] [data-testid="postHeader"]'); - if (headers.length > 0) { - attachUnrollButton(headers[0]); - } + const thread = findThread(); + if (!thread) { + toggle?.remove(); + reconcile(new Map()); + return; + } - const actionBars = document.querySelectorAll('[role="group"][aria-label*="post" i], [data-testid*="post-actions"]'); - if (actionBars.length > 0 && !document.querySelector('.bskyplus-unroll-btn')) { - attachUnrollButton(actionBars[0]); - } + if (!toggle) toggle = makeToggle(); + if (toggle.nextElementSibling !== thread.menu) thread.menu.before(toggle); + const label = active ? 'Restore thread' : 'Unroll thread'; + if (toggle.getAttribute('aria-label') !== label) toggle.setAttribute('aria-label', label); + toggle.setAttribute('title', active ? 'Restore thread' : `Unroll ${thread.total} posts`); + toggle.setAttribute('aria-pressed', String(active)); + + const next = new Map(); + mark(next, thread.menu.parentElement, 'data-bskyplus-unroll-header-controls'); + if (active) { + thread.posts.forEach((post, index) => { + mark(next, post, 'data-bskyplus-unroll-post', String(index + 1)); + if (post.parentElement && post.parentElement.querySelectorAll(POST_SELECTOR).length === 1) { + mark(next, post.parentElement, 'data-bskyplus-unroll-outer'); + } + compactNumber(post, next); + const controls = controlRow(post, next); + if (isExpandedAnchor(post)) compactAnchorChrome(post, controls, next); + if (index > 0) compactFollowup(post, next); + }); + compactReplyPrompt(thread.scope, next); } + reconcile(next); } - const observer = new MutationObserver(() => { - scanForThreads(); - scanForDropdownMenus(); - }); - - if (document.body) { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); - } else { - document.addEventListener('DOMContentLoaded', () => { - observer.observe(document.body, { childList: true, subtree: true }); - scanForThreads(); - scanForDropdownMenus(); + function scheduleScan() { + if (scanQueued) return; + scanQueued = true; + requestAnimationFrame(() => { + scanQueued = false; + scan(); }); } - window.BskyPlusThreadUnroll = { - scanForThreads, - scanForDropdownMenus, - injectUnrollMenuItem, - handleUnrollClick, - openReaderView, - generateMarkdown, - extractLinearAuthorThread - }; + new MutationObserver(scheduleScan).observe(document, { + childList: true, + subtree: true, + attributes: true, + attributeFilter: ['aria-label', 'data-testid'] + }); + window.addEventListener('popstate', scheduleScan); + window.navigation?.addEventListener('navigatesuccess', scheduleScan); + setInterval(() => { + if (route !== location.pathname) scheduleScan(); + }, 1000); + scheduleScan(); })(); diff --git a/package-lock.json b/package-lock.json index ee1f609..9cc5ff5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bskyplus", - "version": "1.0.3.1", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bskyplus", - "version": "1.0.3.1", + "version": "2.0.0", "license": "ISC", "dependencies": { "puppeteer-core": "^25.10.0", diff --git a/package.json b/package.json index 28a3f90..16cfe1a 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,18 @@ { "name": "bskyplus", - "version": "1.0.3.1", + "version": "2.0.0", "description": "", "main": "index.js", "scripts": { - "test": "node --test test/test_new_features.mjs && node --test test/test_llm.mjs && node test/test_composer.mjs && node --test test/test_integrated_settings.mjs test/test_cdn.mjs test/test_cdn_settings.mjs && node test/test_firefox_validation.mjs", + "test": "node --test test/test_new_features.mjs test/test_fetch_interceptors.mjs test/test_thread_unroll.mjs test/test_modal_ocr.mjs && node --test test/test_llm.mjs test/test_llm_settings_save.mjs test/test_llm_permissions.mjs && node test/test_composer.mjs && node --test test/test_integrated_settings.mjs test/test_cdn.mjs test/test_cdn_settings.mjs test/test_cdn_permissions.mjs test/test_theme_model.mjs test/test_theme_runtime.mjs test/test_theme_editor.mjs && node test/test_firefox_validation.mjs", "test:features": "node --test test/test_new_features.mjs", - "test:firefox": "node test/test_firefox_accent.mjs", - "test:llm": "node --test test/test_llm.mjs", + "test:bookmarks": "node --test test/test_bookmarks.mjs", + "test:llm": "node --test test/test_llm.mjs test/test_llm_settings_save.mjs test/test_llm_permissions.mjs", "test:composer": "node test/test_composer.mjs", "test:settings": "node --test test/test_integrated_settings.mjs", "test:settings:extension": "node test/test_extension_settings.mjs", - "test:cdn": "node --test test/test_cdn.mjs test/test_cdn_settings.mjs", + "test:cdn": "node --test test/test_cdn.mjs test/test_cdn_settings.mjs test/test_cdn_permissions.mjs", + "test:themes": "node --test test/test_theme_model.mjs test/test_theme_runtime.mjs test/test_theme_editor.mjs", "test:extension": "node test/test_extension_composer.mjs", "sync:shared": "node scripts/sync_shared.mjs", "package:chrome": "node scripts/package_browser.mjs chrome", @@ -19,7 +20,7 @@ "package": "npm run package:chrome && npm run build:firefox && npm run source:firefox && npm run package:safari", "build:firefox": "node scripts/build_firefox_ocr.mjs && node test/test_firefox_validation.mjs && node scripts/package_firefox.mjs", "source:firefox": "node scripts/package_firefox.mjs --source", - "lint:firefox": "addons-linter dist/firefox/bsky_-1.0.3.1.zip --boring" + "lint:firefox": "addons-linter dist/firefox/bsky_-2.0.0.zip --boring" }, "keywords": [], "author": "", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 0000000..2fdaf7a --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,2043 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + dependencies: + puppeteer-core: + specifier: ^25.10.0 + version: 25.11.0(yauzl@3.4.0) + tesseract.js: + specifier: ^7.0.0 + version: 7.0.0 + devDependencies: + addons-linter: + specifier: ^10.12.0 + version: 10.13.0(supports-color@7.2.0) + buffer: + specifier: ^6.0.3 + version: 6.0.3 + esbuild: + specifier: ^0.28.2 + version: 0.28.2 + fflate: + specifier: ^0.8.3 + version: 0.8.3 + react: + specifier: ^19.3.0 + version: 19.3.0 + react-dom: + specifier: ^19.3.0 + version: 19.3.0(react@19.3.0) + +packages: + + '@esbuild/aix-ppc64@0.28.2': + resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + + '@esbuild/android-arm64@0.28.2': + resolution: {integrity: sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + + '@esbuild/android-arm@0.28.2': + resolution: {integrity: sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + + '@esbuild/android-x64@0.28.2': + resolution: {integrity: sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + + '@esbuild/darwin-arm64@0.28.2': + resolution: {integrity: sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + + '@esbuild/darwin-x64@0.28.2': + resolution: {integrity: sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + + '@esbuild/freebsd-arm64@0.28.2': + resolution: {integrity: sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + + '@esbuild/freebsd-x64@0.28.2': + resolution: {integrity: sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + + '@esbuild/linux-arm64@0.28.2': + resolution: {integrity: sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + + '@esbuild/linux-arm@0.28.2': + resolution: {integrity: sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + + '@esbuild/linux-ia32@0.28.2': + resolution: {integrity: sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + + '@esbuild/linux-loong64@0.28.2': + resolution: {integrity: sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + + '@esbuild/linux-mips64el@0.28.2': + resolution: {integrity: sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + + '@esbuild/linux-ppc64@0.28.2': + resolution: {integrity: sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + + '@esbuild/linux-riscv64@0.28.2': + resolution: {integrity: sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + + '@esbuild/linux-s390x@0.28.2': + resolution: {integrity: sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + + '@esbuild/linux-x64@0.28.2': + resolution: {integrity: sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + + '@esbuild/netbsd-arm64@0.28.2': + resolution: {integrity: sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + + '@esbuild/netbsd-x64@0.28.2': + resolution: {integrity: sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + + '@esbuild/openbsd-arm64@0.28.2': + resolution: {integrity: sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + + '@esbuild/openbsd-x64@0.28.2': + resolution: {integrity: sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + + '@esbuild/openharmony-arm64@0.28.2': + resolution: {integrity: sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openharmony] + + '@esbuild/sunos-x64@0.28.2': + resolution: {integrity: sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + + '@esbuild/win32-arm64@0.28.2': + resolution: {integrity: sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + + '@esbuild/win32-ia32@0.28.2': + resolution: {integrity: sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + + '@esbuild/win32-x64@0.28.2': + resolution: {integrity: sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + + '@eslint-community/eslint-utils@4.10.1': + resolution: {integrity: sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + + '@eslint-community/regexpp@4.12.2': + resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + + '@eslint/config-array@0.21.2': + resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/config-helpers@0.4.2': + resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/core@0.17.0': + resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/eslintrc@3.3.7': + resolution: {integrity: sha512-F42g89Qd5oAWtp0k0nnSrjziAKza7w8SVT4mStc18LZMaRb4J1HQAHLCalEtDCxrTuksx7NU9qsmeLwpOfPqWw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/js@9.39.4': + resolution: {integrity: sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/object-schema@2.1.7': + resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/plugin-kit@0.4.1': + resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@fluent/syntax@0.19.0': + resolution: {integrity: sha512-5D2qVpZrgpjtqU4eNOcWGp1gnUCgjfM+vKGE2y03kKN6z5EBhtx0qdRFbg8QuNNj8wXNoX93KJoYb+NqoxswmQ==} + engines: {node: '>=14.0.0', npm: '>=7.0.0'} + + '@fregante/relaxed-json@2.0.0': + resolution: {integrity: sha512-PyUXQWB42s4jBli435TDiYuVsadwRHnMc27YaLouINktvTWsL3FcKrRMGawTayFk46X+n5bE23RjUTWQwrukWw==} + engines: {node: '>= 0.10.0'} + + '@humanfs/core@0.19.2': + resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==} + engines: {node: '>=18.18.0'} + + '@humanfs/node@0.16.8': + resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==} + engines: {node: '>=18.18.0'} + + '@humanfs/types@0.15.0': + resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==} + engines: {node: '>=18.18.0'} + + '@humanwhocodes/module-importer@1.0.1': + resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} + engines: {node: '>=12.22'} + + '@humanwhocodes/retry@0.4.3': + resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} + engines: {node: '>=18.18'} + + '@mdn/browser-compat-data@8.1.0': + resolution: {integrity: sha512-BNlUjp+9O6gtIHPVZEGFb5rgtuWW8weR+mSKfLOevxbfoZv5DRe3N4ZTEpXiIm5wfR7+kqHu8malCCgP6USrlg==} + + '@pinojs/redact@0.4.0': + resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==} + + '@puppeteer/browsers@3.2.2': + resolution: {integrity: sha512-q2BU4YfO9h/Wt7IcWPcggpOOqLk2Tbs1hDwolvKZrweRjy751OJBKMN9zO5bfD0pzU7X/tvKw/exQds4pM/LOg==} + engines: {node: '>=22.12.0'} + hasBin: true + peerDependencies: + proxy-agent: '>=8.0.1' + yauzl: ^2.10.0 || ^3.4.0 + peerDependenciesMeta: + proxy-agent: + optional: true + yauzl: + optional: true + + '@types/estree@1.0.9': + resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} + + '@types/json-schema@7.0.15': + resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + + acorn-jsx@5.3.2: + resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + + acorn@8.18.0: + resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==} + engines: {node: '>=0.4.0'} + hasBin: true + + addons-linter@10.13.0: + resolution: {integrity: sha512-gHCI20x4umX7q1cfJgwr4k/E6+mk2xkuTji17YGdDQxUuIkoDVxO3HmeZEm3pA/3+pVgayHdDzgt+xSu7vikUQ==} + engines: {node: '>=20.0.0'} + hasBin: true + + addons-moz-compare@1.4.0: + resolution: {integrity: sha512-uAM48cRt09id5+A2M11f1iDYebISjrIKyFYHfBI3GzqqC5BoOLFMSAFqHRaRvChL07qYPmcVme6VMoCKo19d6Q==} + + addons-scanner-utils@15.5.0: + resolution: {integrity: sha512-bucvaWBYzhtIVrkbzSo9SA22DLsOxFKXLlIJ234N6x8+8a3FNDGOva8x9lsM7xVQ7oUZH4RZ/WAEtR54J/iQSg==} + peerDependencies: + express: 5.2.1 + safe-compare: 1.1.4 + peerDependenciesMeta: + express: + optional: true + safe-compare: + optional: true + + ajv@6.15.0: + resolution: {integrity: sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==} + + ajv@8.20.0: + resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==} + + ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + + ansi-regex@6.3.0: + resolution: {integrity: sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==} + engines: {node: '>=12'} + + ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + + ansi-styles@6.2.3: + resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} + engines: {node: '>=12'} + + argparse@2.0.1: + resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + + atomic-sleep@1.0.0: + resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==} + engines: {node: '>=8.0.0'} + + balanced-match@1.0.2: + resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + + base64-js@1.5.1: + resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} + + bmp-js@0.1.0: + resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==} + + boolbase@1.0.0: + resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} + + brace-expansion@1.1.21: + resolution: {integrity: sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==} + + buffer-equal-constant-time@1.0.1: + resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} + + buffer-from@1.1.2: + resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} + + buffer@6.0.3: + resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} + + callsites@3.1.0: + resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} + engines: {node: '>=6'} + + chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + + cheerio-select@2.1.0: + resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==} + + cheerio@1.2.0: + resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==} + engines: {node: '>=20.18.1'} + + chromium-bidi@17.0.2: + resolution: {integrity: sha512-5v9GQFhTktFvotn/OFNJBmKLKRAb6n9r0bVCwf7sHgWc3/JryK0bj1nn93L3pHFrfgcsu6Be6EWsDi+1XHTGDg==} + engines: {node: '>=20.19.0 <22.0.0 || >=22.12.0'} + peerDependencies: + devtools-protocol: '*' + + cliui@8.0.1: + resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} + engines: {node: '>=12'} + + cliui@9.0.1: + resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==} + engines: {node: '>=20'} + + clone@1.0.4: + resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} + engines: {node: '>=0.8'} + + color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + + color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + + columnify@1.6.0: + resolution: {integrity: sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==} + engines: {node: '>=8.0.0'} + + common-tags@1.8.2: + resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==} + engines: {node: '>=4.0.0'} + + concat-map@0.0.1: + resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} + engines: {node: '>= 8'} + + css-select@5.2.2: + resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==} + + css-tree@3.2.1: + resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} + + css-what@6.2.2: + resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==} + engines: {node: '>= 6'} + + debug@4.4.3: + resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + + deep-is@0.1.4: + resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} + + deepmerge@4.3.1: + resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} + engines: {node: '>=0.10.0'} + + defaults@1.0.4: + resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} + + devtools-protocol@0.0.1680125: + resolution: {integrity: sha512-rVARKAvOFJCFkvgX01VLvYqKIvt+cRCqvUxIhB2oAqVGPalxk3w3sb5TUGDagpow/EFblBpm/Zl/29QA2dd+jA==} + + dom-serializer@2.0.0: + resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} + + domelementtype@2.3.0: + resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} + + domhandler@5.0.3: + resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} + engines: {node: '>= 4'} + + domutils@3.2.2: + resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} + + ecdsa-sig-formatter@1.0.11: + resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} + + emoji-regex@10.6.0: + resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==} + + emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + + encoding-sniffer@0.2.1: + resolution: {integrity: sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==} + + entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + + entities@6.0.1: + resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==} + engines: {node: '>=0.12'} + + entities@7.0.1: + resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==} + engines: {node: '>=0.12'} + + esbuild@0.28.2: + resolution: {integrity: sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==} + engines: {node: '>=18'} + hasBin: true + + escalade@3.2.0: + resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} + engines: {node: '>=6'} + + escape-string-regexp@4.0.0: + resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} + engines: {node: '>=10'} + + eslint-plugin-no-unsanitized@4.1.5: + resolution: {integrity: sha512-MSB4hXPVFQrI8weqzs6gzl7reP2k/qSjtCoL2vUMSDejIIq9YL1ZKvq5/ORBXab/PvfBBrWO2jWviYpL+4Ghfg==} + peerDependencies: + eslint: ^9 || ^10 + + eslint-scope@8.4.0: + resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + eslint-visitor-keys@3.4.3: + resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + eslint-visitor-keys@4.2.1: + resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + eslint-visitor-keys@5.0.1: + resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} + + eslint@9.39.4: + resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. + hasBin: true + peerDependencies: + jiti: '*' + peerDependenciesMeta: + jiti: + optional: true + + espree@10.4.0: + resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + espree@11.2.0: + resolution: {integrity: sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} + + esprima@4.0.1: + resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} + engines: {node: '>=4'} + hasBin: true + + esquery@1.7.0: + resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==} + engines: {node: '>=0.10'} + + esrecurse@4.3.0: + resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} + engines: {node: '>=4.0'} + + estraverse@5.3.0: + resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} + engines: {node: '>=4.0'} + + esutils@2.0.3: + resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} + engines: {node: '>=0.10.0'} + + fast-deep-equal@3.1.3: + resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + + fast-json-patch@3.1.1: + resolution: {integrity: sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==} + + fast-json-stable-stringify@2.1.0: + resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + + fast-levenshtein@2.0.6: + resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} + + fast-uri@3.1.8: + resolution: {integrity: sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==} + + fflate@0.8.3: + resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==} + + file-entry-cache@8.0.0: + resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} + engines: {node: '>=16.0.0'} + + find-up@5.0.0: + resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} + engines: {node: '>=10'} + + first-chunk-stream@3.0.0: + resolution: {integrity: sha512-LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw==} + engines: {node: '>=8'} + + flat-cache@4.0.1: + resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} + engines: {node: '>=16'} + + flatted@3.4.4: + resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==} + + get-caller-file@2.0.5: + resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} + engines: {node: 6.* || 8.* || >= 10.*} + + get-east-asian-width@1.7.0: + resolution: {integrity: sha512-XjH1AECxf0giL2V1aU8vKyRR2ppRUb5c0EvT7zuJTokQ74bNo52zOtghqdWIqrhUD79fo3x0WfKZdOqxF6LG1Q==} + engines: {node: '>=18'} + + glob-parent@6.0.2: + resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} + engines: {node: '>=10.13.0'} + + globals@14.0.0: + resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} + engines: {node: '>=18'} + + has-flag@4.0.0: + resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + engines: {node: '>=8'} + + htmlparser2@10.1.0: + resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==} + + iconv-lite@0.6.3: + resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} + engines: {node: '>=0.10.0'} + + idb-keyval@6.3.0: + resolution: {integrity: sha512-um+2dgAWmYsu615EXpWVwSmapJhON0G43t3Ka/EVaohzPQXSMqKEqeDK/oIW3Ow+BXaF2PvSc+oBTFp793A5Ow==} + + ieee754@1.2.1: + resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + + ignore@5.3.2: + resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} + engines: {node: '>= 4'} + + image-size@2.0.4: + resolution: {integrity: sha512-QRUkFFsRV/6fuESxb9Vkq+a0LkSrgKXuc2NEqfikiXxxN/G3tjWt5EVUlMaImRBZRZK/jRBEbYvpPYZL8t08Zw==} + engines: {node: '>=18'} + hasBin: true + + import-fresh@3.3.1: + resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==} + engines: {node: '>=6'} + + imurmurhash@0.1.4: + resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} + engines: {node: '>=0.8.19'} + + is-extglob@2.1.1: + resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} + engines: {node: '>=0.10.0'} + + is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + + is-glob@4.0.3: + resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} + engines: {node: '>=0.10.0'} + + is-url@1.2.4: + resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==} + + is-utf8@0.2.1: + resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==} + + isexe@2.0.0: + resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + + js-yaml@4.3.2: + resolution: {integrity: sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==} + hasBin: true + + json-buffer@3.0.1: + resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} + + json-merge-patch@1.0.2: + resolution: {integrity: sha512-M6Vp2GN9L7cfuMXiWOmHj9bEFbeC250iVtcKQbqVgEsDVYnIsrNsbU+h/Y/PkbBQCtEa4Bez+Ebv0zfbC8ObLg==} + + json-schema-traverse@0.4.1: + resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} + + json-schema-traverse@1.0.0: + resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} + + json-stable-stringify-without-jsonify@1.0.1: + resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} + + jsonwebtoken@9.0.3: + resolution: {integrity: sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==} + engines: {node: '>=12', npm: '>=6'} + + jwa@2.0.1: + resolution: {integrity: sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==} + + jws@4.0.1: + resolution: {integrity: sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==} + + keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + + levn@0.4.1: + resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} + engines: {node: '>= 0.8.0'} + + locate-path@6.0.0: + resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} + engines: {node: '>=10'} + + lodash.includes@4.3.0: + resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} + + lodash.isboolean@3.0.3: + resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} + + lodash.isinteger@4.0.4: + resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==} + + lodash.isnumber@3.0.3: + resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==} + + lodash.isplainobject@4.0.6: + resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + + lodash.isstring@4.0.1: + resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==} + + lodash.merge@4.6.2: + resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + + lodash.once@4.1.1: + resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==} + + mdn-data@2.27.1: + resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==} + + minimatch@3.1.5: + resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} + + mitt@3.0.1: + resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==} + + modern-tar@0.8.5: + resolution: {integrity: sha512-snEhs+6G5Tjd4I7tLCDOaoln2RgE0bD19RzEKgvgK2hZ5VKy3MpLhLTZ2fWpXSTg4K2cyPwp+VHATFJhxfnOeA==} + engines: {node: '>=18.0.0'} + + ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + + natural-compare@1.4.0: + resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + + node-fetch@2.7.0: + resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + + nth-check@2.1.1: + resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + + on-exit-leak-free@2.1.2: + resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==} + engines: {node: '>=14.0.0'} + + opencollective-postinstall@2.0.3: + resolution: {integrity: sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==} + hasBin: true + + optionator@0.9.4: + resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} + engines: {node: '>= 0.8.0'} + + p-limit@3.1.0: + resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} + engines: {node: '>=10'} + + p-locate@5.0.0: + resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} + engines: {node: '>=10'} + + parent-module@1.0.1: + resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} + engines: {node: '>=6'} + + parse5-htmlparser2-tree-adapter@7.1.0: + resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==} + + parse5-parser-stream@7.1.2: + resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==} + + parse5@7.3.0: + resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==} + + path-exists@4.0.0: + resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} + engines: {node: '>=8'} + + path-key@3.1.1: + resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} + engines: {node: '>=8'} + + pend@1.2.0: + resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} + + pino-abstract-transport@3.0.0: + resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==} + + pino-std-serializers@7.1.0: + resolution: {integrity: sha512-BndPH67/JxGExRgiX1dX0w1FvZck5Wa4aal9198SrRhZjH3GxKQUKIBnYJTdj2HDN3UQAS06HlfcSbQj2OHmaw==} + + pino@10.3.1: + resolution: {integrity: sha512-r34yH/GlQpKZbU1BvFFqOjhISRo1MNx1tWYsYvmj6KIRHSPMT2+yHOEb1SG6NMvRoHRF0a07kCOox/9yakl1vg==} + hasBin: true + + prelude-ls@1.2.1: + resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} + engines: {node: '>= 0.8.0'} + + process-warning@5.1.0: + resolution: {integrity: sha512-jQSaVHsPgtyw60e1rQ/A+/ArPEj/S8pS/vFnyGa/gYFXrKk/6RuDkoqVDQ5NI5MmS01698ltlAk0NoDBNLujRw==} + + punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} + engines: {node: '>=6'} + + puppeteer-core@25.11.0: + resolution: {integrity: sha512-Ujym7JbxoAqanaxGcHgmTomfhC01HfDCSuGZ8Hs9boHrDjzbNVMnFRJo2KtbDT9LCRgeJoFnkn9JQZ41eEUrLw==} + engines: {node: '>=22.12.0'} + + quick-format-unescaped@4.0.4: + resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==} + + react-dom@19.3.0: + resolution: {integrity: sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==} + peerDependencies: + react: ^19.3.0 + + react@19.3.0: + resolution: {integrity: sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==} + engines: {node: '>=0.10.0'} + + real-require@0.2.0: + resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} + engines: {node: '>= 12.13.0'} + + real-require@1.0.0: + resolution: {integrity: sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g==} + + regenerator-runtime@0.13.11: + resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + + require-directory@2.1.1: + resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} + engines: {node: '>=0.10.0'} + + require-from-string@2.0.2: + resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} + engines: {node: '>=0.10.0'} + + resolve-from@4.0.0: + resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} + engines: {node: '>=4'} + + safe-buffer@5.2.1: + resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + + safe-stable-stringify@2.5.0: + resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==} + engines: {node: '>=10'} + + safer-buffer@2.1.2: + resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + + scheduler@0.28.0: + resolution: {integrity: sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==} + + semver@7.8.5: + resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==} + engines: {node: '>=10'} + hasBin: true + + shebang-command@2.0.0: + resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} + engines: {node: '>=8'} + + shebang-regex@3.0.0: + resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} + engines: {node: '>=8'} + + sonic-boom@4.2.1: + resolution: {integrity: sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q==} + + source-map-js@1.2.1: + resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} + engines: {node: '>=0.10.0'} + + source-map-support@0.5.21: + resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} + + source-map@0.6.1: + resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} + engines: {node: '>=0.10.0'} + + split2@4.2.0: + resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} + engines: {node: '>= 10.x'} + + string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + + string-width@7.2.0: + resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} + engines: {node: '>=18'} + + string-width@8.2.2: + resolution: {integrity: sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==} + engines: {node: '>=20'} + + strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + + strip-ansi@7.2.0: + resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==} + engines: {node: '>=12'} + + strip-bom-buf@2.0.0: + resolution: {integrity: sha512-gLFNHucd6gzb8jMsl5QmZ3QgnUJmp7qn4uUSHNwEXumAp7YizoGYw19ZUVfuq4aBOQUtyn2k8X/CwzWB73W2lQ==} + engines: {node: '>=8'} + + strip-bom-stream@4.0.0: + resolution: {integrity: sha512-0ApK3iAkHv6WbgLICw/J4nhwHeDZsBxIIsOD+gHgZICL6SeJ0S9f/WZqemka9cjkTyMN5geId6e8U5WGFAn3cQ==} + engines: {node: '>=8'} + + strip-json-comments@3.1.1: + resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} + engines: {node: '>=8'} + + supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + + tesseract.js-core@7.0.0: + resolution: {integrity: sha512-WnNH518NzmbSq9zgTPeoF8c+xmilS8rFIl1YKbk/ptuuc7p6cLNELNuPAzcmsYw450ca6bLa8j3t0VAtq435Vw==} + + tesseract.js@7.0.0: + resolution: {integrity: sha512-exPBkd+z+wM1BuMkx/Bjv43OeLBxhL5kKWsz/9JY+DXcXdiBjiAch0V49QR3oAJqCaL5qURE0vx9Eo+G5YE7mA==} + + thread-stream@4.2.0: + resolution: {integrity: sha512-e2zZ96wSChazBsbENf/Pcm/4swHt2cEKQ92rhUjkL9GCKiTDJIaTBenjE/m9DXi0QBmTMDkFDdOomUy20A1tDQ==} + engines: {node: '>=20'} + + tr46@0.0.3: + resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + + type-check@0.4.0: + resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} + engines: {node: '>= 0.8.0'} + + typed-query-selector@2.12.2: + resolution: {integrity: sha512-EOPFbyIub4ngnEdqi2yOcNeDLaX/0jcE1JoAXQDDMIthap7FoN795lc/SHfIq2d416VufXpM8z/lD+WRm2gfOQ==} + + undici@7.29.1: + resolution: {integrity: sha512-RYONW2MeafgYlkVOKYKkA/Ag7BmXqgIWCa8t1m0JcxrQg9pI9lEqRhAOruOBCbAohOa/gkCF+iPi9hrgvTzu6Q==} + engines: {node: '>=20.18.1'} + + upath@3.0.8: + resolution: {integrity: sha512-YAsrLMIlhfSCm9rga5TZsJ1mXgahs7N0qOTokzU8mFz35hUrYMvVkaEPefI3rEb/vkAWAOj1Km/qdije9RC1kQ==} + engines: {node: '>=20'} + + uri-js@4.4.1: + resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + + wasm-feature-detect@1.9.0: + resolution: {integrity: sha512-zonE+xlIIYtxPy++L24ow0hAD8CICb4+FgPyROd3buyXIqsJvUEDkBgfCCoXOd1Hu3DUr0GOfnPIdcGV+YpNaA==} + + wcwidth@1.0.1: + resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} + + webdriver-bidi-protocol@0.4.3: + resolution: {integrity: sha512-uuN0goWfxP22B7J/uAgBpOYNPttC+XVseYE+rSY5+rQ+YBeVz/VORw8WbmLVcqW78zNg5A4qnjNXYUWR3il2ig==} + + webidl-conversions@3.0.1: + resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + + whatwg-encoding@3.1.1: + resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==} + engines: {node: '>=18'} + deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation + + whatwg-mimetype@4.0.0: + resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==} + engines: {node: '>=18'} + + whatwg-url@5.0.0: + resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} + + which@2.0.2: + resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} + engines: {node: '>= 8'} + hasBin: true + + word-wrap@1.2.5: + resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} + engines: {node: '>=0.10.0'} + + wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + + wrap-ansi@9.0.2: + resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==} + engines: {node: '>=18'} + + ws@8.21.3: + resolution: {integrity: sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + + y18n@5.0.8: + resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} + engines: {node: '>=10'} + + yargs-parser@21.1.1: + resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} + engines: {node: '>=12'} + + yargs-parser@22.0.0: + resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + + yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + + yargs@18.2.0: + resolution: {integrity: sha512-9OpKOLeaoNFecEp7P6iYbzze/5CqWoH7N3SMs/6y1XF4nMvFMspEGZzJ6uFi9MmQwXhyzqYoSEKO3tvA3Z/o2w==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + + yauzl@3.4.0: + resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} + engines: {node: '>=12'} + + yocto-queue@0.1.0: + resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} + engines: {node: '>=10'} + + zlibjs@0.3.1: + resolution: {integrity: sha512-+J9RrgTKOmlxFSDHo0pI1xM6BLVUv+o0ZT9ANtCxGkjIVCCUdx9alUF8Gm+dGLKbkkkidWIHFDZHDMpfITt4+w==} + + zod@3.25.76: + resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} + +snapshots: + + '@esbuild/aix-ppc64@0.28.2': + optional: true + + '@esbuild/android-arm64@0.28.2': + optional: true + + '@esbuild/android-arm@0.28.2': + optional: true + + '@esbuild/android-x64@0.28.2': + optional: true + + '@esbuild/darwin-arm64@0.28.2': + optional: true + + '@esbuild/darwin-x64@0.28.2': + optional: true + + '@esbuild/freebsd-arm64@0.28.2': + optional: true + + '@esbuild/freebsd-x64@0.28.2': + optional: true + + '@esbuild/linux-arm64@0.28.2': + optional: true + + '@esbuild/linux-arm@0.28.2': + optional: true + + '@esbuild/linux-ia32@0.28.2': + optional: true + + '@esbuild/linux-loong64@0.28.2': + optional: true + + '@esbuild/linux-mips64el@0.28.2': + optional: true + + '@esbuild/linux-ppc64@0.28.2': + optional: true + + '@esbuild/linux-riscv64@0.28.2': + optional: true + + '@esbuild/linux-s390x@0.28.2': + optional: true + + '@esbuild/linux-x64@0.28.2': + optional: true + + '@esbuild/netbsd-arm64@0.28.2': + optional: true + + '@esbuild/netbsd-x64@0.28.2': + optional: true + + '@esbuild/openbsd-arm64@0.28.2': + optional: true + + '@esbuild/openbsd-x64@0.28.2': + optional: true + + '@esbuild/openharmony-arm64@0.28.2': + optional: true + + '@esbuild/sunos-x64@0.28.2': + optional: true + + '@esbuild/win32-arm64@0.28.2': + optional: true + + '@esbuild/win32-ia32@0.28.2': + optional: true + + '@esbuild/win32-x64@0.28.2': + optional: true + + '@eslint-community/eslint-utils@4.10.1(eslint@9.39.4(supports-color@7.2.0))': + dependencies: + eslint: 9.39.4(supports-color@7.2.0) + eslint-visitor-keys: 3.4.3 + + '@eslint-community/regexpp@4.12.2': {} + + '@eslint/config-array@0.21.2(supports-color@7.2.0)': + dependencies: + '@eslint/object-schema': 2.1.7 + debug: 4.4.3(supports-color@7.2.0) + minimatch: 3.1.5 + transitivePeerDependencies: + - supports-color + + '@eslint/config-helpers@0.4.2': + dependencies: + '@eslint/core': 0.17.0 + + '@eslint/core@0.17.0': + dependencies: + '@types/json-schema': 7.0.15 + + '@eslint/eslintrc@3.3.7(supports-color@7.2.0)': + dependencies: + ajv: 6.15.0 + debug: 4.4.3(supports-color@7.2.0) + espree: 10.4.0 + globals: 14.0.0 + ignore: 5.3.2 + import-fresh: 3.3.1 + js-yaml: 4.3.2 + minimatch: 3.1.5 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - supports-color + + '@eslint/js@9.39.4': {} + + '@eslint/object-schema@2.1.7': {} + + '@eslint/plugin-kit@0.4.1': + dependencies: + '@eslint/core': 0.17.0 + levn: 0.4.1 + + '@fluent/syntax@0.19.0': {} + + '@fregante/relaxed-json@2.0.0': {} + + '@humanfs/core@0.19.2': + dependencies: + '@humanfs/types': 0.15.0 + + '@humanfs/node@0.16.8': + dependencies: + '@humanfs/core': 0.19.2 + '@humanfs/types': 0.15.0 + '@humanwhocodes/retry': 0.4.3 + + '@humanfs/types@0.15.0': {} + + '@humanwhocodes/module-importer@1.0.1': {} + + '@humanwhocodes/retry@0.4.3': {} + + '@mdn/browser-compat-data@8.1.0': {} + + '@pinojs/redact@0.4.0': {} + + '@puppeteer/browsers@3.2.2(yauzl@3.4.0)': + dependencies: + modern-tar: 0.8.5 + yargs: 18.2.0 + optionalDependencies: + yauzl: 3.4.0 + + '@types/estree@1.0.9': {} + + '@types/json-schema@7.0.15': {} + + acorn-jsx@5.3.2(acorn@8.18.0): + dependencies: + acorn: 8.18.0 + + acorn@8.18.0: {} + + addons-linter@10.13.0(supports-color@7.2.0): + dependencies: + '@fluent/syntax': 0.19.0 + '@fregante/relaxed-json': 2.0.0 + '@mdn/browser-compat-data': 8.1.0 + addons-moz-compare: 1.4.0 + addons-scanner-utils: 15.5.0 + ajv: 8.20.0 + cheerio: 1.2.0 + columnify: 1.6.0 + common-tags: 1.8.2 + css-tree: 3.2.1 + deepmerge: 4.3.1 + eslint: 9.39.4(supports-color@7.2.0) + eslint-plugin-no-unsanitized: 4.1.5(eslint@9.39.4(supports-color@7.2.0)) + eslint-visitor-keys: 5.0.1 + espree: 11.2.0 + esprima: 4.0.1 + fast-json-patch: 3.1.1 + image-size: 2.0.4 + json-merge-patch: 1.0.2 + pino: 10.3.1 + semver: 7.8.5 + source-map-support: 0.5.21 + upath: 3.0.8 + yargs: 17.7.2 + yauzl: 3.4.0 + transitivePeerDependencies: + - express + - jiti + - safe-compare + - supports-color + + addons-moz-compare@1.4.0: {} + + addons-scanner-utils@15.5.0: + dependencies: + common-tags: 1.8.2 + first-chunk-stream: 3.0.0 + jsonwebtoken: 9.0.3 + strip-bom-stream: 4.0.0 + upath: 3.0.8 + yauzl: 3.4.0 + + ajv@6.15.0: + dependencies: + fast-deep-equal: 3.1.3 + fast-json-stable-stringify: 2.1.0 + json-schema-traverse: 0.4.1 + uri-js: 4.4.1 + + ajv@8.20.0: + dependencies: + fast-deep-equal: 3.1.3 + fast-uri: 3.1.8 + json-schema-traverse: 1.0.0 + require-from-string: 2.0.2 + + ansi-regex@5.0.1: {} + + ansi-regex@6.3.0: {} + + ansi-styles@4.3.0: + dependencies: + color-convert: 2.0.1 + + ansi-styles@6.2.3: {} + + argparse@2.0.1: {} + + atomic-sleep@1.0.0: {} + + balanced-match@1.0.2: {} + + base64-js@1.5.1: {} + + bmp-js@0.1.0: {} + + boolbase@1.0.0: {} + + brace-expansion@1.1.21: + dependencies: + balanced-match: 1.0.2 + concat-map: 0.0.1 + + buffer-equal-constant-time@1.0.1: {} + + buffer-from@1.1.2: {} + + buffer@6.0.3: + dependencies: + base64-js: 1.5.1 + ieee754: 1.2.1 + + callsites@3.1.0: {} + + chalk@4.1.2: + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + + cheerio-select@2.1.0: + dependencies: + boolbase: 1.0.0 + css-select: 5.2.2 + css-what: 6.2.2 + domelementtype: 2.3.0 + domhandler: 5.0.3 + domutils: 3.2.2 + + cheerio@1.2.0: + dependencies: + cheerio-select: 2.1.0 + dom-serializer: 2.0.0 + domhandler: 5.0.3 + domutils: 3.2.2 + encoding-sniffer: 0.2.1 + htmlparser2: 10.1.0 + parse5: 7.3.0 + parse5-htmlparser2-tree-adapter: 7.1.0 + parse5-parser-stream: 7.1.2 + undici: 7.29.1 + whatwg-mimetype: 4.0.0 + + chromium-bidi@17.0.2(devtools-protocol@0.0.1680125): + dependencies: + devtools-protocol: 0.0.1680125 + mitt: 3.0.1 + zod: 3.25.76 + + cliui@8.0.1: + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + + cliui@9.0.1: + dependencies: + string-width: 7.2.0 + strip-ansi: 7.2.0 + wrap-ansi: 9.0.2 + + clone@1.0.4: {} + + color-convert@2.0.1: + dependencies: + color-name: 1.1.4 + + color-name@1.1.4: {} + + columnify@1.6.0: + dependencies: + strip-ansi: 6.0.1 + wcwidth: 1.0.1 + + common-tags@1.8.2: {} + + concat-map@0.0.1: {} + + cross-spawn@7.0.6: + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + + css-select@5.2.2: + dependencies: + boolbase: 1.0.0 + css-what: 6.2.2 + domhandler: 5.0.3 + domutils: 3.2.2 + nth-check: 2.1.1 + + css-tree@3.2.1: + dependencies: + mdn-data: 2.27.1 + source-map-js: 1.2.1 + + css-what@6.2.2: {} + + debug@4.4.3(supports-color@7.2.0): + dependencies: + ms: 2.1.3 + optionalDependencies: + supports-color: 7.2.0 + + deep-is@0.1.4: {} + + deepmerge@4.3.1: {} + + defaults@1.0.4: + dependencies: + clone: 1.0.4 + + devtools-protocol@0.0.1680125: {} + + dom-serializer@2.0.0: + dependencies: + domelementtype: 2.3.0 + domhandler: 5.0.3 + entities: 4.5.0 + + domelementtype@2.3.0: {} + + domhandler@5.0.3: + dependencies: + domelementtype: 2.3.0 + + domutils@3.2.2: + dependencies: + dom-serializer: 2.0.0 + domelementtype: 2.3.0 + domhandler: 5.0.3 + + ecdsa-sig-formatter@1.0.11: + dependencies: + safe-buffer: 5.2.1 + + emoji-regex@10.6.0: {} + + emoji-regex@8.0.0: {} + + encoding-sniffer@0.2.1: + dependencies: + iconv-lite: 0.6.3 + whatwg-encoding: 3.1.1 + + entities@4.5.0: {} + + entities@6.0.1: {} + + entities@7.0.1: {} + + esbuild@0.28.2: + optionalDependencies: + '@esbuild/aix-ppc64': 0.28.2 + '@esbuild/android-arm': 0.28.2 + '@esbuild/android-arm64': 0.28.2 + '@esbuild/android-x64': 0.28.2 + '@esbuild/darwin-arm64': 0.28.2 + '@esbuild/darwin-x64': 0.28.2 + '@esbuild/freebsd-arm64': 0.28.2 + '@esbuild/freebsd-x64': 0.28.2 + '@esbuild/linux-arm': 0.28.2 + '@esbuild/linux-arm64': 0.28.2 + '@esbuild/linux-ia32': 0.28.2 + '@esbuild/linux-loong64': 0.28.2 + '@esbuild/linux-mips64el': 0.28.2 + '@esbuild/linux-ppc64': 0.28.2 + '@esbuild/linux-riscv64': 0.28.2 + '@esbuild/linux-s390x': 0.28.2 + '@esbuild/linux-x64': 0.28.2 + '@esbuild/netbsd-arm64': 0.28.2 + '@esbuild/netbsd-x64': 0.28.2 + '@esbuild/openbsd-arm64': 0.28.2 + '@esbuild/openbsd-x64': 0.28.2 + '@esbuild/openharmony-arm64': 0.28.2 + '@esbuild/sunos-x64': 0.28.2 + '@esbuild/win32-arm64': 0.28.2 + '@esbuild/win32-ia32': 0.28.2 + '@esbuild/win32-x64': 0.28.2 + + escalade@3.2.0: {} + + escape-string-regexp@4.0.0: {} + + eslint-plugin-no-unsanitized@4.1.5(eslint@9.39.4(supports-color@7.2.0)): + dependencies: + eslint: 9.39.4(supports-color@7.2.0) + + eslint-scope@8.4.0: + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 + + eslint-visitor-keys@3.4.3: {} + + eslint-visitor-keys@4.2.1: {} + + eslint-visitor-keys@5.0.1: {} + + eslint@9.39.4(supports-color@7.2.0): + dependencies: + '@eslint-community/eslint-utils': 4.10.1(eslint@9.39.4(supports-color@7.2.0)) + '@eslint-community/regexpp': 4.12.2 + '@eslint/config-array': 0.21.2(supports-color@7.2.0) + '@eslint/config-helpers': 0.4.2 + '@eslint/core': 0.17.0 + '@eslint/eslintrc': 3.3.7(supports-color@7.2.0) + '@eslint/js': 9.39.4 + '@eslint/plugin-kit': 0.4.1 + '@humanfs/node': 0.16.8 + '@humanwhocodes/module-importer': 1.0.1 + '@humanwhocodes/retry': 0.4.3 + '@types/estree': 1.0.9 + ajv: 6.15.0 + chalk: 4.1.2 + cross-spawn: 7.0.6 + debug: 4.4.3(supports-color@7.2.0) + escape-string-regexp: 4.0.0 + eslint-scope: 8.4.0 + eslint-visitor-keys: 4.2.1 + espree: 10.4.0 + esquery: 1.7.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 8.0.0 + find-up: 5.0.0 + glob-parent: 6.0.2 + ignore: 5.3.2 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + json-stable-stringify-without-jsonify: 1.0.1 + lodash.merge: 4.6.2 + minimatch: 3.1.5 + natural-compare: 1.4.0 + optionator: 0.9.4 + transitivePeerDependencies: + - supports-color + + espree@10.4.0: + dependencies: + acorn: 8.18.0 + acorn-jsx: 5.3.2(acorn@8.18.0) + eslint-visitor-keys: 4.2.1 + + espree@11.2.0: + dependencies: + acorn: 8.18.0 + acorn-jsx: 5.3.2(acorn@8.18.0) + eslint-visitor-keys: 5.0.1 + + esprima@4.0.1: {} + + esquery@1.7.0: + dependencies: + estraverse: 5.3.0 + + esrecurse@4.3.0: + dependencies: + estraverse: 5.3.0 + + estraverse@5.3.0: {} + + esutils@2.0.3: {} + + fast-deep-equal@3.1.3: {} + + fast-json-patch@3.1.1: {} + + fast-json-stable-stringify@2.1.0: {} + + fast-levenshtein@2.0.6: {} + + fast-uri@3.1.8: {} + + fflate@0.8.3: {} + + file-entry-cache@8.0.0: + dependencies: + flat-cache: 4.0.1 + + find-up@5.0.0: + dependencies: + locate-path: 6.0.0 + path-exists: 4.0.0 + + first-chunk-stream@3.0.0: {} + + flat-cache@4.0.1: + dependencies: + flatted: 3.4.4 + keyv: 4.5.4 + + flatted@3.4.4: {} + + get-caller-file@2.0.5: {} + + get-east-asian-width@1.7.0: {} + + glob-parent@6.0.2: + dependencies: + is-glob: 4.0.3 + + globals@14.0.0: {} + + has-flag@4.0.0: {} + + htmlparser2@10.1.0: + dependencies: + domelementtype: 2.3.0 + domhandler: 5.0.3 + domutils: 3.2.2 + entities: 7.0.1 + + iconv-lite@0.6.3: + dependencies: + safer-buffer: 2.1.2 + + idb-keyval@6.3.0: {} + + ieee754@1.2.1: {} + + ignore@5.3.2: {} + + image-size@2.0.4: {} + + import-fresh@3.3.1: + dependencies: + parent-module: 1.0.1 + resolve-from: 4.0.0 + + imurmurhash@0.1.4: {} + + is-extglob@2.1.1: {} + + is-fullwidth-code-point@3.0.0: {} + + is-glob@4.0.3: + dependencies: + is-extglob: 2.1.1 + + is-url@1.2.4: {} + + is-utf8@0.2.1: {} + + isexe@2.0.0: {} + + js-yaml@4.3.2: + dependencies: + argparse: 2.0.1 + + json-buffer@3.0.1: {} + + json-merge-patch@1.0.2: + dependencies: + fast-deep-equal: 3.1.3 + + json-schema-traverse@0.4.1: {} + + json-schema-traverse@1.0.0: {} + + json-stable-stringify-without-jsonify@1.0.1: {} + + jsonwebtoken@9.0.3: + dependencies: + jws: 4.0.1 + lodash.includes: 4.3.0 + lodash.isboolean: 3.0.3 + lodash.isinteger: 4.0.4 + lodash.isnumber: 3.0.3 + lodash.isplainobject: 4.0.6 + lodash.isstring: 4.0.1 + lodash.once: 4.1.1 + ms: 2.1.3 + semver: 7.8.5 + + jwa@2.0.1: + dependencies: + buffer-equal-constant-time: 1.0.1 + ecdsa-sig-formatter: 1.0.11 + safe-buffer: 5.2.1 + + jws@4.0.1: + dependencies: + jwa: 2.0.1 + safe-buffer: 5.2.1 + + keyv@4.5.4: + dependencies: + json-buffer: 3.0.1 + + levn@0.4.1: + dependencies: + prelude-ls: 1.2.1 + type-check: 0.4.0 + + locate-path@6.0.0: + dependencies: + p-locate: 5.0.0 + + lodash.includes@4.3.0: {} + + lodash.isboolean@3.0.3: {} + + lodash.isinteger@4.0.4: {} + + lodash.isnumber@3.0.3: {} + + lodash.isplainobject@4.0.6: {} + + lodash.isstring@4.0.1: {} + + lodash.merge@4.6.2: {} + + lodash.once@4.1.1: {} + + mdn-data@2.27.1: {} + + minimatch@3.1.5: + dependencies: + brace-expansion: 1.1.21 + + mitt@3.0.1: {} + + modern-tar@0.8.5: {} + + ms@2.1.3: {} + + natural-compare@1.4.0: {} + + node-fetch@2.7.0: + dependencies: + whatwg-url: 5.0.0 + + nth-check@2.1.1: + dependencies: + boolbase: 1.0.0 + + on-exit-leak-free@2.1.2: {} + + opencollective-postinstall@2.0.3: {} + + optionator@0.9.4: + dependencies: + deep-is: 0.1.4 + fast-levenshtein: 2.0.6 + levn: 0.4.1 + prelude-ls: 1.2.1 + type-check: 0.4.0 + word-wrap: 1.2.5 + + p-limit@3.1.0: + dependencies: + yocto-queue: 0.1.0 + + p-locate@5.0.0: + dependencies: + p-limit: 3.1.0 + + parent-module@1.0.1: + dependencies: + callsites: 3.1.0 + + parse5-htmlparser2-tree-adapter@7.1.0: + dependencies: + domhandler: 5.0.3 + parse5: 7.3.0 + + parse5-parser-stream@7.1.2: + dependencies: + parse5: 7.3.0 + + parse5@7.3.0: + dependencies: + entities: 6.0.1 + + path-exists@4.0.0: {} + + path-key@3.1.1: {} + + pend@1.2.0: {} + + pino-abstract-transport@3.0.0: + dependencies: + split2: 4.2.0 + + pino-std-serializers@7.1.0: {} + + pino@10.3.1: + dependencies: + '@pinojs/redact': 0.4.0 + atomic-sleep: 1.0.0 + on-exit-leak-free: 2.1.2 + pino-abstract-transport: 3.0.0 + pino-std-serializers: 7.1.0 + process-warning: 5.1.0 + quick-format-unescaped: 4.0.4 + real-require: 0.2.0 + safe-stable-stringify: 2.5.0 + sonic-boom: 4.2.1 + thread-stream: 4.2.0 + + prelude-ls@1.2.1: {} + + process-warning@5.1.0: {} + + punycode@2.3.1: {} + + puppeteer-core@25.11.0(yauzl@3.4.0): + dependencies: + '@puppeteer/browsers': 3.2.2(yauzl@3.4.0) + chromium-bidi: 17.0.2(devtools-protocol@0.0.1680125) + devtools-protocol: 0.0.1680125 + typed-query-selector: 2.12.2 + webdriver-bidi-protocol: 0.4.3 + ws: 8.21.3 + transitivePeerDependencies: + - bufferutil + - proxy-agent + - utf-8-validate + - yauzl + + quick-format-unescaped@4.0.4: {} + + react-dom@19.3.0(react@19.3.0): + dependencies: + react: 19.3.0 + scheduler: 0.28.0 + + react@19.3.0: {} + + real-require@0.2.0: {} + + real-require@1.0.0: {} + + regenerator-runtime@0.13.11: {} + + require-directory@2.1.1: {} + + require-from-string@2.0.2: {} + + resolve-from@4.0.0: {} + + safe-buffer@5.2.1: {} + + safe-stable-stringify@2.5.0: {} + + safer-buffer@2.1.2: {} + + scheduler@0.28.0: {} + + semver@7.8.5: {} + + shebang-command@2.0.0: + dependencies: + shebang-regex: 3.0.0 + + shebang-regex@3.0.0: {} + + sonic-boom@4.2.1: + dependencies: + atomic-sleep: 1.0.0 + + source-map-js@1.2.1: {} + + source-map-support@0.5.21: + dependencies: + buffer-from: 1.1.2 + source-map: 0.6.1 + + source-map@0.6.1: {} + + split2@4.2.0: {} + + string-width@4.2.3: + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + + string-width@7.2.0: + dependencies: + emoji-regex: 10.6.0 + get-east-asian-width: 1.7.0 + strip-ansi: 7.2.0 + + string-width@8.2.2: + dependencies: + get-east-asian-width: 1.7.0 + strip-ansi: 7.2.0 + + strip-ansi@6.0.1: + dependencies: + ansi-regex: 5.0.1 + + strip-ansi@7.2.0: + dependencies: + ansi-regex: 6.3.0 + + strip-bom-buf@2.0.0: + dependencies: + is-utf8: 0.2.1 + + strip-bom-stream@4.0.0: + dependencies: + first-chunk-stream: 3.0.0 + strip-bom-buf: 2.0.0 + + strip-json-comments@3.1.1: {} + + supports-color@7.2.0: + dependencies: + has-flag: 4.0.0 + + tesseract.js-core@7.0.0: {} + + tesseract.js@7.0.0: + dependencies: + bmp-js: 0.1.0 + idb-keyval: 6.3.0 + is-url: 1.2.4 + node-fetch: 2.7.0 + opencollective-postinstall: 2.0.3 + regenerator-runtime: 0.13.11 + tesseract.js-core: 7.0.0 + wasm-feature-detect: 1.9.0 + zlibjs: 0.3.1 + transitivePeerDependencies: + - encoding + + thread-stream@4.2.0: + dependencies: + real-require: 1.0.0 + + tr46@0.0.3: {} + + type-check@0.4.0: + dependencies: + prelude-ls: 1.2.1 + + typed-query-selector@2.12.2: {} + + undici@7.29.1: {} + + upath@3.0.8: {} + + uri-js@4.4.1: + dependencies: + punycode: 2.3.1 + + wasm-feature-detect@1.9.0: {} + + wcwidth@1.0.1: + dependencies: + defaults: 1.0.4 + + webdriver-bidi-protocol@0.4.3: {} + + webidl-conversions@3.0.1: {} + + whatwg-encoding@3.1.1: + dependencies: + iconv-lite: 0.6.3 + + whatwg-mimetype@4.0.0: {} + + whatwg-url@5.0.0: + dependencies: + tr46: 0.0.3 + webidl-conversions: 3.0.1 + + which@2.0.2: + dependencies: + isexe: 2.0.0 + + word-wrap@1.2.5: {} + + wrap-ansi@7.0.0: + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + + wrap-ansi@9.0.2: + dependencies: + ansi-styles: 6.2.3 + string-width: 7.2.0 + strip-ansi: 7.2.0 + + ws@8.21.3: {} + + y18n@5.0.8: {} + + yargs-parser@21.1.1: {} + + yargs-parser@22.0.0: {} + + yargs@17.7.2: + dependencies: + cliui: 8.0.1 + escalade: 3.2.0 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.1.1 + + yargs@18.2.0: + dependencies: + cliui: 9.0.1 + escalade: 3.2.0 + get-caller-file: 2.0.5 + string-width: 8.2.2 + y18n: 5.0.8 + yargs-parser: 22.0.0 + + yauzl@3.4.0: + dependencies: + pend: 1.2.0 + + yocto-queue@0.1.0: {} + + zlibjs@0.3.1: {} + + zod@3.25.76: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 0000000..2059c30 --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,3 @@ +allowBuilds: + esbuild: set this to true or false + tesseract.js: set this to true or false diff --git a/scripts/package_firefox.mjs b/scripts/package_firefox.mjs index e9fed58..744a84d 100644 --- a/scripts/package_firefox.mjs +++ b/scripts/package_firefox.mjs @@ -37,6 +37,7 @@ async function addDirectory(directory, prefix) { await addDirectory('extension/firefox', source ? 'extension/firefox' : ''); if (source) { await addDirectory('extension/shared', 'extension/shared'); + await addDirectory('branding/extension-icons', 'branding/extension-icons'); await add(existsSync('docs/README-firefox-review.md') ? 'docs/README-firefox-review.md' : 'README.md', 'README.md'); for (const file of [ 'package.json', 'package-lock.json', 'scripts/build_firefox_ocr.mjs', diff --git a/scripts/sync_shared.mjs b/scripts/sync_shared.mjs index c341c72..e56fcc7 100644 --- a/scripts/sync_shared.mjs +++ b/scripts/sync_shared.mjs @@ -5,6 +5,7 @@ export async function syncShared(browsers = ['chrome', 'firefox', 'safari']) { for (const browser of browsers) { if (!['chrome', 'firefox', 'safari'].includes(browser)) throw new Error('Unknown browser'); await cp('extension/shared', `extension/${browser}/shared`, { recursive: true }); + await cp('branding/extension-icons', `extension/${browser}/icons`, { recursive: true }); } } diff --git a/site/assets/bskyplus-symbol-512.png b/site/assets/bskyplus-symbol-512.png new file mode 100644 index 0000000000000000000000000000000000000000..5e94dd4ef27c7c972785b7ecae3952349ed97e91 GIT binary patch literal 20625 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 literal 0 HcmV?d00001 diff --git a/site/assets/bskyplus-symbol-small.svg b/site/assets/bskyplus-symbol-small.svg new file mode 100644 index 0000000..3c2751c --- /dev/null +++ b/site/assets/bskyplus-symbol-small.svg @@ -0,0 +1 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTowNzYzMTJhYy0xMmY4LTQzZjktYTc0Zi03MTllNDU2OTQ5MDYAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaHQZTG0X/aBwA0l0/gyAh7cAAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDoxOTNmM2ZlNi1jMzkyLTQ5YmEtOGI3OS1mYzc2NTE0ZTg3OWZscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNo2QVqgG58w0IGaZZeEQ9OUQAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggSSnz5x1X8l68lvnLnXhoF7IPdwPhnkv79YtQbHIjgROkZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaDxItrDVhh4+OFJFRBlh20gAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCCi6LK17yFbk9BmSvGQ9ULC094/0cprDY/RNbwsmLdkaWRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjJZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOjA3NjMxMmFjLTEyZjgtNDNmOS1hNzRmLTcxOWU0NTY5NDkwNi9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmEyZGMyNjYwLTZlYjAtNDNhNS05M2JiLTQ0MmFiMDYwNDQzOXJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCBJKfPnHVfyXryW+cudeGgXsg93A+GeS/v1i1BsciOBE6JjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggAw1RHV3sfk7XylKunDCG1n9t6HvIuMG3wGkPEeH6O92iY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggciohXSMgjVxHfOa+r9FyLICJTrnX4WNmY28i0iGge2B0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQOb33eU+3wTGaitIGKX60JfuKzOVHfsyUfOrVnIWPPOZW8d1De1xGQj/hki19TQmun+X9HSslCAamaUfGyB2lw4=Bsky+ symbol (small sizes) diff --git a/site/assets/og-card.png b/site/assets/og-card.png new file mode 100644 index 0000000000000000000000000000000000000000..137134ff1d64ceed4f995b5ab8a7cf4b3c930967 GIT binary patch literal 29209 zcme7R@N?(olHy`uVBq!ia0y~yVA;UHz*NS;#K6FCKLj7>=W)T(0_ zI#ea|o-r^m$V<=4%quQQ%u7!7bg9s($SttS z%uKN|GfOc~PBJvoH8D+2(KRtJP18+EOiI&DGD=NKHAprzGf6VdDN4;r1Uoh(vmm1& zu_!gK#6OLJf$-hz#d8sK`1&Kw8xv3?oMa2uV5us7sxG1@_D5pZVI5j6t8RVWcTd*!f z2*W^brKq1P& zz~F#8hCxB8my%eL2#?_4Ckp3c7o2+7c>1dM{M&LMi3U&vFHKI&Nlz=zNHj7vOD;%E z@dfFCV`!Y1C;U91DkS)NQ~$5KPi$RJE#BTA5qRM8;!E3B^`^8iGk_hP2Xa=LLT+MS zW?E`-Nmgn_a!zS6C_6PSN-Zu)EGm&uOv_2lOE1Zg6zgJOV6p>gU|?WS2m8Y)IR`n1 zfy)6KOwH1C z4GkzjUhy%E2#eVLdxqj7mk`QJOIY+RX3G@j~N)z;c~iJ64X zdse&OOMI{S_Q{JQ48jcf*qB3Q`577iv#>BTu{VIjMpl)D&wz)GOPh_6g|YcX9227f z4@j9XNEwp>gMmDVr_3T@Al4vqF7OdcqhCt2@{h+y&d;)&bMSi1A>MkVKOi* zmKB-DSas=iXx}-vhqm*&X6LZ^rPbeJ+WN_#(INHIYI_^kTc2O3T>tvhVQzEiF(!k8 z_?Ww26IUg9Ez_UUx|%oOq{i#(M)6A~+y0Ka%g@rUbGYBiXkBN;i{M`&fe-h(b1npx ze388K;N{*ZV>ARtLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhl#L*QG4gL=*0DC--! z_4jpGXT)zRIIr|uX;QJ_^((2(9Od7OV`r53F6He^`+nkK_A6)qtTP8wULA3$UMI0q zsMP)Weu<3V{zo4PGcX7+c)B=-RLpsEmpvx*sr>Pe@>*KXEbKELF|hgu1zvHH$#^$0 zAa^WW-fht!sP$W3vFQ$J4LrYI>xw@iG5PTrWB2YKj*J*DpGhXv*Wwn z{O_+_D&9XWI=}O{)&1Yq^X><$nVW|*FgP3xopt2Db7GuO{ANK0jSeHwh&V%lP@@1S zC`DWqSU|L^AO|C8NH37Z3B(N$8I=Zw!)UOKCI->0iyZU{#f}v()!dnR=(6s6U`P=1h>b|v_ z|NHaVzmbWf1ynx%D|%CL|cGnj*vzhSc`+*pNexwyQi~sK^(tovCRq{u*wCyTJQgJs0{E0 zS4$41+1GMKG&;eWG<3fnYL(snjcW=de5P#6I@|WE9v}*KK)|h& z!G=tskUDPZ(WB}dA&`1+ikP^&LWnp-QMjL<-y8XK)>TU2Abh12yzI==)6-%6hDBh5 z85U@OoyMTi1$GBR7ex7}G!=q{OXu|_8NUg_CnwENJUMexNnns37uVXP%0f;3b7es% z<6c>KH?IoXwuRwn11Rtt{_L8d`a4Ng$**sY@C%KnS&RJsJr~mz{*5~8d*^s_F3<=2E>F|Y+3vRPMsXHZ4O{QJo(ZzcQ(NX|PEuT; zY?lH`{AXot)!*kU^3LiuUb$?$vXv);EI8E_2;cTUscx;J9GzgdWqb0ovYS;w40|E2 z+q=Rgvc{u`HSKxPx<3MmRm}{sV2Ka%A2W^W`~P^#n1tVoUcA@Qb0(9BEI6(H-!Vh? zbJ^@&GY-tj%)gMnJCcdTN&%E=AIP8X_j1~G;Llu7)3reyB9Lrf@3}MMl`6CM!o86* zOa3}ugcv`)bpPyW3)`1oxVMJ)B9jO!*krXS?7A11WpuS@K=P_j+1!OT8I?xGDegTC zt!|*AsNrP(M<(wQ3&#d0Wssc*w%j_>snV!wRn`}{Si=S!P%1`_dYgszre3V0zl7KyDXw{C~ea^mM|1*HfE(z2t5U8%O` z-cyerDs7#6^jz4QptNmse5Sonv8+1xMbsc2ThG&q%D0%9pi4OiRpQ)yLcV|h3PW}~|dNlB+L~fLwoPqgLPz&2&Quo}F zwab&F_ITYc)aA)$XEbmI8!vIf?MYp{=JIblOme@sn;FV-9k>IIpM(Xw!lOdWLe(AU6Pz@t-61{_*7TbS$s?hZQ$rNxRbs+HGjce5Dy>-g|9 zFfbfWeRg8{?KJNgh1tphhEvGt@D;HJGgp__<4Y6)qy#kzdHO!PuwYy9|79>h3uHgcQw%bWj&+}s0lP2ow z*f3^0fs;|=xg{N@8#mo$ghX_J&#DMv?c1{8LYM)PWRhgJ$X+aC-=GGLCJ9KIS<}2t z`PMszYc1fk1x+;G;!`tj2_85FN##4vmz};Bu`%XW_x$bN46hF#`oh4#U=WkmSF_Wf zZ{AeL-lcO~V;kd6P0Z&%vCp1mgBRF*5n?64nHn3BAy~ zyJtyG=0>~TRi1xWZF;mKr)QddG3y2$r1B-f@4Yl|(NndywDp^^M5E>m$a(|NCDb6It`!D)eQ)$$;>Rd00~QWvh|VPIh332|TA z6XM<*rLl$+smuv%Z|AnT{Ov32tXK5*{NYg!J!P{lqHaDa~)2`<9l$ZI7m~zdx!ku&MR+(3wz5X>_ zt&3Y`Hynj1ESUdx+TM*xYq!MC-tNudeFRGa5=Blx0bnPH2$ z*sd#+<9Ktdu8SVuWM1j8*K66^Rq20n^-@mGdi?42#F)3)RofUCc)-bm?b4zL!E1Bo z?fCu7@YUFn?>-uH8FB*G4Vfv@LXf+}m|+yti2H#O|Eby`W<6 zms{4i50!P^`}O_p-UpleSs5nqe_egzdF@iiQ0a@!Vw&pZ8zrC3wtmCj=_SO_5GP@@ zYI*STvtuu=Y+_(Yc-vI_WbwS9eLZ%WA7-_!GkYz6t~PaR zO>qDN!>$cW95T|w?TkM!ikS7`Z~Kb;-uEwdHNw#<8LJXZ#Rvfb-P z3EJ`{(;3TO%CN3q8E`HwET415+~0@1cFs^{Xi!p`EHZ!2oH@F;%X;d+AMT6&ZTczO z{_SH+&y$)=3=LaX#Jif=CM8JiN%Kgaz4h?ZbE}vbG?cu#TBb$F?U_1xdD6X#-+S45 zqx&mA^1iKRWQbU>imxeqi-^U-$rU>!=CQ5MdXe?H%w2O?e41icg;SV@hjhe@*-HCr z*M+X;2uby9yzuK*#j@q;XMW$mzV=q>eB<}scVdb&7jQA0P!DH%xPQ;ZgU{s7C-G*? zeRV5if5?aJO7kX&p5oLA7rbv59?tdd)uNR?CwCVpzHJRZ_V>^0Q~qf_YhzExGBAi8 zIvc3;h;^17?~};?HTG7Pk=yd7=H7ntqtMf1!V#Cty;HTlr)mYQpSLAb`QN`sZ|2NT zzf||KakJ2;*$%<07m2h6S9b1I*bp$aYr~H2V`taCTFCKFNwdo#L(eRilbhqs&#TWj zTW{ePU}#WX;8YPBTK#i{`#-r^^Yr9vRk+1ZJw1K>e(AHG%-j3p>wY+TO`patH{s&q zqZdDJ^S9i)drkKw?&&Of+wG$&7dmBJoYVE~+s;765DDMZGaf}=S@#(a?~mFM!N4$W zK_%}o?O8pX8w$1RcRNpGAhec;now4>Yk}T02`OR%`q0poM>58Lq8V z_IX#NeW`H8$hy*d6wx*)K34?rSJFaw|;)N+bA>Wo~!FyR-4r| z69cS8yDd_-Bvr2Top`}0Gk;F-#VY-<)z5C-IUl}2g=yi;SvFrEhh|^nW;n3t>z6RA z_A9G24$r!?&gRG0>&qt2cU>sTxmEq-7lfQF+r4wsoRYd!Rnx%0&KD?3^W?@J;c1Pyv z#%YVz$bJ3n(>z`8q_=*j9{1ZU|4*-07kx~67~c~refie1RdSm(=AQDdZY|#0`YOhM zKHtW?ywLeIe-az3B#g4I)kSWzDmg61$S`B0dep5IH!r%Z_S(93Zu*VikGh*mC!UOU zYO47jEB8HH|5(_`*R!;~Rn=(;zBu?xc-oPTYqqRcu9E!wgClH3xIp8DJA1#}x_$HJ zO(q6|aKEQdB><-Cl3za#AOY4_#}O+Vjkwt3Zit2;B?UF3_GwY2Q<%3C*2 z*_N_STeN%ojcHN?&35(^pkfS)QHWJn6^lzwz_bQK5^JXPo_U}BIBrYpLS4VLU6uFtmaUagJimPJS?^6&w=}menD48(H+aLh z7Jf5faqC9QVm*C+Q{lh&{{}7H_an#6_q!BRssM-Xfmx-}=a2kTWMD9U_DUiC+jh;x zm;Q%mKizxAdEU}JhfaUa%wDNvX(8*0vu9(acX=`}JUhF6me0FI7ev40M!kGt7iS{xzdEE`{%uNj z(vwY%rrM`!t8`Ksl{4~veU)E7^sSZNYhO9XftSVU^oH#69SjU-?j1h+oxBSe!6d2xOLWD zWqKVxQT*15&??jPTha^n%HEnCWMjp)?WWAH?(O2a>1$;gFBr*m+03bW*u=n~QK2~iW7RFAIf`LZUzN_orn#THlB zJ>6IOcm4Z4KQ|S-9^I9;^2nsL?zFTx5oVs<^#|Vc-`oB6@Rs}kZa-XnQQiOVzu%pY z1J%pk-Yb7oF-1iA?RT@Uxhf0{-V0*)+P>C5Jo{G77TfQaV~Y&k8=Q)F7*_)QCUI@0Tm=d9|eY5ueJI4LCUmiT*x1aU-~AbK=B_ z^X4TcCqI7iAmM#N`me0~_c0ewp56LN_G--CRXgtmp6%^C5#a68a;JR0NNmD_Gc%Pp zDCPATZQ8l*=92W&zcg;vs(laXn&WAjyYUR$f&C%t6-?*&M6d0-w5QFN-9I?@!X1mL zled-nL|;n{Rd~HcS9JQr{*{7;sg^k|ES&rQC^@9lS= zD{y#_w87jzjz;W+w&(9MzJfirk?sg`}ahNXEjNe zKDf^lO5XG1&Wp0#C{6|jhJUSG3+=Q*3g&#h_#|&HduL+Sl^xDJAKpHi@P4{Z?B23w z3IFc7@il+vZo9go?)ZTR3)tVw2VCFWx8mVdb2X`1Y^Iad_tb5DJ3(yE{^(61J%)96 zv~S&3KNhi5tK{#owMh(bn|=20S7%^mV0a)kZSDo%+1JY1e{2^yyyLYL$JU@Tzb~iV zzq#bBa(}PpJd+>!=}G^8d|2#1Ys-rZi_bsE-}gIk&D~4!VgKHDyCyApP`B6JuIB&M z_ggpUwngqMnk$iZG;8s^J^AzHqSQnf7#RMDHwO6I?z*eowlaA4vKNZBw#jdz-r zVqG^oY-&t2ejIH4-mjI!FKztg`TTl2n^!lVObIdcaaCX5%AI!m_U+i+OG{o}V*V{1 zs&Z#T=Iy24kx31uug#Y)UE0lHu7|7)itM?#D`T@TzpGr{^_Ay8O?8Vc zcN!qTezCN2LWZnDN?K2Z?LwY1`RQ~+* zbn5Es-G*%ZZ`2tW7@PWMIaRTw%hNWP z$yU9;C#*NkXY~@>KQD}});%m-Y_|4&-S1xU{L=M>i`|^fa|HM1-rc8dXXnUs!El4` z+o*R;3=9pk6Hly|=Qqzrmo4M|wfn2*Ef+a8J-+_`hZX5(_V1{gTl`$O`s?oc$Isp- zZJa0dIqFMiaMFxdS6A0s)~CrCd$WJpA3nWuxw%z^M$q@hf7+if-4e&H zUHi8B|JkC_wUdq~uL@gvXRWup;jvkz(yrm!VeMUvbF@NUh+pvr#U(e3lWpz)!{-;7 zzwP?AZ{Oaf4-S2om-_S|Iq9LC)Xy)R$*vN(y34m`l-+LUeRJQv zXJg*pdENdp77~?zzGoOZ>|ZeN>FMdh3=9l+m>L7j_v^)P&i-z9@%Czc``~pkk(vwU z%$ak1{**_&ErK|Nq-=7Z?{g=n>P-xq^J^Xt5JeisE-M_uMxYO&Y zS5m{)g|kcM$YsXtUVM-_vQ7Xr=3XLs)jcNWkaWJk*xu3%`43kfD=&Gl?EH-C4*^Re zSl3>$Joq4Pu2og}tK)6k4rd1Jzjr56{>kTq+qP|s>h$3$c<6NN+S^^ab{lK1S{XX* z-6hB9nth&|fg$1R3!_!cy1d`sSi5{Tn>RIPj{QtSSFU&8R|rqO|36~Qi8njBx6BpV zygl`HpQij7k;5S?9{l+Fe7=R1)sz43Y*N>PQtwvPip{sE)Jl85k2$H~H~V*S1_p*F zor;THx4yV7f2(ZQ_YV^vFWP=mIIetsU@TYOsrJo!aeGw4RMgd<9}T}R_IcWrIYy5z z8t&Y=GigR<@bPTXLri~9+|`{Wy2~~9-j}GFq?=u)Net4`vz^M5nHU%X*qzuTiQvcrDN%Q9ZQ__#doQmtWIef5`# ziLKF&2N%R_(f^ZhXy@mk6zv{K{aY)OcU!+J07c-FlM_-;t+~|7of*ZcVQKj^C+5#8 z)7Rna_-re++v!GR=AxUoJXoDyAGA-rMEOV^EP`&lnI;{oN~Oj*6OB(WXB? zm(N%$X}qMvYpPIs`pOW`J9n1cd^_8Wxj}R@xHo;TW5wd5Jh{S~7mBjk|NOD{(o%2l zg==E=#;v(h?(KAM_K&va=Djm!CLdoMCubeU^Y~TN*VpIMZ{ND*wJ>CT+*;>^*#WWQ zT|2Z&4nI?3bJ7iZ_T)*&y*XMTJGQ5XGfwc||3}IGzm9eJDOK*7c?Q|jUaY98%)IE- z)U;%|V(bov17`viP4xBczCVdhj-Q~!aeHHQ&y)J{&vtuvZ_juaee&qdqenq$)-XNE zf3Dr)tKR-|EWV!oZtv;61kz1C~p zy29sii>qFT>9X;^`2EWJyv&Wg4|lJBUiRunT+ha%Gak0Oe*D(*{kwdJz~MdrPR;0( zz2$ZB%geiGJ5H@C+mx$+h+W{;{TEvo{@S9om+!G_V+|+g#JayB{>}fl<rC8L_U^-_&x@Cykdc-B_3fo1n}*l=i_lu=-m9x$ z4Q}sT*0A%$*{S_@lfvT+Uw1aCI$0|uA3t?GY-@=y!;{`rb+1Xiy=NCZSYUhmx}TK& zwWB*1iQIf2*v4~RCwSSJrb>D744%0E`}WrTc~`ugOVlNNzpSO0_;iJ55AXau;w~qz z+_v&{Wct75m%EJ=KHq2iW}f1BsMJ-Wb63sPD8mCE*x9%m_SAl8tohXWAS~_twD0%D z83LG#IlLRDt+}=Jg+qQyT7Z>v5w#Bm8!Ym^mKjciwrAEUS4vJ?3X)no8SIK`h3n$%VZbrem5!aE(^mN z*~Se&GQ`i$wPr1QeQDuo+s3{=zN7|jaURZ=udk{+7TTEPeCWCPxnJ(Ltv&y@otyV9 zPk&n#^>1}-@b5=219yj=l}cJ?H*#7bMf}A zQfY3(^!(S~Vn2TTb^PVJxz-{|bD6k0d#8F%X8CDYwq{FCX4EVuhBZ=+8-DoAwOLnx zKQ3v>k|!aC2kzCj=39O^)$MO@^J-@O{iN*d)uO*_wyyQleVZNIf9qDb?(eBusfNrm zl)fhX}E9XwJh`}Q$0 zT?q{_z>tZ4ej~#fRaF_Yv&m&9jR)5=`5!b-IjG0}z|G%7WmGp)E{bBWb z2l#D1_pFIhP0KjUmU+S9%h%WIgVxV;D7;^ztg#}0zp4P!hCChXz)5^^U2{I3thql; z_BV_DjxW=vT3WiUeZO-X*6x0JfwAFhQexHS z4SFS)FFfow|HM7V+|g@W{omRD%PZ@WUp@ZowM(@g1sutjKRZXe zt@7W^Oo0cdpj%vNoWxViN$(fm+?|tKcoSpP@zF+>;Oa5Hzid4l7Z?yT|-s1av*`)5` z(_&|(u6+Nr?s???y1i|@d$dCeL`1@lA27@Bt##}%H`sBWUvYoex-M7m7ZMmJv>T_hv8J0$^T~bx#eKd`nvb^)$glTKXuMuzw1`_$#f@&udlA!{Z5Jc_$Bh~ zt)0$OPfa~H*I(rClV{J?MQyG-Q2YJa^Mj|u)(GyMsuw%!F8#gE(s+4R>yAJF6B_Edmve~*^+xu7*ycCKW^Hbi!HzO--|tdU zE;#}F*G=Q!n!lwZV#hX)iMLD#W<>@COR~b3EVsrbj`5#}t7EV5D^!44%r&Gn}!NR|*=5O)QP*r?*r&51@*e|iyx3*?(t;vi#9haUK_a)!?I`VZM<-1>L$(5Cfzbn zkK*UNZ@<2k-`rE`ey`gIqt9AGP zI>w@D$^12LxuUsw`Qc-0D{T&R{9EMA_R9X7=!U58chxmkEOcfC)h+?@|H{qpZ%e#6 zd%dlGo9Etw#6L^;KmB|lc(}dfrHF=D-ZAyh?_b`t*ZQ?2V&(h#AC8YvGCq6Yh{M(w5C}rC9=Q7{)?b{g|LP0Iif8HW{ zzWjN?`8ZDSaK_JvKi*&bS()^HB>SKe4q{arTW^1|)g9w#lGSNZU(_w-Fm zR5GSM`S(-0Wlnwc_WMPzp3U3)`|+caI5ywYTh57=p4-wewfa}4quo?3)$?}R3<+;_ zGzCB-dYiw$3GUx#@Ql;&*wfR~@BdCnvy*@G;>CuPi+`l9z8BzLKGjWL?(3QD-D`{Q zo$j2xTz&uljZ-Et{{6glO3gpnt{-n}k}mnakIHt?E&1RuO`e5og(Gw2J4?s9jLZq2 z6c|_o6tCQ0t#9`@YHOE7@<)FAY(~xb{AIFHtB;#|u&mw_Mn>Wv|duOVt zxNE-j?eaJKJ{~K6E?oZRmi8_wn+5SJgZ_x~XiN!@pQ_#?btZ{du0Cd-`36k}h8d!I z%Xtiwegr%YI~BKaRl;1$Ee*eJ&dGf5FPHwZyF7kR#mj{g&u7FReU)=_+vC&g_fMa+ zpgMTk+S}##DjvTweO(&==}V*HL8b)-IXOO)Io16{>_T_;l{u*So9PCvl2u{|VE(Ue z(6TyvYFe9V$;Cs>B6pINrHuo(=LXto>r%0&mnTP_WQ|AsX`(yIwlwS4(41?a`!Klj1zDth)5Ts0qc-g^%wu_4GQ_@cUQC zx^3-$)33aEdU|^4d+RoN z-~JNtp1PlhU!TauHIYdZ)aOr8(h7Eab!B4J z*CVIB860w_iE!v9-R#Vkk&!uKu-tF{#6>$-CpMoHz9;ejn)d1Nb-$neo*%Z3@2uvp z|G&Gtzh$j863CiYS@&k$+SR9~XkObtqpy$e`?oi%=CUoC>@3*+|L<|#Xl~;Zmi)Ev z-=6!_+z_~>VM(}~k)D9v*C`APB}tx*7tXEQ!(*yV>i$RH*b5Xs2v`#K%Cf-V)0LMJhU!s<#dm-C{{8huB-^C) z)*8mYzpt!}4ekm|_}!3oHRk-hUUAzw*7H}`UcH*R<<{(_`3h@7FaMp#m+LC-Z?F5S ztHYr5rN*vhzNzPA7#SE0*@a3hY?L2$lAMUpk zoSQLUErz$ny6o-M?HlYf947F-eZa`TP;yAd$+;!(#-uruwAxPYnxcAiMUm?CzQ)`w zZ(qr8HFsJqBiCbam7jl>(xd#$%$GrXgwD+se!X*`)=;aUH;#J>L* zzR6aXy}7knH)s07mG5J>r+!{$UH&@wrk%*g>mgRP z$Gf-jW-PtBj+KFd!7A~@ihuiJWrVgB_e-3-xpUDAb#rs`Z~dE(*V_w<);{{aV)C-} z`{%C+T6$^I1lONGKVDku{o6EqQSM^-`iSaPrmxNFe%+kD`g-1led32z=2*`^zW1oX zk`MRdVr6Ay_WgY4Zs=B1bI4lw{{Mng)i4hP4;P!qHv4sNT^l8~ zhJEq0BcR|iTkBAAe}Q0n(tm;ElqWkg<}Hj23BJDh+?`1IB}m00RTVi+0PFs$YLj=g*V+JWJyI z(VLd`{Fm3A=$Gxck}FlR`t{`M`djkn=bnF`aN4qXzea|_o@aXVt*5u@yeWIHuvaQP z?)XvFc=rPwWo1vr^=7<%@nS))zRm9=Kg#Vz4%^s1+nOsqJ<~KoQ*5gCPL{j3ZJ#_B zUBv!2<@VO-^Vhtb+3r3MImmTgijjdq!!d;8>qgz2>(Yp0tJM$;ypYdXM&qB!?_8#jUBx*lhdAIlBqWOx< zzd@4_C9VoOlTI9VH_zw1taR|8^TeQ@S>~VjzMHoF*nacRlmBCJbzdru=w@TbN&YdSUS9W@y zJb6;Heoim<{dy0trvG=(o}R8>ez;e+gui9hSLy9`AJ1riPODdF4O$hVY3R1pOI3hF z`pSCq+E+hb=e@bV{raEt;(7O^)Q)+0d)L2Px_#g8s&yjM8xJ~ee)gh3FZbp)=i}2h z^YgsaXJBBsAbr~J#JyVfExtPL-1hgS^K*m?wo5#o{l0F`>cqc?dZT#mZgB0nxS?^n z$nM=z_g2nrF~9fk-Vt*qt1m|DCZF9Tnmz5`rcM6u^MZ8P?v$_BYb-dst9Q}-gFWJ` z3=9ShfvhqT%cHMX=k3{8q&j`Kl$k(sPwnfw>&5h@F8Y#VXI)zt{QaMNor!wM;b}*fJjpI! zx;#Cj(^Z=@@6MjTYd;1{ne*@2{@);0YVw_s|NHhHITNxr=;zbt?%fm9&i=G{v|Tw! zhwU5xri~i~KR*ar=yYN4T~NuxwqRwCs%Gr2FZ-io;+B``eqT4&dQH^kxE_&h#r@kn zPj1|-{lDSh#q9<2YTi8jU;EKFtTd~0FsaK`VffqA#o;hg8g=*~#efc>dJKOr@+>J>~=I;Jp`|IZP zARRU~_RdNPn+YEmF)%Q=DGEgKm~UT|zwcYkz5bVXH+u))cT2kJW^dY5iBgyQZw0z03eKy-H?mhbS^z_WbXZ9{^eg_(WmS}UxkgWRp!l=Sw zAKST~rrAkrncd&-IQ;hS$^6dB-JADaSLWvxRR;A5OBc>QQlV;>74o~`@xOy>-1!+8 z5)_ygvaWa^`+c)N*M=ttb_*ZN+UT<8+?)P;#j64w&)mBae#|1=q-?`eWBonzW>yCB zTr+#{?$*{jOP}1iym0O}%?8kFS_2lR;_!t{j~D6Nm6nv8_}`zgGV`PP=g)ce$%Srq zHTBP{Z*{8{6s}v5>STDSbMo^0zZ2Rde6%m{YF-qay=5|^&g`{oB@SLZ;2O{9;K<^% zdD+tg@Au7H9?G$_;nkIOKkpu@WbK;x?9ILfahG+n@}8^^o_Ti{D|YYCxV~(v$f>)!vugK$FfPsziFAod zEcmzl@{vVT^kS<{sU$DAe)i;v&EGrONd|8xw@%9XWVzt~Uhw?PwAEgshE0zC+zhLf z1ZHXKp2*DH5bABO$)xM^@6X}s&vs_T+p+%G{^!|gf8MvZGbi*l=2m@uq2zXJQ|@u` z_%;OATMFL>G&Ue?Nb=ns%K0HS<`1#p?2hOeA6R~F3 zyiz&op9>^j-uZdt`n@?S;PIp7;o+KbhuioB7^b~@xBF{8!{Y}DRZ$ELbsQ~eOPpAb z>;E?|e)grjbbY6##f^Hq_m4A!kBir@TrTkL<&C`K&!&Fo-`K|bBChh`%2lCS-4n&? zHm6*kW?&d(sPB=HoNPSfUd(>RxsE>WU*D6vb@azAS6AH^_MRXFb1Mm&jomYdO=m zk1f~l`LRV}F=(py{p-&c*Hi}Su<>eKYg#g|rsm0qM8<;N#fyFBYAL&W<*gH$*xS43 z|Gvx<8VnBMAspU5y|2n`{=a$r(AxRG`S-<-Je#j?;oVW~{X*Zq=J$TRxlBu!Wd8p5 za7y`>#|FPXwy)LaJvH@={nxwZM-$%H8hk!-@^aFQ#P9r5k^+|&Ev>E=`#!~$fi3H@ z+p(UBi>jZBa&ibTG~9#sf=`DpY)YPg@9w_8S??w`-@aG(cV!+&SogIjb28uCyCzvjn4g}C{5)rZ+1mH-?q9#L%ZSiPk+8;<>Tc(RmHh4mdQ`oi{F=&>y@=iVp+}4B3b6! z-`?C?ng0D;l&;4V!@4`CPlv5D{KCR_cf-@!@9T}$$(}y&&$0TutU&WcKei2i!fG?F z@y{`G<$Cz_`qO{ESs4;|X5U%F|5{(KZ>sH)n9NdpcXxJo-JdsaXZ{aa^(1Kdw%yC! z=T^-t&APrWGAQ-Hp^K9qK2$#5|6i{3O~sXmi;q8kB(x-B)-SWHODC3Jj4jW)Z?bQ7 zqTw3t8%v)z%ErZ=X-0So<4cf zky!I?&Hm)mUW^HAudSK*@v*9%-Twadfrm|kwiKr`GDsYo#H8ru;`OTauzR1Y>)ao< zzfwxRoZMXaai#dBOP7uHmSkSikMX#CXoFbG`nJTktGl~5yU(3fnsxnBQo-9O)6$p# zK~=qq6Uy3QYlRQ{NZEgTsV*nTaP94J`KPPbKiPi&Q`MQd<+D~beZQ;Dz|btn!T98Q z)B1g~f8VT5>bbPkTfYBJ;+IXm3}=r1`nsuh_mLwfW*RT^U3Z0f>)E@pfBr6YW@ls& z;bu~7_|xTY@%-k3R*A*_@AJ6DYm^um7&P2;tQi&d$E*%3EMBd3Oyb78a<{q8Qo16@)+Lo$czu))oU}WRvNc!o>z|io>U4dmn zeDO0qgN&J{6q#SDaxgFiFi9A3X}t1zBhOm(r^o-9{|p;no`k3cn*yB~85kTkE_UKr zk#TyP?A?dM};)zk~Z{Wo1&(CW&Qby5Bo$XM-wy)kZGGEuV}| z!o~s?EQ+7Le&4%k_xofnn`xHy_g8s<{N=Plfa%o5rugn_u}63;!b_~gHXc5=ZV#v# zr4pdXGG%koRVzdO{$43RDHc!@oW;q(QagOTxN*R~nw{?Ql4_u!v}AE|(0wjEd0XpS zA>$99KKqBR4T=PrUc}MT5H(FVKAF$BeYRTK&Wo24PCU|&+WG}-7%!9Jg088nz1Qs5$P{2;IACKqnLXg> zDxp~p5f@K(ns6{MB+OeOz~p67sr4-2Nup+1l+>S}?fQRbnF=y6FwBtGYH1Lf_HS2E z*WHHS@9yr)v;>=y6R5~CWy7ipb%AX;_evgFum5@fZVUqhL&C9~qT*uKhEVJIGeVBv zUSIKV)Ae;v|NYWVX5)R4ot&%;a&3MH2jgpTxw;J!mmbXhx>v69$3ONqmfN>)gS@H3 zDC*?E+39&wJ8a!=#V6OVW}A1c1GNBGwch`b*lfkN4dku}5hle2)4Ij=Wi6}ze7N}7 zz5j3Bj}sd&8*bcKKgYJ(%x=E@y9WvHi_>fK-|s3n`>^lzxnI7s&DK46q{G0#u)&AL zi9v07^0_~SW_GHoU!9_&Znb{-(!=w1{-vefmRT}yw(5&&SzKH9^j+ZcX`lvElmN%s zfU;XNFSGZ%9Z$JYZI<)md0^mz{+=C+-TCFZy*HOgSWzV~#OXTPNe6&TB^U`&m)T!EIW<@WbiDJ$)GzX$g0r21i*{6IOdmu5C5R zcpi24nnFeEa4TYZHt?=7pH;aiJ2zZB~) zGnuix=gN%a-&=EEK5A2rml1rD3+h2R7;ZY?kn#HB|C96T%=42Iqp#iEyW#16ILCj-*3E|;X2^=m zm8tTE?RtK5xf^?k_QVbOpY8{nTWcF@e*4n+;qL51!kZ^6KR+9NH6i9c+cSY+Mh1oj zJl;Gle)D*1rJ~=hxDb8X&(G87@9v<-)8zD2r$w#tFS|5zO3vH+=j8tJuAcg&aPP+} zxwrNNpYNM%H~-tJZ=Odw&w3xWHseS*rNO|!(B-e$cyr@bj*|53=xZ{`Wk-)WI==Nu zJ$&Y{pkXFxL%4|i>bcG{MEC#RyYchkNv^L-em>YWu_7{ky8m1wZJXdXd)@k~wN@Pa zIiXPax$N)V{obGEaW4KgW8cnex{u#~laq6f`@LcL--D+6_2TyaPsmxeHvGTj<99pF zc9^{O`EhB&g{^{yg`6{^Y)>s*wR^e$;di#Xwte4m_Q-}UwedDqC%<_87u%ll=Cb#? zn)2HIIbSwco2`l3V`ZdeW*YnE&R&~W+cWMdZ}_Pzm6mqgH780&XxsB6H-9{tqdi$@ zwdsf4+v+dk`~7eIJ+}Gt_kVY@RINYFZg1XiSR1aMaqP&td8w+}zm`9bi;~qXdmC5t z`suXmqU(+L&dmMsYL?5&Td(G>%Q1;POs-VL)jZva%-8a%d#SM&tF`7vt8V;#!ltkd}*OW_hjVC zp6)j4b?cjbXX&S{)t45PufK3__le85K6kI3o6XDr|6J^EmU|znK5Z{&efHqVD%L|O zp8jTYEh{xX-2Ql8TmQn$;2q3$Z_8bE=NT0{raYT!xa)i`Ux8PY{qvPKC*FFW`}NHY zb0)3(ADC|zZm$I8#h#?CjT_cvPYyi%m(TzHv%~4ts z0(TA{4%_tU_ne!Y?&5wi+m4hht^RAfe7oK(16!SE@#ag_kI39vkh}ZvyoxLzc3C&A zw7EC!avx2fEwt|L1j%BZpxf7UqwcIYzQNGB_W$g-pl>yH#eY7{sAugt^W#QF?(HqP z-%nh3W2uz5yUG(OP@2v5?Jw2Z1+y2P^XQJQ7 zE?lC1Eas=pfu*Y^3od=wG}qGA=E2KA#rma=%gg+2Osy7d`c_~r|KIK0#Ke;`*|*E} za(^h_{qO72cQ*^Jl>C`1{Vl@-Tpxyo-ATQ2O;@4f%efbvw}tw3;`ZG6zH)W9dCJlE z^LJ{Pt)1B_R1Rf zfPRMgY@wSc8@*W z+HL1a=<}72+3~~i?d&CU=i6G9`tREDb-u+n#rOZ+nty!QzwTwOwrSSG$IlBT4h??vEr%mkVw1g{ zWzoGWu6e@i-z@h2{4w6de5#MS-yG4I$+rtWEYIIwEG&EHRfMW*%O1rxqnIE6A#PKkIjO__QyV z*|)vBCo*$JZPMqK&YSD|r61KhOTG=O4%g6RcdFYPq)_&myWsl%#r}=w<|xS)=q_StS2w(?br*yzPfTjGbcK$>d3q1k7w`xo4s+fkdj&K%JaLoeORC0TindZ zz;I?}slIjK#rld5w#V&arx)a0Z1Sy3e!nvE+n;Z(-M-@Yzr`JH->&^bV!zkj_?pa; z%ljX7osJh@uNnAo`T8s7vw9@W7hR5D?Gp0sb-?C{+i(B4zVGI2!R>{IFDA@iw5D&y zroxBj%d)GUxB2fgTXg*X(Y@ao->Uq0amUkm+Po8%LYu0p4|IGB*WY^iynKhj+N$Rl zHvE4w{oThu+DxHuOs?EM|9bPq;O{ExE_(d-@9!VHkagy4U+Axkt;NpC>y~^hk9$>> zE0h0QFScDK)-*Bc#KE2&Pw&5fXZP*>!|5k4W-I$VJhJm>$I0{mLT49!`6&N&((cz& zW_AnBk=YcqRXP5J&a`d%DYvGYym)Z?|J?NVKYxEUd4FZ;^$T;m@6C}C6P7m1-PZoR z`)%HdYI9p*E{(r`9(Hv2W{2tW`d^v1;qD2+!(Zde7B!^%1@i6ChOF z-Y~uK{FvGVQEC3#cb^wZdU|ft`>(4yb?w8;_ipFqSEPNKxnqltX366VYm9$~zqu5* z?Xs_ZOdx+4JY` zobPMA&-K_(oTN6jclW=2FE@H|@!u6$z1Nr5-S+0kU0+3I_FCInnjG44;pax%>T_FG zS8km%d+wyXF0Rx&HFy3Of7v2i^Lwv?=AtRK(%)uhP2DEv+_wGq`_~&wvn5TmKD?MM zEp%DgEZ^#}{Ga=qpNgd)dVA;5mC_Gc*3V8R)H93C(Rnd5_y_a6x~iRF(t9ScN%QX4 zRO^oEz6NF27%Mc}cMBv_w$DJ@4B6)GJFaLg`xJ6sotgVGo}e_2to!;UxWl2Fp4^=GDepT3a!@3!up zHxWx^Ze-5VN_%~G$wgnaXE%3M{;bF{PoHlqF}v#PvQ6Kv-tm2FzEvyi#I41ei`Flh zVLNeIe9G&~r}n?;4Dqzg>KyrKD>=yh^wj_?GLofYEs=zc8N3}I{+x-*zfSns7vC#ktzG-~rS6jD@%I-8c`s>KR{qxFE@x9^rlz=& zW8oHoJd3c%nVy`>L}tnUE7!j~`?R0`xpTX$^e!H?w%BoU-p${WCx1ULwYz@Z=4fX9 z{$Km->g?ipvqE&TYEJm=oz;6+`d-ad_v5d4r7iON{LguIo!{~BoKxuMH?#Mc{N4EN z|C~iPJ=6W<`)+J5ySZ$`jTcLUmmlffYEjHpc)&P0>HjZ1+nTF~V(re~O}g8$$#ho9r(a(^QqE1x z-JM)@&E)GwPy5}O%QIsI*yHQ%ncdDXF)%#Xwr2OrGx3wY>CWD*`0>^EkJ8iDzJ0Us z`6BMf<>#hSA>)!tgdc{^ySM~>{9^?Q8J z)xGzrJfbh}X`x;B`%I_zAs@#rL5r{1ecfv-6|(-#qo|vE-BOQ#S+R4yZ>*HI>Va$b zzMc{YW51theC*fr-P2dDo$bH-;^aT=^DS#Xyx7=0@nUCD(jzmtS2YZ|TciZU%;irXU3YHCLUOgsA5Swtjt(5NVnn{iUgL zwN%gB+Xoy=CYC0Bj|!HW^2_zMNTkEY7|LLl)PGENb?{&`n_sTb4zBKW4>t?@xl(SrP%B9DPA7A==m#geguIzfT z%T_b~O(;wIt#dhuYi70h`dgPDJp}OPqB`%ik*?#%KWp^%$`w)HfmhX5=f27 zlDPNg$ig;v-`g9Wym_-EWv$fA;~6)Y_R6x_7XSOa`KR53yxKUazZ3dvCw=}Iu9n+( z(!wnNSJL@H=e)4P+e<(1-KCItXI|{`_NwsiTT+7S@5XFRRM+2YWWd0{z;*1^>{CnL zL~hA&U6VN}Xg=e=xojo5Df%~$hn?rKoTc{5!{2Ux%CGXJY<5@I`8U5TWcL@@Xrr;L zu{BOE{E^q0W4X)oKW(~v{@qQew{s^i_cy&f`KVjYuE@ia*8Es}`}%&~f7;7_e#ui+ ziyOC}ecjFVtxV+0nVp}!xT+51&b3*;$Ts%fA;-ZZvXDgb{X;Ye*64x z?O%NO`|%^kTU=u#kG?(qshNR+LG{=v=EO_qCd>?H>)ut)_bTM@wl!t3(iyv)`uHNZ zWZdVSdF0lJpV+G_l~?namN}b96kM2V$REm<+Lj&s<*#~Z`d-~A2HvjWdWtBD?7Ua7#o}Z&6S5STa9DiSC?y2gNyT$fy z*LjsTe`iR}m0za}?S*$5)_j+{e4lT7S>wCw^^+z|Evk6FY^(M9|0SSa)vnD46c^uI z88}f;@0|JG^V`Gq)AN<+xvEf!h3D;x!-!5n|8OKj}esKUgFph zKbQT#>BdvnmbT5_obk2)#e@le=Q+x4dwEk&?rNSj%ax68lf$lt>vx{znf?1{3@2CK z!_2J6nIc=uE}9#gA9->4`sSRia)+A_9n-a(A-K8Z((QKUYPRnma-Rh5T=Okjtj03? z_S8E;%PZC2um0)~Z60s$fBS{<&EwDf;zP&Ba3RPpQIla>vd`o~&WOW$7Jv@o6b_nH@Xxzp-5K5EH4vbef? zTkro@tCC(nyL#mEw;L1RT=BhZ?_+&Sdxy8P|MNLN77J!iUmukf^~6D@=8v?c_&&+b zuq#rvsT&VIiH+Z9WSEu_pl$y?Yf{ax1LrOr?fyO^?D*#IQl@v}x9^*8Ze6-8ZeJ(w?42u4?$NDCbG!YNm;L+$_2xy(+TQruZ7cb8W$FK2$8T=;o{)Q^Db`iqR4di? zU1jYWpV|9VbQC|IXj2t7`}3V4^>X3M z>iQMFf0$5u{kra3X_jrdTO7N2J7+)hy}RUYz}BnQ!SY{fI({*H`thUrKhoCapPjzG^kn&mnipFQ^}3zJ@_Y9g`D+>5 zDTeORzW;5yWmS1?a@X-stli?d-9NKs=I@POz2Lz`+q;XOwRZZ+?0sLEyzBkLwF|qi zx5(Q~T(Q@QJ>9%qzu!&wPc=)$|L;b3x23foPrGu%r2OEf(&PWS7HwaX;QH2y;bP}K?B&ycv4-nCJ$>!X$2T)Jaqs_G1#`iZHPybPNXPxNWGP&+fU*G9Q=dNZ~UHkZfKj-$km!+za(c7mv+s(O} zb@|iT+x>3tb31nLYHN2cU0)V!^^Nn(+Q={G98yN3GcOZt7 zs&-4tyXMTjEA`VXQ~t)gEXD8Nxc-%iyZ}eXmkjf?kT1oTzpJFXoSQ56$WCv^$NIWc z*EW}~{&jlVj5fX7)g_uEr@1TE4fq}u{q>=!WhTrq= zYi|C({;Anc#~w7ja)_gaq08~u%Z?0P_GPlXbF*J5L@f&pxbEgUpNWfsp<$7t0Fyz? zwV8J}tJM{Mc%K@Pv$v|3YlYi>2?mA+A$J9qgdJ;syx6h-(t^3}ujegpzyH{?5;WS+ zb0HP9KbJwo6?8=0=)tXkxe9{LKV)zS1fO}tfd6>2Atn7+o`K>2{~K5Cf+mF6Ky6}X Zh9xf^Jl^tL1+>7B!PC{xWt~$(699Okow5J` literal 0 HcmV?d00001 diff --git a/site/assets/shot-emoji.webp b/site/assets/shot-emoji.webp new file mode 100644 index 0000000000000000000000000000000000000000..9bea898d9e2ac2212ae53b586744f99040cad50e GIT binary patch literal 30138 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 z%0A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 literal 0 HcmV?d00001 diff --git a/site/index.html b/site/index.html new file mode 100644 index 0000000..9a70f8d --- /dev/null +++ b/site/index.html @@ -0,0 +1,225 @@ + + + + + +Bsky+ for Bluesky + + + + + + + + + + + + + + + + + + + + +

+ +
+ +
+
+
+
+

Extra features for Bluesky

+

Edit posts, inline emoji, OCR alt text, extra video controls and more, right into Bluesky

+
+ + + + Add to Chrome + + + + + Add to Firefox + +
+

Works on bsky.app. No account or sign-up needed.

+
+
+
bsky.app
+ The Bluesky composer with Bsky+ suggesting emoji for :rocke, with :rocket: at the top of the list +
+
+
+ +
+
+
+

Everything it adds

+

Each feature can be switched on or off from the Bsky+ menu in your toolbar.

+
+
+
+
+

Edit posts

+

Fix a typo in one of your own posts from its ••• menu. The post keeps its link.

+
+
+
+

Emoji autocomplete

+

Type a colon and pick any emoji. Typos are fine: :pary still finds :tada:.

+
+
+
+

One-click alt text

+

On-device OCR to generate alt text for your images.

+
+
+
+

AI image descriptions

+

Connect an AI model of your choice, even one on your own computer, to describe photos for you.

+
+
+
+

Thread reader

+

Unroll a thread for better readability!

+
+
+
+

Bookmarks browser

+

Keep a copy of your saved posts in your browser and search them by words, author, media type and date saved.

+
+
+
+

Hide “Liked by”

+

Remove the “Liked by” row from post pages when you would rather not see who liked what.

+
+
+
+

Video speed & PiP

+

Play videos from 0.5x to 2x and pop them out into picture-in-picture, right from Bluesky’s player.

+
+
+
+

Wider timeline

+

Stretch the feed from the usual 600px up to 1200px so big screens show more.

+
+
+
+

Theme editor

+

Build your own colour theme, preview it live on Bluesky and export it to share. You can also import Witchsky themes.

+
+
+
+

Custom AppView

+

Choose who serves your feeds: Bluesky, Eurosky, Blacksky, or an AppView of your own.

+
+
+
+

Custom image CDN

+

Load images from Luna or another CDN of your choice instead of Bluesky’s.

+
+
+
+
+
+ +
+
+ Bsky+ + An independent project, not affiliated with Bluesky. +
+
+ + + diff --git a/test/test_appview.mjs b/test/test_appview.mjs new file mode 100644 index 0000000..8db658c --- /dev/null +++ b/test/test_appview.mjs @@ -0,0 +1,208 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import vm from 'node:vm'; +import { readFile } from 'node:fs/promises'; + +const policy = await readFile('extension/shared/appview-config.js', 'utf8'); +const adapter = await readFile('extension/shared/appview-page.js', 'utf8'); + +function fixture(enforceMatchingPds = false) { + const calls = []; + let listener; + const context = vm.createContext({ URL, Request, Headers, Response, Event, atob, setTimeout, clearTimeout, + location: { origin: 'https://bsky.app', href: 'https://bsky.app/' }, + document: { currentScript: { dataset: { bskyplusChannel: 'test' } } }, + addEventListener(type, callback) { listener = callback; }, + postMessage() {}, + dispatchEvent() {}, + async fetch(input, init) { + const request = new Request(input, init); + calls.push({ url: request.url, headers: Object.fromEntries(request.headers), body: await request.text(), credentials: request.credentials }); + return new Response('{}', { headers: { 'content-type': 'application/json' } }); + }, + }); + vm.runInContext('window = globalThis', context); + vm.runInContext((enforceMatchingPds ? policy.replace('ENFORCE_MATCHING_PDS = false', 'ENFORCE_MATCHING_PDS = true') : policy) + '\n' + adapter, context); + const configure = (hostname, bookmarksAppview = '') => { + context.message = { channel: 'test', direction: 'request', action: 'configure', hostname, bookmarksAppview }; + context.listener = listener; + vm.runInContext("listener({source: window, origin: location.origin, data: message})", context); + }; + const auth = { authorization: 'Bearer a.' + Buffer.from(JSON.stringify({ scope: 'com.atproto.access', sub: 'did:plc:test' })).toString('base64url') + '.b' }; + return { context, calls, configure, auth }; +} + +test('bookmarks can use Bluesky independently of the selected AppView', async () => { + const { context, calls, configure, auth } = fixture(); + configure('api.eurosky.network', 'bluesky'); + for (const method of ['getBookmarks', 'createBookmark', 'deleteBookmark']) { + const url = 'https://eurosky.social/xrpc/app.bsky.bookmark.' + method; + await context.fetch(url, { headers: auth, ...(method === 'getBookmarks' ? {} : { method: 'POST', body: '{}' }) }); + assert.equal(calls.at(-1).url, url); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.bsky.app#bsky_appview'); + } + await context.fetch('https://eurosky.social/xrpc/app.bsky.actor.getProfile', { headers: auth }); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.eurosky.network#bsky_appview'); + const request = new Request('https://eurosky.social/xrpc/app.bsky.bookmark.getBookmarks', { headers: auth }); + assert.equal(await context.BskyPlusAppviewRouting.bookmarkSource(request), 'api.bsky.app'); + configure('api.eurosky.network'); + assert.equal(await context.BskyPlusAppviewRouting.bookmarkSource(request), 'api.eurosky.network'); + await context.fetch(request); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.eurosky.network#bsky_appview'); +}); + +test('hostname validation', () => { + const { context, configure } = fixture(true); + configure(''); + const c = context.BskyPlusAppviewConfig; + assert.equal(c.normalizeHostname('https://API.Example.COM/'), 'api.example.com'); + for (const value of ['http://bad.test', 'evil.test/path', 'user@evil.test', 'evil.test:443']) assert.throws(() => c.normalizeHostname(value)); + assert.equal(c.eligible('api.eurosky.network', 'https://eurosky.social'), true); + assert.equal(c.eligible('api.eurosky.network', 'https://eurosky.social.evil.test'), false); + assert.equal(c.eligible('api.blacksky.community', 'https://pds.blacksky.app'), true); + assert.equal(c.eligible('api.blacksky.community', ''), false); +}); + +test('default stays unchanged; public routing drops cookies and preserves query', async () => { + const { context, calls, configure } = fixture(); + configure(''); + const url = 'https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=bsky.app'; + await context.fetch(url); + assert.equal(calls.at(-1).url, url); + configure('api.example.com'); + await context.fetch(url, { credentials: 'include' }); + assert.equal(calls.at(-1).url, url.replace('public.api.bsky.app', 'api.example.com')); + assert.equal(calls.at(-1).credentials, 'omit'); +}); + +test('presets require matching PDS on every request including after account changes and logout', async () => { + const { context, calls, configure, auth } = fixture(true); + configure('api.eurosky.network'); + const path = '/xrpc/app.bsky.bookmark.createBookmark'; + await context.fetch('https://other.test' + path, { method: 'POST', headers: auth, body: '{"uri":"at://post"}' }); + assert.equal(calls.at(-1).headers['atproto-proxy'], undefined); + await context.fetch(new Request('https://eurosky.social' + path, { method: 'POST', headers: auth, body: '{"uri":"at://post"}' })); + assert.equal(calls.at(-1).url, 'https://eurosky.social' + path); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.eurosky.network#bsky_appview'); + assert.equal(calls.at(-1).body, '{"uri":"at://post"}'); + assert.equal(calls.at(-1).headers.authorization, auth.authorization); + await context.fetch('https://eurosky.social/xrpc/app.bsky.notification.listNotifications', { headers: { ...auth, 'atproto-proxy': 'did:web:api.bsky.app#bsky_notif' } }); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.eurosky.network#bsky_notif'); + await context.fetch('https://other.test' + path, { headers: auth }); + assert.equal(calls.at(-1).headers['atproto-proxy'], undefined); + configure('api.blacksky.community'); + await context.fetch('https://other.test' + path, { headers: auth }); + assert.equal(calls.at(-1).headers['atproto-proxy'], undefined); + await context.fetch('https://blacksky.app' + path, { headers: auth }); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.blacksky.community#bsky_appview'); + await context.fetch('https://blacksky.app/xrpc/com.atproto.server.deleteSession', { method: 'POST' }); + await context.fetch('https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=bsky.app'); + assert.equal(new URL(calls.at(-1).url).hostname, 'public.api.bsky.app'); +}); + +test('PDS matching is temporarily disabled without deleting its policy', async () => { + const { context, calls, configure, auth } = fixture(); + assert.equal(context.BskyPlusAppviewConfig.ENFORCE_MATCHING_PDS, false); + for (const hostname of ['api.eurosky.network', 'api.blacksky.community']) { + assert.equal(context.BskyPlusAppviewConfig.eligible(hostname, 'https://unrelated.test'), true); + configure(hostname); + await context.fetch('https://unrelated.test/xrpc/app.bsky.actor.getProfile', { headers: auth }); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:' + hostname + '#bsky_appview'); + } +}); + +test('chat declaration reads stay on the PDS without mutating shared AppView headers', async () => { + const { context, calls, configure, auth } = fixture(); + const url = 'https://eurosky.social/xrpc/com.atproto.repo.getRecord?repo=did%3Aplc%3Almkzmvv6sdxntwtyxpg7fqqq&collection=chat.bsky.actor.declaration&rkey=self'; + for (const headers of [auth, new Headers(auth), { ...auth, 'atproto-proxy': 'did:web:api.bsky.app#bsky_appview' }, + new Headers({ ...auth, 'atproto-proxy': 'did:web:api.eurosky.network#bsky_appview' })]) { + const init = { headers }; + const original = Object.fromEntries(new Headers(headers)); + for (const host of ['', 'api.eurosky.network', 'api.blacksky.community', 'api.custom.test', '']) { + configure(host); + await context.fetch('https://eurosky.social/xrpc/app.bsky.actor.getProfiles?actors=did:plc:test', init); + assert.deepEqual(Object.fromEntries(new Headers(headers)), original); + await context.fetch(url, init); + assert.equal(calls.at(-1).url, url); + const expected = { ...original }; + delete expected['atproto-proxy']; + assert.deepEqual(calls.at(-1).headers, expected); + assert.deepEqual(Object.fromEntries(new Headers(headers)), original); + await context.fetch(new Request(url, init)); + assert.deepEqual(calls.at(-1).headers, expected); + assert.equal(calls.at(-1).url, url); + } + } +}); + +test('chat declaration correction leaves unrelated record and service requests untouched', async () => { + const { context, calls, configure, auth } = fixture(); + configure(''); + for (const [collection, proxy] of [ + ['app.bsky.actor.profile', 'did:web:api.eurosky.network#bsky_appview'], + ['chat.bsky.actor.declaration', 'did:web:api.bsky.chat#bsky_chat'], + ]) { + const url = 'https://eurosky.social/xrpc/com.atproto.repo.getRecord?repo=did:plc:test&collection=' + collection + '&rkey=self'; + await context.fetch(url, { headers: { ...auth, 'atproto-proxy': proxy } }); + assert.equal(calls.at(-1).url, url); + assert.equal(calls.at(-1).headers['atproto-proxy'], proxy); + } +}); + +test('both profile endpoints retain the selected AppView proxy header', async () => { + const { context, calls, configure, auth } = fixture(); + configure('api.eurosky.network'); + for (const endpoint of ['getProfile', 'getProfiles']) { + const url = 'https://eurosky.social/xrpc/app.bsky.actor.' + endpoint; + assert.equal(context.BskyPlusAppviewConfig.isAppview(new URL(url)), true); + await context.fetch(url, { headers: auth }); + assert.equal(calls.at(-1).url, url); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:api.eurosky.network#bsky_appview'); + } +}); + +test('preference reads and writes stay on the PDS without AppView headers', async () => { + const { context, calls, configure, auth } = fixture(); + const body = JSON.stringify({ preferences: [{ $type: 'app.bsky.actor.defs.savedFeedsPrefV2', items: [] }] }); + for (const host of ['', 'api.eurosky.network', 'api.custom.test']) { + configure(host); + for (const method of ['getPreferences', 'putPreferences']) { + const url = 'https://eurosky.social/xrpc/app.bsky.actor.' + method; + assert.equal(context.BskyPlusAppviewConfig.isAppview(new URL(url)), false); + for (const proxy of [null, 'did:web:api.bsky.app#bsky_appview', 'did:web:api.eurosky.network#bsky_appview']) { + const headers = new Headers(auth); + if (proxy) headers.set('atproto-proxy', proxy); + const init = { headers, method: method === 'putPreferences' ? 'POST' : 'GET' }; + if (init.method === 'POST') { + headers.set('content-type', 'application/json'); + init.body = body; + } + for (const requestInput of [false, true]) { + if (requestInput) await context.fetch(new Request(url, init)); + else await context.fetch(url, init); + assert.equal(calls.at(-1).url, url); + assert.equal(calls.at(-1).headers['atproto-proxy'], undefined); + assert.equal(calls.at(-1).headers.authorization, auth.authorization); + assert.equal(calls.at(-1).body, init.body || ''); + assert.equal(headers.get('atproto-proxy'), proxy); + } + } + } + } +}); + +test('unrelated services and bearer tokens to public AppView are never redirected', async () => { + const { context, calls, configure, auth } = fixture(); + configure('api.example.com'); + for (const path of ['com.atproto.repo.createRecord', 'chat.bsky.convo.listConvos', 'app.bsky.video.uploadVideo']) { + const url = 'https://pds.test/xrpc/' + path; + await context.fetch(url, { headers: auth }); + assert.equal(calls.at(-1).url, url); + assert.equal(calls.at(-1).headers['atproto-proxy'], undefined); + } + await context.fetch('https://pds.test/xrpc/app.bsky.feed.getFeed', { headers: { ...auth, 'atproto-proxy': 'did:web:feed.test#feed_generator' } }); + assert.equal(calls.at(-1).headers['atproto-proxy'], 'did:web:feed.test#feed_generator'); + const publicUrl = 'https://public.api.bsky.app/xrpc/app.bsky.feed.getTimeline'; + await context.fetch(publicUrl, { headers: auth }); + assert.equal(calls.at(-1).url, publicUrl); +}); diff --git a/test/test_bookmarks.mjs b/test/test_bookmarks.mjs new file mode 100644 index 0000000..8cd6e1e --- /dev/null +++ b/test/test_bookmarks.mjs @@ -0,0 +1,603 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +test('bookmark import, local pagination, mutations, isolation and clearing', async () => { + const browser = await puppeteer.launch({ executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', headless: true, args: ['--no-sandbox'] }); + try { + const page = await browser.newPage(); + page.on('pageerror', error => console.error('Bookmark page error:', error.message)); + await page.setRequestInterception(true); + page.on('request', request => request.respond({ status: 200, + contentType: request.resourceType() === 'image' ? 'image/svg+xml' : 'text/html', + body: request.resourceType() === 'image' ? '' : ` + + +
+

Saved Posts

+
Your saved posts
+
+ ` })); + await page.goto('https://bsky.app/saved'); + await page.evaluate(() => { + window.rows = Array.from({ length: 105 }, (_, index) => ({ subject: { uri: `at://did:plc:author/app.bsky.feed.post/${index}`, cid: `cid${index}` }, item: { record: { text: `Post ${index}` } } })); + window.rows[104].createdAt = '2026-01-10T12:00:00Z'; + window.rows[104].item.author = { handle: 'jane.bsky.social', displayName: 'Jane', avatar: 'https://cdn.bsky.app/avatar/jane.png' }; + window.rows[104].item.embed = { $type: 'app.bsky.embed.recordWithMedia#view', media: { + $type: 'app.bsky.embed.images#view', images: [{ alt: 'Café nebula' }] + } }; + window.rows[103].item.embed = { $type: 'app.bsky.embed.video#view', playlist: 'https://video.test/playlist.m3u8' }; + window.rows[102].item.embed = { $type: 'app.bsky.embed.external#view', external: { uri: 'https://example.com', title: 'Astronomy news' } }; + window.calls = []; + window.fail = false; + window.fetch = async (input, init) => { + const url = new URL(input instanceof Request ? input.url : input); + window.calls.push(url.href); + if (url.pathname.endsWith('createBookmark')) window.rows.unshift({ subject: { uri: 'at://new', cid: 'new' }, item: { record: { text: 'New' } } }); + if (url.pathname.endsWith('deleteBookmark')) window.rows.shift(); + if (!url.pathname.endsWith('getBookmarks')) return new Response('{}'); + if (window.fail) return new Response('{}', { status: 503 }); + const start = Number(url.searchParams.get('cursor') || 0); + if (window.holdBookmarkPage && start > 0) await new Promise(resolve => { window.resumeBookmarkPage = resolve; }); + if (start > 0) window.bookmarkPageReturned = true; + const limit = Number(url.searchParams.get('limit') || 50); + return Response.json({ bookmarks: window.rows.slice(start, start + limit), ...(start + limit < window.rows.length ? { cursor: String(start + limit) } : {}) }); + }; + window.query = (method = 'getBookmarks', query = '', did = 'did:plc:first') => fetch(`https://api.bsky.app/xrpc/app.bsky.bookmark.${method}${query}`, { + headers: { authorization: `Bearer e30.${btoa(JSON.stringify({ sub: did }))}.signature` }, + ...(method !== 'getBookmarks' ? { method: 'POST', body: '{}' } : {}) + }).then(response => response.json()); + window.visibleBookmarks = []; + window.resets = 0; + window.refreshes = 0; + window.bookmarkTestClient = { + getQueryCache() {}, + async cancelQueries() {}, + async resetQueries(options) { + if (JSON.stringify(options) !== JSON.stringify({ queryKey: ['bookmarks'], exact: true })) throw new Error('Wrong query'); + window.visibleBookmarks = []; + window.resets++; + window.visibleBookmarks = (await window.query()).bookmarks; + }, + async refetchQueries(options) { + if (JSON.stringify(options) !== JSON.stringify({ queryKey: ['bookmarks'], exact: true, type: 'active' })) throw new Error('Wrong query'); + if (window.holdBookmarkRefresh) await new Promise(resolve => { window.resumeBookmarkRefresh = resolve; }); + window.visibleBookmarks = (await window.query()).bookmarks; + window.refreshes++; + } + }; + let ancestor = { memoizedProps: { client: window.bookmarkTestClient } }; + for (let depth = 0; depth < 160; depth++) ancestor = { return: ancestor }; + document.querySelector('main').__reactFiber$test = ancestor; + }); + await page.evaluate(source => { + const script = document.createElement('script'); + script.dataset.bskyplusChannel = 'test-bookmarks-channel'; + script.textContent = source; + document.head.append(script); + }, await readFile('extension/shared/bookmarks-page.js', 'utf8')); + await page.addStyleTag({ content: await readFile('extension/shared/bookmarks.css', 'utf8') }); + assert.equal((await page.evaluate(() => query())).bookmarks.length, 50); + assert.equal(await page.$('.bskyplus-bookmarks-search'), null, 'search is hidden until local bookmarks are enabled'); + for (const width of [1440, 1100, 390]) { + await page.setViewport({ width, height: 900 }); + await page.waitForFunction(() => { + const panel = document.querySelector('[data-bskyplus-bookmarks]').getBoundingClientRect(); + const header = document.getElementById('nativeHeader').getBoundingClientRect(); + return panel.left === header.left && panel.width === header.width; + }); + assert.equal(await page.evaluate(() => { + const panel = document.querySelector('[data-bskyplus-bookmarks]'); + const feed = document.getElementById('feed'); + const rect = panel.getBoundingClientRect(); + const header = document.getElementById('nativeHeader'); + const column = header.getBoundingClientRect(); + return panel.parentElement === feed && rect.left === column.left && rect.right === column.right && + header.nextElementSibling === panel && rect.top >= column.bottom && column.height === 52 && + !panel.innerText.includes('IndexedDB') && panel.querySelector('[role="status"]').getBoundingClientRect().width === 1 && + getComputedStyle(header.querySelector('[data-bskyplus-bookmark-actions] button')).borderRadius === '999px'; + }), true, `controls stay in the feed at ${width}px`); + } + await page.locator('[data-bskyplus-bookmark-actions] > button').filter(button => button.textContent === 'Enable local bookmarks').click(); + await page.waitForFunction(() => document.body.textContent.includes('105 bookmarks ·')); + await page.evaluate(() => query()); + const before = await page.evaluate(() => calls.length); + const first = await page.evaluate(() => query()); + assert.equal(first.cursor, 'bskyplus:0:50'); + const second = await page.evaluate(() => query('getBookmarks', '?cursor=bskyplus:0:100')); + assert.equal(second.bookmarks.length, 5); + assert.equal(await page.evaluate(() => calls.length), before); + const cursorBeforeSync = await page.evaluate(async () => (await query()).cursor); + assert.ok(cursorBeforeSync, 'the unfiltered list has a next-page cursor before sync'); + await page.evaluate(() => { + window.rows.unshift({ subject: { uri: 'at://manual-sync-addition', cid: 'manual-sync-addition' }, + item: { record: { text: 'Added while sync was idle' } } }); + const removed = window.rows.findIndex(bookmark => bookmark.subject.uri.endsWith('/0')); + window.rows.splice(removed, 1); + }); + await page.locator('[data-bookmark-sync]').click(); + await page.waitForSelector('.bskyplus-bookmarks-toast[data-kind="success"]'); + await page.waitForFunction(() => window.visibleBookmarks[0]?.item.record.text === 'Added while sync was idle'); + assert.equal(await page.evaluate(() => window.visibleBookmarks.some(bookmark => bookmark.subject.uri.endsWith('/0'))), false, + 'manual sync refreshes the visible unfiltered list after removals'); + const restartedCursor = await page.evaluate(cursor => query('getBookmarks', `?cursor=${cursor}`), cursorBeforeSync); + assert.equal(restartedCursor.bookmarks[0].item.record.text, 'Added while sync was idle', + 'manual sync advances pagination generation and stale cursors restart at the first result'); + const syncedPages = await page.evaluate(async () => { + const results = []; + let cursor; + do { + const data = await query('getBookmarks', cursor ? `?cursor=${cursor}` : ''); + results.push(...data.bookmarks.map(bookmark => bookmark.subject.uri)); + cursor = data.cursor; + } while (cursor); + return results; + }); + assert.equal(syncedPages.length, 105); + assert.equal(new Set(syncedPages).size, 105, 'synced pagination has no gaps or duplicate records'); + assert.ok(syncedPages.includes('at://manual-sync-addition')); + assert.equal(syncedPages.some(uri => uri.endsWith('/0')), false, 'removed bookmarks disappear from the local snapshot'); + await page.locator('[aria-label="Dismiss bookmark sync notification"]').click(); + const afterManualSync = await page.evaluate(() => calls.length); + assert.equal(await page.$$('.bskyplus-bookmarks-search').then(elements => elements.length), 1); + assert.deepEqual(await page.$$eval('.bskyplus-bookmarks-search input, .bskyplus-bookmarks-search select, [data-bookmark-content]', inputs => + inputs.filter(input => input.getBoundingClientRect().height > 0).map(input => input.name)), ['query', 'author', 'type']); + await page.addStyleTag({ content: '[popover] { inset: 0 !important; margin: auto !important; transform: translate(50%, 50%) !important; }' }); + const assertContentPosition = async () => { + await page.waitForFunction(() => { + const button = document.querySelector('[data-bookmark-content]').getBoundingClientRect(); + const list = document.querySelector('.bskyplus-bookmarks-options'); + const menu = list.getBoundingClientRect(); + return list.matches(':popover-open') && Math.abs(menu.left - button.left) < 1 && + Math.abs(menu.top - button.bottom - 4) < 1 && Math.abs(menu.width - button.width) < 1 && + list.contains(document.elementFromPoint(menu.left + 10, menu.top + 10)); + }); + }; + for (const width of [1100, 390]) { + await page.setViewport({ width, height: 900 }); + await page.click('[data-bookmark-content]'); + await assertContentPosition(); + await page.keyboard.press('Escape'); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.getAttribute('aria-expanded')), 'false'); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.matches(':focus-visible')), false); + } + await page.focus('[data-bookmark-content]'); + await page.keyboard.press('ArrowDown'); + await page.keyboard.press('ArrowDown'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => window.visibleBookmarks.length === 1 && window.visibleBookmarks[0].item.record.text === 'Post 104'); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.textContent), 'Images'); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.matches(':focus-visible')), false); + await page.click('[data-bookmark-content]'); + await page.click('.bskyplus-bookmarks-options [data-value="images"]'); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.matches(':focus')), false, 'choosing the current value clears focus too'); + await page.click('[data-bookmark-content]'); + await page.click('[data-bookmark-content]'); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.matches(':focus')), false, 'closing with the trigger clears focus'); + await page.click('.bskyplus-bookmarks-search .bskyplus-bookmarks-button'); + await page.waitForFunction(() => window.visibleBookmarks.length === 50); + assert.equal(await page.$eval('[data-bookmark-content]', button => button.textContent), 'All content'); + await page.click('[data-bookmark-content]'); + await page.click('input[name="query"]'); + assert.equal(await page.$eval('.bskyplus-bookmarks-options', list => list.hidden), true); + await page.type('input[name="author"]', 'ja'); + await page.waitForSelector('.bskyplus-bookmarks-authors [role="option"]', { visible: true }); + await page.waitForFunction(() => document.querySelector('.bskyplus-bookmarks-author-avatar img')?.naturalWidth === 36); + assert.equal(await page.$eval('.bskyplus-bookmarks-author-avatar', avatar => { + const rect = avatar.getBoundingClientRect(); + const copy = avatar.nextElementSibling.getBoundingClientRect(); + const row = avatar.closest('[role="option"]').getBoundingClientRect(); + return rect.width === 32 && rect.height === 32 && rect.top >= row.top + 10 && + rect.bottom <= row.bottom - 10 && copy.left > rect.right && + getComputedStyle(avatar).borderRadius === '50%'; + }), true, 'profile pictures are round and sit beside the author text'); + const assertAuthorPosition = async () => { + await page.waitForFunction(() => { + const input = document.querySelector('input[name="author"]').getBoundingClientRect(); + const menu = document.querySelector('.bskyplus-bookmarks-authors').getBoundingClientRect(); + return Math.abs(menu.left - input.left) < 1 && Math.abs(menu.top - input.bottom - 4) < 1 && Math.abs(menu.width - input.width) < 1; + }); + }; + await assertAuthorPosition(); + await page.setViewport({ width: 1100, height: 900 }); + await assertAuthorPosition(); + await page.evaluate(() => { document.body.style.minHeight = '1600px'; window.scrollTo(0, 40); }); + await assertAuthorPosition(); + await page.evaluate(() => { window.scrollTo(0, 0); document.body.style.removeProperty('min-height'); }); + await page.setViewport({ width: 390, height: 900 }); + await assertAuthorPosition(); + assert.equal(await page.$eval('.bskyplus-bookmarks-authors [role="option"] span', element => element.textContent), '@jane.bsky.social'); + await page.evaluate(() => { + document.getElementById('nativeHeader').style.backgroundColor = 'rgba(28, 35, 45, 0.6)'; + document.querySelector('[data-bskyplus-bookmarks]').style.overflow = 'hidden'; + window.dispatchEvent(new Event('resize')); + const list = document.querySelector('.bskyplus-bookmarks-authors'); + const rect = list.getBoundingClientRect(); + const blocker = document.createElement('div'); + blocker.id = 'dropdown-test-blocker'; + Object.assign(blocker.style, { position: 'fixed', zIndex: '2147483646', background: 'red', + left: rect.left + 'px', top: rect.top + 'px', width: rect.width + 'px', height: rect.height + 'px' }); + document.body.append(blocker); + }); + assert.equal(await page.$eval('.bskyplus-bookmarks-authors', list => { + const rect = list.getBoundingClientRect(); + return list.matches(':popover-open') && getComputedStyle(list).backgroundColor === 'rgb(28, 35, 45)' && + list.contains(document.elementFromPoint(rect.left + 10, rect.top + 10)); + }), true, 'suggestions remain opaque and above feed layers, even inside a clipped parent'); + assert.equal(await page.$eval('[data-bookmark-sync]', button => getComputedStyle(button).backgroundColor), 'rgb(34, 46, 63)'); + assert.equal(await page.$eval('.bskyplus-bookmarks-search .bskyplus-bookmarks-button', button => getComputedStyle(button).backgroundColor), 'rgb(34, 46, 63)'); + await page.evaluate(() => { + document.getElementById('dropdown-test-blocker').remove(); + document.querySelector('[data-bskyplus-bookmarks]').style.removeProperty('overflow'); + }); + assert.equal(await page.$eval('.bskyplus-bookmarks-options', element => { + const style = getComputedStyle(element); + return style.backgroundColor === 'rgb(28, 35, 45)' && style.color === 'rgb(241, 243, 245)'; + }), true, 'dark dropdown options use an opaque dark background and contrasting text'); + assert.equal(await page.$eval('[data-bskyplus-bookmarks]', element => getComputedStyle(element).colorScheme), 'dark'); + if (process.env.BOOKMARKS_SCREENSHOT) { + console.log('BOOKMARKS_SCREENSHOT=' + (await page.screenshot({ encoding: 'base64' }))); + await page.setViewport({ width: 1100, height: 900 }); + await page.waitForFunction(() => document.querySelector('[data-bskyplus-bookmarks]').getBoundingClientRect().left === document.getElementById('nativeHeader').getBoundingClientRect().left); + console.log('BOOKMARKS_SCREENSHOT=' + (await page.screenshot({ encoding: 'base64' }))); + await page.click('[data-bookmark-content]'); + console.log('BOOKMARKS_SCREENSHOT=' + (await page.screenshot({ encoding: 'base64' }))); + await page.keyboard.press('Escape'); + await page.focus('input[name="author"]'); + await page.waitForSelector('.bskyplus-bookmarks-authors [role="option"]', { visible: true }); + } + await page.keyboard.press('ArrowDown'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => window.visibleBookmarks.length === 1 && window.visibleBookmarks[0].item.record.text === 'Post 104'); + assert.equal(await page.$eval('input[name="author"]', element => element.value), 'jane.bsky.social'); + assert.equal(await page.$eval('input[name="author"]', element => element.getAttribute('aria-expanded')), 'false'); + assert.equal(await page.$eval('input[name="author"]', element => element.matches(':focus-visible')), false); + await page.focus('input[name="author"]'); + await page.waitForSelector('.bskyplus-bookmarks-authors:popover-open'); + await page.keyboard.press('Escape'); + assert.equal(await page.$eval('input[name="author"]', element => element.matches(':focus')), false, 'dismissing author suggestions clears focus'); + await page.focus('input[name="author"]'); + await page.waitForSelector('.bskyplus-bookmarks-authors:popover-open'); + await page.click('.bskyplus-bookmarks-authors [role="option"]'); + assert.equal(await page.$eval('input[name="author"]', element => element.matches(':focus')), false, 'selecting an author with the pointer clears focus'); + assert.equal(await page.evaluate(() => calls.length), afterManualSync, 'author suggestions come from the full local collection'); + await page.evaluate(() => { + document.body.style.backgroundColor = '#ffffff'; + document.body.style.color = '#1c232d'; + document.getElementById('nativeHeader').style.backgroundColor = '#ffffff'; + window.dispatchEvent(new Event('resize')); + }); + assert.equal(await page.$eval('.bskyplus-bookmarks-options', element => { + const style = getComputedStyle(element); + return style.backgroundColor === 'rgb(255, 255, 255)' && style.color === 'rgb(28, 35, 45)'; + }), true, 'dropdown options follow light themes as well'); + await page.evaluate(() => { + document.body.style.backgroundColor = '#1c232d'; + document.body.style.color = '#f1f3f5'; + document.getElementById('nativeHeader').style.backgroundColor = '#1c232d'; + window.dispatchEvent(new Event('resize')); + }); + await page.click('.bskyplus-bookmarks-search .bskyplus-bookmarks-button'); + await page.waitForFunction(() => window.visibleBookmarks.length === 50); + const resetsBeforeSearch = await page.evaluate(() => { window.holdBookmarkRefresh = true; return window.resets; }); + await page.type('input[name="query"]', 'POST 104'); + await page.waitForFunction(() => typeof window.resumeBookmarkRefresh === 'function'); + assert.equal(await page.evaluate(() => window.visibleBookmarks.length), 50, 'previous posts remain visible while the new filter is pending'); + assert.equal(await page.evaluate(() => window.resets), resetsBeforeSearch, 'filtering never resets the feed into its initial loading state'); + await page.evaluate(() => { window.holdBookmarkRefresh = false; window.resumeBookmarkRefresh(); }); + assert.ok(!await page.$eval('[data-bookmark-results]', element => element.textContent.includes('Could not refresh')), 'finds the client above a deeply nested provider tree'); + await page.waitForFunction(() => window.visibleBookmarks.length === 1 && window.visibleBookmarks[0].item.record.text === 'Post 104'); + assert.equal(await page.evaluate(() => calls.length), afterManualSync, 'search beyond the first 100 records uses only IndexedDB'); + assert.equal(await page.$eval('[data-bookmark-results]', element => element.textContent), '1 of 105 bookmarks'); + await page.evaluate(() => { + const current = { dependencies: { firstContext: { memoizedValue: window.bookmarkTestClient } } }; + const staleClient = { + getQueryCache() {}, + cancelQueries() { throw new Error('Used the previous account client'); }, + resetQueries() { throw new Error('Used the previous account client'); }, + refetchQueries() { throw new Error('Used the previous account client'); } + }; + document.querySelector('main').__reactFiber$test = { + memoizedProps: { value: staleClient }, + stateNode: { current }, + alternate: current + }; + }); + await page.type('input[name="author"]', 'missing-author'); + await page.waitForFunction(() => document.querySelector('[data-bookmark-results]').textContent === '0 of 105 bookmarks'); + await page.waitForFunction(() => window.visibleBookmarks.length === 0); + await page.click('.bskyplus-bookmarks-search .bskyplus-bookmarks-button'); + await page.waitForFunction(() => window.visibleBookmarks.length === 50); + await page.click('[data-bookmark-advanced]'); + await page.waitForSelector('dialog[open]'); + assert.equal(await page.$eval('[data-bookmark-background]', background => { + const inputs = [...background.querySelectorAll('input')].filter(input => input.getBoundingClientRect().height > 0); + return background.inert && !background.closest('dialog') && inputs.length === 2 && + background.textContent.includes('All content') && background.textContent.includes('Advanced'); + }), true, 'normal filters remain visible behind the modal'); + assert.equal(await page.$eval('dialog h2', heading => document.activeElement === heading), true, 'opening Advanced focuses the heading instead of highlighting a text input'); + assert.deepEqual(await page.$$eval('.bskyplus-bookmarks-dialog-actions button', buttons => buttons.map(button => button.textContent)), ['Clear filters', 'Done']); + assert.equal(await page.$('dialog form .bskyplus-bookmarks-button:not([hidden])'), null, 'Clear filters moves out of the form while the dialog is open'); + await page.click('dialog [data-bookmark-content]'); + await assertContentPosition(); + await page.keyboard.press('v'); + assert.equal(await page.$eval('.bskyplus-bookmarks-options [aria-selected="true"]', option => option.textContent), 'Video'); + await page.keyboard.press('Escape'); + assert.ok(await page.$('dialog[open]'), 'Escape closes the content menu without closing Advanced search'); + await page.focus('dialog input[name="author"]'); + await page.waitForSelector('.bskyplus-bookmarks-authors:popover-open'); + await assertAuthorPosition(); + assert.equal(await page.$eval('.bskyplus-bookmarks-authors', list => !!list.closest('dialog[open]')), true); + assert.equal(await page.$$eval('dialog input, dialog [data-bookmark-select]', inputs => inputs.filter(input => input.getBoundingClientRect().height > 0).length), 6); + await page.click('[data-bookmark-order]'); + assert.deepEqual(await page.$$eval('[data-bookmark-options="order"] [role="option"]', options => options.map(option => option.textContent)), ['Newest first', 'Oldest first']); + assert.equal(await page.$eval('[data-bookmark-options="order"]', list => { + const button = document.querySelector('[data-bookmark-order]').getBoundingClientRect(); + const rect = list.getBoundingClientRect(); + return list.matches(':popover-open') && Math.abs(rect.left - button.left) < 1 && + Math.abs(rect.width - button.width) < 1 && getComputedStyle(list).backgroundColor === 'rgb(28, 35, 45)'; + }), true, 'Order uses the same anchored, opaque menu as Content'); + await page.keyboard.press('ArrowDown'); + await page.keyboard.press('Enter'); + assert.equal(await page.$eval('[data-bookmark-order]', button => button.textContent), 'Oldest first'); + await page.waitForFunction(() => document.querySelector('[data-bookmark-background]').textContent.includes('Advanced · 1')); + assert.equal(await page.$eval('[data-bookmark-order]', button => button.matches(':focus')), false); + await page.waitForFunction(() => window.visibleBookmarks[0]?.item.record.text === 'Post 104'); + const staleCursor = await page.evaluate(() => query('getBookmarks', '?cursor=bskyplus:0:100')); + assert.equal(staleCursor.bookmarks[0].item.record.text, 'Post 104', 'old-query cursors restart at the first match'); + await page.click('[aria-label="Close advanced search"]'); + await page.waitForFunction(() => !document.querySelector('dialog')); + assert.equal(await page.$eval('[data-bookmark-advanced]', button => button.textContent), 'Advanced · 1'); + assert.equal(await page.$eval('[data-bookmark-order]', input => input.getBoundingClientRect().height), 0); + await page.click('.bskyplus-bookmarks-search .bskyplus-bookmarks-button'); + await page.waitForFunction(() => window.visibleBookmarks[0]?.item.record.text === 'Added while sync was idle'); + assert.equal(await page.$eval('[data-bookmark-order]', button => button.textContent), 'Newest first'); + await page.click('[data-bookmark-content]'); + await page.click('.bskyplus-bookmarks-options [data-value="images"]'); + await page.waitForFunction(() => window.visibleBookmarks.length === 1 && window.visibleBookmarks[0].item.record.text === 'Post 104'); + await page.type('input[name="query"]', 'CAFE nebula'); + await page.type('input[name="author"]', '@jane'); + await page.click('[data-bookmark-advanced]'); + assert.equal(await page.$eval('dialog input[name="query"]', input => input.value), 'CAFE nebula'); + if (process.env.BOOKMARKS_SCREENSHOT) { + console.log('BOOKMARKS_SCREENSHOT=' + (await page.screenshot({ encoding: 'base64' }))); + } + await page.setViewport({ width: 390, height: 900 }); + assert.equal(await page.$eval('dialog', dialog => { + const rect = dialog.getBoundingClientRect(); + return rect.left >= 0 && rect.right <= innerWidth && dialog.scrollWidth <= dialog.clientWidth; + }), true, 'advanced search fits a mobile viewport'); + await page.evaluate(() => { + for (const name of ['after', 'before']) { + const input = document.querySelector(`input[name="${name}"]`); + input.value = '2026-01-10'; + input.dispatchEvent(new Event('change', { bubbles: true })); + } + }); + await page.waitForFunction(() => document.querySelector('[data-bookmark-results]').textContent === '1 of 105 bookmarks'); + assert.equal((await page.evaluate(() => query())).bookmarks[0].item.record.text, 'Post 104', 'combined text, author, media and date filters match the full collection'); + await page.focus('dialog input[name="query"]'); + await page.keyboard.press('Escape'); + await page.waitForFunction(() => !document.querySelector('dialog')); + assert.equal(await page.$eval('input[name="query"]', input => input.value), 'CAFE nebula'); + assert.equal(await page.$eval('[data-bookmark-advanced]', button => document.activeElement === button), true); + await page.click('.bskyplus-bookmarks-search .bskyplus-bookmarks-button'); + await page.click('[data-bookmark-content]'); + await page.click('.bskyplus-bookmarks-options [data-value="video"]'); + await page.waitForFunction(() => window.visibleBookmarks.length === 1 && window.visibleBookmarks[0].item.record.text === 'Post 103'); + await page.click('[data-bookmark-content]'); + await page.click('.bskyplus-bookmarks-options [data-value="links"]'); + await page.waitForFunction(() => window.visibleBookmarks.length === 1 && window.visibleBookmarks[0].item.record.text === 'Post 102'); + await page.click('[data-bookmark-content]'); + await page.click('.bskyplus-bookmarks-options [data-value="text"]'); + await page.waitForFunction(() => document.querySelector('[data-bookmark-results]').textContent === '102 of 105 bookmarks'); + const textPages = await page.evaluate(async () => { + const results = []; + let cursor; + do { + const data = await query('getBookmarks', cursor ? `?cursor=${cursor}` : ''); + results.push(...data.bookmarks.map(bookmark => bookmark.subject.uri)); + cursor = data.cursor; + } while (cursor); + return results; + }); + assert.equal(textPages.length, 102); + assert.equal(new Set(textPages).size, 102, 'filtered pagination has no gaps or duplicate records'); + await page.click('.bskyplus-bookmarks-search .bskyplus-bookmarks-button'); + await page.waitForFunction(() => document.querySelector('[data-bookmark-results]').textContent === '105 of 105 bookmarks'); + assert.equal(await page.evaluate(() => calls.length), afterManualSync, 'all filters are local'); + await page.evaluate(() => query('createBookmark')); + await page.waitForFunction(() => document.body.textContent.includes('106 bookmarks ·')); + assert.equal((await page.evaluate(() => query())).bookmarks[0].subject.uri, 'at://new'); + await page.evaluate(() => query('deleteBookmark')); + await page.waitForFunction(() => document.body.textContent.includes('105 bookmarks ·')); + assert.notEqual((await page.evaluate(() => query())).bookmarks[0].subject.uri, 'at://new'); + await page.evaluate(() => { window.holdBookmarkPage = true; }); + await page.locator('[data-bookmark-sync]').click(); + await page.waitForFunction(() => typeof window.resumeBookmarkPage === 'function'); + assert.equal(await page.$eval('[data-bookmark-sync]', button => button.disabled && button.textContent === 'Syncing…'), true); + assert.match(await page.$eval('.bskyplus-bookmarks-toast', toast => toast.textContent), /Downloaded 100 bookmarks/); + await page.evaluate(() => { window.holdBookmarkPage = false; window.resumeBookmarkPage(); }); + await page.waitForSelector('.bskyplus-bookmarks-toast[data-kind="success"]'); + assert.match(await page.$eval('.bskyplus-bookmarks-toast', toast => toast.textContent), /Sync complete.*105 bookmarks/); + await page.locator('[aria-label="Dismiss bookmark sync notification"]').click(); + assert.equal(await page.$('.bskyplus-bookmarks-toast'), null); + await page.evaluate(() => { window.fail = true; }); + await page.locator('[data-bookmark-sync]').click(); + await page.waitForFunction(() => document.body.textContent.includes('503')); + await page.waitForSelector('.bskyplus-bookmarks-toast[data-kind="error"]'); + assert.equal(await page.evaluate(async () => { + const request = indexedDB.open('bskyplus-bookmarks'); + const db = await new Promise(resolve => { request.onsuccess = () => resolve(request.result); }); + const read = db.transaction('accounts').objectStore('accounts').get('did:plc:first'); + return new Promise(resolve => { read.onsuccess = () => resolve(read.result.bookmarks.length); }); + }), 105, 'failed imports retain the complete prior snapshot'); + await page.evaluate(() => { window.fail = false; }); + await page.evaluate(() => query('getBookmarks', '', 'did:plc:second')); + assert.equal(await page.locator('[data-bskyplus-bookmark-actions] > button').filter(button => button.textContent === 'Enable local bookmarks').wait().then(() => true), true); + await page.evaluate(() => query()); + await page.waitForSelector('[data-bookmark-sync]'); + assert.deepEqual(await page.$$eval('[data-bskyplus-bookmark-actions] > button', buttons => buttons.map(button => button.textContent)), ['Sync now']); + await page.evaluate(() => { window.holdBookmarkPage = true; window.bookmarkPageReturned = false; }); + await page.locator('[data-bookmark-sync]').click(); + await page.waitForFunction(() => typeof window.resumeBookmarkPage === 'function'); + const peer = await browser.newPage(); + peer.on('pageerror', error => console.error('Peer bookmark page error:', error.message)); + await peer.setRequestInterception(true); + peer.on('request', request => request.respond({ status: 200, contentType: 'text/html', + body: '

Saved Posts

' })); + await peer.goto('https://bsky.app/saved'); + await peer.evaluate(() => { + window.BroadcastChannel = undefined; + window.holdPeerPage = true; + window.peerPageReturned = false; + window.fetch = async input => { + const url = new URL(input instanceof Request ? input.url : input); + if (!url.pathname.endsWith('getBookmarks')) return Response.json({}); + const start = Number(url.searchParams.has('cursor')); + if (start && window.holdPeerPage) await new Promise(resolve => { window.resumePeerPage = resolve; }); + if (start) window.peerPageReturned = true; + return Response.json({ bookmarks: [{ subject: { uri: `at://peer-${start}` } }], + ...(!start ? { cursor: 'peer-next' } : {}) }); + }; + window.query = () => fetch('https://api.bsky.app/xrpc/app.bsky.bookmark.getBookmarks?limit=50', { + headers: { authorization: `Bearer e30.${btoa(JSON.stringify({ sub: 'did:plc:peer' }))}.signature` } + }).then(response => response.json()); + }); + await peer.evaluate(source => { + const script = document.createElement('script'); + script.dataset.bskyplusChannel = 'peer-bookmarks-channel'; + script.textContent = source; + document.head.append(script); + }, await readFile('extension/shared/bookmarks-page.js', 'utf8')); + await peer.evaluate(() => query()); + await peer.evaluate(() => window.postMessage({ channel: 'peer-bookmarks-channel', direction: 'request', + requestId: 'enable-peer', action: 'enable' }, location.origin)); + await peer.waitForFunction(() => typeof window.resumePeerPage === 'function', { timeout: 5000 }); + await page.evaluate(async () => { + const request = indexedDB.open('bskyplus-bookmarks'); + const db = await new Promise(resolve => { request.onsuccess = () => resolve(request.result); }); + const tx = db.transaction('accounts', 'readwrite'); + const store = tx.objectStore('accounts'); + store.put({ did: 'did:plc:first|api.custom.test', enabled: true, bookmarks: [{ subject: { uri: 'at://other-appview' } }] }); + store.put({ did: 'did:plc:second', enabled: true, bookmarks: [{ subject: { uri: 'at://other-account' } }] }); + await new Promise(resolve => { tx.oncomplete = resolve; }); + }); + await page.evaluate(() => new Promise(resolve => { + const listener = event => { + if (event.data?.direction !== 'response' || event.data.requestId !== 'disable-from-settings') return; + window.removeEventListener('message', listener); + resolve(event.data.state); + }; + window.addEventListener('message', listener); + window.postMessage({ channel: 'test-bookmarks-channel', direction: 'request', + requestId: 'disable-from-settings', action: 'disable' }, location.origin); + })); + await page.evaluate(() => { + window.holdBookmarkPage = false; + const resume = window.resumeBookmarkPage; + window.resumeBookmarkPage = undefined; + resume(); + }); + await page.waitForFunction(() => window.bookmarkPageReturned); + await peer.evaluate(() => { + window.holdPeerPage = false; + const resume = window.resumePeerPage; + window.resumePeerPage = undefined; + resume(); + }); + await peer.waitForFunction(() => window.peerPageReturned); + await peer.evaluate(() => new Promise(resolve => setTimeout(resolve, 50))); + await page.evaluate(() => new Promise(resolve => setTimeout(resolve, 50))); + await page.bringToFront(); + assert.deepEqual(await page.evaluate(async () => { + const request = indexedDB.open('bskyplus-bookmarks'); + const db = await new Promise(resolve => { request.onsuccess = () => resolve(request.result); }); + const read = db.transaction('accounts').objectStore('accounts').getAll(); + return new Promise(resolve => { read.onsuccess = () => resolve(read.result); }); + }), [{ did: '__bskyplus_bookmarks_control__', epoch: 1 }], + 'disabling clears every account and AppView snapshot and a pending sync cannot restore them'); + assert.equal(await page.$('.bskyplus-bookmarks-search'), null); + const count = await page.evaluate(() => calls.length); + await page.evaluate(() => query()); + assert.equal(await page.evaluate(() => calls.length), count + 1); + + // Exercise settings controls through the page-world request/response bridge. + await page.evaluate(() => { + history.pushState(null, '', '/bskyplus'); + document.querySelector('[data-bskyplus-bookmarks]').remove(); + const section = document.createElement('section'); + section.id = 'bookmarksSection'; + document.querySelector('main').append(section); + window.chrome = { storage: { + local: { get: async () => ({}), set: async () => {} }, + onChanged: { addListener() {} }, + }, tabs: { + query: async () => [{ id: 1 }], + sendMessage: async (id, message) => new Promise(resolve => { + const requestId = crypto.randomUUID(); + const listener = event => { + if (event.data?.direction !== 'response' || event.data.requestId !== requestId) return; + window.removeEventListener('message', listener); + resolve(event.data.state); + }; + window.addEventListener('message', listener); + window.postMessage({ channel: 'test-bookmarks-channel', direction: 'request', requestId, action: message.action }, location.origin); + }) + } }; + }); + await page.addScriptTag({ content: await readFile('extension/shared/bookmarks-settings.js', 'utf8') }); + await page.locator('#bookmarksSection button:first-child').click(); + await page.waitForFunction(() => document.querySelector('#bookmarksSection [role="status"]').textContent.includes('105 bookmarks ·')); + const synced = await page.evaluate(() => calls.length); + await page.locator('#bookmarksSection button:last-child').click(); + await page.waitForFunction(() => !document.querySelector('#bookmarksSection button:last-child').disabled); + assert.ok(await page.evaluate(() => calls.length) > synced); + await page.locator('#bookmarksSection button:first-child').click(); + await page.waitForFunction(() => document.querySelector('#bookmarksSection [role="status"]').textContent === 'Local bookmarks cleared.'); + assert.equal(await page.$eval('#bookmarksSection button:last-child', button => button.disabled), true); + + // Separate snapshots and enable state survive switching bookmark sources. + await page.evaluate(async () => { + history.pushState(null, '', '/saved'); + window.bookmarkSourceHost = 'api.bsky.app'; + window.BskyPlusAppviewRouting = { bookmarkSource: async () => window.bookmarkSourceHost }; + await query(); + }); + await page.locator('[data-bskyplus-bookmark-actions] > button').filter(button => button.textContent === 'Enable local bookmarks').click(); + await page.waitForFunction(async () => { + const request = indexedDB.open('bskyplus-bookmarks'); + const db = await new Promise(resolve => { request.onsuccess = () => resolve(request.result); }); + const read = db.transaction('accounts').objectStore('accounts').get('did:plc:first'); + return new Promise(resolve => { read.onsuccess = () => resolve(read.result?.bookmarks?.length === 105); }); + }); + await page.evaluate(async () => { + await query(); + window.bookmarkSourceHost = 'api.custom.test'; + window.rows = [{ subject: { uri: 'at://custom', cid: 'custom' }, item: { record: { text: 'Custom source only' } } }]; + window.customResult = await query(); + }); + assert.equal(await page.evaluate(() => customResult.bookmarks.length), 1); + assert.equal(await page.evaluate(async () => { + const request = indexedDB.open('bskyplus-bookmarks'); + const db = await new Promise(resolve => { request.onsuccess = () => resolve(request.result); }); + const read = db.transaction('accounts').objectStore('accounts').get('did:plc:first'); + return new Promise(resolve => { read.onsuccess = () => resolve(read.result?.bookmarks?.length ?? read.result); }); + }), 105); + assert.equal(await page.evaluate(async () => { + window.bookmarkSourceHost = 'api.bsky.app'; + return (await query()).bookmarks.length; + }), 50); + } finally { await browser.close(); } +}); diff --git a/test/test_bookmarks_session_fallback.mjs b/test/test_bookmarks_session_fallback.mjs new file mode 100644 index 0000000..389551f --- /dev/null +++ b/test/test_bookmarks_session_fallback.mjs @@ -0,0 +1,116 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +test('bookmark bridge uses the live session before any captured request and follows account changes', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + args: ['--no-sandbox'] + }); + try { + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', request => request.respond({ status: 200, contentType: 'text/html', body: '

Home

' })); + await page.goto('https://bsky.app/'); + await page.evaluate(() => { + window.bookmarkRequests = []; + window.networkRequests = []; + window.routeThroughFetch = false; + window.bookmarkSourceHost = 'api.eurosky.network'; + window.BskyPlusAppviewRouting = { bookmarkSource: async () => window.bookmarkSourceHost }; + window.setBookmarkSession = did => { + const session = { destroyed: false }; + const agent = { + did, + fetchHandler(path, init) { + window.bookmarkRequests.push({ did, path, proxy: new Headers(init.headers).get('atproto-proxy') }); + if (window.routeThroughFetch) { + const payload = btoa(JSON.stringify({ sub: did })); + const headers = new Headers(init.headers); + headers.set('authorization', `Bearer e30.${payload}.signature`); + return window.fetch(new Request(new URL(path, 'https://pds.test'), { headers })); + } + return Promise.resolve(Response.json({ bookmarks: [] })); + } + }; + window.liveBundle = { session, service: new URL('https://pds.test'), + appviewClient: {}, pdsClient: { agent } }; + document.querySelector('main')['__reactFiber$sessionTest'] = { + memoizedProps: {}, + return: { memoizedProps: { value: window.liveBundle }, return: null } + }; + }; + window.setBookmarkSession('did:plc:first'); + window.fetch = input => { + const request = input instanceof Request ? input : new Request(input); + window.networkRequests.push({ url: request.url, + proxy: request.headers.get('atproto-proxy') }); + return Promise.resolve(Response.json({ bookmarks: [] })); + }; + }); + await page.evaluate(source => { + const script = document.createElement('script'); + script.dataset.bskyplusChannel = 'session-fallback-channel'; + script.textContent = source; + document.head.append(script); + let next = 0; + window.bookmarkBridgeRequest = action => new Promise(resolve => { + const requestId = String(++next); + const listener = event => { + if (event.data?.direction !== 'response' || event.data.requestId !== requestId) return; + window.removeEventListener('message', listener); + resolve(event.data.state); + }; + window.addEventListener('message', listener); + window.postMessage({ channel: 'session-fallback-channel', direction: 'request', requestId, action }, location.origin); + }); + }, await readFile('extension/shared/bookmarks-page.js', 'utf8')); + + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('state'))).available, true); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('enable'))).enabled, true); + assert.deepEqual(await page.evaluate(() => window.bookmarkRequests), [{ + did: 'did:plc:first', + path: '/xrpc/app.bsky.bookmark.getBookmarks?limit=100', + proxy: 'did:web:api.eurosky.network#bsky_appview' + }]); + assert.equal((await page.evaluate(() => window.networkRequests.length)), 0); + + await page.evaluate(() => { + window.routeThroughFetch = true; + history.pushState(null, '', '/saved'); + }); + assert.equal((await page.evaluate(() => Promise.race([ + window.bookmarkBridgeRequest('sync'), + new Promise((_, reject) => setTimeout(() => reject(new Error('Sync deadlocked')), 1500)) + ]))).enabled, true); + assert.deepEqual(await page.evaluate(() => window.networkRequests), [{ + url: 'https://pds.test/xrpc/app.bsky.bookmark.getBookmarks?limit=100', + proxy: 'did:web:api.eurosky.network#bsky_appview' + }]); + + await page.evaluate(() => { + window.setBookmarkSession('did:plc:first'); + window.routeThroughFetch = false; + }); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('sync'))).enabled, true); + assert.equal((await page.evaluate(() => window.bookmarkRequests.length)), 3); + + await page.evaluate(() => { window.bookmarkSourceHost = 'api.bsky.app'; }); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('state'))).available, true); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('enable'))).enabled, true); + assert.equal((await page.evaluate(() => window.bookmarkRequests.at(-1).proxy)), + 'did:web:api.bsky.app#bsky_appview'); + + await page.evaluate(() => window.setBookmarkSession('did:plc:second')); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('state'))).enabled, false); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('enable'))).enabled, true); + assert.equal((await page.evaluate(() => window.bookmarkRequests.at(-1).did)), 'did:plc:second'); + + await page.evaluate(() => { window.liveBundle.session.destroyed = true; }); + assert.equal((await page.evaluate(() => window.bookmarkBridgeRequest('state'))).available, false); + } finally { + await browser.close(); + } +}); diff --git a/test/test_cdn.mjs b/test/test_cdn.mjs index c9f887d..b1e37d3 100644 --- a/test/test_cdn.mjs +++ b/test/test_cdn.mjs @@ -45,7 +45,9 @@ function background(useRules = true) { let stored = { imageCdnHostname: hostname }; let granted = true; const rules = new Map([[99, { id: 99 }]]); + const tabs = []; const api = { + tabs: { create: async tab => { tabs.push(tab); } }, runtime: { id: 'test-extension', getURL: path => `moz-extension://test-extension/${path}`, @@ -66,11 +68,11 @@ function background(useRules = true) { const context = vm.createContext({ URL, browser: api }); vm.runInContext(configSource, context); vm.runInContext(backgroundSource, context); - function apply(sender = { id: api.runtime.id, url: api.runtime.getURL('shared/settings-frame.html') }) { - return new Promise(resolve => api.runtime.onMessage.emit({ action: 'APPLY_IMAGE_CDN' }, sender, resolve)); + function apply(sender = { id: api.runtime.id, url: api.runtime.getURL('shared/settings-frame.html') }, action = 'APPLY_IMAGE_CDN') { + return new Promise(resolve => api.runtime.onMessage.emit({ action }, sender, resolve)); } return { - api, rules, apply, + api, rules, tabs, apply, setHost(value) { stored = { imageCdnHostname: value }; api.storage.onChanged.emit({ imageCdnHostname: { newValue: value } }, 'local'); }, setPermission(value) { granted = value; api.permissions[value ? 'onAdded' : 'onRemoved'].emit({}); }, }; @@ -120,3 +122,19 @@ test('Firefox redirects preserve URL bytes and stop on reset or permission revoc instance.setHost(''); assert.equal((await listener({ url })).redirectUrl, undefined); }); + +test('Firefox opens a privileged permission page only when saved CDN access is missing', async () => { + const instance = background(false); + instance.setPermission(false); + assert.equal((await instance.apply(undefined, 'REQUEST_IMAGE_CDN_ACCESS')).opened, true); + assert.equal(instance.tabs[0].url, instance.api.runtime.getURL('shared/cdn-permissions.html')); + instance.setPermission(true); + assert.equal((await instance.apply(undefined, 'REQUEST_IMAGE_CDN_ACCESS')).enabled, true); + assert.equal(instance.tabs.length, 1); + const webpage = { id: instance.api.runtime.id, url: 'https://bsky.app/bskyplus' }; + assert.equal((await instance.apply(webpage, 'REQUEST_IMAGE_CDN_ACCESS')).success, false); + assert.equal(instance.tabs.length, 1); + instance.setHost(''); + assert.equal((await instance.apply(undefined, 'REQUEST_IMAGE_CDN_ACCESS')).opened, undefined); + assert.equal(instance.tabs.length, 1); +}); diff --git a/test/test_cdn_permissions.mjs b/test/test_cdn_permissions.mjs new file mode 100644 index 0000000..c8d13cb --- /dev/null +++ b/test/test_cdn_permissions.mjs @@ -0,0 +1,116 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +const chromePath = process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'; +const configScript = await readFile('extension/shared/cdn-config.js', 'utf8'); +const pageScript = await readFile('extension/shared/cdn-permissions.js', 'utf8'); +const HOSTNAME = 'luna.danielmorrisey.com'; +const ORIGINS = ['https://cdn.bsky.app/*', `https://${HOSTNAME}/*`]; + +async function openPermissionPage(browser, { stored = HOSTNAME, request = ['grant'], storageError = false } = {}) { + const page = await browser.newPage(); + await page.setContent('

Image CDN access

'); + await page.evaluate(({ initial, expectedHostname, outcomes, failed }) => { + const calls = { get: 0, request: [], messages: [] }; + const queue = outcomes.slice(); + const state = { stored: initial, failed }; + window.__cdnPermissionCalls = calls; + window.__cdnPermissionState = state; + window.browser = { + storage: { + local: { + get: async () => { + calls.get += 1; + if (state.failed) throw new Error('storage unavailable'); + return { imageCdnHostname: state.stored }; + }, + }, + }, + permissions: { + request: async value => { + calls.request.push(structuredClone(value)); + return (queue.shift() || 'grant') === 'grant'; + }, + }, + runtime: { + sendMessage: async message => { + calls.messages.push(structuredClone(message)); + if (message.action === 'APPLY_IMAGE_CDN') { + return { success: true, enabled: true, hostname: expectedHostname }; + } + return { success: true }; + }, + }, + }; + }, { initial: stored, expectedHostname: HOSTNAME, outcomes: request, failed: storageError }); + await page.addScriptTag({ content: configScript }); + await page.addScriptTag({ content: pageScript }); + return page; +} + +async function clickGrant(page) { + await page.waitForFunction(() => !document.querySelector('#grant').disabled); + await page.click('#grant'); +} + +async function calls(page) { + return page.evaluate(() => structuredClone(window.__cdnPermissionCalls)); +} + +test('grant requests exact origins, applies the CDN, and notifies the background', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('active')); + const recorded = await calls(page); + assert.deepEqual(recorded.request, [{ origins: ORIGINS }]); + assert.deepEqual(recorded.messages, [ + { action: 'APPLY_IMAGE_CDN' }, + { action: 'IMAGE_CDN_ACCESS_GRANTED', hostname: HOSTNAME }, + ]); + } finally { + await browser.close(); + } +}); + +test('denied access can be retried from the same page', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser, { request: ['deny', 'grant'] }); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('not granted')); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('active')); + assert.deepEqual((await calls(page)).request, [{ origins: ORIGINS }, { origins: ORIGINS }]); + } finally { + await browser.close(); + } +}); + +test('changed storage after mount prevents applying the old CDN', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser); + await page.evaluate(() => { window.__cdnPermissionState.stored = 'other.example.com'; }); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('saved CDN changed')); + const recorded = await calls(page); + assert.equal(recorded.messages.length, 0); + } finally { + await browser.close(); + } +}); + +test('storage failure on load reports an error and keeps grant unavailable', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser, { storageError: true }); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('storage unavailable')); + assert.equal(await page.$eval('#grant', button => button.disabled), true); + } finally { + await browser.close(); + } +}); diff --git a/test/test_cdn_settings.mjs b/test/test_cdn_settings.mjs index 805b646..f1782f4 100644 --- a/test/test_cdn_settings.mjs +++ b/test/test_cdn_settings.mjs @@ -14,9 +14,12 @@ async function openSettings(browser, { stored = '', permissions = [], applyHostn await page.evaluate(({ initial, permissionResults, appliedHostname, setResult }) => { const calls = { get: 0, set: [], request: [], apply: [] }; window.__cdnTestCalls = calls; + window.__cdnMessageListeners = []; const outcomes = permissionResults.slice(); window.chrome = { runtime: { + id: 'test-extension', + onMessage: { addListener: listener => window.__cdnMessageListeners.push(listener) }, sendMessage: async message => { calls.apply.push(structuredClone(message)); return { success: true, enabled: !!appliedHostname, hostname: appliedHostname }; @@ -28,9 +31,12 @@ async function openSettings(browser, { stored = '', permissions = [], applyHostn calls.get += 1; return { imageCdnHostname: initial }; }, - set: async value => { + set: value => { calls.set.push(structuredClone(value)); - if (setResult === 'reject') throw new Error('storage unavailable'); + if (setResult === 'throw') throw new Error('storage unavailable'); + if (setResult === 'unconfirmed') return undefined; + if (setResult === 'reject') return Promise.reject(new Error('storage unavailable')); + return Promise.resolve(); }, }, }, @@ -128,12 +134,18 @@ test('Denied or rejected permission can be retried after the value is saved', as test('Storage rejection requests no permission and exposes no retry', async () => { const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); try { - const page = await openSettings(browser, { storageSet: 'reject' }); - await clickSave(page, HOSTNAME); - await page.waitForFunction(() => document.querySelector('.bskyplus-cdn-status').textContent.includes('storage unavailable')); - const recorded = await getCalls(page); - assert.equal(recorded.request.length, 0); - assert.equal(await page.$eval('.bskyplus-cdn-grant', button => button.hidden), true); + for (const storageSet of ['reject', 'throw', 'unconfirmed']) { + const page = await openSettings(browser, { storageSet }); + await clickSave(page, HOSTNAME); + await page.waitForFunction(() => document.querySelector('.bskyplus-cdn-status').classList.contains('bskyplus-llm-status-error')); + const recorded = await getCalls(page); + assert.equal(recorded.request.length, 0); + assert.equal(recorded.apply.length, 0); + assert.equal(await page.$eval('.bskyplus-cdn-grant', button => button.hidden), true); + assert.match(await page.$eval('.bskyplus-cdn-status', status => status.textContent), + storageSet === 'unconfirmed' ? /Storage did not confirm/ : /storage unavailable/); + await page.close(); + } } finally { await browser.close(); } @@ -177,3 +189,37 @@ test('Repeated mount does not duplicate the CDN section', async () => { await browser.close(); } }); + +test('Firefox settings without the permissions API opens a grant page after saving', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openSettings(browser); + await page.evaluate(() => { + delete chrome.permissions; + chrome.runtime.sendMessage = async message => { + window.__cdnTestCalls.apply.push(message); + return message.action === 'REQUEST_IMAGE_CDN_ACCESS' + ? { success: true, opened: true } + : { success: true, enabled: false, hostname: 'luna.danielmorrisey.com' }; + }; + }); + await clickSave(page, HOSTNAME); + await page.waitForFunction(() => !document.querySelector('.bskyplus-cdn-save').disabled); + assert.deepEqual((await getCalls(page)).set, [{ imageCdnHostname: HOSTNAME }]); + assert.deepEqual((await getCalls(page)).apply, [{ action: 'REQUEST_IMAGE_CDN_ACCESS' }]); + assert.match(await page.$eval('.bskyplus-cdn-status', el => el.textContent), /opened tab/); + await page.click('.bskyplus-cdn-grant'); + await page.waitForFunction(() => !document.querySelector('.bskyplus-cdn-grant').disabled); + assert.equal((await getCalls(page)).apply.length, 2); + await page.evaluate(() => { + chrome.runtime.sendMessage = async () => ({ success: true, enabled: true, hostname: 'luna.danielmorrisey.com' }); + for (const listener of window.__cdnMessageListeners) { + listener({ action: 'IMAGE_CDN_ACCESS_GRANTED' }, { id: chrome.runtime.id }); + } + }); + await page.waitForFunction(() => document.querySelector('.bskyplus-cdn-status').textContent === 'Image CDN is active.'); + assert.equal(await page.$eval('.bskyplus-cdn-grant', el => el.hidden), true); + } finally { + await browser.close(); + } +}); diff --git a/test/test_default_feed_width.mjs b/test/test_default_feed_width.mjs index 371af21..952db1d 100644 --- a/test/test_default_feed_width.mjs +++ b/test/test_default_feed_width.mjs @@ -27,13 +27,17 @@ async function loadPage(initialFeedWidth = 600) { const storageListeners = []; const runtimeListeners = []; const get = (keys, callback) => { - setTimeout(() => { + const request = new Promise(resolve => setTimeout(() => { const result = {}; - for (const [key, fallback] of Object.entries(keys || {})) { + const defaults = typeof keys === 'string' ? { [keys]: undefined } + : Array.isArray(keys) ? Object.fromEntries(keys.map(key => [key, undefined])) : keys || stored; + for (const [key, fallback] of Object.entries(defaults)) { result[key] = Object.prototype.hasOwnProperty.call(stored, key) ? stored[key] : fallback; } - callback(result); - }, 0); + resolve(result); + }, 0)); + if (callback) request.then(callback); + return request; }; window.__bskyplusTestStorage = stored; window.chrome = { @@ -53,6 +57,7 @@ async function loadPage(initialFeedWidth = 600) { } storageListeners.forEach(listener => listener(changes, 'local')); if (callback) setTimeout(callback, 0); + return Promise.resolve(); } }, onChanged: { addListener: listener => storageListeners.push(listener) } @@ -73,7 +78,8 @@ async function loadPage(initialFeedWidth = 600) { await page.addScriptTag({ content: popupJs }); await page.addScriptTag({ content: feedWidthJs }); await page.waitForFunction(() => - document.getElementById('feedWidthSlider')?.value === String(window.__bskyplusTestStorage.feedWidth)); + document.getElementById('feedWidthSlider')?.value === String(window.__bskyplusTestStorage.feedWidth)) + .catch(async error => { await browser.close(); throw error; }); return { browser, page }; } diff --git a/test/test_dom_utils.mjs b/test/test_dom_utils.mjs new file mode 100644 index 0000000..c79c208 --- /dev/null +++ b/test/test_dom_utils.mjs @@ -0,0 +1,99 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +test('shared observers start before body exists and media downloads preserve exports', async () => { + const sources = await Promise.all(['dom-utils', 'downloader'].map(name => + readFile(`extension/shared/${name}.js`, 'utf8'))); + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + args: ['--no-sandbox'], + }); + try { + const page = await browser.newPage(); + const errors = []; + page.on('pageerror', error => errors.push(error.message)); + await page.setRequestInterception(true); + page.on('request', request => request.abort()); + await page.setContent(` + + + + + `); + await page.waitForSelector('#initial .bskyplus-media-dl-btn'); + assert.equal(await page.evaluate(() => fixture.startedWithoutBody), true, + 'content scripts must register successfully before body exists'); + const initialScans = await page.evaluate(() => fixture.scans); + assert.ok(initialScans > 0, 'deferred observer must perform its initial scan'); + await page.evaluate(() => document.dispatchEvent(new Event('DOMContentLoaded'))); + assert.equal(await page.evaluate(() => fixture.scans), initialScans, + 'startup listener must only run once'); + + await page.evaluate(() => { + const figure = document.createElement('figure'); + figure.id = 'late'; + const video = document.createElement('video'); + video.preload = 'none'; + video.src = 'https://video.test/master.m3u8'; + figure.append(video); + document.querySelector('article').append(figure); + }); + await page.waitForSelector('#late .bskyplus-media-dl-btn'); + assert.equal(await page.$$eval('.bskyplus-media-dl-btn', buttons => buttons.length), 2, + 'late media gets one download button without duplicating existing buttons'); + await page.click('#late .bskyplus-media-dl-btn'); + await page.waitForFunction(() => fixture.downloads.length === 1); + const videoExport = await page.evaluate(async () => ({ + ...fixture.downloads[0], + bytes: [...new Uint8Array(await fixture.blobs[0].arrayBuffer())], + type: fixture.blobs[0].type, + requests: fixture.requests, + })); + assert.deepEqual(videoExport, { + url: 'blob:https://bsky.app/test-1', filename: 'alice.test_2026-09-22.mp4', + connected: true, display: 'none', type: 'video/mp4', + bytes: [0, 255, 128, 10, 13, 0, 42], + requests: ['https://video.test/master.m3u8', 'https://video.test/media/list.m3u8', + 'https://video.test/media/a.ts', 'https://video.test/media/b.ts'], + }); + + await page.waitForFunction(() => fixture.revoked.length === 1); + assert.deepEqual(await page.evaluate(() => fixture.revoked), + ['blob:https://bsky.app/test-1']); + assert.equal(await page.$$eval('a[download]', links => links.length), 0, + 'temporary download links must be removed after their URLs are revoked'); + assert.deepEqual(errors, []); + } finally { + await browser.close(); + } +}); diff --git a/test/test_e2e_all_features.mjs b/test/test_e2e_all_features.mjs index e69de29..5c4ae37 100644 --- a/test/test_e2e_all_features.mjs +++ b/test/test_e2e_all_features.mjs @@ -0,0 +1,276 @@ +/** + * End-to-End Test Suite for Bsky+ Extension + */ + +import puppeteer from 'puppeteer-core'; +import path from 'path'; +import fs from 'fs'; + +const CHROME_PATH = path.resolve('test/browsers/chrome/mac_arm-153.0.8010.36/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'); +const EXT_PATH = path.resolve('extension/chrome'); + +function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +} + +async function updateSettings(page, newSettings) { + await page.evaluate((settings) => { + window.postMessage({ type: 'BSKYPLUS_UPDATE_SETTINGS', settings }, '*'); + }, newSettings); + await sleep(1000); +} + +async function runTests() { + console.log('=== Starting Bsky+ End-to-End Testing ==='); + + const browser = await puppeteer.launch({ + headless: false, + executablePath: CHROME_PATH, + args: [ + `--disable-extensions-except=${EXT_PATH}`, + `--load-extension=${EXT_PATH}`, + '--no-sandbox' + ] + }); + + try { + const page = await browser.newPage(); + await page.setViewport({ width: 1280, height: 900 }); + + // 1. Verify Extension ID + let extensionId = null; + for (let attempt = 0; attempt < 10; attempt++) { + const targets = await browser.targets(); + const extTarget = targets.find(t => t.url().startsWith('chrome-extension://') && t.type() === 'service_worker'); + if (extTarget) { + extensionId = extTarget.url().split('/')[2]; + break; + } + await sleep(500); + } + console.log(`✓ Extension loaded with ID: ${extensionId}`); + + // 2. Navigate to bsky.app & Login + console.log('\n--- Test 0: Login to Bluesky ---'); + await page.goto('https://bsky.app', { waitUntil: 'domcontentloaded' }); + + // Wait for React to mount either login dialog or main app + await page.waitForFunction(() => { + return document.querySelector('div[role="dialog"]') || + document.querySelector('a[href="/search"]') || + document.querySelector('button[aria-label*="post" i], a[aria-label*="post" i]'); + }, { timeout: 15000 }); + + const hasLoginDialog = await page.evaluate(() => { + const dialog = document.querySelector('div[role="dialog"]'); + if (!dialog) return false; + const btn = Array.from(dialog.querySelectorAll('button')).find(b => b.innerText.includes('Sign in')); + if (btn) { + btn.click(); + return true; + } + return false; + }); + + if (hasLoginDialog) { + console.log('Clicked Sign in in welcome dialog...'); + await page.waitForSelector('input[data-testid="loginUsernameInput"]'); + await page.type('input[data-testid="loginUsernameInput"]', 'david.spaces-alpha.bsky.network', { delay: 15 }); + await page.type('input[data-testid="loginPasswordInput"]', '-------', { delay: 15 }); + await (await page.waitForSelector('button[data-testid="loginNextButton"]')).click(); + console.log('Submitted login credentials...'); + } + + // Wait for main feed navigation to be present + await page.waitForSelector('a[href="/search"], button[aria-label*="post" i], a[aria-label*="post" i]', { timeout: 25000 }); + await sleep(2000); + + // Close any leftover modals + await page.evaluate(() => { + const closeBtn = document.querySelector('button[aria-label="Close welcome modal"], button[aria-label="Close"]'); + if (closeBtn) closeBtn.click(); + }); + console.log('✓ Logged in as: david.spaces-alpha.bsky.network'); + + // 4. Test Feature: Skeet Mode with Exact Casing Preservation + console.log('\n--- Test 2: Skeet Mode (Post -> Skeet) ---'); + await page.evaluate(() => { + const container = document.createElement('div'); + container.id = 'bskyplus-test-casing'; + container.innerHTML = ` +
POST
+
Post
+
pOsT
+
post
+
posts
+
POSTS
+ `; + document.body.appendChild(container); + }); + + await updateSettings(page, { skeetMode: true }); + + const casingResults = await page.evaluate(() => { + return [ + document.getElementById('c1').innerText, + document.getElementById('c2').innerText, + document.getElementById('c3').innerText, + document.getElementById('c4').innerText, + document.getElementById('c5').innerText, + document.getElementById('c6').innerText + ]; + }); + console.log('Casing test transformations:', casingResults); + const expected = ['SKEET', 'Skeet', 'sKeEt', 'skeet', 'skeets', 'SKEETS']; + for (let i = 0; i < expected.length; i++) { + if (casingResults[i] !== expected[i]) { + throw new Error(`Casing mismatch at ${i}: got ${casingResults[i]}, expected ${expected[i]}`); + } + } + console.log('✓ Skeet Mode casing preservation PASSED!'); + + // Clean up test element & turn off skeetMode + await page.evaluate(() => { + document.getElementById('bskyplus-test-casing')?.remove(); + }); + await updateSettings(page, { skeetMode: false }); + + // 6. Test Feature: Alt Text OCR + console.log('\n--- Test 4: Add with OCR in Alt Text Modal ---'); + console.log('Opening composer...'); + const composeBtn = await page.waitForSelector('[aria-label*="Compose" i], [aria-label*="New post" i], [aria-label*="New skeet" i]'); + await composeBtn.click(); + await sleep(2000); + + // Wait for Add media button inside composer + await page.waitForSelector('button[aria-label*="Add media" i], button[aria-label*="media" i]'); + + // Upload test image with text "OCR Test Bluesky" + const sampleImg = path.resolve('test/fixtures/test_ocr_sample.png'); + const [fileChooser] = await Promise.all([ + page.waitForFileChooser(), + page.click('button[aria-label*="Add media" i], button[aria-label*="media" i]') + ]); + await fileChooser.accept([sampleImg]); + console.log('Image uploaded! Waiting 3s...'); + await sleep(3000); + + // Click "ALT" button inside the composer dialog + await page.evaluate(() => { + const btns = Array.from(document.querySelectorAll('button')).filter(b => + b.innerText?.trim() === 'ALT' || b.getAttribute('aria-label') === 'Add alt text' + ); + const altBtn = btns.find(b => b.innerText?.trim() === 'ALT') || btns[0]; + if (altBtn) altBtn.click(); + }); + await sleep(2000); + + // Check "Add with OCR" button exists + const ocrBtn = await page.waitForSelector('#bskyplus-ocr-btn', { timeout: 8000 }); + if (!ocrBtn) throw new Error('"Add with OCR" button not found in modal!'); + console.log('✓ "Add with OCR" button found in Add alt text modal!'); + + console.log('Clicking "Add with OCR"...'); + await ocrBtn.click(); + + // Wait for OCR to complete and autofill textarea + await page.waitForFunction(() => { + const textarea = document.querySelector('textarea'); + return textarea && textarea.value.trim().length > 0; + }, { timeout: 25000 }); + + const filledValue = await page.evaluate(() => { + return document.querySelector('textarea').value; + }); + console.log('Autofilled Alt Text via OCR:', filledValue); + if (!filledValue.includes('OCR') && !filledValue.includes('Test')) { + throw new Error(`OCR autofill value unexpected: "${filledValue}"`); + } + console.log('✓ Alt Text OCR recognition and autofill PASSED!'); + + // Take screenshot of alt modal with OCR filled text! + await page.screenshot({ path: 'test/screenshots/alt_modal_with_ocr_verified.png' }); + + // Close alt modal by saving + await page.evaluate(() => { + const dialogs = Array.from(document.querySelectorAll('div[role="dialog"], [aria-modal="true"]')); + const lastDialog = dialogs[dialogs.length - 1]; + const saveBtn = Array.from(lastDialog.querySelectorAll('button')).find(b => b.innerText?.trim() === 'Save'); + if (saveBtn) saveBtn.click(); + }); + await sleep(2000); + + // 7. Test Feature: OCR Toast when no text in image + console.log('\n--- Test 5: OCR with no text in image (Toast verification) ---'); + const blankImgPath = path.resolve('test/fixtures/test_ocr_blank.png'); + const blankDataUrl = await page.evaluate(() => { + const c = document.createElement('canvas'); + c.width = 100; + c.height = 100; + const ctx = c.getContext('2d'); + ctx.fillStyle = '#FFFFFF'; + ctx.fillRect(0, 0, 100, 100); + return c.toDataURL('image/png'); + }); + const base64Data = blankDataUrl.replace(/^data:image\/png;base64,/, ''); + fs.writeFileSync(blankImgPath, Buffer.from(base64Data, 'base64')); + + // Remove existing image in composer + const removeImgBtn = await page.$('button[aria-label*="remove" i], button[aria-label*="delete" i]'); + if (removeImgBtn) await removeImgBtn.click(); + await sleep(1500); + + // Upload blank image + const [fileChooser2] = await Promise.all([ + page.waitForFileChooser(), + page.click('button[aria-label*="Add media" i], button[aria-label*="media" i]') + ]); + await fileChooser2.accept([blankImgPath]); + await sleep(3000); + + // Click ALT for blank image + await page.evaluate(() => { + const btns = Array.from(document.querySelectorAll('button')).filter(b => + b.innerText?.trim() === 'ALT' || b.getAttribute('aria-label') === 'Add alt text' + ); + const altBtn = btns.find(b => b.innerText?.trim() === 'ALT') || btns[0]; + if (altBtn) altBtn.click(); + }); + await sleep(2000); + + const ocrBtn2 = await page.waitForSelector('#bskyplus-ocr-btn', { timeout: 8000 }); + console.log('Clicking "Add with OCR" on blank image...'); + await ocrBtn2.click(); + + // Wait for toast message: "There was no text in the image" + await page.waitForFunction(() => { + const toast = document.querySelector('.bskyplus-toast'); + return toast && toast.textContent.includes('There was no text in the image'); + }, { timeout: 25000 }); + + const toastText = await page.evaluate(() => { + return document.querySelector('.bskyplus-toast').textContent; + }); + console.log(`Toast message displayed: "${toastText}"`); + console.log('✓ Toast for no text PASSED!'); + + // Close composer + await page.evaluate(() => { + const closeBtn = document.querySelector('button[aria-label="Cancel"], button[aria-label="Close"]'); + if (closeBtn) closeBtn.click(); + }); + await sleep(1000); + + console.log('\n========================================'); + console.log('🎉 ALL 5 TESTS PASSED SUCCESSFULLY! 🎉'); + console.log('========================================'); + + } catch (err) { + console.error('\n❌ Test execution failed:', err); + process.exitCode = 1; + } finally { + await browser.close(); + } +} + +runTests(); diff --git a/test/test_edit_post.mjs b/test/test_edit_post.mjs new file mode 100644 index 0000000..e47b2c0 --- /dev/null +++ b/test/test_edit_post.mjs @@ -0,0 +1,427 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +test('edit post enforces age and single-edit limits while preserving attachments', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + }); + try { + const page = await browser.newPage(); + page.setDefaultTimeout(5000); + const pageErrors = []; + page.on('pageerror', error => pageErrors.push(error.message)); + const pageSource = await readFile('extension/shared/edit-post-page.js', 'utf8'); + const bootstrapSource = await readFile('extension/shared/edit-post.js', 'utf8'); + await page.setRequestInterception(true); + page.on('request', request => { + if (new URL(request.url()).pathname === '/shared/edit-post-page.js') { + return request.respond({ contentType: 'text/javascript', body: pageSource }); + } + return request.respond({ + contentType: 'text/html', + body: '', + }); + }); + await page.goto('https://bsky.app/home'); + await page.addStyleTag({ path: 'extension/shared/edit-post.css' }); + await page.evaluate(() => { + const did = 'did:plc:editposttest'; + const text = 'hello https://example.com 😀'; + const start = text.indexOf('https://'); + const encoder = new TextEncoder(); + window.testRecord = { + uri: `at://${did}/app.bsky.feed.post/3mw4u6bdbp22d`, + cid: 'old-cid', + value: { + $type: 'app.bsky.feed.post', + text, + createdAt: new Date(Date.now() - 60_000).toISOString(), + langs: ['en'], + embed: { $type: 'app.bsky.embed.images', images: [{ alt: 'unchanged image' }] }, + facets: [{ + index: { byteStart: encoder.encode(text.slice(0, start)).length, + byteEnd: encoder.encode(text.slice(0, start + 19)).length }, + features: [{ $type: 'app.bsky.richtext.facet#link', uri: 'https://example.com' }], + }], + }, + }; + window.writes = []; + window.reads = []; + window.fetch = async (input, init) => { + const request = new Request(input, init); + const path = new URL(request.url).pathname; + if (path.endsWith('.getRecord')) { + window.reads.push(request.url); + return new Response(JSON.stringify(window.testRecord), { + headers: { 'content-type': 'application/json' }, + }); + } + if (path.endsWith('.applyWrites')) { + const payload = await request.json(); + window.writes.push({ url: request.url, payload }); + window.testRecord.value = payload.writes[1].value; + window.testRecord.cid = 'new-cid'; + return new Response('{}', { headers: { 'content-type': 'application/json' } }); + } + return new Response('{}', { headers: { 'content-type': 'application/json' } }); + }; + const post = document.createElement('article'); + post.dataset.testid = 'feedItem-1'; + post.style.backgroundColor = 'rgb(21, 29, 40)'; + post.style.color = 'rgb(241, 243, 245)'; + const avatarLink = document.createElement('a'); + avatarLink.href = '/profile/me'; + const avatar = document.createElement('img'); + avatar.src = 'data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="2" height="2"/%3E'; + avatarLink.append(avatar); + const link = document.createElement('a'); + link.href = '/profile/me/post/3mw4u6bdbp22d'; + link.textContent = 'Post'; + const button = document.createElement('button'); + button.setAttribute('aria-label', 'Open post options menu'); + button.textContent = 'More'; + button.onclick = () => { + document.querySelector('[role="menu"]')?.remove(); + const menu = document.createElement('div'); + menu.setAttribute('role', 'menu'); + if (window.includeDelete !== false) { + const remove = document.createElement('button'); + remove.setAttribute('role', 'menuitem'); + remove.textContent = 'Delete post'; + menu.append(remove); + } + if (window.includeNativeOption) { + const nativeRow = document.createElement('div'); + nativeRow.className = 'css-g5y9jx r-1loqt21 r-1otgn73'; + nativeRow.style.cssText = 'display:flex;flex-direction:row;align-items:center;gap:16px;padding:8px 10px;border-radius:4px;overflow:hidden;min-height:32px'; + nativeRow.setAttribute('aria-label', 'Mute account'); + nativeRow.setAttribute('role', 'menuitem'); + nativeRow.setAttribute('data-testid', 'postDropdownMuteBtn'); + const label = document.createElement('div'); + label.dir = 'auto'; + label.className = 'css-146c3p1'; + label.style.cssText = 'font-size:13.1px;color:rgb(226,231,238);line-height:17px;flex:1 1 0%;font-weight:600'; + label.textContent = 'Mute account'; + const iconContainer = document.createElement('div'); + iconContainer.className = 'css-g5y9jx'; + iconContainer.style.cssText = 'margin-right:-2px;margin-left:12px'; + const icon = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); + icon.setAttribute('viewBox', '0 0 24 24'); + icon.setAttribute('width', '20'); + icon.setAttribute('height', '20'); + const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); + path.setAttribute('fill', '#ABB8C9'); + path.setAttribute('d', 'M0 0'); + icon.append(path); + iconContainer.append(icon); + nativeRow.append(label, iconContainer); + menu.append(nativeRow); + } + document.body.append(menu); + }; + post.append(avatarLink, link, button); + document.body.append(post); + }); + await page.evaluate(code => { + window.chrome = { + runtime: { getURL: path => location.origin + '/' + path, + onMessage: { addListener() {} } }, + storage: { + local: { get: () => { + window.storageReads = (window.storageReads || 0) + 1; + return Promise.resolve({ editPostEnabled: false }); + } }, + onChanged: { addListener: () => { + window.storageListeners = (window.storageListeners || 0) + 1; + } }, + }, + }; + const script = document.createElement('script'); + script.textContent = code; + document.head.append(script); + }, bootstrapSource); + await page.waitForFunction(() => window.fetch.toString().includes('nativeFetch')); + await page.evaluate(() => { + const token = 'header.' + btoa(JSON.stringify({ scope: 'transition:generic', + sub: 'did:plc:editposttest' })).replace(/=+$/, '') + '.signature'; + void fetch('https://pds.test/xrpc/app.bsky.feed.getTimeline', { + headers: { authorization: 'Bearer ' + token, + 'atproto-proxy': 'did:web:api.bsky.app#bsky_appview' }, + }); + }); + const openMenu = async () => { + await page.click('button[aria-label="Open post options menu"]'); + await page.waitForSelector('[role="menu"]'); + }; + const actionCount = () => page.$$eval('.bskyplus-edit-menu-item', items => items.length); + const openMenuWithRecordLookup = async () => { + const previousReads = await page.evaluate(() => window.reads.length); + await openMenu(); + await page.waitForFunction(count => window.reads.length > count, {}, previousReads); + }; + + assert.deepEqual(await page.evaluate(() => [window.storageReads || 0, + window.storageListeners || 0]), [0, 0], 'saved settings are not read or observed'); + await openMenuWithRecordLookup(); + await page.waitForSelector('.bskyplus-edit-menu-item'); + assert.equal(await actionCount(), 1, 'a saved false setting does not disable editing'); + await page.evaluate(() => document.querySelector('[role="menu"]')?.remove()); + await page.evaluate(() => { window.testRecord.value.createdAt = new Date(Date.now() - 11 * 60_000).toISOString(); }); + await openMenuWithRecordLookup(); + assert.equal(await actionCount(), 0, 'older posts are ineligible'); + await page.evaluate(() => { window.testRecord.value.createdAt = new Date(Date.now() + 60_000).toISOString(); }); + await openMenuWithRecordLookup(); + assert.equal(await actionCount(), 0, 'future posts are ineligible'); + await page.evaluate(() => { window.testRecord.value.createdAt = 'invalid timestamp'; }); + await openMenuWithRecordLookup(); + assert.equal(await actionCount(), 0, 'invalid timestamps are ineligible'); + await page.evaluate(() => { window.testRecord.value.createdAt = new Date(Date.now() - 60_000).toISOString(); }); + await openMenuWithRecordLookup(); + await page.waitForSelector('.bskyplus-edit-menu-item'); + assert.equal(await actionCount(), 1, 'recent posts can be edited'); + assert.deepEqual(await page.$eval('.bskyplus-edit-menu-item', action => ({ + padding: getComputedStyle(action).padding, + minHeight: getComputedStyle(action).minHeight, + label: action.querySelector('[dir="auto"]')?.textContent, + iconWidth: action.querySelector('svg')?.getAttribute('width'), + })), { padding: '8px 10px', minHeight: '32px', label: 'Edit post', iconWidth: '20' }); + await page.evaluate(() => { window.testRecord.value.originalText = 'earlier text'; }); + await openMenuWithRecordLookup(); + assert.equal(await actionCount(), 0, 'originalText marks an already-edited post'); + await page.evaluate(() => { + delete window.testRecord.value.originalText; + window.testRecord.value.updatedAt = new Date().toISOString(); + }); + await openMenuWithRecordLookup(); + assert.equal(await actionCount(), 0, 'updatedAt marks an already-edited post'); + await page.evaluate(() => { window.includeDelete = false; }); + await openMenu(); + assert.equal(await actionCount(), 0, 'no own-post Delete action'); + await page.evaluate(() => { + window.includeDelete = true; + window.includeNativeOption = true; + delete window.testRecord.value.updatedAt; + window.testRecord.value.createdAt = new Date(Date.now() - 60_000).toISOString(); + }); + const readsBeforeEligibleMenu = await page.evaluate(() => window.reads.length); + await openMenuWithRecordLookup(); + await page.waitForSelector('.bskyplus-edit-menu-item'); + assert.ok(await page.evaluate(previous => window.reads.length > previous, readsBeforeEligibleMenu), + 'the menu action appears after the record lookup'); + assert.deepEqual(await page.$eval('.bskyplus-edit-menu-item', action => ({ + stockClass: action.classList.contains('css-g5y9jx'), + ariaLabel: action.getAttribute('aria-label'), + testId: action.getAttribute('data-testid'), + label: action.querySelector('[dir="auto"]')?.textContent, + labelColor: getComputedStyle(action.querySelector('[dir="auto"]')).color, + iconFill: action.querySelector('svg path')?.getAttribute('fill'), + hasPencilPath: action.querySelector('svg path')?.getAttribute('d') !== 'M0 0', + })), { + stockClass: true, + ariaLabel: 'Edit post', + testId: null, + label: 'Edit post', + labelColor: 'rgb(226, 231, 238)', + iconFill: '#ABB8C9', + hasPencilPath: true, + }); + await page.click('.bskyplus-edit-menu-item'); + await page.waitForSelector('.bskyplus-edit-dialog'); + const contentSource = await readFile('extension/chrome/content.js', 'utf8'); + await page.evaluate(code => { + const script = document.createElement('script'); + script.textContent = code; + document.head.append(script); + document.querySelector('.bskyplus-edit-dialog').append(document.createElement('span')); + }, contentSource); + await page.evaluate(() => new Promise(resolve => setTimeout(resolve, 50))); + assert.equal(await page.$$eval('#bskyplus-ocr-header-btn, #bskyplus-ocr-btn', buttons => buttons.length), 0); + assert.deepEqual(await page.$eval('.bskyplus-edit-dialog', dialog => ({ + background: getComputedStyle(dialog).backgroundColor, + color: getComputedStyle(dialog).color, + avatarSize: getComputedStyle(dialog.querySelector('.bskyplus-edit-avatar')).width, + })), { background: 'rgb(21, 29, 40)', color: 'rgb(241, 243, 245)', avatarSize: '42px' }); + assert.equal(await page.$eval('.bskyplus-edit-save', button => button.disabled), true); + assert.deepEqual(await page.$eval('.bskyplus-edit-counter', counter => ({ + remaining: Number(counter.querySelector('.bskyplus-edit-count').textContent), + ringSize: getComputedStyle(counter.querySelector('svg')).width, + })), { remaining: 273, ringSize: '36px' }); + assert.equal(await page.$eval('.bskyplus-edit-attachment-note', node => node.textContent), + 'Existing attachments will stay on this post.'); + await page.$eval('.bskyplus-edit-text', input => { + input.value = 'a'.repeat(301); + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$eval('.bskyplus-edit-save', button => button.disabled), true); + assert.equal(await page.$eval('.bskyplus-edit-count', count => count.textContent), '-1'); + await page.$eval('.bskyplus-edit-text', input => { + input.value = 'changed hello https://example.com 😀'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + await page.evaluate(() => { window.testRecord.cid = 'someone-else-changed-it'; }); + await page.click('.bskyplus-edit-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-edit-message')?.textContent + .includes('changed or can no longer be edited')); + assert.equal(await page.evaluate(() => window.writes.length), 0); + await page.evaluate(() => { + window.testRecord.cid = 'old-cid'; + window.testRecord.value.updatedAt = new Date().toISOString(); + }); + await page.click('.bskyplus-edit-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-edit-message')?.textContent + .includes('changed or can no longer be edited')); + assert.equal(await page.evaluate(() => window.writes.length), 0, + 'a post edited after the composer opened cannot be saved'); + await page.evaluate(() => { + delete window.testRecord.value.updatedAt; + window.testRecord.value.createdAt = new Date(Date.now() - 11 * 60_000).toISOString(); + }); + await page.click('.bskyplus-edit-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-edit-message')?.textContent + .includes('changed or can no longer be edited')); + assert.equal(await page.evaluate(() => window.writes.length), 0, + 'a post that expires while the composer is open cannot be saved'); + await page.evaluate(() => { + window.testRecord.value.createdAt = new Date(Date.now() - 60_000).toISOString(); + }); + const previousCreatedAt = await page.evaluate(() => window.testRecord.value.createdAt); + await page.click('.bskyplus-edit-save'); + await page.waitForFunction(() => window.writes.length === 1); + const write = await page.evaluate(() => window.writes[0]); + assert.equal(write.url, 'https://pds.test/xrpc/com.atproto.repo.applyWrites'); + assert.equal(write.payload.repo, 'did:plc:editposttest'); + assert.equal(write.payload.validate, true); + assert.deepEqual(write.payload.writes.map(item => item.$type), [ + 'com.atproto.repo.applyWrites#delete', + 'com.atproto.repo.applyWrites#create', + ]); + assert.deepEqual(write.payload.writes.map(item => [item.collection, item.rkey]), [ + ['app.bsky.feed.post', '3mw4u6bdbp22d'], + ['app.bsky.feed.post', '3mw4u6bdbp22d'], + ]); + const value = write.payload.writes[1].value; + assert.equal(value.text, 'changed hello https://example.com 😀'); + assert.equal(value.originalText, 'hello https://example.com 😀'); + assert.equal(value.langs[0], 'en'); + assert.equal(value.embed.images[0].alt, 'unchanged image'); + assert.equal(value.facets[0].index.byteStart, 14); + assert.ok(Number.isFinite(Date.parse(value.updatedAt))); + assert.equal(value.createdAt, previousCreatedAt); + assert.ok(Date.parse(value.updatedAt) > Date.parse(previousCreatedAt)); + assert.deepEqual(pageErrors, []); + } finally { + await browser.close(); + } +}); + +test('edit post uses Bluesky’s PDS session when no request token was captured', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + }); + try { + const page = await browser.newPage(); + page.setDefaultTimeout(5000); + const pageErrors = []; + page.on('pageerror', error => pageErrors.push(error.message)); + const pageSource = await readFile('extension/shared/edit-post-page.js', 'utf8'); + await page.setRequestInterception(true); + page.on('request', request => { + if (new URL(request.url()).pathname === '/shared/edit-post-page.js') { + return request.respond({ contentType: 'text/javascript', body: pageSource }); + } + return request.respond({ contentType: 'text/html', body: '' }); + }); + await page.goto('https://bsky.app/home'); + await page.evaluate(() => { + const did = 'did:plc:editposttest'; + const rkey = '3mw4u6bdbp22d'; + window.testRecord = { + uri: `at://${did}/app.bsky.feed.post/${rkey}`, + cid: 'old-cid', + value: { $type: 'app.bsky.feed.post', text: 'original text', + createdAt: new Date(Date.now() - 60_000).toISOString() }, + }; + window.writes = []; + window.mockFetch = async (input, init) => { + const request = new Request(input, init); + if (request.url.includes('.getRecord')) return new Response(JSON.stringify(window.testRecord)); + if (request.url.includes('.applyWrites')) { + window.writes.push({ url: request.url, body: await request.json() }); + return new Response('{}'); + } + return new Response('{}'); + }; + window.fetch = window.mockFetch; + const post = document.createElement('article'); + post.dataset.testid = 'feedItem-1'; + const link = document.createElement('a'); + link.href = `/profile/me/post/${rkey}`; + link.textContent = 'Post'; + const button = document.createElement('button'); + button.setAttribute('aria-label', 'Open post options menu'); + button.textContent = 'More'; + button.onclick = () => { + document.querySelector('[role="menu"]')?.remove(); + const menu = document.createElement('div'); + menu.setAttribute('role', 'menu'); + const remove = document.createElement('button'); + remove.setAttribute('role', 'menuitem'); + remove.textContent = 'Delete post'; + menu.append(remove); + document.body.append(menu); + }; + post.append(link, button); + document.body.append(post); + const script = document.createElement('script'); + script.dataset.bskyplusChannel = 'edit-test-channel'; + script.src = '/shared/edit-post-page.js'; + document.head.append(script); + }); + await page.waitForFunction(() => window.fetch.toString().includes('nativeFetch')); + await page.evaluate(() => window.postMessage({ channel: 'edit-test-channel', + direction: 'configure', enabled: true }, location.origin)); + + await page.click('button[aria-label="Open post options menu"]'); + await page.waitForSelector('[role="menu"]'); + assert.equal(await page.$('.bskyplus-edit-menu-item'), null, + 'the menu waits for a session before checking edit eligibility'); + assert.equal(await page.$('.bskyplus-edit-dialog'), null); + + await page.evaluate(() => { + const button = document.querySelector('button[aria-label="Open post options menu"]'); + const did = 'did:plc:editposttest'; + button['__reactFiber$editTest'] = { + memoizedProps: {}, + return: { + memoizedProps: { value: { + session: { did, destroyed: false }, + pdsClient: { agent: { did, + fetchHandler: (path, init) => window.mockFetch(new URL(path, 'https://pds.test'), init) } }, + } }, + return: null, + }, + }; + }); + await page.click('button[aria-label="Open post options menu"]'); + await page.waitForSelector('.bskyplus-edit-menu-item'); + await page.click('.bskyplus-edit-menu-item'); + await page.waitForSelector('.bskyplus-edit-dialog'); + await page.$eval('.bskyplus-edit-text', input => { + input.value = 'edited text'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + await page.click('.bskyplus-edit-save'); + await page.waitForFunction(() => window.writes.length === 1); + assert.equal(await page.evaluate(() => window.writes[0].url), + 'https://pds.test/xrpc/com.atproto.repo.applyWrites'); + assert.deepEqual(await page.evaluate(() => window.writes[0].body.writes.map(write => write.rkey)), + ['3mw4u6bdbp22d', '3mw4u6bdbp22d']); + assert.deepEqual(pageErrors, []); + } finally { + await browser.close(); + } +}); diff --git a/test/test_extension_composer.mjs b/test/test_extension_composer.mjs index 8116e04..9c56eeb 100644 --- a/test/test_extension_composer.mjs +++ b/test/test_extension_composer.mjs @@ -59,10 +59,22 @@ try { page.setDefaultTimeout(15000); popup.setDefaultTimeout(15000); await popup.goto(popupUrl); + await popup.waitForFunction(() => { + const toggle = document.querySelector('#llmEnabledToggle'); + return toggle && !toggle.disabled; + }); + if (!await popup.$eval('#llmEnabledToggle', toggle => toggle.checked)) { + await popup.click('#llmEnabledToggle'); + } + await popup.waitForFunction(() => { + const endpoint = document.querySelector('#bskyplusLlmEndpoint'); + return endpoint && endpoint.getClientRects().length > 0; + }); await popup.type('#bskyplusLlmEndpoint', 'https://bsky.app/v1/chat/completions'); await popup.type('#bskyplusLlmModel', 'test-vision-model'); await popup.type('#bskyplusLlmApiKey', 'test-only-key'); - await popup.click('.bskyplus-llm-save'); + await popup.focus('.bskyplus-llm-save'); + await popup.keyboard.press('Enter'); await popup.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === 'LLM endpoint saved.'); console.log('Settings saved; checking composer button'); await page.bringToFront(); @@ -73,15 +85,31 @@ try { assert.equal(providerRequest.method, 'POST'); const body = JSON.parse(providerRequest.postData); assert.equal(body.model, 'test-vision-model'); - assert.equal(body.messages[1].content.find(part => part.type === 'image_url').image_url.url, image); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].content.find(part => part.type === 'image_url').image_url.url, image); assert.equal(body.stream, false); assert.equal(await page.$$eval('[role=dialog]', nodes => nodes.length), 0); console.log('LLM saved; checking persistence'); await popup.bringToFront(); await popup.reload(); + await popup.bringToFront(); assert.equal(await popup.$eval('#bskyplusLlmModel', input => input.value), 'test-vision-model'); - await popup.$eval('#bskyplusLlmEndpoint', input => { input.value = ''; }); + await popup.focus('#bskyplusLlmEndpoint'); + assert.equal(await popup.evaluate(() => document.activeElement.id), 'bskyplusLlmEndpoint'); + await popup.keyboard.down('Control'); + await popup.keyboard.press('A'); + await popup.keyboard.up('Control'); + await popup.keyboard.press('Backspace'); + assert.equal(await popup.$eval('#bskyplusLlmEndpoint', input => input.value), ''); await popup.click('.bskyplus-llm-save'); + await popup.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === + 'LLM endpoint cleared. Other settings are saved.'); + const clearedEndpointStatus = await popup.evaluate(async () => { + const { llm } = await chrome.storage.local.get('llm'); + const status = await chrome.runtime.sendMessage({ action: 'GET_LLM_STATUS' }); + return { endpoint: llm?.endpoint, enabled: status?.enabled }; + }); + assert.deepEqual(clearedEndpointStatus, { endpoint: '', enabled: false }); await page.bringToFront(); await page.waitForFunction(() => document.querySelector('[data-method=LLM]').hidden); console.log('PASS: popup save, persisted settings, +LLM visibility, background provider POST, direct alt update, and disabling endpoint'); diff --git a/test/test_extension_llm_visibility.mjs b/test/test_extension_llm_visibility.mjs index c051b07..b67712e 100644 --- a/test/test_extension_llm_visibility.mjs +++ b/test/test_extension_llm_visibility.mjs @@ -32,6 +32,15 @@ try { await popup.goto(popupUrl); await popup.waitForSelector('#bskyplusLlmEndpoint'); await popup.waitForFunction(() => !document.querySelector('.bskyplus-llm-save').disabled); + await popup.waitForFunction(() => { + const toggle = document.querySelector('#llmEnabledToggle'); + return toggle && !toggle.disabled; + }); + if (!await popup.$eval('#llmEnabledToggle', toggle => toggle.checked)) { + await popup.click('#llmEnabledToggle'); + } + await popup.waitForFunction(() => + document.querySelector('#llmEnabledToggleControls')?.getAttribute('aria-hidden') === 'false'); // Disable OCR in the real popup before loading the composer. This verifies // the initial worker-backed setting and leaves LLM as the only action. @@ -84,9 +93,14 @@ try { // Clearing the endpoint must hide the action on the same page as well. await popup.bringToFront(); - await popup.$eval('#bskyplusLlmEndpoint', input => { input.value = ''; }); + await popup.click('#bskyplusLlmEndpoint'); + await popup.keyboard.down('Control'); + await popup.keyboard.press('A'); + await popup.keyboard.up('Control'); + await popup.keyboard.press('Backspace'); await popup.click('.bskyplus-llm-save'); - await popup.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === 'LLM endpoint cleared.'); + await popup.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === + 'LLM endpoint cleared. Other settings are saved.'); await page.bringToFront(); await page.waitForFunction(() => document.querySelector('[data-method=LLM]').hidden); console.log('PASS: LLM visibility updates live after save and clear without reload'); diff --git a/test/test_extension_settings.mjs b/test/test_extension_settings.mjs index 38ac83e..df00c12 100644 --- a/test/test_extension_settings.mjs +++ b/test/test_extension_settings.mjs @@ -13,7 +13,7 @@ async function waitForSettingsFrame(page) { await page.waitForSelector('iframe[data-bskyplus-settings-frame]'); for (let attempt = 0; attempt < 80; attempt += 1) { const frame = page.frames().find(candidate => - candidate.url().endsWith('/shared/settings-frame.html')); + new URL(candidate.url()).pathname.endsWith('/shared/settings-frame.html')); if (frame) return frame; await new Promise(resolve => setTimeout(resolve, 25)); } @@ -52,6 +52,8 @@ try { await page.goto('https://bsky.app/bskyplus'); await page.waitForSelector('[data-bskyplus-settings-page]'); assert.equal(page.url(), 'https://bsky.app/bskyplus'); + assert.equal(await page.$eval('[data-bskyplus-settings-frame]', frame => new URL(frame.src).search), ''); + assert.equal(await page.$eval('[data-bskyplus-theme-link]', link => link.getAttribute('href')), '/bskyplus/theme'); assert.equal(await page.$eval('[data-bskyplus-settings-page] h1', el => el.textContent), 'Bsky+'); assert.equal(await page.$eval('#content', el => getComputedStyle(el).display), 'none'); assert.notEqual(await page.$eval('#sidebar', el => getComputedStyle(el).display), 'none'); @@ -59,6 +61,7 @@ try { await page.reload(); await page.waitForSelector('[data-bskyplus-settings-page]'); assert.equal(page.url(), 'https://bsky.app/bskyplus'); + assert.equal(await page.$eval('[data-bskyplus-theme-link]', link => link.getAttribute('href')), '/bskyplus/theme'); await Promise.all([ page.waitForNavigation(), page.click('[data-bskyplus-settings-page] a'), @@ -69,9 +72,94 @@ try { assert.equal(page.url(), 'https://bsky.app/bskyplus'); await page.bringToFront(); - const frame = await waitForSettingsFrame(page); - await frame.waitForSelector('.bskyplus-cdn-save'); + let frame = await waitForSettingsFrame(page); await frame.waitForSelector('#feedWidthSlider'); + await frame.waitForSelector('#bookmarksAppview'); + assert.equal(await frame.$eval('#bookmarksSection', section => section.parentElement.id), 'featuresSection'); + await frame.waitForSelector('#bookmarksEnabledToggleControls', { hidden: true }); + // Provide an account fixture for the bookmark UI; the network adapter is + // exercised separately by test_bookmarks.mjs. + await frame.evaluate(() => { + const send = chrome.tabs.sendMessage.bind(chrome.tabs); + let enabled = false; + chrome.tabs.sendMessage = async (id, message) => { + if (message.type !== 'BSKYPLUS_BOOKMARKS') return send(id, message); + if (message.action === 'enable') enabled = true; + if (message.action === 'disable') enabled = false; + return { available: true, enabled, status: enabled ? '43 bookmarks synced.' : 'Local bookmarks disabled.' }; + }; + const sendWithAppview = chrome.tabs.sendMessage; + chrome.tabs.sendMessage = async (id, message) => { + if (message.type === 'BSKYPLUS_APPVIEW') { + if (message.action === 'save') await chrome.storage.local.set({ appviewHostname: message.hostname }); + return { success: true, pds: 'https://example.com', allowed: {} }; + } + return sendWithAppview(id, message); + }; + }); + await frame.waitForFunction(() => !document.querySelector('#bookmarksEnabledToggle').disabled); + await frame.focus('#bookmarksEnabledToggle'); + await page.keyboard.press('Space'); + await frame.waitForSelector('#bookmarksEnabledToggleControls', { visible: true }); + await frame.evaluate(() => chrome.storage.local.set({ appviewHostname: 'api.example.com' })); + await frame.waitForSelector('#bookmarksAppview', { visible: true }); + await frame.select('#bookmarksAppview', 'bluesky'); + await frame.waitForFunction(() => !document.querySelector('#bookmarksAppview').disabled); + assert.equal((await readExtensionStorage(frame)).bookmarksAppview, 'bluesky'); + assert.equal((await readExtensionStorage(frame)).appviewHostname, 'api.example.com'); + await frame.evaluate(() => chrome.storage.local.set({ appviewHostname: '', bookmarksAppview: '' })); + await frame.waitForSelector('#bookmarksAppview', { hidden: true }); + await frame.focus('#bookmarksEnabledToggle'); + await page.keyboard.press('Space'); + await frame.waitForSelector('#bookmarksEnabledToggleControls', { hidden: true }); + await frame.waitForSelector('#infrastructureSection'); + assert.equal(await frame.$eval('#appviewSection', section => section.parentElement.id), 'infrastructureSection'); + assert.equal(await frame.$eval('.bskyplus-cdn-section', section => section.parentElement.id), 'infrastructureSection'); + assert.equal(await frame.$('.bskyplus-llm-section summary'), null); + assert.equal(await page.$('[data-bskyplus-infrastructure-link]'), null); + await frame.waitForSelector('#appviewEnabledToggleControls', { hidden: true }); + await frame.focus('#appviewEnabledToggle'); + await page.keyboard.press('Space'); + await frame.waitForSelector('#appviewEnabledToggleControls', { visible: true }); + await frame.waitForSelector('.bskyplus-cdn-save'); + assert.notEqual(await frame.$('#feedWidthSlider'), null); + await frame.waitForSelector('#appviewProvider'); + await frame.waitForFunction(() => !document.querySelector('#appviewProvider').disabled); + assert.equal(await frame.$('#moreSettingsButton'), null); + assert.equal(await frame.$eval('#appviewProvider', input => input.value), ''); + assert.equal(await frame.$eval('#appviewProvider', input => input.options[1].disabled), false); + assert.equal(await frame.$eval('#appviewProvider', input => input.options[2].disabled), false); + await frame.$eval('.bskyplus-appview-provider-row button', button => button.click()); + await frame.waitForFunction(() => document.querySelector('#appviewSection [role="status"]').textContent === 'AppView is unchanged.'); + assert.equal(await page.$('dialog[data-bskyplus-appview-restart]'), null); + await frame.select('#appviewProvider', 'custom'); + await frame.waitForSelector('#appviewSection input[type="text"]', { visible: true }); + await frame.$eval('#appviewSection input[type="text"]', input => { input.value = 'api.eurosky.network'; }); + await frame.$eval('.bskyplus-appview-provider-row button', button => button.click()); + await frame.waitForFunction(() => document.querySelector('#appviewSection [role="status"]').textContent === 'AppView changed.'); + assert.equal((await readExtensionStorage(frame)).appviewHostname, 'api.eurosky.network'); + await page.waitForSelector('dialog[data-bskyplus-appview-restart][open]'); + const dialogBounds = await page.$eval('dialog[data-bskyplus-appview-restart]', dialog => { + const { top, right, bottom, left } = dialog.getBoundingClientRect(); + return { top, right, bottom, left, width: innerWidth, height: innerHeight }; + }); + assert.ok(dialogBounds.top >= 0 && dialogBounds.bottom <= dialogBounds.height); + assert.ok(dialogBounds.left >= 0 && dialogBounds.right <= dialogBounds.width); + await Promise.all([ + page.waitForNavigation({ waitUntil: 'domcontentloaded' }), + page.click('dialog[data-bskyplus-appview-restart] button'), + ]); + await page.waitForSelector('[data-bskyplus-settings-page] h1'); + frame = await waitForSettingsFrame(page); + assert.equal((await readExtensionStorage(frame)).appviewHostname, 'api.eurosky.network'); + await frame.evaluate(() => chrome.storage.local.set({ appviewHostname: '', bookmarksAppview: '' })); + await page.reload(); + await page.waitForSelector('[data-bskyplus-settings-page] h1'); + assert.equal(page.url(), 'https://bsky.app/bskyplus'); + assert.equal(await page.$eval('[data-bskyplus-settings-page] h1', title => title.textContent), 'Bsky+'); + frame = await waitForSettingsFrame(page); + await frame.waitForSelector('#appviewProvider'); + await frame.waitForSelector('#appviewEnabledToggleControls', { hidden: true }); await frame.waitForFunction(() => document.querySelector('#feedWidthSlider').value === '600'); // The integrated page uses the same controls as the popup, while its @@ -79,7 +167,6 @@ try { assert.equal(await frame.$eval('#feedWidthSlider', input => input.value), '600'); assert.equal(await frame.$eval('#mediaDownloaderToggle', input => input.closest('[data-feature]').style.display), 'none'); assert.equal(await frame.$eval('#accountAgeToggle', input => input.closest('[data-feature]').style.display), 'none'); - assert.equal(await frame.$eval('#threadUnrollToggle', input => input.closest('[data-feature]').style.display), 'none'); assert.equal(await frame.$eval('#localOcrToggle', input => input.checked), true); await page.evaluate(() => { @@ -89,46 +176,53 @@ try { }); }); - await frame.click('[data-width="600"]'); + await frame.focus('[data-width="600"]'); + await page.keyboard.press('Enter'); await frame.waitForFunction(() => document.querySelector('#feedWidthVal').textContent.includes('600px')); await page.waitForFunction(() => getComputedStyle(document.documentElement).getPropertyValue('--bskyplus-feed-width').trim() === '599px'); assert.equal((await readExtensionStorage(frame)).feedWidth, 600); - await frame.click('#skeetModeToggle'); - await frame.click('#localOcrToggle'); - await frame.evaluate(() => { - const input = document.querySelector('#hexInput'); - input.value = '#123456'; - input.dispatchEvent(new Event('change', { bubbles: true })); - }); - await frame.waitForFunction(() => document.querySelector('#hexInput').value === '#123456'); - await frame.click('[data-width="800"]'); + await frame.focus('#skeetModeToggle'); + await page.keyboard.press('Space'); + await frame.focus('#localOcrToggle'); + await page.keyboard.press('Space'); + assert.equal(await frame.$('[data-feature="accentColor"], #colorPicker, #hexInput'), null); + await frame.focus('[data-width="800"]'); + await page.keyboard.press('Enter'); await page.waitForFunction(() => getComputedStyle(document.documentElement).getPropertyValue('--bskyplus-feed-width').trim() === '800px'); // Exercise the real permission API with the already-granted Bluesky origin. // Saving configuration must not send a generation request or expose the key. + assert.equal(await frame.$eval('.bskyplus-llm-section', section => section.parentElement.id), 'altTextSection'); + assert.equal(await frame.$eval('#localOcrToggle', input => input.closest('.section').id), 'altTextSection'); + await frame.waitForSelector('#bskyplusLlmEndpoint', { hidden: true }); + await frame.focus('#llmEnabledToggle'); + await page.keyboard.press('Space'); + await frame.waitForSelector('#bskyplusLlmEndpoint', { visible: true }); await frame.waitForFunction(() => !document.querySelector('.bskyplus-llm-save').disabled); await frame.evaluate(() => { document.querySelector('#bskyplusLlmEndpoint').value = 'https://bsky.app/v1/chat/completions'; document.querySelector('#bskyplusLlmModel').value = 'vision-test'; document.querySelector('#bskyplusLlmApiKey').value = 'test-key-do-not-send'; }); - await page.evaluate(() => window.scrollTo(0, document.documentElement.scrollHeight)); - await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)))); - await frame.click('.bskyplus-llm-save'); + // Keyboard activation avoids stale click coordinates while the iframe resizes. + await frame.focus('.bskyplus-llm-save'); + await page.keyboard.press('Enter'); await frame.waitForFunction(() => document.querySelector('.bskyplus-llm-section .bskyplus-llm-status').textContent === 'LLM endpoint saved.'); const stored = await readExtensionStorage(frame); assert.equal(stored.skeetMode, true); assert.equal(stored.localOcrEnabled, false); - assert.equal(stored.accentColor, '#123456'); assert.equal(stored.feedWidth, 800); assert.deepEqual(stored.llm, { endpoint: 'https://bsky.app/v1/chat/completions', model: 'vision-test', apiKey: 'test-key-do-not-send', + enabled: true, + customPrompt: '', + useCustomPrompt: false, }); assert.equal(await page.evaluate(() => { const iframe = document.querySelector('iframe[data-bskyplus-settings-frame]'); @@ -150,27 +244,128 @@ try { assert.deepEqual(await reloadedFrame.evaluate(() => ({ skeetMode: document.querySelector('#skeetModeToggle').checked, localOcr: document.querySelector('#localOcrToggle').checked, - accent: document.querySelector('#hexInput').value, endpoint: document.querySelector('#bskyplusLlmEndpoint').value, model: document.querySelector('#bskyplusLlmModel').value, apiKey: document.querySelector('#bskyplusLlmApiKey').value, })), { skeetMode: true, localOcr: false, - accent: '#123456', endpoint: 'https://bsky.app/v1/chat/completions', model: 'vision-test', apiKey: 'test-key-do-not-send', }); + await page.click('[data-bskyplus-theme-link]'); + await page.waitForFunction(() => location.pathname === '/bskyplus/theme'); + await page.waitForSelector('[data-bskyplus-settings-page]'); + assert.equal(await page.$eval('[data-bskyplus-settings-page] h1', heading => heading.textContent), 'Theme editor'); + assert.equal(await page.$eval('[data-bskyplus-settings-page] a', link => link.getAttribute('href')), '/bskyplus'); + assert.match(await page.$eval('[data-bskyplus-settings-frame]', frame => frame.src), /\/shared\/settings-frame\.html\?section=theme$/); + const themeFrame = await waitForSettingsFrame(page); + await themeFrame.waitForSelector('[data-theme-hex="background"]'); + assert.equal(await themeFrame.$('#feedWidthSlider'), null); + await themeFrame.evaluate(() => { + const name = document.querySelector('.bskyplus-theme-name'); + name.value = 'Forest'; name.dispatchEvent(new Event('input', { bubbles: true })); + const color = document.querySelector('[data-theme-hex="background"]'); + color.value = '#10231E'; color.dispatchEvent(new Event('input', { bubbles: true })); + }); + await themeFrame.focus('.bskyplus-theme-apply'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => getComputedStyle(document.body).backgroundColor === 'rgb(16, 35, 30)'); + const savedTheme = (await readExtensionStorage(themeFrame)).bskyplusThemes; + assert.equal(savedTheme.themes[0].name, 'Forest'); + assert.equal(savedTheme.activeId, savedTheme.themes[0].id); + await page.reload(); + await page.waitForFunction(() => getComputedStyle(document.body).backgroundColor === 'rgb(16, 35, 30)'); + const themedFrame = await waitForSettingsFrame(page); + await themedFrame.waitForFunction(() => document.querySelector('.bskyplus-theme-name')?.value === 'Forest'); + await themedFrame.evaluate(() => [...document.querySelectorAll('.bskyplus-theme-actions button')] + .find(button => button.textContent === 'Use Bluesky default').focus()); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => !document.documentElement.hasAttribute('data-bskyplus-theme-active')); + assert.equal((await readExtensionStorage(themedFrame)).bskyplusThemes.themes.length, 1); const popup = await browser.newPage(); await popup.goto(new URL('popup/popup.html', workerTarget.url()).href); - await popup.waitForSelector('#bskyplusCdnHostname'); - await popup.waitForFunction(() => !document.querySelector('.bskyplus-cdn-reset').disabled); - await popup.click('.bskyplus-cdn-reset'); + await popup.waitForSelector('#moreSettingsButton'); + await popup.waitForFunction(() => !document.querySelector('#appviewProvider')?.disabled && + document.querySelector('#bskyplusCdnProvider') && !document.querySelector('#bskyplusCdnProvider').disabled); + assert.equal(await popup.$eval('#llmEnabledToggle', element => element.checked), true); + for (const selector of ['#bookmarksSection']) { + assert.equal(await popup.$eval(selector, element => element.parentElement.id), 'featuresSection'); + } + for (const selector of ['#appviewSection', '.bskyplus-cdn-section']) { + assert.equal(await popup.$eval(selector, element => element.parentElement.id), 'infrastructureSection'); + } + assert.equal(await popup.$eval('.bskyplus-llm-section', section => section.parentElement.id), 'altTextSection'); + assert.equal(await popup.$eval('#localOcrToggle', input => input.closest('.section').id), 'altTextSection'); + await popup.click('#llmEnabledToggle'); + await popup.waitForFunction(() => !document.querySelector('#llmEnabledToggle').disabled); + await popup.waitForSelector('#bskyplusLlmEndpoint', { hidden: true }); + assert.equal((await readExtensionStorage(popup)).llm.enabled, false); + assert.equal((await readExtensionStorage(popup)).llm.apiKey, 'test-key-do-not-send'); + await popup.click('#llmEnabledToggle'); + await popup.waitForFunction(() => !document.querySelector('#llmEnabledToggle').disabled); + await popup.waitForSelector('#bskyplusLlmEndpoint', { visible: true }); + await popup.type('#bskyplusLlmModel', 'popup-model'); + await popup.click('#llmEnabledToggle'); + await popup.waitForFunction(() => !document.querySelector('#llmEnabledToggle').disabled); + await popup.waitForSelector('#bskyplusLlmModel', { hidden: true }); + await popup.click('#llmEnabledToggle'); + await popup.waitForFunction(() => !document.querySelector('#llmEnabledToggle').disabled); + assert.ok(await popup.$eval('#bskyplusLlmModel', input => input.value.endsWith('popup-model'))); + await popup.click('#llmEnabledToggle'); + await popup.waitForFunction(() => !document.querySelector('#llmEnabledToggle').disabled); + await popup.click('#cdnEnabledToggle'); + await popup.select('#bskyplusCdnProvider', ''); + await popup.waitForSelector('#bskyplusCdnHostname', { hidden: true }); + await popup.select('#bskyplusCdnProvider', 'custom'); + await popup.waitForSelector('#bskyplusCdnHostname', { visible: true }); + await popup.select('#bskyplusCdnProvider', 'luna.danielmorrisey.com'); + await popup.waitForSelector('#bskyplusCdnHostname', { hidden: true }); + await popup.select('#bskyplusCdnProvider', ''); + await popup.locator('.bskyplus-cdn-save').click(); await popup.waitForFunction(() => document.querySelector('.bskyplus-cdn-status').textContent === 'Image CDN disabled.'); - assert.equal(await popup.$eval('#bskyplusCdnHostname', input => input.value), ''); - assert.ok(await popup.$eval('body', body => body.scrollWidth <= 320), 'Popup CDN controls must fit the popup width'); - console.log('PASS: unpacked extension settings navigation, persistence, and popup CDN controls'); + assert.equal((await readExtensionStorage(popup)).imageCdnHostname, ''); + assert.equal(await popup.$eval('#cdnEnabledToggle', toggle => toggle.checked), false); + await popup.click('#appviewEnabledToggle'); + await popup.select('#appviewProvider', ''); + await popup.waitForSelector('#appviewSection input[type="text"]', { hidden: true }); + await popup.select('#appviewProvider', 'custom'); + await popup.waitForSelector('#appviewSection input[type="text"]', { visible: true }); + await popup.select('#appviewProvider', ''); + await popup.waitForSelector('#appviewSection input[type="text"]', { hidden: true }); + assert.equal(await popup.$('.bskyplus-theme-name'), null); + assert.equal(await popup.$eval('body', body => body.getBoundingClientRect().width), 400); + assert.ok(await popup.$eval('body', body => body.scrollWidth <= 400), 'Quick settings must fit the popup width'); + assert.equal(await popup.evaluate(() => chrome.runtime.getManifest().action.default_popup), 'popup/popup.html'); + for (const selector of ['[data-feature="feedWidth"]', '#featuresSection', '#altTextSection', '#infrastructureSection']) { + assert.equal(await popup.$eval(`${selector} .section-collapse-button`, button => button.getAttribute('aria-expanded')), 'true'); + } + await popup.click('#featuresSection .section-collapse-button'); + await popup.waitForFunction(() => !document.querySelector('#featuresSection .section-collapse-button').disabled); + await popup.waitForSelector('#mediaViewerToggle', { hidden: true }); + assert.equal((await readExtensionStorage(popup)).settingsSectionCollapsed_features, true); + await popup.reload(); + await popup.waitForFunction(() => document.querySelector('#featuresSection .section-collapse-button')?.getAttribute('aria-expanded') === 'false'); + await popup.waitForSelector('#appviewEnabledToggle', { visible: true }); + const settingsPreview = await browser.newPage(); + await settingsPreview.goto(new URL('shared/settings-frame.html', workerTarget.url()).href); + await settingsPreview.waitForFunction(() => document.querySelector('#featuresSection .section-collapse-button')?.getAttribute('aria-expanded') === 'false'); + await settingsPreview.waitForSelector('#appviewEnabledToggle'); + assert.equal(await settingsPreview.$eval('#infrastructureSection .section-collapse-button', button => button.getAttribute('aria-expanded')), 'true'); + await settingsPreview.focus('#infrastructureSection .section-collapse-button'); + await settingsPreview.keyboard.press('Enter'); + await settingsPreview.waitForFunction(() => !document.querySelector('#infrastructureSection .section-collapse-button').disabled); + await settingsPreview.waitForSelector('#appviewEnabledToggle', { hidden: true }); + await settingsPreview.reload(); + await settingsPreview.waitForFunction(() => document.querySelector('#infrastructureSection .section-collapse-button')?.getAttribute('aria-expanded') === 'false'); + await settingsPreview.click('#featuresSection .section-collapse-button'); + await popup.waitForFunction(() => document.querySelector('#featuresSection .section-collapse-button').getAttribute('aria-expanded') === 'true'); + await popup.waitForSelector('#mediaViewerToggle', { visible: true }); + await settingsPreview.close(); + await popup.click('#moreSettingsButton'); + await browser.waitForTarget(target => target.url() === 'https://bsky.app/bskyplus'); + console.log('PASS: Infrastructure navigation, independent bookmark provider, popup feature rows, LLM disclosure, and settings persistence'); } finally { await browser.close(); } diff --git a/test/test_fetch_interceptors.mjs b/test/test_fetch_interceptors.mjs new file mode 100644 index 0000000..c45e04d --- /dev/null +++ b/test/test_fetch_interceptors.mjs @@ -0,0 +1,96 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +const editPostSource = await readFile('extension/shared/edit-post-page.js', 'utf8'); +const bookmarksSource = await readFile('extension/shared/bookmarks-page.js', 'utf8'); +const cases = [ + { name: 'edit post', scripts: [{ source: editPostSource, channel: true }] }, + { name: 'bookmarks', scripts: [{ source: bookmarksSource }] }, + { name: 'edit post then bookmarks', scripts: [ + { source: editPostSource, channel: true }, { source: bookmarksSource }, + ] }, + { name: 'bookmarks then edit post', scripts: [ + { source: bookmarksSource }, { source: editPostSource, channel: true }, + ] }, +]; + +test('fetch interceptors preserve POST request bodies and headers', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + args: ['--no-sandbox'], + }); + try { + for (const scenario of cases) { + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', request => request.respond({ + status: 200, + contentType: 'text/html', + body: '

Saved Posts

', + })); + await page.goto('https://bsky.app/saved'); + await page.evaluate(scripts => { + window.forwarded = []; + window.fetch = async (input, init) => { + const request = new Request(input, init); + const body = await request.text(); + window.forwarded.push({ + url: request.url, + method: request.method, + body, + authorization: request.headers.get('authorization'), + tag: request.headers.get('x-regression-tag'), + contentType: request.headers.get('content-type'), + }); + return new Response('{}', { headers: { 'content-type': 'application/json' } }); + }; + for (const item of scripts) { + const script = document.createElement('script'); + if (item.channel) script.dataset.bskyplusChannel = 'fetch-interceptor-test'; + script.textContent = item.source; + document.head.append(script); + } + }, scenario.scripts); + + const forwarded = await page.evaluate(async () => { + const endpoint = 'https://bsky.app/xrpc/app.bsky.bookmark.createBookmark'; + const authorization = `Bearer e30.${btoa(JSON.stringify({ sub: 'did:plc:fetchfixture' }))}.sig`; + const calls = [ + ['Request input', () => window.fetch(new Request(endpoint, { + method: 'POST', + headers: { authorization, 'content-type': 'application/json', 'x-regression-tag': 'request-input' }, + body: '{"source":"Request input"}', + }))], + ['URL and init', () => window.fetch(endpoint, { + method: 'POST', + headers: { authorization, 'content-type': 'application/json', 'x-regression-tag': 'url-init' }, + body: '{"source":"URL and init"}', + })], + ]; + for (const [, send] of calls) { + const response = await send(); + await response.text(); + } + return window.forwarded; + }); + + assert.equal(forwarded.length, 2, `${scenario.name} forwards each request once`); + assert.deepEqual(forwarded.map(({ body }) => body), [ + '{"source":"Request input"}', '{"source":"URL and init"}', + ], `${scenario.name} preserves both POST bodies`); + for (const [index, request] of forwarded.entries()) { + assert.equal(request.url, 'https://bsky.app/xrpc/app.bsky.bookmark.createBookmark'); + assert.equal(request.method, 'POST'); + assert.match(request.authorization, /^Bearer e30\./); + assert.equal(request.tag, index === 0 ? 'request-input' : 'url-init'); + assert.equal(request.contentType, 'application/json'); + } + await page.close(); + } + } finally { + await browser.close(); + } +}); diff --git a/test/test_firefox_accent.mjs b/test/test_firefox_accent.mjs deleted file mode 100644 index 8a0093b..0000000 --- a/test/test_firefox_accent.mjs +++ /dev/null @@ -1,169 +0,0 @@ -import assert from 'node:assert/strict'; -import path from 'node:path'; -import { cp, mkdtemp, readFile, writeFile, rm } from 'node:fs/promises'; -import puppeteer from 'puppeteer-core'; -import { ensureLoggedIn } from './test_helper.mjs'; - -const live = process.argv.includes('--live'); -const fixture = ` - - Test link -
- -`; - -// Keep the shipped extension intact. This bridge exercises its real storage -// listener in Firefox; BiDi cannot evaluate code inside extension popup pages. -const extensionPath = await mkdtemp('/var/folders/vm/d_061zwd4vd7v3lwb617bf680000gn/T/opencode/firefox-accent-'); -await cp(path.resolve('extension/firefox'), extensionPath, { recursive: true }); -const manifestPath = path.join(extensionPath, 'manifest.json'); -const manifest = JSON.parse(await readFile(manifestPath, 'utf8')); -manifest.content_scripts[0].js.push('test-storage-bridge.js'); -await writeFile(manifestPath, JSON.stringify(manifest)); -await writeFile(path.join(extensionPath, 'test-storage-bridge.js'), ` - window.addEventListener('message', async event => { - if (event.source !== window || event.data?.type !== 'BSKYPLUS_TEST_SETTINGS') return; - await browser.storage.local.set(event.data.settings); - document.documentElement.dataset.testSettingsSaved = event.data.id; - }); -`); - -const browser = await puppeteer.launch({ - browser: 'firefox', - executablePath: process.env.FIREFOX_PATH || '/Applications/Firefox.app/Contents/MacOS/firefox', - userDataDir: path.resolve('test/profiles/firefox'), - headless: true, -}); - -let sequence = 0; -async function setSettings(page, settings) { - const id = String(++sequence); - await page.evaluate(({ settings, id }) => { - window.postMessage({ type: 'BSKYPLUS_TEST_SETTINGS', settings, id }, '*'); - }, { settings, id }); - await page.waitForFunction(id => document.documentElement.dataset.testSettingsSaved === id, {}, id); -} - -async function newTestPage() { - const page = await browser.newPage(); - if (!live) { - await page.setRequestInterception(true); - page.on('request', request => { - if (request.isNavigationRequest() && request.url().startsWith('https://bsky.app')) { - return request.respond({ contentType: 'text/html', body: fixture }); - } - return request.continue(); - }); - } - await page.goto('https://bsky.app', { waitUntil: 'domcontentloaded' }); - return page; -} - -async function expectAccent(page, expected) { - const selector = live ? 'button[aria-label="Compose new post"]' : '#accent-button'; - await page.waitForFunction((selector, expected) => { - return [...document.querySelectorAll(selector)].some(button => - getComputedStyle(button).backgroundColor === expected); - }, { timeout: 10000 }, selector, expected); -} - -try { - await browser.installExtension(extensionPath); - const page = await newTestPage(); - if (live) { - await ensureLoggedIn(page); - await page.waitForSelector('a[href="/notifications"]', { timeout: 30000 }); - } - await setSettings(page, { accentColor: '#1083fe' }); - await expectAccent(page, 'rgb(15, 115, 255)'); - await setSettings(page, { accentColor: '#750787' }); - await expectAccent(page, 'rgb(117, 7, 135)'); - console.log('PASS: saved accent recolors Firefox buttons'); - - if (!live) { - const styles = await page.evaluate(() => { - const button = getComputedStyle(document.querySelector('#accent-button')); - const icon = getComputedStyle(document.querySelector('#accent-icon')); - return { - text: button.color, - link: getComputedStyle(document.querySelector('#accent-link')).color, - border: getComputedStyle(document.querySelector('#accent-border')).borderTopColor, - fill: icon.fill, stroke: icon.stroke, - }; - }); - assert.deepEqual(styles, { - text: 'rgb(255, 255, 255)', link: 'rgb(117, 7, 135)', - border: 'rgb(117, 7, 135)', fill: 'rgb(117, 7, 135)', stroke: 'rgb(117, 7, 135)', - }); - await page.evaluate(() => { - const button = document.createElement('button'); - button.id = 'dynamic-button'; - button.style.backgroundColor = '#0f73ff'; - document.body.appendChild(button); - }); - assert.equal(await page.$eval('#dynamic-button', el => getComputedStyle(el).backgroundColor), 'rgb(117, 7, 135)'); - console.log('PASS: text contrast, links, borders, SVGs, and newly rendered controls'); - } - - const secondPage = await newTestPage(); - await expectAccent(secondPage, 'rgb(117, 7, 135)'); - if (live) { - await secondPage.waitForSelector('a[href="/notifications"]'); - console.log('PASS: new tab reused the signed-in account session'); - } - await page.reload({ waitUntil: 'domcontentloaded' }); - await expectAccent(page, 'rgb(117, 7, 135)'); - await setSettings(page, { accentColor: '#FF0018' }); - await expectAccent(page, 'rgb(255, 0, 24)'); - await expectAccent(secondPage, 'rgb(255, 0, 24)'); - console.log('PASS: reload, new tab, and cross-tab settings updates'); - - await setSettings(page, { accentColor: '#1083fe' }); - await expectAccent(page, 'rgb(15, 115, 255)'); - await expectAccent(secondPage, 'rgb(15, 115, 255)'); - console.log('PASS: reset restores native Bluesky blue'); - - if (process.argv.includes('--ocr')) { - // Exercise the actual content-script button, background page, worker, and - // packaged WASM/language data without uploading anything to Bluesky. - for (const text of ['HELLO BLUESKY', '']) { - await page.evaluate(text => { - document.querySelector('#ocr-test-dialog')?.remove(); - const dialog = document.createElement('div'); - dialog.id = 'ocr-test-dialog'; - dialog.setAttribute('role', 'dialog'); - const canvas = document.createElement('canvas'); - canvas.width = 640; - canvas.height = 120; - const ctx = canvas.getContext('2d'); - ctx.fillStyle = 'white'; - ctx.fillRect(0, 0, canvas.width, canvas.height); - ctx.fillStyle = 'black'; - ctx.font = '48px sans-serif'; - ctx.fillText(text, 30, 75); - const img = document.createElement('img'); - img.src = canvas.toDataURL('image/png'); - const wrapper = document.createElement('div'); - wrapper.appendChild(document.createElement('textarea')); - dialog.append(img, wrapper); - document.body.appendChild(dialog); - }, text); - await page.waitForSelector('#bskyplus-ocr-btn'); - await page.click('#bskyplus-ocr-btn'); - await page.waitForFunction(() => document.querySelector('#bskyplus-ocr-btn')?.disabled === false, { timeout: 60000 }); - assert.equal(await page.$eval('#bskyplus-ocr-btn', el => el.textContent), 'Add with OCR'); - assert.equal(await page.$eval('#bskyplus-ocr-btn', el => !!el.querySelector('svg path')), true); - if (text) { - assert.equal(await page.$eval('#ocr-test-dialog textarea', el => el.value.trim()), text); - console.log('PASS: bundled Firefox OCR recognizes text and restores button'); - } else { - await page.waitForFunction(() => [...document.querySelectorAll('.bskyplus-toast')].some(el => el.textContent === 'There was no text in the image')); - assert.equal(await page.$eval('#ocr-test-dialog textarea', el => el.value), ''); - console.log('PASS: blank image shows no-text toast and restores button'); - } - } - } -} finally { - await browser.close(); - await rm(extensionPath, { recursive: true, force: true }); -} diff --git a/test/test_firefox_build.mjs b/test/test_firefox_build.mjs index 28895ff..528caec 100644 --- a/test/test_firefox_build.mjs +++ b/test/test_firefox_build.mjs @@ -1,10 +1,11 @@ import assert from 'node:assert/strict'; import { execFileSync } from 'node:child_process'; import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; import path from 'node:path'; import { unzipSync } from 'fflate'; -const directory = await mkdtemp('/var/folders/vm/d_061zwd4vd7v3lwb617bf680000gn/T/opencode/firefox-review-build-'); +const directory = await mkdtemp(path.join(tmpdir(), 'bskyplus-firefox-review-build-')); const { version } = JSON.parse(await readFile('extension/firefox/manifest.json', 'utf8')); const addonPath = `dist/firefox/bsky_-${version}.zip`; try { diff --git a/test/test_integrated_settings.mjs b/test/test_integrated_settings.mjs index 2aeabf6..2532fa3 100644 --- a/test/test_integrated_settings.mjs +++ b/test/test_integrated_settings.mjs @@ -27,15 +27,17 @@ function documentFor(pathname, search = '') { window.addEventListener('resize', alignNativeCenter); alignNativeCenter(); + `; } - if (pathname === '/settings' && new URLSearchParams(search).get('bskyplus') === '1') { + if (pathname === '/settings' && ['1', 'theme'].includes(new URLSearchParams(search).get('bskyplus'))) { return `

Native settings heading

Native settings content

+ `; } @@ -50,6 +52,7 @@ function documentFor(pathname, search = '') {
Native settings content
+ `; } @@ -63,8 +66,10 @@ function documentFor(pathname, search = '') { async function startFixtureServer() { const server = createServer((request, response) => { const url = new URL(request.url, 'http://127.0.0.1'); - if (url.pathname === '/bskyplus') { - response.writeHead(302, { location: '/settings?bskyplus=1' }); + if (url.pathname === '/bskyplus' || url.pathname === '/bskyplus/theme') { + response.writeHead(302, { + location: url.pathname === '/bskyplus/theme' ? '/settings?bskyplus=theme' : '/settings?bskyplus=1', + }); response.end(); return; } @@ -80,6 +85,7 @@ async function openFixture() { const fixture = await startFixtureServer(); const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); const page = await browser.newPage(); + page.setDefaultTimeout(5000); return { ...fixture, browser, page }; } @@ -119,6 +125,25 @@ test('settings link uses the about entry and client-side navigation mounts Bsky+ { tag: 'SECTION', hidden: false }, ]); + assert.equal(await fixture.page.$eval('[data-bskyplus-theme-link]', link => link.getAttribute('href')), '/bskyplus/theme'); + await fixture.page.click('[data-bskyplus-theme-link]'); + await fixture.page.waitForFunction(() => location.pathname === '/bskyplus/theme'); + await fixture.page.waitForSelector('section[data-bskyplus-settings-page] h1'); + assert.equal(await fixture.page.$eval('section[data-bskyplus-settings-page] h1', heading => heading.textContent), 'Theme editor'); + assert.equal(await fixture.page.$eval('section[data-bskyplus-settings-page] a', link => link.getAttribute('href')), '/bskyplus'); + + await fixture.page.click('section[data-bskyplus-settings-page] a[href="/bskyplus"]'); + await fixture.page.waitForFunction(() => location.pathname === '/bskyplus'); + await fixture.page.waitForSelector('section[data-bskyplus-settings-page] h1'); + assert.equal(await fixture.page.$eval('section[data-bskyplus-settings-page] h1', heading => heading.textContent), 'Bsky+'); + await fixture.page.goBack(); + await fixture.page.waitForFunction(() => location.pathname === '/bskyplus/theme'); + await fixture.page.waitForSelector('section[data-bskyplus-settings-page] h1'); + assert.equal(await fixture.page.$eval('section[data-bskyplus-settings-page] h1', heading => heading.textContent), 'Theme editor'); + await fixture.page.goBack(); + await fixture.page.waitForFunction(() => location.pathname === '/bskyplus'); + await fixture.page.waitForSelector('section[data-bskyplus-settings-page] h1'); + assert.equal(await fixture.page.$eval('section[data-bskyplus-settings-page] h1', heading => heading.textContent), 'Bsky+'); await fixture.page.goBack(); await fixture.page.waitForFunction(() => location.pathname === '/settings'); await fixture.page.waitForSelector('section[data-bskyplus-settings-page]', { hidden: true }); @@ -144,23 +169,32 @@ test('fallback account link, direct refresh, back/forward, and mutation remain i assert.equal(await fixture.page.evaluate(() => location.pathname), '/bskyplus'); assert.equal(await fixture.page.$$eval('section[data-bskyplus-settings-page]', sections => sections.length), 1); + await fixture.page.goto(`${fixture.origin}/bskyplus/theme`, { waitUntil: 'networkidle0' }); + await fixture.page.waitForSelector('section[data-bskyplus-settings-page] h1'); + assert.equal(await fixture.page.evaluate(() => location.pathname), '/bskyplus/theme'); + assert.equal(await fixture.page.$eval('section[data-bskyplus-settings-page] h1', heading => heading.textContent), 'Theme editor'); + await fixture.page.reload({ waitUntil: 'networkidle0' }); + await fixture.page.waitForSelector('section[data-bskyplus-settings-page] h1'); + assert.equal(await fixture.page.evaluate(() => location.pathname), '/bskyplus/theme'); + await fixture.page.reload({ waitUntil: 'networkidle0' }); assert.equal(await fixture.page.$$eval('section[data-bskyplus-settings-page]', sections => sections.length), 1); - await fixture.page.click('section[data-bskyplus-settings-page] a[href="/settings"]'); - await fixture.page.waitForFunction(() => location.pathname === '/settings'); + await fixture.page.click('section[data-bskyplus-settings-page] a[href="/bskyplus"]'); + await fixture.page.waitForFunction(() => location.pathname === '/bskyplus'); await fixture.page.goBack(); await fixture.page.waitForSelector('section[data-bskyplus-settings-page]'); + assert.equal(await fixture.page.evaluate(() => location.pathname), '/bskyplus/theme'); await fixture.page.goForward(); - await fixture.page.waitForFunction(() => location.pathname === '/settings'); + await fixture.page.waitForFunction(() => location.pathname === '/bskyplus'); await fixture.page.evaluate(() => { const extra = document.createElement('div'); extra.textContent = 'native mutation'; document.querySelector('main').append(extra); }); - await fixture.page.waitForFunction(() => document.querySelectorAll('a[data-bskyplus-settings-link]').length === 1); - assert.equal(await fixture.page.$$eval('a[data-bskyplus-settings-link]', links => links.length), 1); + await fixture.page.waitForFunction(() => document.querySelectorAll('[data-bskyplus-theme-link]').length === 1); + assert.equal(await fixture.page.$$eval('[data-bskyplus-theme-link]', links => links.length), 1); } finally { await closeFixture(fixture); } @@ -187,6 +221,23 @@ test('Chrome route rule redirects only the exact Bsky+ main-frame path', () => { assert.equal(matcher.test('https://bsky.app/bskyplus-extra'), false); assert.equal(matcher.test('https://bsky.app/settings'), false); assert.equal(rule.action.redirect.url, 'https://bsky.app/settings?bskyplus=1'); + + const themeRule = routeRules.find(candidate => candidate.id === 2); + const themeMatcher = new RegExp(themeRule.condition.regexFilter); + assert.deepEqual(themeRule.condition.resourceTypes, ['main_frame']); + assert.equal(themeMatcher.test('https://bsky.app/bskyplus/theme'), true); + assert.equal(themeMatcher.test('https://bsky.app/bskyplus/theme/'), true); + assert.equal(themeMatcher.test('https://bsky.app/bskyplus/theme?from=settings'), true); + assert.equal(themeMatcher.test('https://bsky.app/bskyplus/theme-extra'), false); + assert.equal(themeRule.action.redirect.url, 'https://bsky.app/settings?bskyplus=theme'); + const infrastructureRule = routeRules.find(candidate => candidate.id === 3); + const infrastructureMatcher = new RegExp(infrastructureRule.condition.regexFilter); + assert.deepEqual(infrastructureRule.condition.resourceTypes, ['main_frame']); + for (const suffix of ['', '/', '?from=settings']) { + assert.equal(infrastructureMatcher.test('https://bsky.app/bskyplus/infrastructure' + suffix), true); + } + assert.equal(infrastructureMatcher.test('https://bsky.app/bskyplus/infrastructure-extra'), false); + assert.equal(infrastructureRule.action.redirect.url, 'https://bsky.app/settings?bskyplus=infrastructure'); }); test('integrated settings follow the native center through compact sidebar breakpoints', async () => { @@ -226,5 +277,15 @@ test('Firefox redirects only the custom route', () => { assert.equal(listener({ url: `https://bsky.app${route}` }).redirectUrl, 'https://bsky.app/settings?bskyplus=1'); } + for (const route of ['/bskyplus/theme', '/bskyplus/theme/', '/bskyplus/theme?from=settings']) { + assert.equal(listener({ url: `https://bsky.app${route}` }).redirectUrl, + 'https://bsky.app/settings?bskyplus=theme'); + } assert.equal(listener({ url: 'https://bsky.app/bskyplus-extra' }).redirectUrl, undefined); + assert.equal(listener({ url: 'https://bsky.app/bskyplus/theme-extra' }).redirectUrl, undefined); + for (const suffix of ['', '/', '?from=settings']) { + assert.equal(listener({ url: 'https://bsky.app/bskyplus/infrastructure' + suffix }).redirectUrl, + 'https://bsky.app/settings?bskyplus=infrastructure'); + } + assert.equal(listener({ url: 'https://bsky.app/bskyplus/infrastructure-extra' }).redirectUrl, undefined); }); diff --git a/test/test_llm.mjs b/test/test_llm.mjs index 52272e1..be7d621 100644 --- a/test/test_llm.mjs +++ b/test/test_llm.mjs @@ -64,13 +64,27 @@ function makeBridge(overrides = {}) { return { bridge: llm.createBridge(env), calls, env }; } +function requestLlmAccess(bridge, sender, message = { action: 'REQUEST_LLM_ACCESS' }) { + return new Promise((resolve, reject) => { + try { + assert.equal(bridge.onMessage(message, sender, resolve), true); + } catch (error) { + reject(error); + } + }); +} + test('normalizeSettings trims strings and defaults missing fields', () => { assert.deepEqual(llm.normalizeSettings({ endpoint: ' https://x/y ', model: ' m ', apiKey: 'k' }), { endpoint: 'https://x/y', model: 'm', apiKey: 'k', + useCustomPrompt: false, + customPrompt: '', + }); + assert.deepEqual(llm.normalizeSettings(null), { + endpoint: '', model: '', apiKey: '', useCustomPrompt: false, customPrompt: '', }); - assert.deepEqual(llm.normalizeSettings(null), { endpoint: '', model: '', apiKey: '' }); }); test('validateEndpoint accepts full http(s) chat URLs and local endpoints', () => { @@ -150,6 +164,17 @@ test('validateEndpoint rejects blank, non-http, credentialed, fragmented, and ba assert.equal(llm.validateEndpoint('https://api.example.com/').ok, false); }); +test('disabled LLM retains configuration but refuses generation', async () => { + const disabled = { ...ENABLED, useCustomPrompt: false, customPrompt: '', enabled: false }; + assert.equal(llm.isEnabled(disabled), false); + assert.deepEqual(llm.normalizeSettings(disabled), disabled); + const { bridge, calls } = makeBridge({ getSettings: async () => disabled }); + const result = await bridge.runLlm({ image: VALID_IMAGE }, SENDER); + assert.equal(result.success, false); + assert.equal(result.error, 'LLM is disabled'); + assert.equal(calls.length, 0); +}); + test('isEnabled is derived from a valid endpoint', () => { assert.equal(llm.isEnabled(ENABLED), true); assert.equal(llm.isEnabled({ endpoint: '', model: 'x', apiKey: 'k' }), false); @@ -194,10 +219,12 @@ test('buildRequestBody sends prompt plus data:image and optional model', () => { const body = llm.buildRequestBody({ model: 'vision-1' }, { system: 'S', user: 'U' }, VALID_IMAGE); assert.equal(body.stream, false); assert.equal(body.model, 'vision-1'); - assert.equal(body.messages[0].role, 'system'); - assert.equal(body.messages[0].content, 'S'); - const parts = body.messages[1].content; - assert.equal(parts[0].text, 'U'); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].role, 'user'); + const parts = body.messages[0].content; + assert.equal(parts.length, 2); + assert.equal(parts[0].type, 'text'); + assert.equal(parts[0].text, 'S'); assert.equal(parts[1].image_url.url, VALID_IMAGE); const noModel = llm.buildRequestBody({ model: '' }, null, VALID_IMAGE); @@ -219,8 +246,48 @@ test('RUN_LLM success sends a POST with bearer key and returns trimmed text', as const body = JSON.parse(calls[0].opts.body); assert.equal(body.model, 'test-model'); assert.equal(body.stream, false); - assert.equal(body.messages[0].content, 'sys prompt'); - assert.equal(body.messages[1].content[1].image_url.url, VALID_IMAGE); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].role, 'user'); + assert.equal(body.messages[0].content.length, 2); + assert.equal(body.messages[0].content[0].text, 'sys prompt'); + assert.equal(body.messages[0].content[1].image_url.url, VALID_IMAGE); +}); + +test('RUN_LLM uses only the saved custom prompt and image', async () => { + const customPrompt = 'Describe the image in one sentence.'; + const { bridge, calls } = makeBridge({ + getSettings: async () => ({ ...ENABLED, useCustomPrompt: true, customPrompt }), + }); + await bridge.runLlm({ image: VALID_IMAGE }, SENDER); + + const body = JSON.parse(calls[0].opts.body); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].content.length, 2); + assert.equal(body.messages[0].content[0].text, customPrompt); + assert.equal(body.messages[0].content[1].image_url.url, VALID_IMAGE); +}); + +test('RUN_LLM keeps the bundled prompt when custom prompt is disabled but its draft remains saved', async () => { + const { bridge, calls } = makeBridge({ + getSettings: async () => ({ ...ENABLED, useCustomPrompt: false, customPrompt: 'Saved draft' }), + }); + await bridge.runLlm({ image: VALID_IMAGE }, SENDER); + + const body = JSON.parse(calls[0].opts.body); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].content[0].text, 'sys prompt'); +}); + +test('RUN_LLM falls back to the bundled prompt when the enabled custom prompt is blank', async () => { + const { bridge, calls } = makeBridge({ + getSettings: async () => ({ ...ENABLED, useCustomPrompt: true, customPrompt: ' ' }), + }); + await bridge.runLlm({ image: VALID_IMAGE }, SENDER); + + const body = JSON.parse(calls[0].opts.body); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].content[0].text, 'sys prompt'); + assert.equal(body.messages[0].content.length, 2); }); test('RUN_LLM omits Authorization when no API key is saved', async () => { @@ -303,6 +370,28 @@ test('RUN_LLM never throws into the message channel', async () => { assert.equal(typeof result.error, 'string'); }); +test('LLM completion clears its timeout on success, parse errors, and synchronous failures', async t => { + t.mock.timers.enable({ apis: ['setTimeout'] }); + for (const response of ['valid', 'invalid', 'empty', 'throw']) { + let aborted = false; + const { bridge } = makeBridge({ + fetch: (url, options) => { + options.signal.addEventListener('abort', () => { aborted = true; }); + if (response === 'throw') throw new TypeError('failed synchronously'); + return Promise.resolve({ ok: true, text: async () => response === 'valid' + ? JSON.stringify({ choices: [{ message: { content: 'Alt text' } }] }) + : response === 'invalid' ? 'not JSON' : '' }); + }, + }); + const result = await bridge.runLlm({ image: VALID_IMAGE }, SENDER); + assert.equal(result.success, response === 'valid'); + t.mock.timers.tick(2000); + assert.equal(aborted, false, `${response}: completed request must not leave an abort timer running`); + const retry = await bridge.runLlm({ image: VALID_IMAGE }, SENDER); + assert.notEqual(retry.error, 'An LLM request is already in progress'); + } +}); + test('RUN_LLM rejects bad images before any network call', async () => { const { bridge, calls } = makeBridge(); const result = await bridge.runLlm({ image: 'not-a-data-url' }, SENDER); @@ -479,6 +568,95 @@ test('sender validation rejects other ids, sub-frames, and non-bsky origins', as } }); +test('REQUEST_LLM_ACCESS accepts this extension settings page and rejects malicious senders', async () => { + let settingsReads = 0; + let permissionChecks = 0; + const opened = []; + const extensionRoot = `moz-extension://${OWN_ID}/`; + const bridge = llm.createBridge({ + api: { + runtime: { id: OWN_ID, getURL: (p) => extensionRoot + p }, + permissions: { contains: async () => { permissionChecks++; return true; } }, + tabs: { create: async options => { opened.push(options); } }, + }, + getSettings: async () => { settingsReads++; return ENABLED; }, + supportsDataConsent: false, + }); + + const accepted = await requestLlmAccess(bridge, { + id: OWN_ID, frameId: 0, url: extensionRoot + 'shared/settings-frame.html', + }); + assert.deepEqual(accepted, { success: true, granted: true }); + assert.equal(permissionChecks, 1); + + for (const sender of [ + { id: 'other-extension', url: extensionRoot + 'settings.html' }, + { id: OWN_ID, url: 'https://evil.example/settings.html' }, + { id: OWN_ID, url: `moz-extension://${OWN_ID}.evil/settings.html` }, + ]) { + const rejected = await requestLlmAccess(bridge, sender); + assert.deepEqual(rejected, { success: false, error: 'Open Bsky+ settings to grant LLM access.' }); + } + assert.equal(settingsReads, 1, 'rejected senders do not read settings'); + assert.equal(permissionChecks, 1, 'rejected senders do not probe permissions'); + assert.deepEqual(opened, [], 'already-granted access does not open a page'); +}); + +test('REQUEST_LLM_ACCESS rejects an invalid endpoint without opening a page', async () => { + const opened = []; + let permissionChecks = 0; + const extensionRoot = `moz-extension://${OWN_ID}/`; + const bridge = llm.createBridge({ + api: { + runtime: { id: OWN_ID, getURL: (p) => extensionRoot + p }, + permissions: { contains: async () => { permissionChecks++; return false; } }, + tabs: { create: async options => { opened.push(options); } }, + }, + getSettings: async () => ({ ...ENABLED, endpoint: 'not-an-endpoint' }), + supportsDataConsent: true, + }); + + const result = await requestLlmAccess(bridge, { + id: OWN_ID, url: extensionRoot + 'settings.html', + }); + assert.deepEqual(result, { success: false, error: 'Save a valid LLM endpoint before granting access.' }); + assert.equal(permissionChecks, 0); + assert.deepEqual(opened, []); +}); + +test('REQUEST_LLM_ACCESS opens the fixed extension permission page when host or consent is missing', async () => { + const extensionRoot = `moz-extension://${OWN_ID}/`; + const fixedPageUrl = extensionRoot + 'shared/llm-permissions.html'; + for (const { missing, hostGranted, consentGranted } of [ + { missing: 'host', hostGranted: false, consentGranted: true }, + { missing: 'consent', hostGranted: true, consentGranted: false }, + ]) { + const probes = []; + const opened = []; + const bridge = llm.createBridge({ + api: { + runtime: { id: OWN_ID, getURL: (p) => extensionRoot + p }, + permissions: { contains: async permission => { + probes.push(permission); + return permission.origins ? hostGranted : consentGranted; + } }, + tabs: { create: async options => { opened.push(options); } }, + }, + getSettings: async () => ENABLED, + supportsDataConsent: true, + }); + + const result = await requestLlmAccess(bridge, { + id: OWN_ID, url: extensionRoot + 'settings.html', + }, { action: 'REQUEST_LLM_ACCESS', url: 'https://attacker.example/permission-page' }); + assert.deepEqual(result, { success: true, opened: true }, `missing ${missing} opens the permission page`); + assert.equal(probes.length, 2); + assert.ok(probes.some(permission => permission.origins?.[0] === 'http://127.0.0.1/*')); + assert.ok(probes.some(permission => permission.data_collection?.join(',') === 'websiteContent,authenticationInfo')); + assert.deepEqual(opened, [{ url: fixedPageUrl }], 'the broker opens its own fixed page, not the message URL'); + } +}); + test('concurrent RUN_LLM from the same tab is deduplicated without blocking other tabs', async () => { let release; const gate = new Promise((resolve) => { release = resolve; }); @@ -542,8 +720,11 @@ test('prompt is loaded once from runtime.getURL(shared/alt-text-prompt.json)', a const endpointCall = calls.find((call) => call.url === ENABLED.endpoint); const body = JSON.parse(endpointCall.opts.body); - assert.equal(body.messages[0].content, 'PROMPT_SYS'); - assert.equal(body.messages[1].content[0].text, 'PROMPT_USR'); + assert.equal(body.messages.length, 1); + assert.equal(body.messages[0].content.length, 2); + assert.equal(body.messages[0].role, 'user'); + assert.equal(body.messages[0].content[0].text, 'PROMPT_SYS'); + assert.equal(body.messages[0].content[1].image_url.url, VALID_IMAGE); }); test('settings validateEndpoint matches backend rules and strips ports', () => { @@ -586,7 +767,10 @@ test('storageGet resolves stored values and defaults to empty on failure', async test('settings module never broadcasts the endpoint or API key', async () => { const source = await readFile(path.join(repoRoot, 'extension/shared/llm-settings.js'), 'utf8'); assert.equal(source.includes('SETTINGS_UPDATED'), false); - assert.equal(source.includes('sendMessage'), false); + const brokerPayload = source.match(/sendMessage\(\s*(\{[^}]*\})\s*\)/)?.[1]; + assert.ok(brokerPayload, 'settings asks the background broker to check permissions'); + assert.match(brokerPayload, /action:\s*'REQUEST_LLM_ACCESS'/); + assert.doesNotMatch(brokerPayload, /\b(?:endpoint|apiKey)\b/i); }); test('onMessage keeps the channel open for RUN_LLM and always responds', async () => { @@ -601,14 +785,15 @@ test('onMessage keeps the channel open for RUN_LLM and always responds', async ( assert.equal(ignored, undefined); }); -test('shared prompt JSON targets blind/low-vision readers, forbids invention, and caps at 2000', async () => { +test('shared prompt targets blind/low-vision readers and requests output within the 2000-character limit', async () => { const prompt = JSON.parse(await readFile(path.join(repoRoot, 'extension/shared/alt-text-prompt.json'), 'utf8')); assert.equal(typeof prompt.system, 'string'); - assert.match(prompt.system, /2000/); + const limit = prompt.system.match(/under (\d+) characters/i); + assert.ok(limit, 'Prompt must specify an output length limit'); + assert.ok(Number(limit[1]) > 0 && Number(limit[1]) <= 2000); assert.match(prompt.system, /alt text/i); assert.match(prompt.system, /blind|low-vision/i); assert.match(prompt.system, /only/i); - assert.match(prompt.system, /2000/); assert.match(prompt.system, /do not invent|not invent/i); }); diff --git a/test/test_llm_permissions.mjs b/test/test_llm_permissions.mjs new file mode 100644 index 0000000..8386c8b --- /dev/null +++ b/test/test_llm_permissions.mjs @@ -0,0 +1,155 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +const chromePath = process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'; +const llmSource = await readFile('extension/shared/llm.js', 'utf8'); +const pageSource = await readFile('extension/shared/llm-permissions.js', 'utf8'); +const manifest = JSON.parse(await readFile('extension/firefox/manifest.json', 'utf8')); +const SETTINGS = { + endpoint: 'https://llm.example.test/v1/chat/completions', + model: 'vision-test', + apiKey: 'test-key-do-not-send', + useCustomPrompt: false, + customPrompt: '', +}; + +async function openPermissionPage(browser, { + stored = SETTINGS, + version = '140.0', + request = ['grant'], +} = {}) { + const page = await browser.newPage(); + await page.setContent('

'); + await page.evaluate(({ initial, firefoxVersion, outcomes }) => { + const calls = { request: [], contains: [], listeners: 0 }; + const state = { + settings: structuredClone(initial), + originGranted: false, + dataGranted: false, + outcomes: outcomes.slice(), + }; + window.__llmPermissionCalls = calls; + window.__llmPermissionState = state; + window.browser = { + runtime: { + id: 'test-extension', + getURL: path => `moz-extension://test-extension/${path}`, + getBrowserInfo: async () => ({ name: 'Firefox', version: firefoxVersion }), + onMessage: { addListener: () => { calls.listeners += 1; } }, + }, + storage: { + local: { + get: async () => ({ llm: structuredClone(state.settings) }), + }, + }, + permissions: { + contains: async value => { + calls.contains.push(structuredClone(value)); + if (value.origins) return state.originGranted; + if (value.data_collection) return state.dataGranted; + return false; + }, + request: async value => { + calls.request.push(structuredClone(value)); + const outcome = state.outcomes.shift() || 'grant'; + if (outcome === 'deny') return false; + if (outcome === 'reject') throw new Error('permission API rejected'); + state.originGranted = true; + if (value.data_collection) state.dataGranted = true; + return true; + }, + }, + }; + }, { initial: stored, firefoxVersion: version, outcomes: request }); + await page.evaluate(source => { + const script = document.createElement('script'); + script.setAttribute('data-no-register', ''); + script.textContent = source; + document.head.appendChild(script); + script.remove(); + }, llmSource); + await page.addScriptTag({ content: pageSource }); + await page.waitForFunction(() => !document.querySelector('#grant').disabled || document.querySelector('#grant').hidden); + return page; +} + +async function clickGrant(page) { + await page.waitForFunction(() => !document.querySelector('#grant').hidden && !document.querySelector('#grant').disabled); + await page.click('#grant'); +} + +async function calls(page) { + return page.evaluate(() => structuredClone(window.__llmPermissionCalls)); +} + +test('Firefox manifest declares data categories in gecko settings, not optional_permissions', () => { + assert.equal(manifest.optional_permissions.includes('data_collection'), false); + assert.deepEqual(manifest.browser_specific_settings.gecko.data_collection_permissions, { + required: ['none'], + optional: ['websiteContent', 'authenticationInfo'], + }); +}); + +test('permission page grants saved origin and Firefox data consent without a duplicate bridge listener', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('active')); + const recorded = await calls(page); + assert.deepEqual(recorded.request, [{ + origins: ['https://llm.example.test/*'], + data_collection: ['websiteContent', 'authenticationInfo'], + }]); + assert.equal(recorded.listeners, 0); + } finally { + await browser.close(); + } +}); + +test('denied permission can be retried from the privileged page', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser, { request: ['deny', 'grant'] }); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('not granted')); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('active')); + assert.equal((await calls(page)).request.length, 2); + } finally { + await browser.close(); + } +}); + +test('changed saved endpoint is detected before the old grant is reported as active', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser); + await page.evaluate(() => { + window.__llmPermissionState.settings.endpoint = 'https://other.example.test/v1/chat/completions'; + }); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('settings changed')); + assert.equal(documentContainsActive(await page.$eval('#status', status => status.textContent)), false); + } finally { + await browser.close(); + } +}); + +test('Firefox versions before built-in data consent request only the saved endpoint origin', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openPermissionPage(browser, { version: '109.0' }); + await clickGrant(page); + await page.waitForFunction(() => document.querySelector('#status').textContent.includes('active')); + assert.deepEqual((await calls(page)).request, [{ origins: ['https://llm.example.test/*'] }]); + } finally { + await browser.close(); + } +}); + +function documentContainsActive(statusText) { + return statusText.includes('active'); +} diff --git a/test/test_llm_settings_save.mjs b/test/test_llm_settings_save.mjs index 005e1bf..491e6f6 100644 --- a/test/test_llm_settings_save.mjs +++ b/test/test_llm_settings_save.mjs @@ -10,32 +10,44 @@ const SAVED = { endpoint: 'https://llm.example.test/v1/chat/completions', model: 'vision-test', apiKey: 'test-key-do-not-send', + useCustomPrompt: false, + customPrompt: '', }; -async function openSettings(browser, { stored = {}, permission, storageSet } = {}) { +async function openSettings(browser, { + stored = {}, permission, storageSet, missingPermissions = false, + brokerResponse = { success: true, opened: true }, +} = {}) { const page = await browser.newPage(); await page.setContent('
'); - await page.evaluate(({ initial, permissionResults, setResult }) => { - const calls = { get: 0, set: [], request: [] }; + await page.evaluate(({ initial, permissionResults, setResult, missingPermissions, brokerResponse }) => { + const calls = { get: 0, set: [], request: [], messages: [] }; window.__llmTestCalls = calls; + let storedSettings = structuredClone(initial); const outcomes = permissionResults.slice(); - window.chrome = { + const api = { runtime: { getBrowserInfo: async () => ({ name: 'Chrome', version: '140.0' }), + sendMessage: async message => { + calls.messages.push(structuredClone(message)); + return brokerResponse; + }, }, storage: { local: { get: async () => { calls.get += 1; - return { llm: initial }; + return { llm: structuredClone(storedSettings) }; }, set: async value => { calls.set.push(structuredClone(value)); if (setResult === 'reject') throw new Error('storage unavailable'); + storedSettings = structuredClone(value.llm); }, }, }, - permissions: { + }; + if (!missingPermissions) api.permissions = { request: async request => { calls.request.push({ request: structuredClone(request), @@ -45,12 +57,14 @@ async function openSettings(browser, { stored = {}, permission, storageSet } = { if (outcome === 'reject') throw new Error('permission request failed'); return outcome !== 'deny'; }, - }, - }; + }; + window.chrome = api; }, { initial: stored, permissionResults: Array.isArray(permission) ? permission : [permission || 'grant'], setResult: storageSet || 'resolve', + missingPermissions, + brokerResponse, }); await page.addScriptTag({ content: settingsScript }); await page.waitForSelector('.bskyplus-llm-section'); @@ -88,6 +102,37 @@ test('Save persists LLM settings before requesting host access', async () => { } }); +test('missing embedded permissions API opens the broker page and remains retryable', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openSettings(browser, { missingPermissions: true }); + await fillAndSave(page); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent.includes('permissions page')); + assert.equal(await page.$eval('.bskyplus-llm-grant', button => button.hidden), false); + assert.notEqual(await page.$eval('.bskyplus-llm-status', status => status.textContent), 'LLM endpoint saved.'); + await page.click('.bskyplus-llm-grant'); + await page.waitForFunction(() => window.__llmTestCalls.messages.length === 2); + assert.deepEqual((await calls(page)).messages, [ + { action: 'REQUEST_LLM_ACCESS' }, + { action: 'REQUEST_LLM_ACCESS' }, + ]); + } finally { + await browser.close(); + } +}); + +test('missing permissions API does not treat an unexpected broker response as a grant', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openSettings(browser, { missingPermissions: true, brokerResponse: { success: true } }); + await fillAndSave(page); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent.includes('finish enabling')); + assert.equal(await page.$eval('.bskyplus-llm-grant', button => button.hidden), false); + } finally { + await browser.close(); + } +}); + test('denied or rejected permission keeps saved settings and exposes retry', async () => { for (const permission of ['deny', 'reject']) { const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); @@ -120,6 +165,128 @@ test('storage failure never requests host access', async () => { } }); +test('custom prompt draft is saved even when it is incomplete, without permission', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openSettings(browser); + await page.evaluate(endpoint => { + document.querySelector('#bskyplusLlmEndpoint').value = endpoint; + document.querySelector('#bskyplusLlmUseCustomPrompt').click(); + }, SAVED.endpoint); + await page.click('.bskyplus-llm-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent.includes('Enter a custom prompt')); + const recorded = await calls(page); + assert.ok(recorded.set.length >= 1, 'the toggle and current settings draft are saved'); + assert.equal(recorded.set.at(-1).llm.useCustomPrompt, true); + assert.equal(recorded.request.length, 0); + } finally { + await browser.close(); + } +}); + +test('custom prompt stays saved while its disabled field is empty and can be restored', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const prompt = 'Describe colors and visible text.'; + const page = await openSettings(browser, { + stored: { ...SAVED, useCustomPrompt: true, customPrompt: prompt }, + }); + assert.deepEqual(await page.$eval('#bskyplusLlmCustomPrompt', input => ({ + value: input.value, + disabled: input.disabled, + })), { value: prompt, disabled: false }); + assert.equal(await page.$$eval('.bskyplus-llm-label', labels => + labels.filter(label => label.textContent === 'Custom prompt').length), 1); + assert.equal(await page.$eval('.bskyplus-llm-section', section => section.textContent.includes('Use custom prompt')), false); + + await page.click('#bskyplusLlmUseCustomPrompt'); + await page.waitForFunction(() => window.__llmTestCalls.set.some(({ llm }) => llm.useCustomPrompt === false)); + assert.deepEqual(await page.$eval('#bskyplusLlmCustomPrompt', input => ({ + value: input.value, + disabled: input.disabled, + placeholder: input.placeholder, + })), { value: '', disabled: true, placeholder: '' }); + + await page.click('.bskyplus-llm-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === 'LLM endpoint saved.'); + const persisted = (await calls(page)).set.at(-1).llm; + assert.equal(persisted.useCustomPrompt, false); + assert.equal(persisted.customPrompt, prompt); + await page.close(); + + const reopened = await openSettings(browser, { stored: persisted }); + assert.deepEqual(await reopened.$eval('#bskyplusLlmCustomPrompt', input => ({ + value: input.value, + disabled: input.disabled, + })), { value: '', disabled: true }); + await reopened.click('#bskyplusLlmUseCustomPrompt'); + assert.deepEqual(await reopened.$eval('#bskyplusLlmCustomPrompt', input => ({ + value: input.value, + disabled: input.disabled, + })), { value: prompt, disabled: false }); + } finally { + await browser.close(); + } +}); + +test('each independent setting is saved when its field loses focus', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openSettings(browser, { stored: { model: 'old-model', apiKey: 'old-key' } }); + await page.focus('#bskyplusLlmEndpoint'); + await page.$eval('#bskyplusLlmEndpoint', (input, value) => { input.value = value; input.dispatchEvent(new Event('input', { bubbles: true })); }, SAVED.endpoint); + await page.click('#bskyplusLlmModel'); + await page.$eval('#bskyplusLlmModel', input => { input.value = 'new-model'; input.dispatchEvent(new Event('input', { bubbles: true })); }); + await page.click('#bskyplusLlmApiKey'); + await page.$eval('#bskyplusLlmApiKey', input => { input.value = 'new-key'; input.dispatchEvent(new Event('input', { bubbles: true })); }); + await page.click('.bskyplus-llm-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent.includes('saved')); + + const recorded = await calls(page); + assert.deepEqual(recorded.set.slice(0, 3).map(value => value.llm), [ + { endpoint: SAVED.endpoint, model: 'old-model', apiKey: 'old-key', useCustomPrompt: false, customPrompt: '' }, + { endpoint: SAVED.endpoint, model: 'new-model', apiKey: 'old-key', useCustomPrompt: false, customPrompt: '' }, + { endpoint: SAVED.endpoint, model: 'new-model', apiKey: 'new-key', useCustomPrompt: false, customPrompt: '' }, + ]); + assert.equal(recorded.request.length, 1); + } finally { + await browser.close(); + } +}); + +test('window blur starts saving a focused draft and drafts never request permission', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openSettings(browser, { stored: { model: 'old-model' } }); + await page.focus('#bskyplusLlmModel'); + await page.$eval('#bskyplusLlmModel', input => { input.value = 'draft-model'; input.dispatchEvent(new Event('input', { bubbles: true })); }); + await page.evaluate(() => window.dispatchEvent(new Event('blur'))); + await page.waitForFunction(() => window.__llmTestCalls.set.length > 0); + const recorded = await calls(page); + assert.equal(recorded.set.at(-1).llm.model, 'draft-model'); + assert.equal(recorded.request.length, 0); + } finally { + await browser.close(); + } +}); + +test('clearing only the endpoint retains other saved settings', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const existing = { ...SAVED, enabled: false }; + const page = await openSettings(browser, { stored: existing }); + await page.focus('#bskyplusLlmEndpoint'); + await page.$eval('#bskyplusLlmEndpoint', input => { input.value = ''; input.dispatchEvent(new Event('input', { bubbles: true })); }); + await page.click('.bskyplus-llm-save'); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent.includes('cleared')); + const recorded = await calls(page); + assert.deepEqual(recorded.set.at(-1).llm, { ...existing, endpoint: '' }); + assert.equal(recorded.request.length, 0); + } finally { + await browser.close(); + } +}); + test('reopened settings popup reads the persisted LLM values', async () => { const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); try { @@ -133,7 +300,7 @@ test('reopened settings popup reads the persisted LLM values', async () => { endpoint: document.querySelector('#bskyplusLlmEndpoint').value, model: document.querySelector('#bskyplusLlmModel').value, apiKey: document.querySelector('#bskyplusLlmApiKey').value, - })), SAVED); + })), { endpoint: SAVED.endpoint, model: SAVED.model, apiKey: SAVED.apiKey }); } finally { await browser.close(); } diff --git a/test/test_modal_ocr.mjs b/test/test_modal_ocr.mjs new file mode 100644 index 0000000..8dd747a --- /dev/null +++ b/test/test_modal_ocr.mjs @@ -0,0 +1,42 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +const ocrButtons = '#bskyplus-ocr-btn, #bskyplus-ocr-header-btn'; +const image = 'Uploaded image'; +const fields = `${image}
`; + +for (const browserName of ['chrome', 'firefox', 'safari']) { + test(`${browserName}: modal OCR belongs only to the alt-text editor`, async t => { + const browser = await puppeteer.launch({ executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', headless: true }); + t.after(() => browser.close()); + const page = await browser.newPage(); + await page.setContent(` + + + + `); + await page.evaluate(() => { + window.chrome = { + storage: { local: { get: (_, callback) => callback({ localOcrEnabled: true }) }, onChanged: { addListener() {} } }, + runtime: { onMessage: { addListener() {} }, sendMessage: async () => ({ success: true, text: 'Recognized text' }) }, + }; + }); + await page.addScriptTag({ content: await readFile(`extension/${browserName}/content.js`, 'utf8') }); + await page.waitForSelector(`#alt :is(${ocrButtons})`); + assert.equal(await page.$$eval(ocrButtons, nodes => nodes.length), 1); + assert.equal(await page.$(`#profile :is(${ocrButtons})`), null); + assert.equal(await page.$(`#ocr-title :is(${ocrButtons})`), null); + await page.click(`#alt :is(${ocrButtons})`); + await page.waitForFunction(() => document.querySelector('#alt textarea').value === 'Recognized text'); + assert.equal(await page.$eval('#profile textarea', node => node.value), ''); + await page.$eval('#alt', modal => { + modal.setAttribute('aria-label', 'Edit profile'); + modal.querySelector('h2').textContent = 'Edit profile'; + }); + await page.waitForFunction(selector => !document.querySelector(selector), {}, ocrButtons); + }); +} diff --git a/test/test_new_features.mjs b/test/test_new_features.mjs index 9b45f37..29ed70d 100644 --- a/test/test_new_features.mjs +++ b/test/test_new_features.mjs @@ -212,6 +212,13 @@ class MockElement { return null; } + contains(node) { + for (let current = node; current; current = current.parentElement) { + if (current === this) return true; + } + return false; + } + addEventListener(event, fn) { if (!this.listeners[event]) this.listeners[event] = []; this.listeners[event].push(fn); @@ -478,17 +485,21 @@ test('2. Enhanced Media Viewer: toolbar placement, playback speed, and PiP', () assert.equal(video1.getAttribute('controls'), null, 'Video must retain custom controls'); const speedSelect = toolbar.querySelector('.bskyplus-speed-select'); - assert.ok(speedSelect, 'Speed select must be attached'); - assert.deepEqual(speedSelect.querySelectorAll('option').map(option => option.value), - ['0.5', '1', '1.25', '1.5', '2']); + assert.ok(speedSelect, 'Speed menu trigger must be attached'); + assert.equal(speedSelect.tagName, 'BUTTON', 'Speed menu trigger should be a custom button'); + assert.equal(speedSelect.getAttribute('aria-haspopup'), 'menu'); // Selecting 1.5x sets video playbackRate and is remembered. - speedSelect.value = '1.5'; - speedSelect.focus(); - speedSelect.dispatchEvent(new window.Event('change')); + const speedMenu = document.querySelector('.bskyplus-speed-menu'); + assert.ok(speedMenu, 'Custom speed menu should be attached to the document'); + assert.deepEqual(speedMenu.querySelectorAll('[role="menuitemradio"]') + .map(option => option.getAttribute('data-speed')), + ['0.5', '1', '1.25', '1.5', '2']); + speedMenu.querySelector('[data-speed="1.5"]').click(); assert.equal(video1.playbackRate, 1.5); - assert.equal(document.activeElement, document.body, - 'changing speed should blur the selector'); + assert.equal(speedSelect.value, '1.5'); + assert.equal(speedSelect.querySelector('.bskyplus-speed-value').textContent, '1.5x'); + assert.equal(speedMenu.querySelector('[data-speed="1.5"]').getAttribute('aria-checked'), 'true'); assert.equal(controlsRow.childNodes[3], toolbar, 'toolbar should be inserted as the fourth direct control in the row'); @@ -682,87 +693,7 @@ test('5. Account Age: fresh account detection and badge calculation', () => { assert.ok(olderAge.days > 30, 'Should not qualify as fresh account'); }); -test('6. Thread Unroll: linear author thread extraction, 3-dot dropdown menu injection, and Markdown generation', () => { - const { context, window, document } = createEnvironment(); - runScript('extension/shared/feature-flags.js', context); - window.BskyPlusFeatureFlags?.setAllowAlpha(true); - runScript('extension/shared/dom-utils.js', context); - runScript('extension/shared/thread-unroll.js', context); - - const { extractLinearAuthorThread, generateMarkdown, scanForDropdownMenus } = window.BskyPlusThreadUnroll; - - const authorDid = 'did:plc:author123'; - const threadNode = { - post: { - uri: 'at://author123/app.bsky.feed.post/post1', - cid: 'cid1', - author: { did: authorDid, handle: 'alice.bsky.social', displayName: 'Alice' }, - record: { text: '1/3 First skeet in thread!', createdAt: '2026-09-14T09:00:00Z' }, - embed: { - images: [{ thumb: 'thumb1.jpg', fullsize: 'full1.jpg', alt: 'A sunset photo' }] - } - }, - replies: [ - { - post: { - uri: 'at://author123/app.bsky.feed.post/post2', - author: { did: authorDid, handle: 'alice.bsky.social', displayName: 'Alice' }, - record: { text: '2/3 Second skeet in thread with more details.', createdAt: '2026-09-14T09:01:00Z' } - }, - replies: [ - { - post: { - uri: 'at://author123/app.bsky.feed.post/post3', - author: { did: authorDid, handle: 'alice.bsky.social', displayName: 'Alice' }, - record: { text: '3/3 Final concluding skeet.', createdAt: '2026-09-14T09:02:00Z' } - } - } - ] - }, - { - // Unrelated third-party reply that should NOT be part of author thread - post: { - uri: 'at://rando/app.bsky.feed.post/rando1', - author: { did: 'did:plc:other', handle: 'bob.bsky.social', displayName: 'Bob' }, - record: { text: 'Cool thread!', createdAt: '2026-09-14T09:05:00Z' } - } - } - ] - }; - - const linearPosts = extractLinearAuthorThread(threadNode); - assert.equal(linearPosts.length, 3, 'Should extract only the 3 author skeets'); - assert.equal(linearPosts[0].text, '1/3 First skeet in thread!'); - assert.equal(linearPosts[1].text, '2/3 Second skeet in thread with more details.'); - assert.equal(linearPosts[2].text, '3/3 Final concluding skeet.'); - assert.equal(linearPosts[0].images.length, 1); - assert.equal(linearPosts[0].images[0].alt, 'A sunset photo'); - - // Test Markdown export generation - const md = generateMarkdown(linearPosts); - assert.ok(md.includes('# Thread by Alice (@alice.bsky.social)')); - assert.ok(md.includes('### 1/3')); - assert.ok(md.includes('1/3 First skeet in thread!')); - assert.ok(md.includes('![A sunset photo](full1.jpg)')); - assert.ok(md.includes('### 2/3')); - assert.ok(md.includes('### 3/3')); - - // Test 3-dot dropdown menu injection - const menu = document.createElement('div'); - menu.setAttribute('role', 'menu'); - const translateItem = document.createElement('div'); - translateItem.setAttribute('role', 'menuitem'); - translateItem.textContent = 'Translate'; - menu.appendChild(translateItem); - document.body.appendChild(menu); - - scanForDropdownMenus(); - const unrollMenuItem = menu.querySelector('.bskyplus-unroll-menu-item'); - assert.ok(unrollMenuItem, 'Should inject Unroll Thread item into 3-dot post dropdown menu'); - assert.ok(unrollMenuItem.textContent.includes('Unroll Thread'), 'Menu item should say Unroll Thread'); -}); - -test('7. Feature Flags: stage gating, alpha toggle, and runtime feature suppression', () => { +test('6. Feature Flags: stage gating, alpha toggle, and runtime feature suppression', () => { const { context, window, document } = createEnvironment(); runScript('extension/shared/feature-flags.js', context); runScript('extension/shared/dom-utils.js', context); @@ -776,41 +707,21 @@ test('7. Feature Flags: stage gating, alpha toggle, and runtime feature suppress assert.ok(flags.FEATURE_FLAGS.quickEmoji, 'quickEmoji flag exists'); assert.ok(flags.FEATURE_FLAGS.feedWidth, 'feedWidth flag exists'); assert.ok(flags.FEATURE_FLAGS.accountAge, 'accountAge flag exists'); - assert.ok(flags.FEATURE_FLAGS.threadUnroll, 'threadUnroll flag exists'); - // Test release stage behavior flags.setFeatureStage('quickEmoji', 'release'); assert.equal(flags.isFeatureEnabled('quickEmoji'), true, 'Release feature should be enabled'); // Test Alpha stage gating - flags.setFeatureStage('threadUnroll', 'alpha'); + flags.setFeatureStage('accountAge', 'alpha'); flags.setAllowAlpha(false); - assert.equal(flags.isFeatureEnabled('threadUnroll'), false, 'Alpha feature should be disabled when alpha mode is off'); + assert.equal(flags.isFeatureEnabled('accountAge'), false, 'Alpha feature should be disabled when alpha mode is off'); flags.setAllowAlpha(true); - assert.equal(flags.isFeatureEnabled('threadUnroll'), true, 'Alpha feature should be enabled when alpha mode is on'); + assert.equal(flags.isFeatureEnabled('accountAge'), true, 'Alpha feature should be enabled when alpha mode is on'); // Test Disabled stage - flags.setFeatureStage('threadUnroll', 'disabled'); - assert.equal(flags.isFeatureEnabled('threadUnroll'), false, 'Disabled feature should stay disabled even with alpha mode on'); - - // Test runtime feature suppression in thread-unroll.js - flags.setFeatureStage('threadUnroll', 'disabled'); - runScript('extension/shared/thread-unroll.js', context); - const menu = document.createElement('div'); - menu.setAttribute('role', 'menu'); - const randoItem = document.createElement('div'); - randoItem.textContent = 'Translate'; - menu.appendChild(randoItem); - document.body.appendChild(menu); - - window.BskyPlusThreadUnroll.scanForDropdownMenus(); - assert.equal(menu.querySelector('.bskyplus-unroll-menu-item'), null, 'Should NOT inject unroll menu item when feature is disabled'); - - // Reset to release stage and re-test - flags.setFeatureStage('threadUnroll', 'release'); - window.BskyPlusThreadUnroll.scanForDropdownMenus(); - assert.ok(menu.querySelector('.bskyplus-unroll-menu-item'), 'Should inject unroll menu item once re-enabled'); + flags.setFeatureStage('accountAge', 'disabled'); + assert.equal(flags.isFeatureEnabled('accountAge'), false, 'Disabled feature should stay disabled even with alpha mode on'); // Test runtime suppression in media downloader flags.setFeatureStage('mediaDownloader', 'alpha'); diff --git a/test/test_notification_width.mjs b/test/test_notification_width.mjs index ea764e7..2975510 100644 --- a/test/test_notification_width.mjs +++ b/test/test_notification_width.mjs @@ -23,6 +23,9 @@ test('custom width leaves notification avatar columns narrow', async () => {
`); await page.addScriptTag({ path: 'extension/shared/feed-width.js' }); await page.evaluate(() => window.BskyPlusFeedWidth.setWidth(1000)); + await page.waitForFunction(() => + document.getElementById('feed').getBoundingClientRect().width === 1000 && + !document.documentElement.hasAttribute('data-bskyplus-feed-width-animating')); const layout = await page.evaluate(() => Object.fromEntries( ['feed', 'avatar', 'text'].map(id => [id, document.getElementById(id).getBoundingClientRect().width]))); assert.equal(layout.feed, 1000); @@ -32,3 +35,124 @@ test('custom width leaves notification avatar columns narrow', async () => { await browser.close(); } }); + +test('widened text-only posts use the full column while embeds stay contained', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', + headless: true, + }); + try { + const page = await browser.newPage(); + await page.setViewport({ width: 1600, height: 1000 }); + await page.setContent(` +
+
+
+
A text-only post that should fill the feed.
+
+
+
+
A post with media.
+
Sample image
+
+
+
+
+
+
+
Quoted author
+ A text-only quote card. +
+
+
+ `); + await page.addStyleTag({ path: 'extension/shared/features.css' }); + await page.addScriptTag({ path: 'extension/shared/feed-width.js' }); + await page.evaluate(() => window.BskyPlusFeedWidth.setWidth(1000)); + await page.waitForFunction(() => + document.getElementById('feed').getBoundingClientRect().width === 1000 && + !document.documentElement.hasAttribute('data-bskyplus-feed-width-animating')); + + const widths = await page.evaluate(() => { + const post = document.createElement('div'); + post.setAttribute('data-testid', 'contentHider-post'); + post.style.cssText = 'display:flex;flex-direction:column'; + const wrapper = document.createElement('div'); + wrapper.id = 'newTextWrapper'; + wrapper.style.marginBottom = '2px'; + const text = document.createElement('div'); + text.setAttribute('data-testid', 'postText'); + text.textContent = 'A newly loaded text-only post.'; + wrapper.appendChild(text); + post.appendChild(wrapper); + document.getElementById('feed').appendChild(post); + + return Object.fromEntries(['textWrapper', 'newTextWrapper', 'media', 'mediaImage', 'videoWrapper', 'postVideo', 'quote'].map(id => [ + id, document.getElementById(id).getBoundingClientRect().width + ])); + }); + assert.deepEqual(widths, { + textWrapper: 1000, + newTextWrapper: 1000, + media: 600, + mediaImage: 600, + videoWrapper: 600, + postVideo: 600, + quote: 1000 + }); + } finally { + await browser.close(); + } +}); + +test('live width changes animate the feed, borders, and sidebars unless motion is reduced', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', + headless: true, + }); + try { + const page = await browser.newPage(); + await page.setViewport({ width: 1600, height: 1000 }); + await page.setContent(` + + +
+
+ `); + await page.addScriptTag({ path: 'extension/shared/feed-width.js' }); + await page.evaluate(() => window.BskyPlusFeedWidth.setWidth(900)); + await page.waitForFunction(() => document.getElementById('feed').getAnimations() + .some(animation => animation.transitionProperty === 'max-width')); + + const active = await page.evaluate(() => { + const isTransitioning = (id, property) => document.getElementById(id).getAnimations() + .some(animation => animation.transitionProperty === property); + return { + feed: isTransitioning('feed', 'max-width'), + borders: isTransitioning('borders', 'width'), + left: isTransitioning('left', 'margin-left'), + right: isTransitioning('right', 'margin-left') + }; + }); + assert.deepEqual(active, { feed: true, borders: true, left: true, right: true }); + const duration = await page.$eval('#feed', feed => feed.getAnimations() + .find(animation => animation.transitionProperty === 'max-width').effect.getTiming().duration); + assert.equal(duration, 800); + + await page.waitForFunction(() => + Math.round(document.getElementById('feed').getBoundingClientRect().width) === 900 && + !document.documentElement.hasAttribute('data-bskyplus-feed-width-animating')); + await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'reduce' }]); + const reducedMotion = await page.evaluate(() => { + window.BskyPlusFeedWidth.setWidth(700); + const feed = document.getElementById('feed'); + return { + width: feed.getBoundingClientRect().width, + animations: feed.getAnimations().length + }; + }); + assert.deepEqual(reducedMotion, { width: 700, animations: 0 }); + } finally { + await browser.close(); + } +}); diff --git a/test/test_popup_bookmarks.mjs b/test/test_popup_bookmarks.mjs new file mode 100644 index 0000000..016dc50 --- /dev/null +++ b/test/test_popup_bookmarks.mjs @@ -0,0 +1,66 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +test('popup enable toggle ignores state polls that began before the click', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + args: ['--no-sandbox'] + }); + try { + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', request => request.respond({ + status: 200, + contentType: 'text/html', + body: '

Details

' + })); + await page.goto('https://extension.test/popup/popup.html'); + await page.evaluate(() => { + const pending = []; + window.chrome = { + tabs: { + query: async () => [{ id: 1 }], + sendMessage: async (id, message) => new Promise(resolve => pending.push({ action: message.action, resolve })) + }, + storage: { + local: { get: async () => ({ appviewHostname: 'api.bsky.app' }) }, + onChanged: { addListener() {} } + } + }; + window.__pendingBookmarkRequests = pending; + window.__intervalCallback = null; + window.setInterval = callback => { window.__intervalCallback = callback; return 1; }; + }); + await page.addScriptTag({ content: await readFile('extension/chrome/popup/feature-row.js', 'utf8') }); + await page.addScriptTag({ content: await readFile('extension/chrome/shared/bookmarks-settings.js', 'utf8') }); + await page.waitForFunction(() => window.__pendingBookmarkRequests.length === 1); + assert.equal(await page.$$eval('#bookmarksSection button', buttons => + buttons.some(button => button.textContent === 'Sync now')), false); + assert.equal(await page.$('#bookmarksSection [role="status"]'), null); + assert.equal(await page.$eval('#bookmarksAppview', select => select.parentElement.hidden), false); + await page.evaluate(() => window.__pendingBookmarkRequests[0].resolve({ available: true, enabled: false })); + await page.waitForFunction(() => { + const toggle = document.getElementById('bookmarksEnabledToggle'); + return toggle && !toggle.disabled; + }); + + // Begin a periodic state request, then complete enable before that poll. + await page.evaluate(() => { window.__intervalCallback(); }); + await page.waitForFunction(() => window.__pendingBookmarkRequests.length === 2); + await page.click('#bookmarksEnabledToggle'); + await page.waitForFunction(() => window.__pendingBookmarkRequests.length === 3); + assert.equal(await page.evaluate(() => window.__pendingBookmarkRequests[2].action), 'enable'); + await page.evaluate(() => window.__pendingBookmarkRequests[2].resolve({ available: true, enabled: true })); + await page.waitForFunction(() => document.getElementById('bookmarksEnabledToggle').checked); + + await page.evaluate(() => window.__pendingBookmarkRequests[1].resolve({ available: true, enabled: false })); + await new Promise(resolve => setTimeout(resolve, 0)); + assert.equal(await page.$eval('#bookmarksEnabledToggle', toggle => toggle.checked), true, + 'a stale poll must not turn off the successful enable state'); + } finally { + await browser.close(); + } +}); diff --git a/test/test_popup_flags.mjs b/test/test_popup_flags.mjs index f484fae..df1cc96 100644 --- a/test/test_popup_flags.mjs +++ b/test/test_popup_flags.mjs @@ -17,15 +17,18 @@ async function loadPopup(page, browserName, { enableAlphaFeatures = false } = {} const stored = { enableAlphaFeatures: initialAlpha }; const listeners = []; const get = (keys, callback) => { - setTimeout(() => { + const result = new Promise(resolve => setTimeout(() => { + if (typeof keys === 'string') keys = [keys]; if (Array.isArray(keys)) { - callback(Object.fromEntries(keys + resolve(Object.fromEntries(keys .filter(key => Object.prototype.hasOwnProperty.call(stored, key)) .map(key => [key, stored[key]]))); } else { - callback({ ...keys, ...stored }); + resolve({ ...keys, ...stored }); } - }, 0); + }, 0)); + if (callback) result.then(callback); + else return result; }; window.chrome = { runtime: { getManifest: () => ({ version: 'test' }) }, @@ -79,11 +82,11 @@ for (const browserName of browsers) { await loadPopup(page, browserName); const state = await visibleState(page); - for (const feature of ['mediaDownloader', 'accountAge', 'threadUnroll']) { + for (const feature of ['mediaDownloader', 'accountAge']) { assert.equal(state[feature].visible, false, `${feature} should be hidden by default`); assert.equal(state[feature].badgeCount, 0, `${feature} should have no hidden badge`); } - for (const feature of ['feedWidth', 'mediaViewer', 'quickEmoji', 'skeetMode', 'accentColor', 'localOcr']) { + for (const feature of ['feedWidth', 'mediaViewer', 'quickEmoji', 'skeetMode', 'localOcr']) { assert.equal(state[feature].visible, true, `${feature} should be visible at release stage`); } assert.equal(await page.$eval('#localOcrToggle', input => input.checked), true); @@ -100,7 +103,7 @@ for (const browserName of browsers) { const page = await browser.newPage(); await loadPopup(page, browserName, { enableAlphaFeatures: true }); let state = await visibleState(page); - for (const feature of ['mediaDownloader', 'accountAge', 'threadUnroll']) { + for (const feature of ['mediaDownloader', 'accountAge']) { assert.equal(state[feature].visible, true, `${feature} should show when alpha is enabled`); assert.equal(state[feature].badgeCount, 1, `${feature} should have one alpha badge`); } @@ -116,7 +119,7 @@ for (const browserName of browsers) { window.eval('currentSettings.enableAlphaFeatures = false; updateUI()'); }); state = await visibleState(page); - for (const feature of ['mediaDownloader', 'accountAge', 'threadUnroll']) { + for (const feature of ['mediaDownloader', 'accountAge']) { assert.equal(state[feature].visible, false, `${feature} should hide after alpha is disabled`); assert.equal(state[feature].badgeCount, 0, `${feature} badge should be removed on refresh`); } diff --git a/test/test_popup_themes.mjs b/test/test_popup_themes.mjs new file mode 100644 index 0000000..54b4d6a --- /dev/null +++ b/test/test_popup_themes.mjs @@ -0,0 +1,186 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +const chromePath = process.env.CHROME_PATH || '/usr/bin/google-chrome'; + +async function openPopup(browser, browserName) { + const page = await browser.newPage(); + const html = await readFile(`extension/${browserName}/popup/popup.html`, 'utf8'); + const popupScript = await readFile(`extension/${browserName}/popup/popup.js`, 'utf8'); + const themeModel = await readFile(`extension/${browserName}/shared/theme-model.js`, 'utf8'); + const themePopup = await readFile(`extension/${browserName}/shared/popup-theme.js`, 'utf8'); + const featureFlags = await readFile('extension/shared/feature-flags.js', 'utf8'); + const popupCss = await readFile(`extension/${browserName}/popup/popup.css`, 'utf8'); + + await page.setContent(html.replace(//gi, '')); + await page.addStyleTag({ content: popupCss }); + await page.evaluate(() => { + const stored = {}; + const listeners = []; + const state = { navigation: null, failThemeWrite: false }; + window.close = () => {}; + function resultFor(keys) { + if (typeof keys === 'string') return keys in stored ? { [keys]: stored[keys] } : {}; + if (Array.isArray(keys)) return Object.fromEntries(keys.filter(key => key in stored).map(key => [key, stored[key]])); + if (keys && typeof keys === 'object') return { ...keys, ...stored }; + return { ...stored }; + } + window.__popupThemeState = state; + window.chrome = { + runtime: { getManifest: () => ({ version: 'test' }) }, + storage: { + local: { + get: (keys, callback) => { + const promise = Promise.resolve(resultFor(keys)); + if (callback) promise.then(callback); + return promise; + }, + set: values => { + if (state.failThemeWrite && Object.hasOwn(values, 'bskyplusThemes')) { + return Promise.reject(new Error('Storage unavailable')); + } + const changes = {}; + for (const [key, newValue] of Object.entries(values)) { + changes[key] = { oldValue: stored[key], newValue }; + stored[key] = newValue; + } + listeners.forEach(listener => listener(changes, 'local')); + return Promise.resolve(); + }, + }, + onChanged: { addListener: listener => listeners.push(listener) }, + }, + tabs: { + query: (query, callback) => { + const promise = Promise.resolve([{ id: 7, url: 'https://bsky.app/bskyplus' }]); + if (callback) promise.then(callback); + return promise; + }, + update: async (id, properties) => { state.navigation = { id, ...properties }; }, + create: async properties => { state.navigation = properties; }, + sendMessage: async () => ({ maxWidth: 1200 }), + }, + }; + }); + + await page.addScriptTag({ content: featureFlags }); + await page.addScriptTag({ content: themeModel }); + const initialTheme = await page.evaluate(() => { + const theme = { ...BskyPlusThemes.BUILTIN_THEMES['bluesky-dark'], id: 'saved-ocean', name: 'Saved ocean' }; + const second = { ...BskyPlusThemes.BUILTIN_THEMES['bluesky-light'], id: 'saved-forest', name: 'Saved forest' }; + const value = { schemaVersion: 1, activeId: theme.id, themes: [theme, second] }; + chrome.storage.local.set({ bskyplusThemes: value }); + return { id: theme.id, secondId: second.id }; + }); + await page.addScriptTag({ content: popupScript }); + await page.addScriptTag({ content: themePopup }); + await page.waitForFunction(() => document.querySelector('#themeSelect')?.disabled === false); + return { page, initialTheme }; +} + +for (const browserName of ['chrome', 'firefox', 'safari']) { + test(`${browserName} popup selects complete themes and follows storage changes`, async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const { page, initialTheme } = await openPopup(browser, browserName); + const openOptions = async () => { + if (await page.$eval('#themeOptions', options => options.hidden)) await page.click('#themeSelect'); + await page.waitForFunction(() => !document.querySelector('#themeOptions').hidden); + }; + const chooseTheme = async (id, keyboard = false) => { + await openOptions(); + const option = `[data-theme-option="${id}"]`; + if (keyboard) { + await page.focus(option); + await page.keyboard.press('Enter'); + } else await page.click(option); + }; + + assert.equal(await page.$eval('#themeSelect', button => button.disabled), false); + await page.click('#themeSelect'); + await page.waitForFunction(() => !document.querySelector('#themeOptions').hidden); + if (process.env.SCREENSHOT_PATH && browserName === 'chrome') { + await page.screenshot({ path: process.env.SCREENSHOT_PATH, fullPage: true }); + } + const preview = await page.$eval('[data-theme-option="bluesky-light"]', option => { + const row = option; + return { + primary: getComputedStyle(row.querySelector('.theme-option-preview-bar')).backgroundColor, + rowHeight: row.getBoundingClientRect().height, + }; + }); + const expectedPrimary = await page.evaluate(() => { + const hex = BskyPlusThemes.BUILTIN_THEMES['bluesky-light'].colors.primary.slice(1); + const [red, green, blue] = hex.match(/../g).map(channel => parseInt(channel, 16)); + return `rgb(${red}, ${green}, ${blue})`; + }); + assert.equal(preview.primary, expectedPrimary, 'preview swatch uses the actual theme palette'); + assert.ok(preview.rowHeight < 60, `theme rows stay compact (${preview.rowHeight}px)`); + assert.equal(await page.$eval('#themeOptions', panel => { + const rows = [...panel.querySelectorAll('.theme-option')]; + return panel.scrollWidth <= panel.clientWidth + 1 && + rows.every(row => row.scrollWidth <= row.clientWidth + 1); + }), true, 'theme picker has no horizontal overflow'); + + await page.keyboard.press('Escape'); + await page.waitForFunction(() => document.querySelector('#themeOptions').hidden); + assert.equal(await page.$eval('#themeSelect', trigger => document.activeElement === trigger), true, + 'Escape restores focus to the picker trigger'); + + await chooseTheme('bluesky-light', true); + await page.waitForFunction(() => document.querySelector('#themeStatus').textContent === 'Theme applied.'); + await page.waitForFunction(() => document.activeElement?.id === 'themeSelect'); + assert.equal(await page.$eval('#themeSelect', trigger => document.activeElement === trigger), true, + 'successful keyboard selection restores focus to the trigger'); + let saved = await page.evaluate(async () => (await chrome.storage.local.get('bskyplusThemes')).bskyplusThemes); + assert.equal(saved.activeId, 'bluesky-light'); + assert.deepEqual(saved.themes.map(theme => theme.id), [initialTheme.id, initialTheme.secondId]); + assert.equal(await page.$eval('[data-theme-option="bluesky-light"]', option => option.getAttribute('aria-pressed')), 'true'); + + await page.evaluate(async id => { + const library = (await chrome.storage.local.get('bskyplusThemes')).bskyplusThemes; + await chrome.storage.local.set({ bskyplusThemes: { ...library, activeId: id } }); + }, initialTheme.secondId); + await page.waitForFunction(() => document.querySelector('[data-theme-option="saved-forest"]')?.getAttribute('aria-pressed') === 'true'); + + await chooseTheme(''); + await page.waitForFunction(() => document.querySelector('#themeStatus').textContent === 'Theme applied.'); + saved = await page.evaluate(async () => (await chrome.storage.local.get('bskyplusThemes')).bskyplusThemes); + assert.equal(saved.activeId, null); + assert.equal(saved.themes.length, 2); + + await page.evaluate(() => { window.__popupThemeState.failThemeWrite = true; }); + await chooseTheme('bluesky-dark'); + await page.waitForFunction(() => document.querySelector('#themeStatus').textContent === 'Could not apply that theme. Try again.'); + assert.equal(await page.$eval('[data-theme-option=""]', option => option.getAttribute('aria-pressed')), 'true'); + await page.waitForFunction(() => document.activeElement?.getAttribute('data-theme-option') === 'bluesky-dark'); + assert.equal(await page.$eval('[data-theme-option="bluesky-dark"]', option => document.activeElement === option), true, + 'failed selection restores focus to the attempted option for retry'); + + await page.evaluate(async () => { + window.__popupThemeState.failThemeWrite = false; + const { bskyplusThemes } = await chrome.storage.local.get('bskyplusThemes'); + await chrome.storage.local.set({ bskyplusThemes: { + ...bskyplusThemes, activeId: 'bluesky-dark', deletedBuiltinIds: ['bluesky-dark'], + } }); + }); + await page.waitForFunction(() => !document.querySelector('[data-theme-option="bluesky-dark"]')); + assert.equal(await page.$eval('[data-theme-option=""]', option => option.getAttribute('aria-pressed')), 'true', + 'removing the active included theme restores native selection'); + await chooseTheme('bluesky-light'); + await page.waitForFunction(() => document.querySelector('#themeStatus').textContent === 'Theme applied.'); + saved = await page.evaluate(async () => (await chrome.storage.local.get('bskyplusThemes')).bskyplusThemes); + assert.deepEqual(saved.deletedBuiltinIds, ['bluesky-dark'], + 'changing themes preserves deleted suggestions'); + assert.equal(await page.$('[data-theme-option="bluesky-dark"]'), null); + + await page.click('#editThemeButton'); + await page.waitForFunction(() => window.__popupThemeState.navigation?.url === 'https://bsky.app/settings?bskyplus=theme'); + assert.equal(await page.$eval('#editThemeButton', button => button.textContent), 'Edit theme'); + } finally { + await browser.close(); + } + }); +} diff --git a/test/test_settings_frame.mjs b/test/test_settings_frame.mjs new file mode 100644 index 0000000..fa1fc12 --- /dev/null +++ b/test/test_settings_frame.mjs @@ -0,0 +1,200 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import path from 'node:path'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +test('canonical settings scripts mount feature rows and retain their layout and saves', async () => { + const browser = await puppeteer.launch({ + executablePath: process.env.CHROME_PATH || '/usr/bin/google-chrome', + headless: true, + }); + try { + const served = new Set(); + const page = await browser.newPage(); + await page.evaluateOnNewDocument(() => { + const listeners = []; + const stored = () => JSON.parse(localStorage.getItem('settings') || '{}'); + const reply = (value, callback) => { callback?.(value); return Promise.resolve(value); }; + window.chrome = { + runtime: { + id: 'test-extension', + getURL: filename => location.origin + '/' + filename, + getManifest: () => ({ version: '1.0' }), + onMessage: { addListener() {} }, + sendMessage: () => Promise.resolve({ success: true, hostname: stored().imageCdnHostname || '', + enabled: !!stored().imageCdnHostname }), + }, + storage: { + local: { + get: (keys, callback) => reply({ ...(typeof keys === 'object' && !Array.isArray(keys) ? keys : {}), ...stored() }, callback), + set: (value, callback) => { + const old = stored(); + localStorage.setItem('settings', JSON.stringify({ ...old, ...value })); + const changes = Object.fromEntries(Object.entries(value).map(([key, newValue]) => + [key, { oldValue: old[key], newValue }])); + listeners.forEach(listener => listener(changes, 'local')); + return reply(undefined, callback); + }, + }, + onChanged: { addListener: listener => listeners.push(listener) }, + }, + tabs: { + query: (query, callback) => reply([{ id: 1, url: 'https://bsky.app' }], callback), + sendMessage: (id, message, callback) => reply({ success: true, available: false, enabled: false, + hostname: '', pds: 'https://pds.example.com', allowed: {}, maxWidth: 1200 }, callback), + }, + permissions: { request: () => Promise.resolve(true) }, + }; + }); + await page.setRequestInterception(true); + page.on('request', async request => { + const url = new URL(request.url()); + if (!/^\/(shared|popup)\//.test(url.pathname)) return request.respond({ status: 404 }); + const canonical = url.pathname.startsWith('/shared/'); + const filename = path.basename(url.pathname); + const body = await readFile(path.join(canonical ? 'extension/shared' : 'extension/chrome/popup', filename)); + if (canonical) served.add(filename); + const contentType = filename.endsWith('.css') ? 'text/css' : + filename.endsWith('.html') ? 'text/html' : 'text/javascript'; + return request.respond({ contentType, body }); + }); + + const frameUrl = 'https://extension.test/shared/settings-frame.html'; + await page.goto(frameUrl); + await page.waitForFunction(() => document.querySelector('#appviewProvider')?.disabled === false); + assert.deepEqual(await page.$$eval('body > .section', sections => + sections.map(section => section.id || section.dataset.feature)), + ['feedWidth', 'themeSection', 'featuresSection', 'altTextSection', 'infrastructureSection']); + for (const selector of ['#appviewSection', '.bskyplus-cdn-section']) { + assert.equal(await page.$eval(selector, row => row.parentElement.id), 'infrastructureSection'); + } + assert.equal(await page.$eval('.bskyplus-llm-section', row => row.parentElement.id), 'altTextSection'); + assert.equal(await page.$eval('#bookmarksSection', row => row.parentElement.id), 'featuresSection'); + assert.equal(await page.$$eval('#bookmarksSection button', buttons => + buttons.some(button => button.textContent === 'Sync now')), true); + assert.notEqual(await page.$('#bookmarksSection [role="status"]'), null); + assert.equal(await page.$('#editPostToggle'), null); + assert.equal(await page.$('.bskyplus-llm-section summary'), null); + assert.equal(await page.$('#moreSettingsButton'), null); + + for (const selector of ['#llmEnabledToggle', '#appviewEnabledToggle', '#cdnEnabledToggle']) { + await page.waitForFunction(selector => !document.querySelector(selector).disabled, {}, selector); + await page.focus(selector); + await page.keyboard.press('Space'); + } + await page.waitForSelector('#bskyplusLlmEndpoint', { visible: true }); + await page.waitForSelector('#appviewProvider', { visible: true }); + await page.waitForSelector('#bskyplusCdnProvider', { visible: true }); + for (const [selector, expectedRatio] of [ + ['.bskyplus-llm-key-row', 4], ['.bskyplus-appview-provider-row', 7 / 3], + ]) { + const layout = await page.$eval(selector, row => { + const style = getComputedStyle(row); + const columns = style.gridTemplateColumns.split(' ').map(parseFloat); + return { display: style.display, gap: style.gap, ratio: columns[0] / columns[1], + radius: getComputedStyle(row.lastElementChild).borderRadius }; + }); + assert.equal(layout.display, 'grid'); + assert.equal(layout.gap, '8px'); + assert.equal(layout.radius, '8px'); + assert.ok(Math.abs(layout.ratio - expectedRatio) < 0.01); + } + + await page.evaluate(() => { + document.querySelector('#bskyplusLlmEndpoint').value = 'https://bsky.app/v1/chat/completions'; + document.querySelector('#bskyplusLlmModel').value = 'vision-test'; + document.querySelector('#bskyplusLlmApiKey').value = 'test-key'; + document.querySelector('#bskyplusLlmUseCustomPrompt').checked = true; + document.querySelector('#bskyplusLlmUseCustomPrompt').dispatchEvent(new Event('change', { bubbles: true })); + document.querySelector('#bskyplusLlmCustomPrompt').value = 'Describe colors and visible text.'; + document.querySelector('#bskyplusLlmCustomPrompt').dispatchEvent(new Event('input', { bubbles: true })); + }); + await page.focus('.bskyplus-llm-save'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === 'LLM endpoint saved.'); + assert.deepEqual(await page.evaluate(async () => (await chrome.storage.local.get('llm')).llm), { + endpoint: 'https://bsky.app/v1/chat/completions', model: 'vision-test', apiKey: 'test-key', + useCustomPrompt: true, customPrompt: 'Describe colors and visible text.', enabled: true, + }); + await page.focus('#bskyplusLlmUseCustomPrompt'); + await page.keyboard.press('Space'); + await page.focus('.bskyplus-llm-save'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => document.querySelector('.bskyplus-llm-status').textContent === 'LLM endpoint saved.'); + assert.deepEqual(await page.evaluate(async () => (await chrome.storage.local.get('llm')).llm), { + endpoint: 'https://bsky.app/v1/chat/completions', model: 'vision-test', apiKey: 'test-key', + useCustomPrompt: false, customPrompt: 'Describe colors and visible text.', enabled: true, + }); + await page.select('#bskyplusCdnProvider', ''); + await page.focus('.bskyplus-cdn-save'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => document.querySelector('.bskyplus-cdn-status').textContent === 'Image CDN disabled.'); + await page.select('#appviewProvider', ''); + await page.focus('.bskyplus-appview-provider-row button'); + await page.keyboard.press('Enter'); + await page.waitForFunction(() => !document.querySelector('#appviewEnabledToggle').checked); + + await page.reload(); + await page.waitForFunction(() => document.querySelector('#bskyplusLlmApiKey')?.value === 'test-key'); + assert.equal(await page.$eval('#llmEnabledToggle', toggle => toggle.checked), true); + assert.equal(await page.$eval('#bskyplusLlmUseCustomPrompt', toggle => toggle.checked), false); + assert.deepEqual(await page.$eval('#bskyplusLlmCustomPrompt', input => ({ value: input.value, disabled: input.disabled })), + { value: '', disabled: true }); + assert.equal(await page.$$eval('.bskyplus-llm-label', labels => + labels.filter(label => label.textContent === 'Custom prompt').length), 1); + assert.equal(await page.$eval('.bskyplus-llm-section', section => section.textContent.includes('Use custom prompt')), false); + await page.focus('#bskyplusLlmUseCustomPrompt'); + await page.keyboard.press('Space'); + await page.waitForFunction(() => document.querySelector('#bskyplusLlmCustomPrompt').value === 'Describe colors and visible text.'); + assert.equal(await page.$eval('#bskyplusLlmCustomPrompt', input => input.disabled), false); + await page.focus('#bskyplusLlmUseCustomPrompt'); + await page.keyboard.press('Space'); + await page.waitForFunction(() => document.querySelector('#bskyplusLlmCustomPrompt').value === '' && + document.querySelector('#bskyplusLlmCustomPrompt').disabled); + await page.goto('https://extension.test/popup/popup.html'); + await page.waitForFunction(() => document.querySelector('#appviewProvider')?.disabled === false); + assert.deepEqual(await page.$$eval('body > .section', sections => + sections.map(section => section.id || section.dataset.feature)), + ['feedWidth', 'themeSection', 'featuresSection', 'altTextSection', 'infrastructureSection']); + assert.equal(await page.$$eval('#infrastructureSection', sections => sections.length), 1); + assert.equal(await page.$$eval('#bookmarksSection button', buttons => + buttons.some(button => button.textContent === 'Sync now')), false); + assert.equal(await page.$('#bookmarksSection [role="status"]'), null); + assert.equal(await page.$eval('.bskyplus-llm-section', row => row.parentElement.id), 'altTextSection'); + for (const selector of ['#appviewSection', '.bskyplus-cdn-section']) { + assert.equal(await page.$eval(selector, row => row.parentElement.id), 'infrastructureSection'); + } + assert.equal(await page.$eval('#bookmarksSection', row => row.parentElement.id), 'featuresSection'); + assert.equal(await page.$eval('#bskyplusLlmApiKey', input => input.value), 'test-key'); + assert.deepEqual(await page.$eval('#bskyplusLlmCustomPrompt', input => ({ value: input.value, disabled: input.disabled })), + { value: '', disabled: true }); + assert.equal(await page.$('#editPostToggle'), null); + assert.equal(await page.$eval('body', body => body.getBoundingClientRect().width), 400); + assert.ok(await page.$eval('body', body => body.scrollWidth <= 400)); + await page.waitForFunction(() => + document.querySelector('#infrastructureSection .section-collapse-button')?.getAttribute('aria-expanded') === 'true'); + await page.click('#infrastructureSection .section-collapse-button'); + await page.waitForFunction(() => + document.querySelector('#infrastructureSection .section-collapse-button')?.getAttribute('aria-expanded') === 'false'); + assert.equal((await page.evaluate(() => chrome.storage.local.get('settingsSectionCollapsed_infrastructure'))) + .settingsSectionCollapsed_infrastructure, true); + await page.reload(); + await page.waitForFunction(() => document.querySelector('#appviewProvider')?.disabled === false); + await page.waitForFunction(() => + document.querySelector('#infrastructureSection .section-collapse-button')?.getAttribute('aria-expanded') === 'false'); + await page.click('#llmEnabledToggle'); + await page.waitForFunction(async () => (await chrome.storage.local.get('llm')).llm.enabled === false); + assert.deepEqual(await page.evaluate(async () => { + const { useCustomPrompt, customPrompt } = (await chrome.storage.local.get('llm')).llm; + return { useCustomPrompt, customPrompt }; + }), { useCustomPrompt: false, customPrompt: 'Describe colors and visible text.' }); + for (const filename of ['settings-frame.html', 'settings-frame.js', 'settings-frame.css', + 'llm-settings.js', 'llm-settings.css', 'cdn-config.js', 'cdn-settings.js', + 'appview-config.js', 'appview-settings.js', 'bookmarks-settings.js']) { + assert.ok(served.has(filename), `Expected canonical ${filename} to be loaded`); + } + } finally { + await browser.close(); + } +}); diff --git a/test/test_settings_theme.mjs b/test/test_settings_theme.mjs new file mode 100644 index 0000000..47f31ee --- /dev/null +++ b/test/test_settings_theme.mjs @@ -0,0 +1,193 @@ +import assert from 'node:assert/strict'; +import path from 'node:path'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +const executablePath = process.env.CHROME_PATH || '/usr/bin/google-chrome'; + +test('opening settings with an active theme keeps the page and iframe readable', async () => { + const browser = await puppeteer.launch({ executablePath, headless: true, + enableExtensions: [path.resolve('extension/chrome')] }); + try { + const worker = await browser.waitForTarget(target => target.type() === 'service_worker'); + const seed = await browser.newPage(); + await seed.goto(new URL('shared/settings-frame.html?section=theme', worker.url()).href); + await seed.waitForSelector('[data-theme-library]'); + const page = await browser.newPage(); + let nativeMode = 'light'; + await page.setRequestInterception(true); + page.on('request', request => { + const url = new URL(request.url()); + if (url.origin !== 'https://bsky.app') return request.continue(); + const settings = url.pathname === '/settings'; + return request.respond({ contentType: 'text/html', body: ` + + +

${settings ? 'Settings' : 'Home'}

+ ${settings ? 'About' : 'Home feed'} +
` }); + }); + + async function assertReadable(text, background) { + await page.waitForSelector('[data-bskyplus-settings-frame]'); + const element = await page.$('[data-bskyplus-settings-frame]'); + const frame = await element.contentFrame(); + await frame.waitForSelector('#featuresSection'); + await frame.waitForFunction(expected => { + const label = document.querySelector('#featuresSection .toggle-label'); + return label && getComputedStyle(label).color === expected; + }, {}, text); + assert.equal(await page.$eval('[data-bskyplus-settings-page]', node => getComputedStyle(node).color), text); + const variables = await frame.evaluate(() => ({ + text: document.documentElement.style.getPropertyValue('--text-primary'), + background: document.documentElement.style.getPropertyValue('--bg-primary'), + })); + assert.equal(variables.text, text); + assert.equal(variables.background, background); + assert.notEqual(variables.text, variables.background); + } + + for (nativeMode of ['light', 'dim']) { + for (const base of ['light', 'dim', 'dark']) { + const colors = await seed.evaluate(async base => { + const theme = BskyPlusThemes.createTheme('Copied default ' + base, base); + await chrome.storage.local.set({ bskyplusThemes: { schemaVersion: 1, activeId: theme.id, themes: [theme] } }); + return theme.colors; + }, base); + const rgb = hex => 'rgb(' + hex.slice(1).match(/../g).map(channel => parseInt(channel, 16)).join(', ') + ')'; + await page.goto('https://bsky.app/'); + await page.waitForSelector('[data-bskyplus-theme-active]'); + await page.click('nav a'); + await page.waitForSelector('[data-bskyplus-settings-link]'); + await page.click('[data-bskyplus-settings-link]'); + await assertReadable(rgb(colors.text), rgb(colors.background)); + await page.reload(); + await assertReadable(rgb(colors.text), rgb(colors.background)); + } + } + + // Removing the override must refresh the sampled native foreground too. + await seed.evaluate(async () => { + const stored = await chrome.storage.local.get('bskyplusThemes'); + await chrome.storage.local.set({ bskyplusThemes: { ...stored.bskyplusThemes, activeId: null } }); + }); + await page.waitForFunction(() => !document.documentElement.hasAttribute('data-bskyplus-theme-active')); + await assertReadable('rgb(255, 255, 255)', 'rgb(21, 29, 40)'); + } finally { + await browser.close(); + } +}); + +test('theme editor preserves native styling until selection, then crossfades the host page over 1000ms', async () => { + const browser = await puppeteer.launch({ executablePath, headless: true, + enableExtensions: [path.resolve('extension/chrome')] }); + try { + const worker = await browser.waitForTarget(target => target.type() === 'service_worker'); + const seed = await browser.newPage(); + await seed.goto(new URL('shared/settings-frame.html?section=theme', worker.url()).href); + await seed.waitForSelector('[data-theme-library]'); + const preview = await seed.evaluate(async () => { + const first = BskyPlusThemes.createTheme('First preview', 'light'); + const second = BskyPlusThemes.createTheme('Second preview', 'dark'); + first.colors.background = '#FFFFFF'; + second.colors.background = '#123456'; + second.colors.primary = '#AA3300'; + second.colors.like = '#FF55AA'; + await chrome.storage.local.set({ bskyplusThemes: { + schemaVersion: 1, activeId: null, themes: [first, second], + } }); + return { id: second.id, background: second.colors.background }; + }); + + const page = await browser.newPage(); + await page.setRequestInterception(true); + page.on('request', request => { + const url = new URL(request.url()); + if (url.origin !== 'https://bsky.app') return request.continue(); + const settings = url.pathname === '/settings'; + return request.respond({ contentType: 'text/html', body: ` + + +

${settings ? 'Settings' : 'Home'}

+ ${settings ? 'About' : 'Home feed'} +
Handle + +
` }); + }); + + await page.goto('https://bsky.app/'); + await page.click('nav a'); + await page.waitForSelector('[data-bskyplus-settings-link]'); + await page.click('[data-bskyplus-settings-link]'); + await page.waitForSelector('[data-bskyplus-theme-link]'); + await page.click('[data-bskyplus-theme-link]'); + await page.waitForFunction(() => [...document.querySelectorAll('iframe')] + .some(frame => frame.src.includes('section=theme'))); + const frame = page.frames().find(candidate => candidate.url().includes('section=theme')); + await frame.waitForSelector(`[data-theme-card="${preview.id}"]`); + const styleProperties = { + body: ['backgroundColor', 'color'], + '.post': ['backgroundColor', 'color', 'borderTopColor'], + '.muted': ['color'], + '.primary': ['backgroundColor'], + '.like': ['fill'], + }; + const readStyles = () => page.evaluate(properties => Object.fromEntries( + Object.entries(properties).map(([selector, names]) => [selector, Object.fromEntries(names.map(name => + [name, getComputedStyle(document.querySelector(selector))[name]]))])), styleProperties); + const initial = await readStyles(); + assert.equal(await page.$('[data-bskyplus-theme-active]'), null, + 'opening the editor with native styling must not apply a draft or saved theme'); + assert.equal(initial.body.backgroundColor, 'rgb(255, 255, 255)'); + assert.equal(initial.body.color, 'rgb(0, 0, 0)'); + + await frame.$eval(`[data-theme-card="${preview.id}"] .bskyplus-theme-preview-post`, element => element.click()); + await page.waitForFunction(id => document.documentElement.dataset.bskyplusThemeActive === id, {}, preview.id); + const start = await page.evaluate(() => { + const rootAnimations = () => document.getAnimations().filter(animation => + animation.effect.pseudoElement === '::view-transition-old(root)' || + animation.effect.pseudoElement === '::view-transition-new(root)'); + return { + background: getComputedStyle(document.body).backgroundColor, + elementAnimations: document.getAnimations().filter(animation => + !animation.effect.pseudoElement?.startsWith('::view-transition')).length, + rootAnimations: rootAnimations().map(animation => ({ + duration: animation.effect.getTiming().duration, playState: animation.playState, + })), + }; + }); + const startStyles = await readStyles(); + assert.notEqual(start.background, initial.body.backgroundColor); + assert.equal(start.background, 'rgb(18, 52, 86)'); + for (const selector of Object.keys(styleProperties)) { + assert.notDeepEqual(startStyles[selector], initial[selector], `${selector} switches with the preview`); + } + assert.equal(start.elementAnimations, 0); + assert.ok(start.rootAnimations.length > 0); + assert.ok(start.rootAnimations.every(animation => animation.duration === 1000)); + assert.ok(start.rootAnimations.every(animation => animation.playState === 'running')); + await page.evaluate(() => { + for (const animation of document.getAnimations()) { + if (animation.effect.pseudoElement === '::view-transition-old(root)' || + animation.effect.pseudoElement === '::view-transition-new(root)') animation.currentTime = 500; + } + }); + assert.ok(await page.evaluate(() => document.getAnimations().some(animation => + animation.effect.pseudoElement === '::view-transition-old(root)' && animation.playState === 'running'))); + await page.waitForFunction(() => !document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + assert.deepEqual(await readStyles(), startStyles); + } finally { + await browser.close(); + } +}); diff --git a/test/test_theme_editor.mjs b/test/test_theme_editor.mjs new file mode 100644 index 0000000..ee79d1d --- /dev/null +++ b/test/test_theme_editor.mjs @@ -0,0 +1,919 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import puppeteer from 'puppeteer-core'; + +const chromePath = process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'; +const modelScript = await readFile('extension/shared/theme-model.js', 'utf8'); +const editorScript = await readFile('extension/shared/theme-editor.js', 'utf8'); + +async function openEditor(browser, { seed = null, rejectSet = false, rejectGet = false, permissionGranted = true } = {}) { + const page = await browser.newPage(); + page.setDefaultTimeout(5_000); + await page.setContent('
Existing settings
'); + await page.evaluate(({ failSet, failGet, permissionGranted }) => { + let themeNumber = 0; + if (!crypto.randomUUID) Object.defineProperty(crypto, 'randomUUID', { + value: () => `theme-${++themeNumber}`, + }); + const listeners = []; + window.__themeStorage = { value: null, sets: [], listeners }; + window.__themeMessages = []; + window.__themePermissionRequests = []; + window.__themePermissionOrder = []; + window.postMessage = message => window.__themeMessages.push(structuredClone(message)); + window.confirm = () => { throw new Error('Native confirmation should not be used.'); }; + window.chrome = { + storage: { + local: { + get: async key => { + if (failGet) throw new Error('storage unavailable'); + return { [key]: structuredClone(window.__themeStorage.value) }; + }, + set: async values => { + if (failSet) throw new Error('storage unavailable'); + for (const [key, value] of Object.entries(values)) { + const oldValue = structuredClone(window.__themeStorage.value); + window.__themeStorage.value = structuredClone(value); + window.__themeStorage.sets.push(structuredClone(value)); + listeners.forEach(listener => listener({ [key]: { oldValue, newValue: structuredClone(value) } }, 'local')); + } + }, + }, + onChanged: { addListener: listener => listeners.push(listener) }, + }, + permissions: { + request: async permissions => { + window.__themePermissionRequests.push(structuredClone(permissions)); + window.__themePermissionOrder.push('permission'); + return permissionGranted; + }, + }, + }; + URL.createObjectURL = blob => { window.__themeExport = { blob, revoked: false }; return 'blob:bskyplus-theme'; }; + URL.revokeObjectURL = () => { window.__themeExport.revoked = true; }; + HTMLAnchorElement.prototype.click = function click() { + window.__themeDownload = { href: this.href, download: this.download }; + }; + }, { failSet: rejectSet, failGet: rejectGet, permissionGranted }); + await page.addScriptTag({ content: modelScript }); + if (seed) { + await page.evaluate(kind => { + const first = BskyPlusThemes.createTheme('Ocean', 'dark'); + const second = BskyPlusThemes.createTheme('Sunrise', 'light'); + window.__themeStorage.value = { + schemaVersion: 1, + activeId: kind === 'active' ? first.id : null, + themes: kind === 'one' ? [first] : [first, second], + }; + }, seed); + } + await page.addScriptTag({ content: editorScript }); + await page.waitForSelector('[data-bskyplus-theme-editor]'); + await page.waitForFunction(() => document.querySelector('.bskyplus-theme-name')); + return page; +} + +async function setName(page, value) { + await page.$eval('.bskyplus-theme-name', (input, next) => { + input.value = next; + input.dispatchEvent(new Event('input', { bubbles: true })); + }, value); +} + +async function stored(page) { + return page.evaluate(() => structuredClone(window.__themeStorage.value)); +} + +test('theme disclosures animate in both directions, reverse smoothly, and respect reduced motion', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + await page.setViewport({ width: 640, height: 1100 }); + for (const file of ['extension/chrome/popup/popup.css', 'extension/shared/settings-frame.css', 'extension/shared/theme-editor.css']) { + await page.addStyleTag({ content: await readFile(file, 'utf8') }); + } + await page.$eval('[data-theme-hex="onPrimary"]', input => { + input.value = '#006AFF'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + const selectors = ['[data-theme-library]', '[data-theme-contrast-warning]', + ...await page.$$eval('[data-theme-group]', groups => groups.map(group => `[data-theme-group="${group.dataset.themeGroup}"]`))]; + for (const selector of selectors) { + await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'reduce' }]); + await page.waitForFunction(() => matchMedia('(prefers-reduced-motion: reduce)').matches); + const collapsed = await page.$eval(selector, details => { + if (details.open) details.querySelector('summary').click(); + return details.getBoundingClientRect().height; + }); + await page.waitForFunction(selector => !document.querySelector(selector).open, {}, selector); + await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'no-preference' }]); + await page.waitForFunction(() => !matchMedia('(prefers-reduced-motion: reduce)').matches); + const middle = await page.$eval(selector, async details => { + await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))); + details.querySelector('summary').click(); + await new Promise(resolve => setTimeout(resolve, 90)); + return { height: details.getBoundingClientRect().height, + animating: details.querySelector('.bskyplus-theme-section-reveal').getAnimations().length > 0 }; + }); + await page.waitForFunction(selector => { + const details = document.querySelector(selector); + return details.open && !details.querySelector('.bskyplus-theme-section-reveal').getAnimations().length; + }, {}, selector); + const expanded = await page.$eval(selector, details => details.getBoundingClientRect().height); + assert.ok(middle.animating && middle.height > collapsed && middle.height < expanded, `${selector} expands gradually: ${JSON.stringify({ collapsed, middle, expanded })}`); + const closing = await page.$eval(selector, async details => { + details.querySelector('summary').click(); + await new Promise(resolve => setTimeout(resolve, 90)); + return { height: details.getBoundingClientRect().height, + inert: details.querySelector('.bskyplus-theme-section-content').inert }; + }); + assert.ok(closing.inert && closing.height > collapsed && closing.height < expanded, `${selector} collapses gradually and prevents hidden controls receiving focus`); + await page.waitForFunction(selector => !document.querySelector(selector).open, {}, selector); + } + await page.$eval('[data-theme-library]', async details => { + const summary = details.querySelector('summary'); + summary.click(); + await new Promise(resolve => setTimeout(resolve, 70)); + summary.click(); + await new Promise(resolve => setTimeout(resolve, 30)); + summary.click(); + }); + await page.waitForFunction(() => { + const details = document.querySelector('[data-theme-library]'); + return details.open && details.dataset.themeExpanded === 'true' && + !details.querySelector('.bskyplus-theme-section-reveal').getAnimations().length; + }); + await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'reduce' }]); + for (const selector of selectors) { + assert.equal(await page.$eval(selector, details => { + const expected = !details.open; + details.querySelector('summary').click(); + return details.open === expected && !details.querySelector('.bskyplus-theme-section-reveal').getAnimations().length; + }), true, `${selector} toggles immediately with reduced motion`); + } + if (process.env.THEME_SECTIONS_SCREENSHOT) console.log('THEME_SECTIONS_SCREENSHOT=' + await page.screenshot({ encoding: 'base64' })); + } finally { await browser.close(); } +}); + +test('saved theme gallery shows independent palettes in two columns and preserves collapse state', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + assert.equal(await page.$('.bskyplus-theme-bases'), null); + assert.deepEqual(await page.$$eval('button', buttons => buttons.filter(button => /^New (light|dim|dark)$/.test(button.textContent)).map(button => button.textContent)), []); + for (const file of ['extension/chrome/popup/popup.css', 'extension/shared/settings-frame.css', 'extension/shared/theme-editor.css']) { + await page.addStyleTag({ content: await readFile(file, 'utf8') }); + } + const original = await stored(page); + assert.equal(await page.$('.bskyplus-theme-select'), null); + assert.equal(await page.$('[data-theme-preview]'), null); + assert.equal(await page.$eval('[data-theme-library]', node => + node.previousElementSibling.classList.contains('bskyplus-theme-preview-toggle')), true); + const includedCount = await page.evaluate(() => Object.keys(BskyPlusThemes.BUILTIN_THEMES).length); + assert.equal(await page.$$eval('[data-theme-card]', cards => cards.length), includedCount + original.themes.length); + for (const theme of original.themes) { + assert.equal(await page.$eval(`[data-theme-card="${theme.id}"] .bskyplus-theme-preview`, card => + card.style.getPropertyValue('--bskyplus-preview-background')), theme.colors.background); + } + for (const width of [640, 390]) { + await page.setViewport({ width, height: 900 }); + const cards = await page.$$eval('[data-theme-card]', cards => cards.map(card => { + const { x, y, width } = card.getBoundingClientRect(); + return { x, y, width }; + })); + assert.equal(cards[0].width, cards[1].width); + assert.equal(cards[0].y, cards[1].y); + assert.ok(cards[1].x > cards[0].x + cards[0].width); + assert.equal(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth), true); + } + await page.click(`[data-theme-card="${original.themes[1].id}"] .bskyplus-theme-preview-post`); + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Sunrise'); + assert.equal(await page.$eval('[data-theme-selected="true"]', card => card.dataset.themeCard), original.themes[1].id); + assert.equal(await page.$eval('[data-theme-selected="true"] .bskyplus-theme-card-preview', preview => + getComputedStyle(preview).outlineWidth), '2px'); + assert.deepEqual(await stored(page), original); + await page.click(`[data-theme-select="${original.themes[0].id}"]`); + await page.$eval('[data-theme-hue]', input => { + input.value = '60'; input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$eval(`[data-theme-card="${original.activeId}"] .bskyplus-theme-preview`, card => + card.style.getPropertyValue('--bskyplus-preview-primary')), original.themes[0].colors.primary); + await page.click('.bskyplus-theme-hue button'); + await page.click('[data-theme-library] > summary'); + await setName(page, 'Ocean edited'); + await page.click('[data-theme-save]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Saved and applied'); + assert.equal(await page.$eval('[data-theme-library]', details => details.open), false); + await page.click('[data-theme-library] > summary'); + assert.equal(await page.$eval(`[data-theme-card="${original.activeId}"] .bskyplus-theme-card-name`, node => node.textContent), 'Ocean edited'); + } finally { await browser.close(); } +}); + +test('hue shift updates the complete draft, resets losslessly, and saves only on request', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + const original = await stored(page); + const readColors = () => page.$$eval('[data-theme-hex]', inputs => Object.fromEntries( + inputs.map(input => [input.dataset.themeHex, input.value.toUpperCase()]))); + const shift = value => page.$eval('[data-theme-hue]', (input, value) => { + input.value = value; + input.dispatchEvent(new Event('input', { bubbles: true })); + }, value); + assert.equal(await page.$eval('.bskyplus-theme-preview-toggle input', input => input.checked), true); + await shift(120); + const shifted = await readColors(); + assert.notEqual(shifted.primary, original.themes[0].colors.primary); + assert.deepEqual(shifted, await page.evaluate(colors => BskyPlusThemes.shiftHue(colors, 120), original.themes[0].colors)); + assert.deepEqual(await stored(page), original); + assert.deepEqual(await page.evaluate(() => window.__themeMessages.at(-1).theme.colors), shifted); + await shift(-47); + await page.click('.bskyplus-theme-hue button'); + assert.deepEqual(await readColors(), original.themes[0].colors); + await shift(73); + await page.$eval('[data-theme-hex="background"]', input => { + input.value = '#804040'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$eval('[data-theme-hue]', input => input.value), '0'); + await shift(120); + assert.equal((await readColors()).background, '#408040'); + const finalColors = await readColors(); + await page.click('.bskyplus-theme-apply'); + if (await page.$('dialog[open]')) await page.click('dialog button[type="submit"]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Saved and applied'); + assert.deepEqual((await stored(page)).themes.find(theme => theme.id === original.activeId).colors, finalColors); + assert.equal(await page.$eval('[data-theme-hue]', input => input.value), '0'); + await page.click(`[data-theme-select="${original.themes[1].id}"]`); + assert.deepEqual(await readColors(), original.themes[1].colors); + assert.equal(await page.$eval('[data-theme-hue-value]', output => output.textContent), '0°'); + } finally { + await browser.close(); + } +}); + +test('color picker coalesces rapid drag input before a change or save', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + const original = await stored(page); + const choose = (value, type) => page.$eval('[data-theme-picker="primary"]', (picker, { value, type }) => { + picker.value = value; + picker.dispatchEvent(new Event(type, { bubbles: true })); + }, { value, type }); + + await choose('#123456', 'input'); + await page.waitForFunction(() => window.__themeMessages.at(-1)?.theme?.colors.primary === '#123456'); + assert.equal(await page.$eval('[data-theme-hex="primary"]', input => input.value), '#123456'); + assert.equal(await page.$eval('[data-theme-save-as]', button => button.disabled), false); + assert.deepEqual(await stored(page), original); + + await choose('#654321', 'input'); + await page.waitForFunction(() => window.__themeMessages.at(-1)?.theme?.colors.primary === '#654321'); + assert.deepEqual(await stored(page), original); + + const messageCount = await page.evaluate(() => window.__themeMessages.length); + await page.$eval('[data-theme-picker="primary"]', picker => { + for (const color of ['#112233', '#223344', '#334455']) { + picker.value = color; + picker.dispatchEvent(new Event('input', { bubbles: true })); + } + }); + assert.equal(await page.evaluate(() => window.__themeMessages.length), messageCount); + await page.waitForFunction(() => window.__themeMessages.at(-1)?.theme?.colors.primary === '#334455'); + assert.equal(await page.evaluate(() => window.__themeMessages.length), messageCount + 1); + assert.deepEqual(await stored(page), original); + + await choose('#AABBCC', 'change'); + assert.equal(await page.evaluate(() => window.__themeMessages.at(-1).theme.colors.primary), '#AABBCC'); + assert.deepEqual(await stored(page), original); + } finally { await browser.close(); } +}); + +test('low contrast warns before saving and allows cancelling or saving anyway', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.$eval('[data-theme-hex="surfaceRaised"]', input => { + input.value = '#FFFFFF'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$eval('[data-theme-contrast-warning]', node => node.hidden), false); + assert.match(await page.$eval('[data-theme-contrast-warning]', node => node.textContent), /Main text on Raised surface: 1.0:1/); + await page.click('[data-theme-save]'); + await page.waitForSelector('dialog[open]'); + assert.equal(await stored(page), null); + await page.keyboard.press('Escape'); + await page.waitForSelector('dialog', { hidden: true }); + assert.equal(await stored(page), null); + await page.click('[data-theme-save]'); + assert.equal(await page.$eval('dialog button[type="submit"]', button => button.textContent), 'Save anyway'); + await page.click('dialog button[type="submit"]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 1); + assert.equal((await stored(page)).themes[0].colors.surfaceRaised, '#FFFFFF'); + assert.equal((await stored(page)).activeId, (await stored(page)).themes[0].id); + } finally { await browser.close(); } +}); + +test('Save as requires edits and creates a named copy without changing the original', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + const original = await stored(page); + assert.equal(await page.$eval('[data-theme-save-as]', button => button.disabled), true); + await page.$eval('[data-theme-hex="background"]', input => { + input.value = '#10231E'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$eval('[data-theme-save-as]', button => button.disabled), false); + await page.click('[data-theme-save-as]'); + await page.waitForSelector('dialog[open] #bskyplusThemeCopyName'); + await page.keyboard.press('Escape'); + await page.waitForSelector('dialog', { hidden: true }); + assert.deepEqual(await stored(page), original); + await page.click('[data-theme-save-as]'); + await page.$eval('#bskyplusThemeCopyName', input => { input.value = 'Forest copy'; }); + await page.click('dialog button[type="submit"]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 3); + const saved = await stored(page); + assert.deepEqual(saved.themes.find(theme => theme.id === original.activeId), original.themes[0]); + const copy = saved.themes.find(theme => theme.id === saved.activeId); + assert.equal(copy.name, 'Forest copy'); + assert.equal(copy.colors.background, '#10231E'); + assert.notEqual(copy.id, original.activeId); + assert.equal(await page.$eval('[data-theme-save-as]', button => button.disabled), true); + } finally { await browser.close(); } +}); + +test('contrast recommendations reveal both settings and clear both highlights when either color fixes the pair', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.$eval('[data-theme-hex="onPrimary"]', input => { + input.value = '#006AFF'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + await page.click('[data-theme-contrast-warning] summary'); + assert.match(await page.$eval('[data-theme-contrast-warning]', node => node.textContent), /Darken “Text on colored controls” in Links and primary controls/); + await page.click('[data-theme-contrast-warning] [data-theme-contrast-edit="onPrimary"]'); + await page.waitForFunction(() => document.activeElement?.dataset.themeHex === 'onPrimary'); + assert.equal(await page.$eval('[data-theme-field="onPrimary"]', field => + field.classList.contains('bskyplus-theme-field-highlight') && field.closest('details').open), true); + assert.deepEqual(await page.$$eval('.bskyplus-theme-field-highlight', fields => fields.map(field => field.dataset.themeField).sort()), ['onPrimary', 'primary']); + await page.$eval('[data-theme-field="onPrimary"]', field => { field.closest('details').open = false; }); + await page.click('[data-theme-save]'); + await page.click('dialog [data-theme-contrast-edit="onPrimary"]'); + await page.waitForSelector('dialog', { hidden: true }); + await page.waitForFunction(() => document.activeElement?.dataset.themeHex === 'onPrimary'); + assert.equal(await stored(page), null); + assert.equal(await page.$$eval('.bskyplus-theme-field-highlight', fields => fields.length), 2); + await page.$eval('[data-theme-hex="onPrimary"]', input => { + input.value = '#000000'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$('.bskyplus-theme-field-highlight'), null); + assert.equal(await page.$eval('[data-theme-contrast-warning]', node => node.hidden), true); + await page.$eval('[data-theme-hex="surfaceRaised"]', input => { + input.value = '#FFFFFF'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + await page.$$eval('[data-theme-group]', groups => groups.forEach(group => { group.open = false; })); + await page.click('[data-theme-contrast-warning] [data-theme-contrast-edit="text"][data-theme-contrast-background="surfaceRaised"]'); + await page.waitForFunction(() => document.activeElement?.dataset.themeHex === 'text'); + assert.deepEqual(await page.$$eval('.bskyplus-theme-field-highlight', fields => fields.map(field => ({ key: field.dataset.themeField, open: field.closest('details').open }))), [ + { key: 'surfaceRaised', open: true }, { key: 'text', open: true }, + ]); + await page.$eval('[data-theme-hex="surfaceRaised"]', input => { + input.value = '#19222E'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$('.bskyplus-theme-field-highlight'), null); + } finally { await browser.close(); } +}); + +test('contrast highlights expire after three seconds without changing the colors or closing sections', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.$eval('[data-theme-hex="onPrimary"]', input => { + input.value = '#006AFF'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + await page.click('[data-theme-contrast-warning] summary'); + await page.click('[data-theme-contrast-edit="onPrimary"]'); + assert.equal(await page.$$eval('.bskyplus-theme-field-highlight', fields => fields.length), 2); + await page.waitForFunction(() => !document.querySelector('.bskyplus-theme-field-highlight'), { timeout: 4500 }); + assert.equal(await page.$eval('[data-theme-hex="onPrimary"]', input => input.value), '#006AFF'); + assert.equal(await page.$eval('[data-theme-field="onPrimary"]', field => field.closest('details').open), true); + } finally { await browser.close(); } +}); + +test('saving and applying preserves open and closed theme groups', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await setName(page, 'Keep editing'); + assert.equal(await page.$eval('[data-theme-save]', button => button.textContent), 'Save and apply'); + const states = [false, true, false, true, true, false]; + await page.$$eval('[data-theme-group]', (groups, states) => { + groups.forEach((group, index) => { group.open = states[index]; }); + }, states); + await page.click('.bskyplus-theme-apply'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Saved and applied'); + assert.equal(await page.$$eval('.bskyplus-theme-actions button', buttons => + buttons.filter(button => button.textContent === 'Apply').length), 1); + assert.equal(await page.$eval('[data-theme-save-as]', button => button.disabled), true); + assert.deepEqual(await page.$$eval('[data-theme-group]', groups => groups.map(group => group.open)), states); + await setName(page, 'Keep editing again'); + assert.equal(await page.$eval('[data-theme-save]', button => button.textContent), 'Save and apply'); + await page.click('.bskyplus-theme-apply'); + await page.waitForFunction(() => window.__themeStorage.value?.themes[0].name === 'Keep editing again'); + assert.deepEqual(await page.$$eval('[data-theme-group]', groups => groups.map(group => group.open)), states); + } finally { await browser.close(); } +}); + +test('saves multiple local themes and reloads the active library', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await setName(page, 'Ocean'); + await page.click('[data-theme-save]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 1); + await page.click('[data-theme-select="bluesky-light"]'); + await setName(page, 'Sunrise'); + await page.click('.bskyplus-theme-apply'); + await page.click('dialog button[type="submit"]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 2); + const library = await stored(page); + assert.deepEqual(library.themes.map(theme => theme.name), ['Ocean', 'Sunrise']); + assert.equal(library.activeId, library.themes[1].id); + + const reload = await browser.newPage(); + await reload.setContent('
'); + await reload.evaluate(value => { + const listeners = []; + window.chrome = { storage: { local: { get: async key => ({ [key]: value }), set: async () => {} }, onChanged: { addListener: listener => listeners.push(listener) } } }; + }, library); + await reload.addScriptTag({ content: modelScript }); + await reload.addScriptTag({ content: editorScript }); + await reload.waitForFunction(savedCount => document.querySelectorAll('[data-theme-card]').length === + Object.keys(BskyPlusThemes.BUILTIN_THEMES).length + savedCount, {}, library.themes.length); + assert.equal(await reload.$eval('.bskyplus-theme-name', input => input.value), 'Sunrise'); + } finally { + await browser.close(); + } +}); + +test('apply, Bluesky default, and delete change only the active saved theme', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + const initial = await stored(page); + await page.click('.bskyplus-theme-apply'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Saved and applied'); + assert.equal((await stored(page)).activeId, initial.themes[0].id); + + await page.click('[data-theme-default]'); + await page.waitForFunction(() => window.__themeStorage.value.activeId === null); + assert.equal((await stored(page)).themes.length, 2); + + await page.click('.bskyplus-theme-delete'); + await page.waitForSelector('[data-theme-confirm][open]'); + await page.click('[data-theme-confirm-accept]'); + await page.waitForFunction(() => window.__themeStorage.value.themes.length === 1); + const afterDelete = await stored(page); + assert.equal(afterDelete.themes[0].id, initial.themes[1].id); + assert.equal(afterDelete.activeId, null); + } finally { + await browser.close(); + } +}); + +test('invalid hex stays out of storage and a valid draft exports JSON', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.$eval('[data-theme-hex="background"]', input => { + input.value = '#bad'; + input.dispatchEvent(new Event('input', { bubbles: true })); + }); + assert.equal(await page.$eval('[data-theme-hex="background"]', input => input.getAttribute('aria-invalid')), 'true'); + assert.equal(await stored(page), null); + + await setName(page, 'Export me'); + await page.click('.bskyplus-theme-actions button:last-child'); + await page.waitForFunction(() => !!window.__themeExport && !!window.__themeDownload); + const exported = await page.evaluate(async () => ({ + json: await window.__themeExport.blob.text(), + download: window.__themeDownload.download, + })); + const theme = JSON.parse(exported.json); + assert.equal(theme.name, 'Export me'); + assert.equal(theme.schemaVersion, 1); + assert.equal(exported.download, 'Export-me.json'); + } finally { + await browser.close(); + } +}); + +test('imports a valid JSON theme as an unsaved draft', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + const imported = await page.evaluate(() => ({ + ...BskyPlusThemes.createTheme('Imported ocean', 'light'), + id: 'imported-ocean', + colors: { ...BskyPlusThemes.PRESETS.light, primary: '#123456' }, + })); + await page.$eval('[data-theme-import-input]', (input, theme) => { + const file = new File([JSON.stringify(theme)], 'ocean.json', { type: 'application/json' }); + Object.defineProperty(input, 'files', { configurable: true, value: [file] }); + input.dispatchEvent(new Event('change', { bubbles: true })); + }, imported); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent.startsWith('Imported theme')); + + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Imported ocean'); + assert.equal(await page.$eval('[data-theme-hex="primary"]', input => input.value), '#123456'); + assert.equal(await page.$('[data-theme-select][aria-pressed="true"]'), null); + assert.equal(await stored(page), null); + + await page.click('[data-theme-save]'); + await page.click('dialog button[type="submit"]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes[0]?.name === 'Imported ocean'); + assert.equal((await stored(page)).themes[0].id, 'imported-ocean'); + } finally { + await browser.close(); + } +}); + +test('rejects invalid JSON without replacing the current draft', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await setName(page, 'Keep this draft'); + await page.$eval('[data-theme-import-input]', input => { + const file = new File(['{not JSON'], 'broken.json', { type: 'application/json' }); + Object.defineProperty(input, 'files', { configurable: true, value: [file] }); + input.dispatchEvent(new Event('change', { bubbles: true })); + }); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'The selected file is not valid JSON.'); + + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Keep this draft'); + assert.equal(await stored(page), null); + } finally { + await browser.close(); + } +}); + +test('imports a theme with an existing ID as a copy', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'one' }); + const original = (await stored(page)).themes[0]; + await page.$eval('[data-theme-import-input]', (input, theme) => { + const file = new File([JSON.stringify(theme)], 'copy.json', { type: 'application/json' }); + Object.defineProperty(input, 'files', { configurable: true, value: [file] }); + input.dispatchEvent(new Event('change', { bubbles: true })); + }, { ...original, name: 'Ocean copy' }); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent.startsWith('Imported as a copy')); + await page.click('[data-theme-save]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 2); + + const library = await stored(page); + assert.equal(library.themes[0].id, original.id); + assert.notEqual(library.themes[1].id, original.id); + assert.equal(library.themes[1].name, 'Ocean copy'); + } finally { + await browser.close(); + } +}); + +test('imports a WitchSky base palette and its variants as separate saved themes', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.evaluate(() => { + const colors = { + canvas: '#1c1310', surface: '#2e2018', surfaceRaised: '#251a15', text: '#f4deb8', + textMuted: '#e8c28a', border: '#3d2b1f', accent: '#d4975c', accentSoft: '#4d3828', + onAccent: '#2c221a', positive: '#4caf7d', warning: '#e2b76f', critical: '#e06c6c', favorite: '#cc5577', + }; + const uri = 'at://did:plc:l37td5yhxl2irrzrgvei4qay/app.witchsky.theme.colors/3mvpzxkrbms25'; + window.fetch = async url => { + if (String(url).startsWith('https://plc.directory/')) { + return new Response(JSON.stringify({ service: [{ id: '#atproto_pds', type: 'AtprotoPersonalDataServer', serviceEndpoint: 'https://pds.example.test' }] })); + } + return new Response(JSON.stringify({ uri, value: { + $type: 'app.witchsky.theme.colors', name: 'Coffee', base: { name: 'Default', colors }, + variants: [ + { name: 'Light', colors: { canvas: '#f7f2e9', surface: '#efe3d0', surfaceRaised: '#fdf8f0', text: '#1c1310' } }, + { name: 'Dark', colors: { canvas: '#050505', surface: '#171717', surfaceRaised: '#111111', text: '#f7f1e8' } }, + ], + } })); + }; + }); + await page.type('[data-theme-witchsky-uri]', 'at://did:plc:l37td5yhxl2irrzrgvei4qay/app.witchsky.theme.colors/3mvpzxkrbms25'); + await page.click('[data-theme-witchsky-import]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 3); + + const library = await stored(page); + assert.deepEqual(library.themes.map(theme => theme.name), ['Coffee — Default', 'Coffee — Light', 'Coffee — Dark']); + assert.equal(library.activeId, null); + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Coffee — Default'); + assert.equal(await page.$eval('[data-theme-status]', node => node.textContent), 'Imported 3 WitchSky themes'); + } finally { + await browser.close(); + } +}); + +test('imports the provided did:web WitchSky URI after verifying its DID document and PDS record', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.evaluate(() => { + const uri = 'at://did:web:vessel.darkworld.download/app.witchsky.theme.colors/3mv3ih7bfgs2m'; + const colors = { + canvas: '#1c1310', surface: '#2e2018', surfaceRaised: '#251a15', text: '#f4deb8', + textMuted: '#e8c28a', border: '#3d2b1f', accent: '#d4975c', accentSoft: '#4d3828', + onAccent: '#2c221a', positive: '#4caf7d', warning: '#e2b76f', critical: '#e06c6c', favorite: '#cc5577', + }; + const variants = Array.from({ length: 11 }, (_, index) => ({ + name: 'Variant ' + (index + 1), + colors: { canvas: index % 2 ? '#f7f2e9' : '#050505' }, + })); + const didDocument = { + id: 'did:web:vessel.darkworld.download', + service: [{ id: '#atproto_pds', type: 'AtprotoPersonalDataServer', serviceEndpoint: 'https://pushingbuddies.kralsei.stream' }], + }; + const record = { uri, value: { + $type: 'app.witchsky.theme.colors', name: 'Vessel palette', + base: { name: 'Default', colors }, variants, + } }; + window.__witchSkyRequests = []; + window.fetch = async url => { + const requestUrl = new URL(url); + window.__themePermissionOrder.push('fetch ' + requestUrl.pathname); + window.__witchSkyRequests.push(requestUrl.href); + if (requestUrl.href === 'https://vessel.darkworld.download/.well-known/did.json') { + return new Response(JSON.stringify(didDocument)); + } + if (requestUrl.origin === 'https://pushingbuddies.kralsei.stream') { + window.__witchSkyRecordQuery = Object.fromEntries(requestUrl.searchParams.entries()); + return new Response(JSON.stringify(record)); + } + throw new Error('Unexpected WitchSky request: ' + requestUrl.href); + }; + }); + const uri = 'at://did:web:vessel.darkworld.download/app.witchsky.theme.colors/3mv3ih7bfgs2m'; + await page.type('[data-theme-witchsky-uri]', uri); + await page.click('[data-theme-witchsky-import]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 12); + + const library = await stored(page); + assert.equal(library.themes.length, 12); + assert.equal(library.themes[0].name, 'Vessel palette — Default'); + assert.equal(library.themes.at(-1).name, 'Vessel palette — Variant 11'); + assert.deepEqual(await page.evaluate(() => window.__themePermissionRequests), [ + { origins: ['https://vessel.darkworld.download/*'] }, + ]); + assert.deepEqual(await page.evaluate(() => window.__themePermissionOrder), [ + 'permission', 'fetch /.well-known/did.json', 'fetch /xrpc/com.atproto.repo.getRecord', + ]); + assert.deepEqual(await page.evaluate(() => window.__themeStorage.value && window.__witchSkyRecordQuery), { + repo: 'did:web:vessel.darkworld.download', + collection: 'app.witchsky.theme.colors', + rkey: '3mv3ih7bfgs2m', + }); + assert.equal(await page.$eval('[data-theme-status]', node => node.textContent), 'Imported 12 WitchSky themes'); + } finally { + await browser.close(); + } +}); + +test('denied did:web host permission prevents network access and storage changes', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { permissionGranted: false }); + await page.evaluate(() => { + window.__witchSkyRequests = []; + window.fetch = async url => { window.__witchSkyRequests.push(String(url)); return new Response('{}'); }; + }); + await page.type('[data-theme-witchsky-uri]', 'at://did:web:vessel.darkworld.download/app.witchsky.theme.colors/3mv3ih7bfgs2m'); + await page.click('[data-theme-witchsky-import]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Access to the did:web repository was not granted.'); + + assert.deepEqual(await page.evaluate(() => window.__themePermissionRequests), [ + { origins: ['https://vessel.darkworld.download/*'] }, + ]); + assert.deepEqual(await page.evaluate(() => window.__witchSkyRequests), []); + assert.equal(await stored(page), null); + } finally { + await browser.close(); + } +}); + +test('did:web importer rejects a DID document whose id does not match the URI', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + await page.evaluate(() => { + window.__witchSkyRequests = []; + window.fetch = async url => { + const requestUrl = new URL(url); + window.__witchSkyRequests.push(requestUrl.href); + return new Response(JSON.stringify({ + id: 'did:web:another.example', + service: [{ id: '#atproto_pds', serviceEndpoint: 'https://pds.example.test' }], + })); + }; + }); + await page.type('[data-theme-witchsky-uri]', 'at://did:web:vessel.darkworld.download/app.witchsky.theme.colors/3mv3ih7bfgs2m'); + await page.click('[data-theme-witchsky-import]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'The did:web document does not match the WitchSky repository.'); + + assert.deepEqual(await page.evaluate(() => window.__witchSkyRequests), [ + 'https://vessel.darkworld.download/.well-known/did.json', + ]); + assert.equal(await stored(page), null); + } finally { + await browser.close(); + } +}); + +test('page preview checkbox sends validated drafts without saving them', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + assert.equal(await page.$eval('.bskyplus-theme-preview-toggle input', input => input.checked), true); + await page.click('[data-theme-select="bluesky-dark"]'); + await setName(page, 'Live preview'); + const preview = await page.evaluate(() => window.__themeMessages.filter(message => message.type === 'BSKYPLUS_THEME_PREVIEW').at(-1)); + + assert.equal(preview.theme.name, 'Live preview'); + assert.equal(await stored(page), null); + + await page.click('.bskyplus-theme-preview-toggle input'); + const cleared = await page.evaluate(() => window.__themeMessages.filter(message => message.type === 'BSKYPLUS_THEME_PREVIEW').at(-1)); + assert.equal(cleared.theme, null); + } finally { + await browser.close(); + } +}); + +test('native theme preview stays off on initial load until a theme is chosen', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + for (const seed of [null, 'two']) { + const page = await openEditor(browser, { seed }); + const initialPreviews = await page.evaluate(() => window.__themeMessages + .filter(message => message.type === 'BSKYPLUS_THEME_PREVIEW')); + assert.ok(initialPreviews.length > 0); + assert.ok(initialPreviews.every(message => message.theme === null), `seed ${seed}: initial preview messages should clear rather than choose a theme`); + + await page.click('[data-theme-select="bluesky-light"]'); + await page.waitForFunction(() => window.__themeMessages + .filter(message => message.type === 'BSKYPLUS_THEME_PREVIEW').at(-1)?.theme?.id === 'bluesky-light'); + const chosen = await page.evaluate(() => window.__themeMessages + .filter(message => message.type === 'BSKYPLUS_THEME_PREVIEW').at(-1)); + assert.equal(chosen.theme.id, 'bluesky-light'); + await page.close(); + } + } finally { + await browser.close(); + } +}); + +test('dirty edits survive a cancelled selection and an external library change', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'two' }); + await setName(page, 'Unsaved Ocean'); + await page.click(`[data-theme-select="${(await stored(page)).themes[1].id}"]`); + await page.waitForSelector('[data-theme-confirm][open]'); + assert.match(await page.$eval('[data-theme-confirm]', dialog => dialog.textContent), /Discard unsaved theme changes\?/); + await page.click('[data-theme-confirm-cancel]'); + await page.waitForSelector('[data-theme-confirm]', { hidden: true }); + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Unsaved Ocean'); + assert.equal(await page.$eval('[data-theme-select][aria-pressed="true"]', button => button.dataset.themeSelect), (await stored(page)).themes[0].id); + + await page.evaluate(() => { + const changed = BskyPlusThemes.createTheme('Elsewhere', 'dim'); + window.__themeStorage.listeners.forEach(listener => listener({ + bskyplusThemes: { oldValue: null, newValue: { schemaVersion: 1, activeId: changed.id, themes: [changed] } }, + }, 'local')); + }); + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Unsaved Ocean'); + assert.match(await page.$eval('[data-theme-status]', node => node.textContent), /another Bsky\+ window/); + } finally { + await browser.close(); + } +}); + +test('discard modal confirms theme replacement and delete modal stays in the page', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'active' }); + const original = await stored(page); + await setName(page, 'Unsaved Ocean'); + await page.click('[data-theme-select="bluesky-dim"]'); + await page.waitForSelector('[data-theme-confirm][open]'); + await page.keyboard.press('Escape'); + await page.waitForSelector('[data-theme-confirm]', { hidden: true }); + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Unsaved Ocean'); + + await page.click(`[data-theme-select="${original.themes[1].id}"]`); + await page.waitForSelector('[data-theme-confirm][open]'); + await page.click('[data-theme-confirm-accept]'); + await page.waitForFunction(() => document.querySelector('.bskyplus-theme-name')?.value === 'Sunrise'); + assert.equal(await page.$eval('.bskyplus-theme-name', input => input.value), 'Sunrise'); + assert.deepEqual(await stored(page), original); + + await page.click('.bskyplus-theme-delete'); + await page.waitForSelector('[data-theme-confirm][open]'); + assert.match(await page.$eval('[data-theme-confirm]', dialog => dialog.textContent), /Delete “Sunrise”\?/); + await page.click('[data-theme-confirm-cancel]'); + assert.deepEqual(await stored(page), original); + await page.click('.bskyplus-theme-delete'); + await page.waitForSelector('[data-theme-confirm][open]'); + await page.click('[data-theme-confirm-accept]'); + await page.waitForFunction(() => window.__themeStorage.value?.themes.length === 1); + assert.equal((await stored(page)).themes[0].name, 'Ocean'); + } finally { await browser.close(); } +}); + +test('built-in themes apply without saving, edits save as custom copies, and saved themes remain deletable', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { seed: 'one' }); + const before = await stored(page); + const includedCount = await page.evaluate(() => Object.keys(BskyPlusThemes.BUILTIN_THEMES).length); + assert.equal(await page.$$eval('[data-theme-card]', cards => cards.length), includedCount + before.themes.length); + const darkId = 'bluesky-dark'; + await page.click(`[data-theme-select="${darkId}"]`); + assert.equal(await page.$eval('.bskyplus-theme-delete', button => button.disabled), false); + await page.click('[data-theme-save]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Saved and applied'); + const applied = await stored(page); + assert.equal(applied.activeId, darkId); + assert.deepEqual(applied.themes, before.themes); + + await setName(page, 'My Dark Copy'); + await page.click('[data-theme-save]'); + if (await page.$('dialog[open]')) await page.click('dialog button[type="submit"]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent === 'Saved and applied'); + const copied = await stored(page); + assert.equal(copied.themes.length, before.themes.length + 1); + assert.notEqual(copied.activeId, darkId); + assert.equal(copied.themes.at(-1).name, 'My Dark Copy'); + await page.click('.bskyplus-theme-delete'); + await page.click('dialog [data-theme-confirm-accept]'); + await page.waitForFunction(id => !document.querySelector(`[data-theme-card="${id}"]`), {}, copied.activeId); + assert.equal((await stored(page)).activeId, null); + assert.equal(await page.$$eval('[data-theme-card]', cards => cards.filter(card => card.dataset.themeCard.startsWith('bluesky-')).length), 3); + } finally { await browser.close(); } +}); + +test('all included themes can be removed per user and stay removed after storage refresh', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser); + const builtinIds = await page.evaluate(() => Object.keys(BskyPlusThemes.BUILTIN_THEMES)); + for (const id of builtinIds) { + await page.click(`[data-theme-select="${id}"]`); + assert.equal(await page.$eval('.bskyplus-theme-delete', button => button.disabled), false, `${id} has a delete action`); + await page.click('[data-theme-save]'); + await page.waitForFunction(id => window.__themeStorage.value?.activeId === id, {}, id); + + await page.click('.bskyplus-theme-delete'); + await page.waitForSelector('[data-theme-confirm][open]'); + await page.click('[data-theme-confirm-accept]'); + await page.waitForFunction(id => !document.querySelector(`[data-theme-card="${id}"]`) && + window.__themeStorage.value?.deletedBuiltinIds?.includes(id) && + window.__themeStorage.value.activeId === null, {}, id); + const latestPreview = await page.evaluate(() => window.__themeMessages + .filter(message => message.type === 'BSKYPLUS_THEME_PREVIEW').at(-1)); + assert.equal(latestPreview.theme, null, `${id} deletion clears the page preview`); + } + const library = await stored(page); + assert.deepEqual(library.deletedBuiltinIds, builtinIds); + assert.equal(library.themes.length, 0); + assert.equal(library.activeId, null); + assert.deepEqual(await page.$$eval('[data-theme-card]', cards => cards.map(card => card.dataset.themeCard)), []); + assert.deepEqual(await page.evaluate(() => BskyPlusThemes.availableBuiltinThemes(window.__themeStorage.value)), []); + } finally { await browser.close(); } +}); + +test('a storage write failure leaves the draft dirty and reports the failure', async () => { + const browser = await puppeteer.launch({ executablePath: chromePath, headless: true }); + try { + const page = await openEditor(browser, { rejectSet: true }); + await setName(page, 'Cannot save'); + await page.click('[data-theme-save]'); + await page.waitForFunction(() => document.querySelector('[data-theme-status]').textContent.includes('Could not save')); + assert.equal(await stored(page), null); + assert.equal(await page.$eval('[data-theme-save]', button => button.disabled), false); + } finally { + await browser.close(); + } +}); diff --git a/test/test_theme_model.mjs b/test/test_theme_model.mjs new file mode 100644 index 0000000..25a5721 --- /dev/null +++ b/test/test_theme_model.mjs @@ -0,0 +1,375 @@ +import assert from 'node:assert/strict'; +import {readFile} from 'node:fs/promises'; +import test from 'node:test'; +import vm from 'node:vm'; + +const source = await readFile(new URL('../extension/shared/theme-model.js', import.meta.url), 'utf8'); +const context = vm.createContext({crypto: {randomUUID: () => 'generated-theme-id'}, URL}); +vm.runInContext(source, context, {filename: 'theme-model.js'}); +const themes = context.BskyPlusThemes; +const plain = value => JSON.parse(JSON.stringify(value)); + +function validTheme(overrides = {}) { + const base = overrides.base || 'light'; + return { + schemaVersion: 1, + id: 'night-owl_01', + name: 'Night owl', + base, + colors: {...themes.PRESETS[base]}, + ...overrides, + }; +} + +test('hue shifts rotate colors in either direction and leave neutral colors unchanged', () => { + const colors = { red: '#FF0000', muted: '#804040', black: '#000000', white: '#FFFFFF', gray: '#777777' }; + assert.deepEqual(plain(themes.shiftHue(colors, 120)), { + red: '#00FF00', muted: '#408040', black: '#000000', white: '#FFFFFF', gray: '#777777', + }); + assert.equal(themes.shiftHue(colors, -120).red, '#0000FF'); + assert.equal(themes.shiftHue(colors, 480).red, '#00FF00'); + assert.deepEqual(plain(themes.shiftHue(colors, 360)), colors); + assert.equal(colors.red, '#FF0000'); + assert.throws(() => themes.shiftHue(colors, NaN), /finite hue shift/); +}); + +test('hue shifts cover complete palettes and preserve channel extrema', () => { + for (const palette of Object.values(themes.PRESETS)) { + const shifted = themes.shiftHue(palette, 73); + assert.deepEqual(Object.keys(shifted), Object.keys(palette)); + for (const key of themes.KEYS) { + const channels = hex => hex.slice(1).match(/../g).map(value => parseInt(value, 16)); + assert.equal(Math.min(...channels(shifted[key])), Math.min(...channels(palette[key]))); + assert.equal(Math.max(...channels(shifted[key])), Math.max(...channels(palette[key]))); + } + assert.deepEqual(plain(themes.shiftHue(palette, 0)), plain(palette)); + } +}); + +test('contrast checker catches unreadable text on secondary surfaces and colored buttons', () => { + const colors = { ...themes.PRESETS.dark, surfaceRaised: '#FFFFFF', primary: '#FFFFFF' }; + const issues = themes.contrastIssues(colors); + assert.ok(issues.some(issue => issue.foreground === 'text' && issue.background === 'surfaceRaised' && issue.ratio === 1)); + assert.ok(issues.some(issue => issue.foreground === 'onPrimary' && issue.background === 'primary' && issue.ratio === 1)); + assert.ok(issues.every(issue => issue.ratio < 3)); + assert.ok(!themes.contrastIssues(themes.PRESETS.dark).some(issue => issue.foreground === 'text')); +}); + +test('theme schema accepts only a complete version-one theme and normalizes it', () => { + const theme = validTheme({ + name: ' Night owl ', + colors: {...themes.PRESETS.light, text: '#aBc123'}, + ignored: 'discarded', + }); + + assert.deepEqual(plain(themes.validateTheme(theme)), { + schemaVersion: 1, + id: 'night-owl_01', + name: 'Night owl', + base: 'light', + colors: {...plain(themes.PRESETS.light), text: '#ABC123'}, + }); +}); + +test('theme schema rejects unsupported versions, unsafe IDs, names, bases, and incomplete colors', () => { + assert.throws(() => themes.validateTheme(null), /Unsupported theme format/); + assert.throws(() => themes.validateTheme(validTheme({schemaVersion: 2})), /Unsupported theme format/); + assert.throws(() => themes.validateTheme(validTheme({id: '../theme'})), /Invalid theme ID/); + assert.throws(() => themes.validateTheme(validTheme({id: 'x'.repeat(81)})), /Invalid theme ID/); + assert.throws(() => themes.validateTheme(validTheme({name: ' '})), /between 1 and 80/); + assert.throws(() => themes.validateTheme(validTheme({name: 'x'.repeat(81)})), /between 1 and 80/); + assert.throws(() => themes.validateTheme(validTheme({base: 'system'})), /Choose a light, dim, or dark base/); + assert.throws(() => themes.validateTheme(validTheme({colors: {...themes.PRESETS.light, primary: 'blue'}})), /six-digit hex color for primary/); + assert.throws(() => themes.validateTheme(validTheme({colors: {...themes.PRESETS.light, primary: '#12345678'}})), /six-digit hex color for primary/); + assert.throws(() => themes.validateTheme(validTheme({colors: {}})), /six-digit hex color for background/); +}); + +test('theme factory uses a safe requested base and falls back to dim', () => { + const light = themes.createTheme('Light personal', 'light'); + assert.equal(light.id, 'generated-theme-id'); + assert.equal(light.base, 'light'); + assert.deepEqual(light.colors, themes.PRESETS.light); + + const fallback = themes.createTheme(); + assert.equal(fallback.base, 'dim'); + assert.deepEqual(fallback.colors, themes.PRESETS.dim); + assert.equal(themes.createTheme('Bad base', 'invalid').base, 'dim'); +}); + +test('library normalization removes malformed, duplicate, and inactive entries without losing valid themes', () => { + const first = validTheme({id: 'first', name: 'First'}); + const duplicate = validTheme({id: 'first', name: 'Second copy'}); + const second = validTheme({id: 'second', name: 'Second', base: 'dark', colors: {...themes.PRESETS.dark}}); + const malformed = validTheme({id: 'broken', colors: {...themes.PRESETS.light, warning: '#fff'}}); + + assert.deepEqual(plain(themes.normalizeLibrary({ + schemaVersion: 1, + activeId: 'first', + themes: [first, malformed, duplicate, second], + })), { + schemaVersion: 1, + activeId: 'first', + themes: [plain(themes.validateTheme(first)), plain(themes.validateTheme(second))], + }); + + assert.deepEqual(themes.normalizeLibrary({schemaVersion: 1, activeId: 'missing', themes: [first]}).activeId, null); + assert.deepEqual(plain(themes.normalizeLibrary({schemaVersion: 0, activeId: 'first', themes: [first]})), { + schemaVersion: 1, + activeId: null, + themes: [], + }); + assert.deepEqual(plain(themes.normalizeLibrary(undefined)), {schemaVersion: 1, activeId: null, themes: []}); +}); + +test('library normalization caps input at one hundred candidates before validation', () => { + const candidates = Array.from({length: 101}, (_, index) => validTheme({id: 'theme-' + index, name: 'Theme ' + index})); + const library = themes.normalizeLibrary({schemaVersion: 1, activeId: 'theme-100', themes: candidates}); + assert.equal(library.themes.length, 100); + assert.equal(library.activeId, null); + assert.equal(library.themes.at(-1).id, 'theme-99'); +}); + +test('deleted builtin choices persist only known unique ids and cannot stay active', () => { + const builtinIds = Object.keys(themes.BUILTIN_THEMES); + const deleted = themes.normalizeLibrary({ + schemaVersion: 1, + activeId: builtinIds[0], + themes: [], + deletedBuiltinIds: [builtinIds[0], 'unknown-theme', builtinIds[0], 42], + }); + assert.deepEqual(plain(deleted), { + schemaVersion: 1, + activeId: null, + themes: [], + deletedBuiltinIds: [builtinIds[0]], + }); + assert.deepEqual(plain(themes.availableBuiltinThemes(deleted).map(theme => theme.id)), builtinIds.slice(1)); + + const remainingActive = themes.normalizeLibrary({ + schemaVersion: 1, activeId: builtinIds[1], themes: [], deletedBuiltinIds: [builtinIds[0]], + }); + assert.equal(remainingActive.activeId, builtinIds[1]); + assert.equal(themes.availableBuiltinThemes(remainingActive).length, builtinIds.length - 1); + assert.deepEqual(plain(themes.normalizeLibrary({ schemaVersion: 1, activeId: null, themes: [], deletedBuiltinIds: ['unknown-theme'] })), { + schemaVersion: 1, activeId: null, themes: [], + }, 'unknown ids are discarded and an empty tombstone list preserves the legacy shape'); +}); + +test('export is a clean, canonical theme document without secrets or extraneous fields', () => { + const theme = validTheme({ + token: 'secret-token', + endpoint: 'https://api.example.test', + colors: {...themes.PRESETS.light, apiKey: 'secret-key'}, + }); + const exported = themes.exportTheme(theme); + const parsed = JSON.parse(exported); + + assert.equal(exported.endsWith('\n'), true); + assert.deepEqual(Object.keys(parsed).sort(), ['base', 'colors', 'id', 'name', 'schemaVersion']); + assert.equal('token' in parsed, false); + assert.equal('endpoint' in parsed, false); + assert.equal('apiKey' in parsed.colors, false); + assert.equal(parsed.colors.primary, '#006AFF'); +}); + +test('WitchSky AT URIs accept raw and PDSls forms and reject other collections', () => { + const uri = 'at://did:plc:l37td5yhxl2irrzrgvei4qay/app.witchsky.theme.colors/3mvpzxkrbms25'; + assert.deepEqual(plain(themes.parseWitchSkyUri(uri)), { + uri, + repo: 'did:plc:l37td5yhxl2irrzrgvei4qay', + rkey: '3mvpzxkrbms25', + }); + assert.deepEqual(plain(themes.parseWitchSkyUri('https://pds.ls/' + uri + '#record')), plain(themes.parseWitchSkyUri(uri))); + assert.throws(() => themes.parseWitchSkyUri('at://did:plc:l37td5yhxl2irrzrgvei4qay/app.bsky.feed.post/3mvpzxkrbms25'), /complete WitchSky/); + assert.throws(() => themes.parseWitchSkyUri('https://example.com/theme'), /complete WitchSky/); +}); + +test('WitchSky did:web URIs resolve root and path DID documents safely', () => { + const uri = 'at://did:web:vessel.darkworld.download/app.witchsky.theme.colors/3mv3ih7bfgs2m'; + assert.deepEqual(plain(themes.parseWitchSkyUri(uri)), { + uri, + repo: 'did:web:vessel.darkworld.download', + rkey: '3mv3ih7bfgs2m', + didDocumentUrl: 'https://vessel.darkworld.download/.well-known/did.json', + }); + assert.equal(themes.parseWitchSkyUri( + 'at://did:web:example.test%3A8443:team:alice/app.witchsky.theme.colors/abc123', + ).didDocumentUrl, 'https://example.test:8443/team/alice/did.json'); + assert.equal(themes.parseWitchSkyUri( + 'at://did:web:example.test:team%20one/app.witchsky.theme.colors/abc123', + ).didDocumentUrl, 'https://example.test/team%20one/did.json'); + for (const repo of [ + 'did:web:bad host.example', + 'did:web:example.test%2F..', + 'did:web:example.test:..', + 'did:web:example.test:%2Fadmin', + 'did:web:example.test:%ZZ', + ]) { + assert.throws(() => themes.parseWitchSkyUri(`at://${repo}/app.witchsky.theme.colors/abc123`), /complete WitchSky/); + } +}); + +test('WitchSky base and variants become separate complete Bsky+ themes', () => { + const record = { + $type: 'app.witchsky.theme.colors', + name: 'Coffee', + base: { name: 'Default', colors: { + canvas: '#1c1310', surface: '#2e2018', surfaceRaised: '#251a15', text: '#f4deb8', + textMuted: '#e8c28a', border: '#3d2b1f', accent: '#d4975c', accentSoft: '#4d3828', + onAccent: '#2c221a', positive: '#4caf7d', warning: '#e2b76f', critical: '#e06c6c', favorite: '#cc5577', + } }, + variants: [ + { name: 'Light', colors: { canvas: '#f7f2e9', surface: '#efe3d0', surfaceRaised: '#fdf8f0', text: '#1c1310' } }, + { name: 'Dark', colors: { canvas: '#050505', surface: '#171717', surfaceRaised: '#111111', text: '#f7f1e8' } }, + ], + }; + const imported = plain(themes.witchSkyThemes(record)); + + assert.deepEqual(imported.map(theme => theme.name), ['Coffee — Default', 'Coffee — Light', 'Coffee — Dark']); + assert.deepEqual(imported.map(theme => theme.base), ['dark', 'light', 'dark']); + assert.equal(imported[0].colors.background, '#1C1310'); + assert.equal(imported[0].colors.primary, '#D4975C'); + assert.equal(imported[0].colors.negative, '#E06C6C'); + assert.equal(imported[0].colors.like, '#CC5577'); + assert.equal(imported[1].colors.background, '#F7F2E9'); + assert.equal(imported[1].colors.positive, '#4CAF7D'); + imported.forEach(theme => assert.doesNotThrow(() => themes.validateTheme(theme))); +}); + +test('WitchSky conversion rejects malformed records and translucent colors', () => { + assert.throws(() => themes.witchSkyThemes(null), /not a WitchSky/); + assert.throws(() => themes.witchSkyThemes({ $type: 'app.witchsky.theme.colors', name: 'Broken', base: { colors: {} } }), /missing/); + assert.throws(() => themes.witchSkyThemes({ + $type: 'app.witchsky.theme.colors', name: 'Broken', + base: { colors: { canvas: '#00000080' } }, + }), /opaque/); +}); + +test('source palettes produce exact ALF light, dark, and dim inversions', () => { + const light = themes.palette('light'); + const dark = themes.palette('dark'); + const dim = themes.palette('dim'); + + assert.equal(light.contrast_0, '#FFFFFF'); + assert.equal(light.primary_25, '#F5F9FF'); + assert.equal(light.primary_500, '#006AFF'); + assert.equal(dark.contrast_0, '#000000'); + assert.equal(dark.contrast_1000, '#FFFFFF'); + assert.equal(dark.primary_25, '#001533'); + assert.equal(dark.primary_500, '#006AFF'); + assert.equal(dim.contrast_0, '#151D28'); + assert.equal(dim.primary_25, '#122136'); + assert.equal(dim.primary_500, '#0F73FF'); + assert.equal(dim.negative_975, '#FFF5F7'); +}); + +test('mapping is property-aware for neutral surfaces, borders, and text', () => { + const theme = validTheme({ + colors: { + ...themes.PRESETS.light, + background: '#101112', + hover: '#202122', + border: '#303132', + borderStrong: '#404142', + text: '#505152', + textMuted: '#606162', + textSubtle: '#707172', + textInverse: '#808182', + }, + }); + + assert.equal(themes.mapColor('#DCE2EA', 'background-color', theme, 'light'), '#202122'); + assert.equal(themes.mapColor('#DCE2EA', 'border-color', theme, 'light'), '#303132'); + assert.notEqual(themes.mapColor('#DCE2EA', 'color', theme, 'light'), '#202122'); + assert.equal(themes.mapColor('#000000', 'color', theme, 'light'), '#505152'); + assert.equal(themes.mapColor('#FFFFFF', 'color', theme, 'dark'), '#505152'); + assert.equal(themes.mapColor('#DCE2EA', 'outline-color', theme, 'light'), theme.colors.focus); +}); + +test('mapping handles primary, like, error, alpha overlays, and shadows separately', () => { + const theme = validTheme({ + colors: { + ...themes.PRESETS.light, + primary: '#112233', primaryHover: '#223344', primaryMuted: '#334455', link: '#445566', + like: '#556677', negative: '#667788', negativeMuted: '#778899', + overlay: '#8899AA', shadow: '#99AABB', + }, + }); + + assert.equal(themes.mapColor('#006AFF', 'background-color', theme, 'light'), '#112233'); + assert.equal(themes.mapColor('#006AFF', 'color', theme, 'light'), '#445566'); + assert.equal(themes.mapColor('#EC4899', 'fill', theme, 'light'), '#556677'); + assert.equal(themes.mapColor('#E91646', 'color', theme, 'light'), '#667788'); + assert.equal(themes.mapColor('rgba(0, 0, 0, 0.5)', 'background-color', theme, 'light'), 'rgba(136, 153, 170, 0.5)'); + assert.equal(themes.mapColor('#00000080', 'box-shadow', theme, 'light'), 'rgba(153, 170, 187, 0.5019607843137255)'); + assert.equal(themes.mapColor('transparent', 'background-color', theme, 'light'), null); + assert.equal(themes.mapColor('#123456', 'color', theme, 'light'), null); +}); + +test('contrast ratios use WCAG relative luminance', () => { + assert.equal(themes.contrastRatio('#000000', '#FFFFFF'), 21); + assert.equal(themes.contrastRatio('#123456', '#123456'), 1); + assert.equal(themes.contrastRatio('#123456', '#FEDCBA'), themes.contrastRatio('#FEDCBA', '#123456')); + assert.ok(themes.contrastRatio('#1D3A5F', '#FFFFFF') >= 4.5); +}); + +test('built-in Bluesky themes remain active choices and cannot be shadowed in saved libraries', () => { + const light = themes.BUILTIN_THEMES['bluesky-light']; + assert.deepEqual(Object.keys(themes.BUILTIN_THEMES).filter(id => id.startsWith('bluesky-')), + ['bluesky-light', 'bluesky-dim', 'bluesky-dark']); + assert.equal(light.name, 'Bluesky Light'); + assert.equal(themes.normalizeLibrary({ schemaVersion: 1, activeId: light.id, themes: [] }).activeId, light.id); + const impostor = { ...light, colors: { ...light.colors } }; + assert.deepEqual(plain(themes.normalizeLibrary({ schemaVersion: 1, activeId: light.id, themes: [impostor] })), { + schemaVersion: 1, activeId: light.id, themes: [], + }); +}); + +test('included Helium themes preserve imported names and palettes as frozen builtins', () => { + const ids = [ + 'bskyplus-coffee-espresso-light', + 'bskyplus-floras-moat-floras-moat', + 'bskyplus-witchsky-mu-pink-midnight', + 'bskyplus-snuffbait-dark-coven', + 'bskyplus-latte-mauve', + ]; + const imported = ids.map(id => themes.BUILTIN_THEMES[id]); + assert.deepEqual(imported.map(theme => theme.name), [ + 'Coffee / Espresso — Light', + "Flora's Moat — Flora's Moat", + 'Witchsky + mu Pink — Midnight', + 'snuffbait dark — Coven', + 'Latte — Mauve', + ]); + assert.deepEqual(imported.map(theme => theme.base), ['light', 'dark', 'dark', 'dark', 'light']); + assert.deepEqual(Object.keys(themes.PRESETS), ['light', 'dim', 'dark'], + 'the existing light, dim, and dark factories remain unchanged'); + + for (let index = 0; index < imported.length; index += 1) { + const theme = imported[index]; + assert.ok(theme, `included theme ${ids[index]} exists`); + assert.equal(theme.id, ids[index]); + assert.equal(themes.isBuiltinTheme(theme.id), true); + assert.deepEqual(plain(themes.validateTheme(theme)), plain(theme)); + assert.deepEqual(Object.keys(theme.colors).sort(), [...themes.KEYS].sort()); + assert.equal(Object.isFrozen(theme), true); + assert.equal(Object.isFrozen(theme.colors), true); + } + assert.equal(imported[0].colors.primary, '#A55A1F'); + assert.equal(imported[1].colors.background, '#333333'); + assert.equal(imported[2].colors.background, '#150B08'); + assert.equal(imported[3].colors.text, '#FFE0FF'); + assert.equal(imported[4].colors.primary, '#8839EF'); + + assert.equal(themes.normalizeLibrary(undefined).activeId, null, + 'adding included themes does not auto-activate one'); + const userTheme = validTheme({id: 'existing-user-theme', name: 'Existing user theme'}); + const saved = themes.normalizeLibrary({schemaVersion: 1, activeId: userTheme.id, themes: [userTheme]}); + assert.equal(saved.activeId, userTheme.id, 'an existing user theme remains active'); + assert.deepEqual(plain(saved.themes), [plain(themes.validateTheme(userTheme))]); + + const activeBuiltin = themes.normalizeLibrary({schemaVersion: 1, activeId: imported[0].id, themes: []}); + assert.equal(activeBuiltin.activeId, imported[0].id, 'included themes can be selected without storing a copy'); + const shadowedBuiltin = themes.normalizeLibrary({schemaVersion: 1, activeId: imported[0].id, themes: [imported[0]]}); + assert.deepEqual(plain(shadowedBuiltin), {schemaVersion: 1, activeId: imported[0].id, themes: []}); +}); diff --git a/test/test_theme_runtime.mjs b/test/test_theme_runtime.mjs new file mode 100644 index 0000000..1bab204 --- /dev/null +++ b/test/test_theme_runtime.mjs @@ -0,0 +1,317 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +const executablePath = process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'; +const model = await readFile('extension/shared/theme-model.js', 'utf8'); +const runtime = await readFile('extension/shared/theme-runtime.js', 'utf8'); +const integratedSettings = await readFile('extension/shared/integrated-settings.js', 'utf8'); + +test('themes cover stylesheet, inline, SVG, pseudo-element and dynamic states, then restore native styles', async () => { + const browser = await puppeteer.launch({ executablePath, headless: true }); + const page = await browser.newPage(); + try { + await page.goto('https://example.com'); + await page.setContent(` +
handle
+ + Link +
Text
+
Custom text and background
+ + +
+ +
+
+
Composer
+ `); + await page.evaluate(() => { + window.listeners = []; + window.initialThemeRead = new Promise(resolve => { window.resolveInitialThemeRead = resolve; }); + window.chrome = { storage: { + local: { get: () => window.initialThemeRead }, + onChanged: { addListener: fn => window.listeners.push(fn) }, + } }; + }); + // UUIDs are supplied here so fixtures also work in restricted browser environments. + await page.addScriptTag({ content: model }); + await page.addScriptTag({ content: runtime }); + const original = await page.$eval('#inline', el => el.getAttribute('style')); + const photo = await page.$eval('#photo', el => el.src); + await page.evaluate(() => { + const m = window.BskyPlusThemes; + const theme = { schemaVersion: 1, id: 'test-theme', name: 'Test theme', base: 'dark', colors: { + ...m.PRESETS.dark, background: '#102030', surface: '#203040', surfaceRaised: '#304050', + text: '#F1F2F3', textMuted: '#AABBCC', textSubtle: '#8899AA', border: '#556677', + primary: '#AA3300', primaryHover: '#BB4400', link: '#55DDFF', onPrimary: '#EEEECC', + like: '#FF55AA', positive: '#33CC88', overlay: '#112233', shadow: '#223344', + } }; + window.library = { schemaVersion: 1, activeId: theme.id, themes: [theme] }; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: window.library } }, 'local')); + window.resolveInitialThemeRead({ bskyplusThemes: window.library }); + }); + const color = (selector, property, pseudo) => page.$eval(selector, (el, property, pseudo) => getComputedStyle(el, pseudo)[property], property, pseudo); + await page.waitForFunction(() => getComputedStyle(document.body).backgroundColor === 'rgb(16, 32, 48)'); + assert.equal(await color('body', 'backgroundColor'), 'rgb(16, 32, 48)'); + assert.equal(await color('.post', 'backgroundColor'), 'rgb(32, 48, 64)'); + assert.equal(await color('.post', 'borderTopColor'), 'rgb(85, 102, 119)'); + assert.equal(await color('.composer-edge', 'borderTopColor'), 'rgba(0, 0, 0, 0)'); + assert.equal(await color('.composer-edge', 'borderBottomColor'), 'rgba(0, 0, 0, 0)'); + await page.$eval('.composer-edge', element => { + element.style.borderTopColor = '#DCE2EA'; + element.style.borderBottomColor = '#DCE2EA'; + }); + await page.waitForFunction(() => + getComputedStyle(document.querySelector('.composer-edge')).borderTopColor === 'rgb(85, 102, 119)'); + assert.equal(await color('.composer-edge', 'borderBottomColor'), 'rgb(85, 102, 119)'); + await page.$eval('.composer-edge', element => { + element.style.borderTopColor = 'transparent'; + element.style.borderBottomColor = 'transparent'; + }); + await page.waitForFunction(() => + getComputedStyle(document.querySelector('.composer-edge')).borderTopColor === 'rgba(0, 0, 0, 0)'); + assert.equal(await color('.composer-edge', 'borderBottomColor'), 'rgba(0, 0, 0, 0)'); + assert.equal(await color('.muted', 'color'), 'rgb(170, 187, 204)'); + assert.equal(await color('.primary', 'backgroundColor'), 'rgb(170, 51, 0)'); + assert.equal(await color('.white', 'color'), 'rgb(238, 238, 204)'); + await page.hover('.primary'); + assert.equal(await color('.primary', 'backgroundColor'), 'rgb(187, 68, 0)'); + assert.equal(await color('input', 'color', '::placeholder'), 'rgb(136, 153, 170)'); + assert.equal(await color('.media', 'color'), 'rgb(85, 221, 255)'); + assert.equal(await color('#inline', 'backgroundColor'), 'rgb(48, 64, 80)'); + assert.equal(await color('#root', 'color'), 'rgb(18, 52, 86)'); + assert.equal(await color('#root', 'backgroundColor'), 'rgba(0, 0, 0, 0)'); + assert.equal(await color('#like', 'fill'), 'rgb(255, 85, 170)'); + assert.equal(await color('#repost', 'stroke'), 'rgb(51, 204, 136)'); + assert.equal(await color('#verified', 'fill'), 'rgb(238, 238, 204)'); + assert.equal(await color('#overlay', 'backgroundColor'), 'rgba(17, 34, 51, 0.6)'); + assert.match(await color('.shadow', 'boxShadow'), /rgba\(34, 51, 68, 0.4\)/); + assert.equal(await page.$eval('#inline', el => el.getAttribute('style')), original); + await page.$eval('#root', element => { + element.style.color = '#234567'; + element.style.backgroundColor = '#654321'; + }); + await page.waitForFunction(() => { + const style = getComputedStyle(document.querySelector('#root')); + return style.color === 'rgb(35, 69, 103)' && style.backgroundColor === 'rgb(101, 67, 33)'; + }); + await page.$eval('#root', element => { + element.style.removeProperty('color'); + element.style.removeProperty('background-color'); + }); + await page.waitForFunction(() => { + const style = getComputedStyle(document.querySelector('#root')); + return style.color === 'rgb(241, 242, 243)' && style.backgroundColor === 'rgb(16, 32, 48)'; + }); + assert.equal(await page.$eval('#photo', el => el.src), photo); + assert.match(await color('#art', 'backgroundImage'), /rgb\(0, 106, 255\)/); + assert.match(await color('#fade', 'backgroundImage'), /rgb\(16, 32, 48\)/); + + await page.evaluate(() => { + window.previewStartedAt = performance.now(); + const preview = structuredClone(window.library.themes[0]); + preview.id = 'preview-theme'; + preview.colors.background = '#654321'; + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: preview })); + }); + await page.waitForFunction(() => document.getAnimations().some(animation => + animation.effect.pseudoElement === '::view-transition-old(root)' || + animation.effect.pseudoElement === '::view-transition-new(root)')); + const previewState = await page.evaluate(() => ({ + background: getComputedStyle(document.body).backgroundColor, + elementAnimations: document.body.getAnimations().length, + durations: [...new Set(document.getAnimations() + .filter(animation => animation.effect.pseudoElement === '::view-transition-old(root)' || + animation.effect.pseudoElement === '::view-transition-new(root)') + .map(animation => animation.effect.getTiming().duration))], + })); + assert.equal(previewState.background, 'rgb(101, 67, 33)'); + assert.equal(previewState.elementAnimations, 0); + assert.deepEqual(previewState.durations, [1000]); + assert.equal(await page.$eval('html', element => element.getAttribute('data-bskyplus-theme-active')), 'preview-theme'); + await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'reduce' }]); + await page.waitForFunction(() => !document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + const cancellationElapsed = await page.evaluate(() => performance.now() - window.previewStartedAt); + assert.ok(cancellationElapsed < 900, `reduced motion cancels the active transition promptly (${cancellationElapsed}ms)`); + await page.evaluate(() => { + const preview = structuredClone(window.library.themes[0]); + preview.id = 'reduced-preview-theme'; + preview.colors.background = '#123456'; + window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: preview })); + }); + await page.waitForFunction(() => document.documentElement.dataset.bskyplusThemeActive === 'reduced-preview-theme'); + assert.equal(await page.evaluate(() => document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))), false); + assert.equal(await color('body', 'backgroundColor'), 'rgb(18, 52, 86)'); + await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'no-preference' }]); + await page.evaluate(() => window.dispatchEvent(new CustomEvent('bskyplus:theme-preview', { detail: null }))); + assert.equal(await color('body', 'backgroundColor'), 'rgb(16, 32, 48)'); + assert.equal(await page.$eval('html', element => element.getAttribute('data-bskyplus-theme-active')), 'test-theme'); + + await page.evaluate(() => { + document.querySelector('#inline').style.backgroundColor = '#F9FAFB'; + const extra = document.createElement('p'); + extra.id = 'dynamic'; extra.style.color = '#EC4899'; document.body.append(extra); + document.styleSheets[0].insertRule('.late { color: #006AFF; }'); + const late = document.createElement('span'); late.className = 'late'; document.body.append(late); + }); + await page.waitForFunction(() => getComputedStyle(document.querySelector('#dynamic')).color === 'rgb(255, 85, 170)'); + assert.equal(await color('#inline', 'backgroundColor'), 'rgb(32, 48, 64)'); + await page.waitForFunction(() => getComputedStyle(document.querySelector('.late')).color === 'rgb(85, 221, 255)'); + + await page.evaluate(() => { + history.replaceState(null, '', '/settings'); + const native = document.createElement('a'); + native.href = '/settings/about'; + const label = document.createElement('span'); + label.dir = 'auto'; label.style.color = '#000000'; label.textContent = 'About'; + native.append(label); document.body.append(native); + }); + await page.addScriptTag({ content: integratedSettings }); + await page.waitForSelector('[data-bskyplus-settings-link]'); + await page.evaluate(() => { + window.library.themes[0].colors.text = '#ABCDEF'; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: window.library } }, 'local')); + }); + await page.waitForFunction(() => getComputedStyle(document.querySelector('[data-bskyplus-settings-label]')).color === 'rgb(171, 205, 239)', { timeout: 2000 }); + assert.equal(await color('[data-bskyplus-settings-icon] path', 'fill'), 'rgb(171, 205, 239)'); + + await page.evaluate(() => { + document.documentElement.className = 'theme--dim'; + document.querySelector('#inline').style.backgroundColor = '#151D28'; + }); + await page.waitForFunction(() => getComputedStyle(document.querySelector('#inline')).backgroundColor === 'rgb(16, 32, 48)'); + await page.evaluate(() => { + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: { ...window.library, activeId: null } } }, 'local')); + }); + await page.waitForFunction(() => !document.documentElement.hasAttribute('data-bskyplus-theme-active')); + assert.equal(await page.$('#bskyplus-theme-style'), null); + assert.equal(await page.$('[data-bskyplus-theme-inline]'), null); + assert.equal(await color('.post', 'backgroundColor'), 'rgb(249, 250, 251)'); + assert.equal(await color('#like', 'fill'), 'rgb(236, 72, 153)'); + assert.equal(await color('#inline', 'backgroundColor'), 'rgb(21, 29, 40)'); + assert.equal(await color('#root', 'backgroundColor'), 'rgb(249, 250, 251)'); + assert.equal(await page.$eval('#root', element => element.getAttribute('style')), ''); + assert.equal(await color('[data-bskyplus-settings-label]', 'color'), 'rgb(0, 0, 0)'); + } finally { await browser.close(); } +}); + +test('runtime applies a persisted built-in theme ID without adding it to the saved library', async () => { + const browser = await puppeteer.launch({ executablePath, headless: true }); + const page = await browser.newPage(); + try { + await page.setContent(''); + await page.evaluate(() => { + const builtinId = 'bluesky-dark'; + window.chrome = { storage: { + local: { get: async () => ({ bskyplusThemes: { schemaVersion: 1, activeId: builtinId, themes: [] } }) }, + onChanged: { addListener: () => {} }, + } }; + }); + await page.addScriptTag({ content: model }); + await page.addScriptTag({ content: runtime }); + await page.waitForFunction(() => document.documentElement.dataset.bskyplusThemeActive === 'bluesky-dark'); + assert.equal(await page.$eval('html', element => element.dataset.bskyplusThemeActive), 'bluesky-dark'); + assert.equal(await page.evaluate(() => BskyPlusThemes.normalizeLibrary({ + schemaVersion: 1, activeId: 'bluesky-dark', themes: [], + }).themes.length), 0); + } finally { await browser.close(); } +}); + +test('popup theme selection animates palette changes after load and preserves runtime fallbacks', async () => { + const browser = await puppeteer.launch({ executablePath, headless: true }); + const page = await browser.newPage(); + try { + await page.goto('https://example.com'); + await page.setContent(''); + await page.evaluate(() => { + window.listeners = []; + window.themeRead = new Promise(resolve => { window.resolveThemeRead = resolve; }); + window.chrome = { storage: { + local: { get: () => window.themeRead }, + onChanged: { addListener: fn => window.listeners.push(fn) }, + } }; + }); + await page.addScriptTag({ content: model }); + await page.addScriptTag({ content: runtime }); + await page.evaluate(() => { + window.resolveThemeRead({ bskyplusThemes: { schemaVersion: 1, activeId: 'bluesky-dark', themes: [] } }); + return new Promise(resolve => setTimeout(resolve, 0)); + }); + await page.waitForFunction(() => document.documentElement.dataset.bskyplusThemeActive === 'bluesky-dark'); + const hasTransition = () => page.evaluate(() => document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + assert.equal(await hasTransition(), false, 'initial storage load applies without an animation'); + + await page.evaluate(() => { + const model = window.BskyPlusThemes; + const samePalette = { ...structuredClone(model.BUILTIN_THEMES['bluesky-dark']), id: 'same-palette', name: 'Same palette' }; + const library = { schemaVersion: 1, activeId: 'bluesky-dark', themes: [samePalette] }; + window.library = library; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: library } }, 'local')); + }); + assert.equal(await hasTransition(), false, 'unrelated library edits do not animate'); + await page.evaluate(() => { + const model = window.BskyPlusThemes; + const samePalette = { ...structuredClone(model.BUILTIN_THEMES['bluesky-dark']), id: 'same-palette', name: 'Same palette' }; + const library = { schemaVersion: 1, activeId: samePalette.id, themes: [samePalette] }; + window.library = library; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: library } }, 'local')); + }); + await page.waitForFunction(() => document.documentElement.dataset.bskyplusThemeActive === 'same-palette'); + assert.equal(await hasTransition(), false, 'selecting a theme with the same palette does not animate'); + + await page.evaluate(() => { + const model = window.BskyPlusThemes; + const popupTheme = { ...structuredClone(model.BUILTIN_THEMES['bluesky-dark']), id: 'popup-theme', name: 'Popup theme' }; + popupTheme.colors.background = '#123456'; + const library = { schemaVersion: 1, activeId: popupTheme.id, themes: [popupTheme] }; + window.library = library; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: library } }, 'local')); + }); + await page.waitForFunction(() => document.documentElement.dataset.bskyplusThemeActive === 'popup-theme'); + await page.waitForFunction(() => document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + const popupDurations = await page.evaluate(() => [...new Set(document.getAnimations() + .filter(animation => animation.effect.pseudoElement === '::view-transition-old(root)' || + animation.effect.pseudoElement === '::view-transition-new(root)') + .map(animation => animation.effect.getTiming().duration))]); + assert.deepEqual(popupDurations, [1000]); + await page.waitForFunction(() => !document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + + await page.evaluate(() => { + const library = { ...window.library, activeId: null }; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: library } }, 'local')); + }); + await page.waitForFunction(() => !document.documentElement.hasAttribute('data-bskyplus-theme-active')); + await page.waitForFunction(() => document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + await page.waitForFunction(() => !document.getAnimations().some(animation => + animation.effect.pseudoElement?.startsWith('::view-transition'))); + + await page.evaluate(() => { + Object.defineProperty(document, 'startViewTransition', { configurable: true, value: undefined }); + const popupTheme = { ...structuredClone(window.BskyPlusThemes.BUILTIN_THEMES['bluesky-dark']), id: 'fallback-theme' }; + const library = { schemaVersion: 1, activeId: popupTheme.id, themes: [popupTheme] }; + window.library = library; + window.listeners.forEach(fn => fn({ bskyplusThemes: { newValue: library } }, 'local')); + }); + await page.waitForFunction(() => document.documentElement.dataset.bskyplusThemeActive === 'fallback-theme'); + assert.equal(await hasTransition(), false, 'selection still applies when View Transitions are unavailable'); + } finally { await browser.close(); } +}); diff --git a/test/test_thread_unroll.mjs b/test/test_thread_unroll.mjs new file mode 100644 index 0000000..807201a --- /dev/null +++ b/test/test_thread_unroll.mjs @@ -0,0 +1,232 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import test from 'node:test'; +import puppeteer from 'puppeteer-core'; + +// Mirrors the anchor/linear post structure in Bluesky's PostThread components. +const profile = '/profile/alice.test'; +const icon = ''; +const controls = n => `
+
+
+
+
+
`; +const avatar = n => `Alice`; +// Current thread RichText has data-word-wrap, but no postText test ID. +const text = (n, total) => `
Part ${n}: a longer paragraph of the thread, with a link inside the text. ${n}/${total}
`; +const media = n => `
Thread attachment
`; +function child(n, total = 3, author = 'alice.test') { + return `
+
${avatar(n)}
+ +
${text(n, total)}
${media(n)}${controls(n)}
`; +} +// Use div for PostHider's outer linked RN-web view, avoiding invalid nested parsing. +const childMarkup = (...args) => child(...args).replace('