Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9bf9c94dd6 | ||
|
|
5696c89dee | ||
|
|
50d61371e1 |
@@ -20,7 +20,7 @@ jobs:
|
|||||||
id: release
|
id: release
|
||||||
run: |
|
run: |
|
||||||
python3 scripts/release/validate_release.py --github-output "$GITHUB_OUTPUT"
|
python3 scripts/release/validate_release.py --github-output "$GITHUB_OUTPUT"
|
||||||
backend_version=$(python3 -c "import re; text=open('backend/app/core/config.py').read(); print(re.search(r\"version: str = os\\.getenv\\('LINKLOG_VERSION', '([^']+)'\\)\", text).group(1))")
|
backend_version=$(python3 -c "import json; print(json.load(open('frontend/version.json'))['version'])")
|
||||||
if [ "${GITHUB_REF_NAME#v}" != "$backend_version" ]; then
|
if [ "${GITHUB_REF_NAME#v}" != "$backend_version" ]; then
|
||||||
echo "tag ${GITHUB_REF_NAME} does not match backend version $backend_version" >&2
|
echo "tag ${GITHUB_REF_NAME} does not match backend version $backend_version" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
+10
-1
@@ -1,6 +1,6 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Version v0.1.2
|
## Version v0.2.0
|
||||||
### Features
|
### Features
|
||||||
* Users can edit or delete labels created by themselves on the labels page
|
* Users can edit or delete labels created by themselves on the labels page
|
||||||
* Administrators can edit labels from the admin interface
|
* Administrators can edit labels from the admin interface
|
||||||
@@ -15,6 +15,15 @@
|
|||||||
* Brightened the Red theme surfaces and deepened its crimson accents
|
* Brightened the Red theme surfaces and deepened its crimson accents
|
||||||
* Allow every user to filter the feed using every available tag or label
|
* Allow every user to filter the feed using every available tag or label
|
||||||
* Bundle required web fonts during Docker image builds and serve them from LinkLog
|
* Bundle required web fonts during Docker image builds and serve them from LinkLog
|
||||||
|
* Bundle required web fonts during Docker image builds and serve them from LinkLog
|
||||||
|
* New Entry page warns when the title/URL combination already exists, matching the browser extension's duplicate warning
|
||||||
|
* New Entry page warns when an existing link with the same title has a different or missing URL (after tracking parameters are stripped)
|
||||||
|
* New Entry page auto-fills the title when the URL field loses focus, instead of requiring a manual button press
|
||||||
|
* Added a "Re-fetch Title" button to manually re-scrape the title after editing the URL
|
||||||
|
* New Entry duplicate detection and submission strip known tracking parameters (utm_*, gclid, fbclid, etc.) from URLs, mirroring the browser extension
|
||||||
|
* Browser extension popup now matches the New Entry page: it warns on duplicate title/URL, notes when the stored link has a different URL, and gained a "Re-fetch title" button; bumped extension version to 0.2.0
|
||||||
|
* Generate Firefox update metadata from every signed XPI with verified SHA-256 archive hashes
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* Fixed element ID conflict on the Admin page so Available Themes load correctly
|
* Fixed element ID conflict on the Admin page so Available Themes load correctly
|
||||||
* Positioned new-entry tag checkboxes after their label text
|
* Positioned new-entry tag checkboxes after their label text
|
||||||
|
|||||||
@@ -17,8 +17,9 @@ XPI_OUTPUT := $(XPI_UNSIGNED_DIR)/$(XPI_FILE)
|
|||||||
EXTENSION_FILES := manifest.json logo.svg icon-16.png icon-32.png icon-48.png icon-96.png options.css options.html options.js popup.css popup.html popup.js l10n.js _locales/en-US/messages.json _locales/es/messages.json _locales/de/messages.json _locales/fr/messages.json _locales/nl/messages.json
|
EXTENSION_FILES := manifest.json logo.svg icon-16.png icon-32.png icon-48.png icon-96.png options.css options.html options.js popup.css popup.html popup.js l10n.js _locales/en-US/messages.json _locales/es/messages.json _locales/de/messages.json _locales/fr/messages.json _locales/nl/messages.json
|
||||||
EXTENSION_SOURCES := $(addprefix webextension/,$(EXTENSION_FILES))
|
EXTENSION_SOURCES := $(addprefix webextension/,$(EXTENSION_FILES))
|
||||||
XPI_VALIDATOR := scripts/release/validate_xpi.py
|
XPI_VALIDATOR := scripts/release/validate_xpi.py
|
||||||
|
UPDATES_GENERATOR := scripts/release/generate_updates.py
|
||||||
|
|
||||||
.PHONY: all logos xpi check-tools clean-generated
|
.PHONY: all logos xpi update-updates check-tools clean-generated
|
||||||
|
|
||||||
all: logos
|
all: logos
|
||||||
|
|
||||||
@@ -28,6 +29,9 @@ logos: check-tools $(GENERATED_LOGOS)
|
|||||||
|
|
||||||
xpi: $(XPI_OUTPUT)
|
xpi: $(XPI_OUTPUT)
|
||||||
|
|
||||||
|
update-updates: $(UPDATES_GENERATOR) webextension/manifest.json
|
||||||
|
@python3 $(UPDATES_GENERATOR)
|
||||||
|
|
||||||
$(XPI_OUTPUT): $(EXTENSION_SOURCES) $(GENERATED_LOGOS) $(XPI_VALIDATOR)
|
$(XPI_OUTPUT): $(EXTENSION_SOURCES) $(GENERATED_LOGOS) $(XPI_VALIDATOR)
|
||||||
@test -n "$(EXTENSION_VERSION)" || { echo "Error: extension version is missing from webextension/manifest.json" >&2; exit 1; }
|
@test -n "$(EXTENSION_VERSION)" || { echo "Error: extension version is missing from webextension/manifest.json" >&2; exit 1; }
|
||||||
@mkdir -p $(XPI_UNSIGNED_DIR) $(XPI_SIGNED_DIR)
|
@mkdir -p $(XPI_UNSIGNED_DIR) $(XPI_SIGNED_DIR)
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ For local development:
|
|||||||
|
|
||||||
The backend currently uses FastAPI, uvicorn, SQLite, and Pydantic. `httpx2` is included for the Starlette-compatible test client.
|
The backend currently uses FastAPI, uvicorn, SQLite, and Pydantic. `httpx2` is included for the Starlette-compatible test client.
|
||||||
Jinja2 is included for server-rendered HTML templates.
|
Jinja2 is included for server-rendered HTML templates.
|
||||||
The backend version is `0.1.1` and is exposed through the FastAPI/OpenAPI metadata. It can be overridden with `LINKLOG_VERSION`.
|
The backend version is `0.2.0` and is exposed through the FastAPI/OpenAPI metadata. It is read from `frontend/version.json`, the single source of truth shared by the backend and frontend.
|
||||||
LinkLog is licensed under the GNU General Public License, version 3 or any later version. See [LICENSE](LICENSE).
|
LinkLog is licensed under the GNU General Public License, version 3 or any later version. See [LICENSE](LICENSE).
|
||||||
|
|
||||||
## Local Installation
|
## Local Installation
|
||||||
@@ -110,11 +110,11 @@ This publishes `${APP_PORT:-8000}` and defaults the application URL to `http://l
|
|||||||
|
|
||||||
## Releases
|
## Releases
|
||||||
|
|
||||||
Releases run in Gitea Actions when a `v*` tag is pushed. The Docker release version comes from `LINKLOG_VERSION`'s default in `backend/app/core/config.py`; the tag must match that backend version. The Firefox plugin version is independent and comes from the most recent signed `XPI/signed/LinkLog-<version>.xpi` checked into the repository.
|
Releases run in Gitea Actions when a `v*` tag is pushed. The Docker release version comes from `frontend/version.json`; the tag must match that version. The Firefox plugin version is independent and comes from the most recent signed `XPI/signed/LinkLog-<version>.xpi` checked into the repository.
|
||||||
|
|
||||||
The signed XPI is produced manually and should be checked into `XPI/signed/LinkLog-<version>.xpi`. The workflow validates the latest signed XPI's embedded manifest, publishes Docker images to `git.kolkman.org/olaf/link-log:<backend-version>` and `:latest`, and creates a release README that describes the project, the current backend/container version, and the raw signed XPI download URL with the plugin version.
|
The signed XPI is produced manually and should be checked into `XPI/signed/LinkLog-<version>.xpi`. Run `make update-updates` after adding a signed XPI to regenerate `webextension/updates.json` from every valid signed release artifact. The workflow validates the latest signed XPI's embedded manifest, publishes Docker images to `git.kolkman.org/olaf/link-log:<backend-version>` and `:latest`, and creates a release README that describes the project, the current backend/container version, and the raw signed XPI download URL with the plugin version.
|
||||||
|
|
||||||
The extension's `update_url` points at the stable raw repository URL `https://git.kolkman.org/olaf/Link-Log/raw/branch/main/webextension/updates.json`. Update `webextension/updates.json` with each signed XPI version and commit it together with the XPI. Release READMEs point to the raw signed XPI at `https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-<version>.xpi`.
|
The extension's `update_url` points at the stable raw repository URL `https://git.kolkman.org/olaf/Link-Log/raw/branch/main/webextension/updates.json`. Commit the regenerated `webextension/updates.json` together with each signed XPI. Release READMEs point to the raw signed XPI at `https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-<version>.xpi`.
|
||||||
|
|
||||||
The workflow requires Gitea Actions secrets named `REGISTRY_USERNAME`, `REGISTRY_TOKEN`, and `RELEASE_TOKEN`. `REGISTRY_TOKEN` is a Gitea access token with permission to push packages; `RELEASE_TOKEN` needs permission to create releases and upload release assets.
|
The workflow requires Gitea Actions secrets named `REGISTRY_USERNAME`, `REGISTRY_TOKEN`, and `RELEASE_TOKEN`. `REGISTRY_TOKEN` is a Gitea access token with permission to push packages; `RELEASE_TOKEN` needs permission to create releases and upload release assets.
|
||||||
|
|
||||||
|
|||||||
@@ -1424,3 +1424,69 @@ Don't let the frontend and plugin pull from the google foundry but make sure any
|
|||||||
|
|
||||||
### Assistant outcome
|
### Assistant outcome
|
||||||
Removed the web frontend's Google Fonts import and added a Docker build-time font bundling script. Image builds now download pinned Asset, DM Sans, and Space Grotesk files into `frontend/static/fonts`, generate a local `fonts.css`, and serve them through LinkLog at `/static/fonts`. The Firefox extension did not make Google Font requests and continues to use bundled assets with local fallback fonts. A clean image build confirmed all nine local font assets are present.
|
Removed the web frontend's Google Fonts import and added a Docker build-time font bundling script. Image builds now download pinned Asset, DM Sans, and Space Grotesk files into `frontend/static/fonts`, generate a local `fonts.css`, and serve them through LinkLog at `/static/fonts`. The Firefox extension did not make Google Font requests and continues to use bundled assets with local fallback fonts. A clean image build confirmed all nine local font assets are present.
|
||||||
|
|
||||||
|
### User
|
||||||
|
On the new-entry page follow the logic for existing pages that already exists in the plugin and display "This link already exists. Comment and tags can be updated, and by submitting publishing will be retriggered." when the link exists. Also assess if the Auto-fill title button is necessary, or if the functionality can be automated while the URL is entered.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Added a duplicate-check request (`GET /api/links/check`) to `new-entry.js`, triggered on URL/title blur, that shows the requested warning in a new `#duplicate-status` element and clears it as the fields are edited. Replaced the manual "Auto-fill Title" button with automatic scraping on URL blur (only filling the title when it is still empty and the URL actually changed), removing the now-unused button and CSS.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Also: detect as duplicate when the URL has arguments (not already stripped). And: add a button to re-fetch the title for if the URL has been fetched but the user still edits the field.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Added client-side stripping of known tracking parameters (`utm_*`, `gclid`, `fbclid`, etc.) mirroring the browser extension, applied consistently to the scrape lookup, duplicate check, and submission. Added a "Re-fetch Title" button next to the title field that force-refreshes the scraped title regardless of the auto-fill guard.
|
||||||
|
|
||||||
|
### User
|
||||||
|
If the link already exist with URL arguments then also display the warning, but add that the link has been stored additional parameters.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Extended the duplicate warning to note when the stored link had additional URL parameters stripped (e.g. tracking parameters) compared to the entered URL.
|
||||||
|
|
||||||
|
### User
|
||||||
|
I want this last change to be more precise: I do not want to be warned when parameters are stripped, but when the URL entered has arguments/parameters and the URL in the database has none or different ones (even after tracking parameters are stripped).
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Added `find_owned_link_by_title` in `link_service.py` and extended `GET /api/links/check` to return `{exists, url_matches, stored_url}`, detecting a title match with a differing URL in addition to an exact match. `new-entry.js` now only warns about a differing stored URL when `url_matches` is false, no longer warning solely because tracking parameters were stripped from an otherwise matching URL.
|
||||||
|
|
||||||
|
### User
|
||||||
|
In the check duplicate I have a `<br>` tag, but that shows as formatted text on the page, I want a real break to occur at that position.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Reworked `setStatus` in `new-entry.js` to split messages on `\n` and build real `<br>` elements via DOM APIs instead of relying on `textContent` (which escaped the literal `<br>`) or unsafe `innerHTML`.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Update VIBE and Changelog.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Appended the new-entry duplicate-detection and title auto-fill work to `VIBE/PROMPTS.md` and `VIBE/CHAT_LOG.md`, and added a Version v0.1.3 section to `CHANGELOG.MD`.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Make sure the webplugin has the same functionality as just implemented in the new-entry page. Increase its version number to 0.2.0.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Brought `webextension/popup.js` to parity with `new-entry.js`: the duplicate check now distinguishes an exact title/URL match from a title match with a differing stored URL (using the same `/api/links/check` `url_matches`/`stored_url` fields) and shows an additional localized note in the latter case; added a "Re-fetch title" button that calls the backend `/api/scrape` endpoint (guarded by existing backend-permission checks) and auto-fills the title on URL blur when empty; reworked `setStatus` to render real `<br>` line breaks via DOM APIs instead of `textContent`. Added `duplicateLinkDifferentUrl`, `refetchTitle`, and `titleFetchFailed` strings to all five locale files, updated `popup.html` with the new button, and bumped `manifest.json` to version `0.2.0`. Full backend test suite (36 tests) passed.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Add a feature to the Make file that updates the updates.json file based on available signed releases.
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Added `make update-updates`, which regenerates `webextension/updates.json` from valid versioned signed XPIs. The generator reads each packaged manifest, validates its version, add-on ID, and Firefox minimum version, and ignores non-release artifacts.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Add sha hashes to the updates.json
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Added Firefox-compatible `sha256:<hex>` update hashes generated from each signed XPI's bytes. Release validation now rejects missing or mismatched hashes; the generated metadata and release validator passed for signed versions 0.2.0 and 0.1.0.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Update changelog and VIBE
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Recorded the signed-XPI update metadata automation and SHA-256 integrity hashes in the v0.2.0 changelog and VIBE logs.
|
||||||
|
|
||||||
|
### User
|
||||||
|
Make sure that when the plugin is signed the version in the link it the about page is updated too
|
||||||
|
|
||||||
|
### Assistant outcome
|
||||||
|
Extended `make update-updates` to set the About page plugin download URL to the newest valid signed XPI. Release validation now also rejects an About page whose link does not match the latest signed artifact; verified with LinkLog 0.2.0.
|
||||||
|
|||||||
@@ -254,6 +254,20 @@
|
|||||||
235. I believe tag selection was still working for v0.1.0 - it is still broken
|
235. I believe tag selection was still working for v0.1.0 - it is still broken
|
||||||
236. Don't let the frontend and plugin pull from the google foundry but make sure any necessary fonts are served from the linklog server. I would prefer the fonts to be updated at docker image building time.
|
236. Don't let the frontend and plugin pull from the google foundry but make sure any necessary fonts are served from the linklog server. I would prefer the fonts to be updated at docker image building time.
|
||||||
|
|
||||||
|
## 2026-08-28
|
||||||
|
|
||||||
|
237. On the new-entry page follow the logic for existing pages that already exists in the plugin and display "This link already exists. Comment and tags can be updated, and by submitting publishing will be retriggered." when the link exists. Also assess if the Auto-fill title button is necessary, or if the functionality can be automated while the URL is entered.
|
||||||
|
238. Also: detect as duplicate when the URL has arguments (not already stripped). And: add a button to re-fetch the title for if the URL has been fetched but the user still edits the field.
|
||||||
|
239. If the link already exist with URL arguments then also display the warning, but add that the link has been stored additional parameters.
|
||||||
|
240. I want this last change to be more precise: I do not want to be warned when parameters are stripped, but when the URL entered has arguments/parameters and the URL in the database has none or different ones (even after tracking parameters are stripped).
|
||||||
|
241. In the check duplicate I have a `<br>` tag, but that shows as formatted text on the page, I want a real break to occur at that position.
|
||||||
|
242. Update VIBE and Changelog.
|
||||||
|
243. Make sure the webplugin has the same functionality as just implemented in the new-entry page. Increase its version number to 0.2.0.
|
||||||
|
244. Add a feature to the Make file that updates the updates.json file based on available signed releases.
|
||||||
|
245. Add sha hashes to the updates.json
|
||||||
|
246. Update changelog and VIBE
|
||||||
|
247. Make sure that when the plugin is signed the version in the link it the about page is updated too
|
||||||
|
|
||||||
## Future entries
|
## Future entries
|
||||||
|
|
||||||
Append each new user prompt here with its date and preserve the chronological order.
|
Append each new user prompt here with its date and preserve the chronological order.
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -6,7 +6,7 @@ from fastapi import APIRouter, Depends, Header, HTTPException, Response, status
|
|||||||
import logging
|
import logging
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
from backend.app.services.link_service import create_link, delete_link, find_owned_link_by_title_url, get_link_tags, get_owned_link, list_public_links, list_tags, mark_mastodon_posted, update_link
|
from backend.app.services.link_service import create_link, delete_link, find_owned_link_by_title, find_owned_link_by_title_url, get_link_tags, get_owned_link, list_public_links, list_tags, mark_mastodon_posted, update_link
|
||||||
from backend.app.database import get_connection
|
from backend.app.database import get_connection
|
||||||
from backend.app.services.plugin_manager import plugin_manager
|
from backend.app.services.plugin_manager import plugin_manager
|
||||||
from backend.app.services.token_service import validate_token
|
from backend.app.services.token_service import validate_token
|
||||||
@@ -65,7 +65,12 @@ def check_existing_link(
|
|||||||
if info is None:
|
if info is None:
|
||||||
raise HTTPException(status_code=401, detail='Token expired or invalid')
|
raise HTTPException(status_code=401, detail='Token expired or invalid')
|
||||||
record = find_owned_link_by_title_url(info['user_id'], title, url)
|
record = find_owned_link_by_title_url(info['user_id'], title, url)
|
||||||
return {'exists': record is not None}
|
if record is not None:
|
||||||
|
return {'exists': True, 'url_matches': True, 'stored_url': record['url']}
|
||||||
|
record = find_owned_link_by_title(info['user_id'], title)
|
||||||
|
if record is not None:
|
||||||
|
return {'exists': True, 'url_matches': False, 'stored_url': record['url']}
|
||||||
|
return {'exists': False, 'url_matches': None, 'stored_url': None}
|
||||||
|
|
||||||
|
|
||||||
@router.post('/links', status_code=status.HTTP_201_CREATED)
|
@router.post('/links', status_code=status.HTTP_201_CREATED)
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
## Copyright © 2026 Olaf Kolkman
|
## Copyright © 2026 Olaf Kolkman
|
||||||
## SPDX-License-Identifier: GPL-3.0-or-later
|
## SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass, field
|
||||||
|
import json
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
@@ -10,6 +11,7 @@ from cryptography.fernet import Fernet
|
|||||||
|
|
||||||
BASE_DIR = Path(__file__).resolve().parent.parent.parent
|
BASE_DIR = Path(__file__).resolve().parent.parent.parent
|
||||||
DB_PATH = BASE_DIR / 'data' / 'linklog.db'
|
DB_PATH = BASE_DIR / 'data' / 'linklog.db'
|
||||||
|
VERSION_FILE = BASE_DIR.parent / 'frontend' / 'version.json'
|
||||||
|
|
||||||
|
|
||||||
def normalize_public_url(value: str) -> str:
|
def normalize_public_url(value: str) -> str:
|
||||||
@@ -20,11 +22,19 @@ def normalize_public_url(value: str) -> str:
|
|||||||
return f'{scheme}://{value}'
|
return f'{scheme}://{value}'
|
||||||
|
|
||||||
|
|
||||||
|
def load_version() -> str:
|
||||||
|
# frontend/version.json is the single source of truth for the app version, shared by backend and frontend.
|
||||||
|
try:
|
||||||
|
return json.loads(VERSION_FILE.read_text())['version']
|
||||||
|
except (OSError, KeyError, ValueError):
|
||||||
|
return '0.0.0'
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Settings:
|
class Settings:
|
||||||
app_env: str = os.getenv('APP_ENV', 'development').lower()
|
app_env: str = os.getenv('APP_ENV', 'development').lower()
|
||||||
app_name: str = os.getenv('LINKLOG_APP_NAME', 'LinkLog')
|
app_name: str = os.getenv('LINKLOG_APP_NAME', 'LinkLog')
|
||||||
version: str = os.getenv('LINKLOG_VERSION', '0.1.1')
|
version: str = field(default_factory=load_version)
|
||||||
database_url: str = os.getenv('LINKLOG_DATABASE_URL', f'sqlite:///{DB_PATH}')
|
database_url: str = os.getenv('LINKLOG_DATABASE_URL', f'sqlite:///{DB_PATH}')
|
||||||
secret_key: str = os.getenv('LINKLOG_SECRET_KEY', 'dev-secret-key-change-me')
|
secret_key: str = os.getenv('LINKLOG_SECRET_KEY', 'dev-secret-key-change-me')
|
||||||
data_encryption_key: str = os.getenv('LINKLOG_DATA_ENCRYPTION_KEY', '')
|
data_encryption_key: str = os.getenv('LINKLOG_DATA_ENCRYPTION_KEY', '')
|
||||||
|
|||||||
@@ -123,6 +123,19 @@ def find_owned_link_by_title_url(user_id: str, title: str, url: str) -> dict | N
|
|||||||
return record
|
return record
|
||||||
|
|
||||||
|
|
||||||
|
def find_owned_link_by_title(user_id: str, title: str) -> dict | None:
|
||||||
|
with get_connection() as conn:
|
||||||
|
row = conn.execute(
|
||||||
|
'SELECT * FROM links WHERE user_id = ? AND title = ? ORDER BY created_at DESC LIMIT 1',
|
||||||
|
(user_id, title),
|
||||||
|
).fetchone()
|
||||||
|
if row is None:
|
||||||
|
return None
|
||||||
|
record = dict(row)
|
||||||
|
record['tags'] = get_link_tags(conn, record['id'])
|
||||||
|
return record
|
||||||
|
|
||||||
|
|
||||||
def list_public_links(username: str | None = None):
|
def list_public_links(username: str | None = None):
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
rows = conn.execute(
|
rows = conn.execute(
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
## SPDX-License-Identifier: GPL-3.0-or-later
|
## SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
from pathlib import Path
|
||||||
import threading
|
import threading
|
||||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||||
from urllib.parse import parse_qs
|
from urllib.parse import parse_qs
|
||||||
@@ -11,6 +12,7 @@ from unittest.mock import MagicMock, patch
|
|||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
from backend.app.main import app
|
from backend.app.main import app
|
||||||
|
from backend.app.core.config import settings
|
||||||
from backend.app.database import get_connection, hash_password
|
from backend.app.database import get_connection, hash_password
|
||||||
from backend.app.services.email_service import get_smtp_settings
|
from backend.app.services.email_service import get_smtp_settings
|
||||||
from backend.app.services.login_throttle import clear_login_failures
|
from backend.app.services.login_throttle import clear_login_failures
|
||||||
@@ -31,7 +33,7 @@ def login_headers(username='alice'):
|
|||||||
|
|
||||||
|
|
||||||
def test_login_returns_token():
|
def test_login_returns_token():
|
||||||
assert app.version == '0.1.1'
|
assert app.version == settings.version
|
||||||
response = client.post('/api/auth/login', json={
|
response = client.post('/api/auth/login', json={
|
||||||
'email': 'alice@example.com',
|
'email': 'alice@example.com',
|
||||||
'password': 'secret123',
|
'password': 'secret123',
|
||||||
@@ -806,7 +808,9 @@ def test_public_and_admin_pages_render_html():
|
|||||||
assert about_page.status_code == 200
|
assert about_page.status_code == 200
|
||||||
assert 'Save the good stuff' in about_page.text
|
assert 'Save the good stuff' in about_page.text
|
||||||
assert '<h2>Plugin</h2>' in about_page.text
|
assert '<h2>Plugin</h2>' in about_page.text
|
||||||
assert 'https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-0.1.0.xpi' in about_page.text
|
updates = json.loads((Path(__file__).resolve().parents[2] / 'webextension' / 'updates.json').read_text())
|
||||||
|
latest_update = updates['addons']['linklog@kolkman.org']['updates'][0]
|
||||||
|
assert latest_update['update_link'] in about_page.text
|
||||||
assert 'id="auth-about-link" href="/about"' in about_page.text
|
assert 'id="auth-about-link" href="/about"' in about_page.text
|
||||||
assert client.get('/admin').status_code == 200
|
assert client.get('/admin').status_code == 200
|
||||||
admin_page = client.get('/admin').text
|
admin_page = client.get('/admin').text
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: git.kolkman.org/olaf/link-log:development # or :latest or a version-tag
|
image: git.kolkman.org/olaf/link-log:${LINKLOG_VERSION:-latest} # or :development or a :version-tag
|
||||||
container_name: ${APP_CONTAINER_NAME:-linklog-app}
|
container_name: ${APP_CONTAINER_NAME:-linklog-app}
|
||||||
volumes:
|
volumes:
|
||||||
- ./linklog_data:/app/backend/data
|
- ./linklog_data:/app/backend/data
|
||||||
|
|||||||
@@ -11,8 +11,9 @@
|
|||||||
const existingTagsEl = document.getElementById('existing-tags');
|
const existingTagsEl = document.getElementById('existing-tags');
|
||||||
const mastodonPublishing = document.getElementById('mastodon-publishing');
|
const mastodonPublishing = document.getElementById('mastodon-publishing');
|
||||||
const mastodonEnabledCheckbox = document.getElementById('mastodon-enabled');
|
const mastodonEnabledCheckbox = document.getElementById('mastodon-enabled');
|
||||||
const scrapeButton = document.getElementById('scrape-button');
|
|
||||||
const scrapeStatus = document.getElementById('scrape-status');
|
const scrapeStatus = document.getElementById('scrape-status');
|
||||||
|
const duplicateStatus = document.getElementById('duplicate-status');
|
||||||
|
const refetchTitleButton = document.getElementById('refetch-title-button');
|
||||||
const submitButton = document.getElementById('submit-button');
|
const submitButton = document.getElementById('submit-button');
|
||||||
const submitStatus = document.getElementById('submit-status');
|
const submitStatus = document.getElementById('submit-status');
|
||||||
|
|
||||||
@@ -21,9 +22,14 @@
|
|||||||
let selectedTags = new Set();
|
let selectedTags = new Set();
|
||||||
let currentUser = null;
|
let currentUser = null;
|
||||||
|
|
||||||
// Utility function to add status messages
|
// Utility function to add status messages; splits on \n into real <br> line breaks without using innerHTML.
|
||||||
function setStatus(statusEl, message, isError = false) {
|
function setStatus(statusEl, message, isError = false) {
|
||||||
statusEl.textContent = message;
|
const lines = message.split('\n');
|
||||||
|
statusEl.replaceChildren(
|
||||||
|
...lines.flatMap((line, index) => (
|
||||||
|
index === 0 ? [document.createTextNode(line)] : [document.createElement('br'), document.createTextNode(line)]
|
||||||
|
)),
|
||||||
|
);
|
||||||
statusEl.className = `status ${isError ? 'error' : 'success'}`;
|
statusEl.className = `status ${isError ? 'error' : 'success'}`;
|
||||||
statusEl.classList.remove('hidden');
|
statusEl.classList.remove('hidden');
|
||||||
if (!isError) {
|
if (!isError) {
|
||||||
@@ -106,17 +112,29 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scrape URL for title
|
// Strip known tracking parameters so duplicate detection and scraping ignore them, mirroring the browser extension.
|
||||||
scrapeButton.addEventListener('click', async (e) => {
|
function removeKnownTrackingParams(urlString) {
|
||||||
e.preventDefault();
|
try {
|
||||||
const url = urlInput.value.trim();
|
const url = new URL(urlString);
|
||||||
if (!url) {
|
const known = new Set([
|
||||||
setStatus(scrapeStatus, 'Please enter a URL', true);
|
'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
|
||||||
return;
|
'utm_id', 'utm_name', 'gclid', 'fbclid', 'dclid', 'msclkid',
|
||||||
|
]);
|
||||||
|
for (const key of known) {
|
||||||
|
url.searchParams.delete(key);
|
||||||
|
}
|
||||||
|
return url.toString();
|
||||||
|
} catch (error) {
|
||||||
|
return urlString;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
scrapeButton.disabled = true;
|
// Fetch the page title for the given URL and fill it in, unless the user already typed one.
|
||||||
setStatus(scrapeStatus, 'Scraping...', false);
|
let lastScrapedUrl = null;
|
||||||
|
async function fetchTitle(url, { force = false } = {}) {
|
||||||
|
if (!url || (!force && (titleInput.value.trim() || url === lastScrapedUrl))) return;
|
||||||
|
|
||||||
|
setStatus(scrapeStatus, 'Looking up title...', false);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`/api/scrape?url=${encodeURIComponent(url)}`, {
|
const response = await fetch(`/api/scrape?url=${encodeURIComponent(url)}`, {
|
||||||
@@ -132,6 +150,7 @@
|
|||||||
throw new Error(`HTTP ${response.status}`);
|
throw new Error(`HTTP ${response.status}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lastScrapedUrl = url;
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
if (data.title) {
|
if (data.title) {
|
||||||
titleInput.value = data.title;
|
titleInput.value = data.title;
|
||||||
@@ -142,16 +161,67 @@
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Scrape error:', error);
|
console.error('Scrape error:', error);
|
||||||
setStatus(scrapeStatus, `Error: ${error.message}`, true);
|
setStatus(scrapeStatus, `Error: ${error.message}`, true);
|
||||||
} finally {
|
|
||||||
scrapeButton.disabled = false;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
urlInput.addEventListener('blur', async () => {
|
||||||
|
await fetchTitle(removeKnownTrackingParams(urlInput.value.trim()));
|
||||||
|
checkDuplicate();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
refetchTitleButton.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const url = removeKnownTrackingParams(urlInput.value.trim());
|
||||||
|
if (!url) {
|
||||||
|
setStatus(scrapeStatus, 'Please enter a URL', true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
titleInput.value = '';
|
||||||
|
fetchTitle(url, { force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
// Warn when the URL/title combination already exists for this user, mirroring the browser extension.
|
||||||
|
titleInput.addEventListener('blur', checkDuplicate);
|
||||||
|
|
||||||
|
urlInput.addEventListener('input', () => duplicateStatus.classList.add('hidden'));
|
||||||
|
titleInput.addEventListener('input', () => duplicateStatus.classList.add('hidden'));
|
||||||
|
|
||||||
|
async function checkDuplicate() {
|
||||||
|
const url = removeKnownTrackingParams(urlInput.value.trim());
|
||||||
|
const title = titleInput.value.trim();
|
||||||
|
if (!url || !title) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/links/check?${new URLSearchParams({ title, url })}`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
});
|
||||||
|
if (!response.ok) return;
|
||||||
|
const data = await response.json();
|
||||||
|
if (data.exists) {
|
||||||
|
// Re-derive the match locally: browser URL normalization (e.g. trailing slashes) can
|
||||||
|
// make the server's raw string comparison disagree even when the URLs are equivalent.
|
||||||
|
const urlMatches = data.url_matches || (data.stored_url && removeKnownTrackingParams(data.stored_url) === url);
|
||||||
|
let message = 'This link already exists. ';
|
||||||
|
if (!urlMatches) {
|
||||||
|
message += 'But, the stored link has a different URL (missing or different parameters).';
|
||||||
|
message += '\nWhen you save the entry you risk a duplicate entry.';
|
||||||
|
} else {
|
||||||
|
message += '\nYou can still save the entry, which will update the existing entry\'s comment and or tags.';
|
||||||
|
}
|
||||||
|
setStatus(duplicateStatus, message, true);
|
||||||
|
} else {
|
||||||
|
duplicateStatus.classList.add('hidden');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// Duplicate checking is advisory; submission remains available.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Handle form submission
|
// Handle form submission
|
||||||
entryForm.addEventListener('submit', async (e) => {
|
entryForm.addEventListener('submit', async (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
const url = urlInput.value.trim();
|
const url = removeKnownTrackingParams(urlInput.value.trim());
|
||||||
const title = titleInput.value.trim();
|
const title = titleInput.value.trim();
|
||||||
const comment = commentInput.value.trim();
|
const comment = commentInput.value.trim();
|
||||||
const newTags = newTagsInput.value.trim();
|
const newTags = newTagsInput.value.trim();
|
||||||
|
|||||||
@@ -1133,8 +1133,7 @@ button:disabled {
|
|||||||
transition: all 0.2s ease;
|
transition: all 0.2s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-actions button[type='submit'],
|
.form-actions button[type='submit'] {
|
||||||
#scrape-button:not(:disabled) {
|
|
||||||
background: var(--mauve);
|
background: var(--mauve);
|
||||||
border: 1px solid var(--mauve);
|
border: 1px solid var(--mauve);
|
||||||
color: var(--crust);
|
color: var(--crust);
|
||||||
@@ -1150,22 +1149,6 @@ button:disabled {
|
|||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
|
|
||||||
#scrape-button {
|
|
||||||
background: var(--surface-1);
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
color: var(--text);
|
|
||||||
}
|
|
||||||
|
|
||||||
#scrape-button:not(:disabled):hover {
|
|
||||||
background: var(--surface-2);
|
|
||||||
border-color: var(--text);
|
|
||||||
}
|
|
||||||
|
|
||||||
#scrape-button:disabled {
|
|
||||||
opacity: 0.6;
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-actions a {
|
.form-actions a {
|
||||||
background: var(--surface-1);
|
background: var(--surface-1);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
<section class="link-item">
|
<section class="link-item">
|
||||||
<h2>Plugin</h2>
|
<h2>Plugin</h2>
|
||||||
<p>Install the Firefox plugin to save links directly from your browser. <a
|
<p>Install the Firefox plugin to save links directly from your browser. <a
|
||||||
href="https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-0.1.0.xpi"
|
href="https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-0.2.0.xpi"
|
||||||
download>Download and install the Plugin</a>.</p>
|
download>Download and install the Plugin</a>.</p>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -52,7 +52,6 @@
|
|||||||
<span>URL</span>
|
<span>URL</span>
|
||||||
<input id="url-input" name="url" type="url" required placeholder="https://example.com" />
|
<input id="url-input" name="url" type="url" required placeholder="https://example.com" />
|
||||||
</label>
|
</label>
|
||||||
<button id="scrape-button" class="secondary" type="button">Auto-fill Title</button>
|
|
||||||
<div id="scrape-status" class="status hidden" aria-live="polite"></div>
|
<div id="scrape-status" class="status hidden" aria-live="polite"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -61,8 +60,11 @@
|
|||||||
<span>Title</span>
|
<span>Title</span>
|
||||||
<input id="title-input" name="title" type="text" required />
|
<input id="title-input" name="title" type="text" required />
|
||||||
</label>
|
</label>
|
||||||
|
<button id="refetch-title-button" class="secondary" type="button">Re-fetch Title</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="duplicate-status" class="status hidden" aria-live="polite"></div>
|
||||||
|
|
||||||
<div class="form-section">
|
<div class="form-section">
|
||||||
<label>
|
<label>
|
||||||
<span>Comment</span>
|
<span>Comment</span>
|
||||||
@@ -101,6 +103,6 @@
|
|||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<script src="/static/auth-header.js"></script>
|
<script src="/static/auth-header.js"></script>
|
||||||
<script src="/static/new-entry.js?v=2"></script>
|
<script src="/static/new-entry.js?v=8"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"version": "0.1.1"
|
"version": "0.2.0"
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Generate Firefox update metadata from LinkLog signed XPI artifacts."""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
import zipfile
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
|
SIGNED_DIR = ROOT / 'XPI' / 'signed'
|
||||||
|
MANIFEST_PATH = ROOT / 'webextension' / 'manifest.json'
|
||||||
|
UPDATES_PATH = ROOT / 'webextension' / 'updates.json'
|
||||||
|
ABOUT_TEMPLATE_PATH = ROOT / 'frontend' / 'templates' / 'about.html'
|
||||||
|
RAW_BASE_URL = 'https://git.kolkman.org/olaf/Link-Log/raw/branch/main'
|
||||||
|
XPI_NAME_RE = re.compile(r'LinkLog-(\d+\.\d+\.\d+)\.xpi')
|
||||||
|
ABOUT_XPI_URL_RE = re.compile(rf'{re.escape(RAW_BASE_URL)}/XPI/signed/LinkLog-\d+\.\d+\.\d+\.xpi')
|
||||||
|
|
||||||
|
|
||||||
|
def fail(message: str) -> None:
|
||||||
|
raise SystemExit(f'update metadata generation failed: {message}')
|
||||||
|
|
||||||
|
|
||||||
|
def version_key(version: str) -> tuple[int, int, int]:
|
||||||
|
return tuple(int(part) for part in version.split('.'))
|
||||||
|
|
||||||
|
|
||||||
|
def read_packaged_manifest(xpi_path: Path) -> dict:
|
||||||
|
try:
|
||||||
|
with zipfile.ZipFile(xpi_path) as archive:
|
||||||
|
if archive.testzip() is not None:
|
||||||
|
fail(f'{xpi_path.relative_to(ROOT)} contains a corrupt member')
|
||||||
|
return json.loads(archive.read('manifest.json'))
|
||||||
|
except (OSError, KeyError, json.JSONDecodeError, zipfile.BadZipFile) as error:
|
||||||
|
fail(f'could not read {xpi_path.relative_to(ROOT)}: {error}')
|
||||||
|
|
||||||
|
|
||||||
|
def sha256_digest(xpi_path: Path) -> str:
|
||||||
|
with xpi_path.open('rb') as xpi_file:
|
||||||
|
return hashlib.file_digest(xpi_file, 'sha256').hexdigest()
|
||||||
|
|
||||||
|
|
||||||
|
def update_about_plugin_link(xpi_path: Path) -> None:
|
||||||
|
about_template = ABOUT_TEMPLATE_PATH.read_text()
|
||||||
|
latest_xpi_url = f'{RAW_BASE_URL}/{xpi_path.relative_to(ROOT).as_posix()}'
|
||||||
|
updated_template, replacements = ABOUT_XPI_URL_RE.subn(latest_xpi_url, about_template)
|
||||||
|
if replacements != 1:
|
||||||
|
fail(f'expected one signed XPI link in {ABOUT_TEMPLATE_PATH.relative_to(ROOT)}; found {replacements}')
|
||||||
|
ABOUT_TEMPLATE_PATH.write_text(updated_template)
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
source_manifest = json.loads(MANIFEST_PATH.read_text())
|
||||||
|
addon_id = source_manifest.get('browser_specific_settings', {}).get('gecko', {}).get('id')
|
||||||
|
if not addon_id:
|
||||||
|
fail('webextension/manifest.json is missing browser_specific_settings.gecko.id')
|
||||||
|
|
||||||
|
releases = []
|
||||||
|
for xpi_path in SIGNED_DIR.glob('LinkLog-*.xpi'):
|
||||||
|
match = XPI_NAME_RE.fullmatch(xpi_path.name)
|
||||||
|
if not match:
|
||||||
|
continue
|
||||||
|
version = match.group(1)
|
||||||
|
manifest = read_packaged_manifest(xpi_path)
|
||||||
|
if manifest.get('version') != version:
|
||||||
|
fail(f'{xpi_path.relative_to(ROOT)} manifest version does not match its filename')
|
||||||
|
gecko = manifest.get('browser_specific_settings', {}).get('gecko', {})
|
||||||
|
if gecko.get('id') != addon_id:
|
||||||
|
fail(f'{xpi_path.relative_to(ROOT)} add-on id does not match webextension/manifest.json')
|
||||||
|
strict_min_version = gecko.get('strict_min_version')
|
||||||
|
if not strict_min_version:
|
||||||
|
fail(f'{xpi_path.relative_to(ROOT)} is missing browser_specific_settings.gecko.strict_min_version')
|
||||||
|
releases.append((version, xpi_path, strict_min_version, sha256_digest(xpi_path)))
|
||||||
|
|
||||||
|
if not releases:
|
||||||
|
fail(f'no signed LinkLog release artifacts found in {SIGNED_DIR.relative_to(ROOT)}')
|
||||||
|
|
||||||
|
releases.sort(key=lambda release: version_key(release[0]), reverse=True)
|
||||||
|
updates = [
|
||||||
|
{
|
||||||
|
'version': version,
|
||||||
|
'update_link': f'{RAW_BASE_URL}/{xpi_path.relative_to(ROOT).as_posix()}',
|
||||||
|
'update_hash': f'sha256:{digest}',
|
||||||
|
'applications': {
|
||||||
|
'gecko': {
|
||||||
|
'strict_min_version': strict_min_version,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for version, xpi_path, strict_min_version, digest in releases
|
||||||
|
]
|
||||||
|
UPDATES_PATH.write_text(json.dumps({'addons': {addon_id: {'updates': updates}}}, indent=2) + '\n')
|
||||||
|
update_about_plugin_link(releases[0][1])
|
||||||
|
print(f'updated {UPDATES_PATH.relative_to(ROOT)} with {len(updates)} signed release(s)')
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""Validate the version and checked-in artifacts for a LinkLog release."""
|
"""Validate the version and checked-in artifacts for a LinkLog release."""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
@@ -9,9 +10,12 @@ from pathlib import Path
|
|||||||
|
|
||||||
|
|
||||||
ROOT = Path(__file__).resolve().parents[2]
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
SETTINGS_PATH = ROOT / 'backend' / 'app' / 'core' / 'config.py'
|
VERSION_FILE = ROOT / 'frontend' / 'version.json'
|
||||||
SIGNED_DIR = ROOT / 'XPI' / 'signed'
|
SIGNED_DIR = ROOT / 'XPI' / 'signed'
|
||||||
MANIFEST_PATH = ROOT / 'webextension' / 'manifest.json'
|
MANIFEST_PATH = ROOT / 'webextension' / 'manifest.json'
|
||||||
|
UPDATES_PATH = ROOT / 'webextension' / 'updates.json'
|
||||||
|
ABOUT_TEMPLATE_PATH = ROOT / 'frontend' / 'templates' / 'about.html'
|
||||||
|
RAW_BASE_URL = 'https://git.kolkman.org/olaf/Link-Log/raw/branch/main'
|
||||||
VERSION_RE = re.compile(r'\d+\.\d+\.\d+')
|
VERSION_RE = re.compile(r'\d+\.\d+\.\d+')
|
||||||
|
|
||||||
|
|
||||||
@@ -34,12 +38,62 @@ def find_latest_signed_xpi() -> tuple[str, Path]:
|
|||||||
return max(candidates, key=lambda candidate: version_key(candidate[0]))
|
return max(candidates, key=lambda candidate: version_key(candidate[0]))
|
||||||
|
|
||||||
|
|
||||||
|
def validate_self_update(source_manifest: dict, extension_version: str, xpi_path: Path) -> None:
|
||||||
|
gecko_settings = source_manifest.get('browser_specific_settings', {}).get('gecko', {})
|
||||||
|
addon_id = gecko_settings.get('id')
|
||||||
|
strict_min_version = gecko_settings.get('strict_min_version')
|
||||||
|
if not addon_id:
|
||||||
|
fail('webextension/manifest.json is missing browser_specific_settings.gecko.id')
|
||||||
|
|
||||||
|
updates_data = json.loads(UPDATES_PATH.read_text())
|
||||||
|
addon_entry = updates_data.get('addons', {}).get(addon_id)
|
||||||
|
if not addon_entry:
|
||||||
|
fail(f'{UPDATES_PATH.relative_to(ROOT)} has no entry for add-on id {addon_id!r}')
|
||||||
|
|
||||||
|
entry = next((u for u in addon_entry.get('updates', []) if u.get('version') == extension_version), None)
|
||||||
|
if entry is None:
|
||||||
|
fail(
|
||||||
|
f'{UPDATES_PATH.relative_to(ROOT)} has no update entry for version {extension_version!r}; '
|
||||||
|
'add one alongside the signed XPI so the self-update mechanism can find it'
|
||||||
|
)
|
||||||
|
|
||||||
|
expected_link = f'{RAW_BASE_URL}/{xpi_path.relative_to(ROOT).as_posix()}'
|
||||||
|
if entry.get('update_link') != expected_link:
|
||||||
|
fail(
|
||||||
|
f'{UPDATES_PATH.relative_to(ROOT)} update_link {entry.get("update_link")!r} does not match '
|
||||||
|
f'the expected raw signed XPI URL {expected_link!r}'
|
||||||
|
)
|
||||||
|
|
||||||
|
with xpi_path.open('rb') as xpi_file:
|
||||||
|
expected_hash = f'sha256:{hashlib.file_digest(xpi_file, "sha256").hexdigest()}'
|
||||||
|
if entry.get('update_hash') != expected_hash:
|
||||||
|
fail(
|
||||||
|
f'{UPDATES_PATH.relative_to(ROOT)} update_hash {entry.get("update_hash")!r} does not match '
|
||||||
|
f'the SHA-256 hash of {xpi_path.relative_to(ROOT)}'
|
||||||
|
)
|
||||||
|
|
||||||
|
entry_min_version = entry.get('applications', {}).get('gecko', {}).get('strict_min_version')
|
||||||
|
if entry_min_version != strict_min_version:
|
||||||
|
fail(
|
||||||
|
f'{UPDATES_PATH.relative_to(ROOT)} applications.gecko.strict_min_version {entry_min_version!r} '
|
||||||
|
f'does not match webextension/manifest.json strict_min_version {strict_min_version!r}'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_about_plugin_link(xpi_path: Path) -> None:
|
||||||
|
expected_link = f'{RAW_BASE_URL}/{xpi_path.relative_to(ROOT).as_posix()}'
|
||||||
|
if expected_link not in ABOUT_TEMPLATE_PATH.read_text():
|
||||||
|
fail(
|
||||||
|
f'{ABOUT_TEMPLATE_PATH.relative_to(ROOT)} does not link to the latest signed XPI '
|
||||||
|
f'{xpi_path.relative_to(ROOT)}'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def main() -> None:
|
def main() -> None:
|
||||||
settings = SETTINGS_PATH.read_text()
|
version_data = json.loads(VERSION_FILE.read_text())
|
||||||
match = re.search(r"version: str = os\.getenv\('LINKLOG_VERSION', '([^']+)'\)", settings)
|
backend_version = version_data.get('version')
|
||||||
if not match:
|
if not backend_version:
|
||||||
fail('backend version default could not be found')
|
fail(f'version could not be found in {VERSION_FILE.relative_to(ROOT)}')
|
||||||
backend_version = match.group(1)
|
|
||||||
if not VERSION_RE.fullmatch(backend_version):
|
if not VERSION_RE.fullmatch(backend_version):
|
||||||
fail(f'backend version {backend_version} is not a valid three-part version')
|
fail(f'backend version {backend_version} is not a valid three-part version')
|
||||||
|
|
||||||
@@ -64,6 +118,9 @@ def main() -> None:
|
|||||||
if archive.testzip() is not None:
|
if archive.testzip() is not None:
|
||||||
fail('signed XPI contains a corrupt member')
|
fail('signed XPI contains a corrupt member')
|
||||||
|
|
||||||
|
validate_self_update(source_manifest, extension_version, xpi_path)
|
||||||
|
validate_about_plugin_link(xpi_path)
|
||||||
|
|
||||||
signed_xpi = xpi_path.relative_to(ROOT)
|
signed_xpi = xpi_path.relative_to(ROOT)
|
||||||
if len(sys.argv) == 3 and sys.argv[1] == '--github-output':
|
if len(sys.argv) == 3 and sys.argv[1] == '--github-output':
|
||||||
with Path(sys.argv[2]).open('a') as output:
|
with Path(sys.argv[2]).open('a') as output:
|
||||||
|
|||||||
@@ -42,7 +42,10 @@
|
|||||||
"submissionFailed": {"message": "Senden fehlgeschlagen"},
|
"submissionFailed": {"message": "Senden fehlgeschlagen"},
|
||||||
"linkSaved": {"message": "Link auf $URL$ gespeichert.", "placeholders": {"url": {"content": "$1"}}},
|
"linkSaved": {"message": "Link auf $URL$ gespeichert.", "placeholders": {"url": {"content": "$1"}}},
|
||||||
"linkAlreadyExists": {"message": "Dieser Link existiert bereits. Kommentar und Tags wurden aktualisiert und die Veröffentlichung erneut ausgelöst."},
|
"linkAlreadyExists": {"message": "Dieser Link existiert bereits. Kommentar und Tags wurden aktualisiert und die Veröffentlichung erneut ausgelöst."},
|
||||||
"duplicateLinkWarning": {"message": "Dieser Link existiert bereits. Kommentar und Tags können aktualisiert werden; beim Absenden wird die Veröffentlichung erneut ausgelöst."},
|
"duplicateLinkSameUrl": {"message": "Dieser Link existiert bereits.\nDu kannst den Eintrag trotzdem speichern; dabei werden Kommentar und Tags des bestehenden Eintrags aktualisiert."},
|
||||||
|
"duplicateLinkDifferentUrl": {"message": "Dieser Link existiert bereits. Der gespeicherte Link hat jedoch eine andere URL (fehlende oder andere Parameter).\nWenn du den Eintrag speicherst, riskierst du einen doppelten Eintrag."},
|
||||||
|
"refetchTitle": {"message": "Titel erneut abrufen"},
|
||||||
|
"titleFetchFailed": {"message": "Titel konnte nicht abgerufen werden"},
|
||||||
"publishingErrors": {"message": "Fehler bei der Veröffentlichung: $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
"publishingErrors": {"message": "Fehler bei der Veröffentlichung: $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
||||||
"submissionFailedConnection": {"message": "Senden fehlgeschlagen. Überprüfe die Verbindung zum Backend."},
|
"submissionFailedConnection": {"message": "Senden fehlgeschlagen. Überprüfe die Verbindung zum Backend."},
|
||||||
"loggedInAt": {"message": "$USERNAME$ ist bei $BACKEND$ angemeldet", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
"loggedInAt": {"message": "$USERNAME$ ist bei $BACKEND$ angemeldet", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
||||||
|
|||||||
@@ -133,8 +133,17 @@
|
|||||||
"linkAlreadyExists": {
|
"linkAlreadyExists": {
|
||||||
"message": "This link already exists. Comment and tags were updated, and publishing was retriggered."
|
"message": "This link already exists. Comment and tags were updated, and publishing was retriggered."
|
||||||
},
|
},
|
||||||
"duplicateLinkWarning": {
|
"duplicateLinkSameUrl": {
|
||||||
"message": "This link already exists. Comment and tags can be updated, and by submitting publishing will be retriggered."
|
"message": "This link already exists.\nYou can still save the entry, which will update the existing entry's comment and or tags."
|
||||||
|
},
|
||||||
|
"duplicateLinkDifferentUrl": {
|
||||||
|
"message": "This link already exists. But, the stored link has a different URL (missing or different parameters).\nWhen you save the entry you risk a duplicate entry."
|
||||||
|
},
|
||||||
|
"refetchTitle": {
|
||||||
|
"message": "Re-fetch title"
|
||||||
|
},
|
||||||
|
"titleFetchFailed": {
|
||||||
|
"message": "Could not fetch title"
|
||||||
},
|
},
|
||||||
"publishingErrors": {
|
"publishingErrors": {
|
||||||
"message": "Publishing errors: $ERRORS$",
|
"message": "Publishing errors: $ERRORS$",
|
||||||
|
|||||||
@@ -42,7 +42,10 @@
|
|||||||
"submissionFailed": {"message": "Error al enviar"},
|
"submissionFailed": {"message": "Error al enviar"},
|
||||||
"linkSaved": {"message": "Enlace guardado en $URL$.", "placeholders": {"url": {"content": "$1"}}},
|
"linkSaved": {"message": "Enlace guardado en $URL$.", "placeholders": {"url": {"content": "$1"}}},
|
||||||
"linkAlreadyExists": {"message": "Este enlace ya existe. Se actualizaron el comentario y las etiquetas, y se volvió a activar la publicación."},
|
"linkAlreadyExists": {"message": "Este enlace ya existe. Se actualizaron el comentario y las etiquetas, y se volvió a activar la publicación."},
|
||||||
"duplicateLinkWarning": {"message": "Este enlace ya existe. Puedes actualizar el comentario y las etiquetas; al enviarlo se volverá a activar la publicación."},
|
"duplicateLinkSameUrl": {"message": "Este enlace ya existe.\nAún puedes guardar la entrada, lo que actualizará el comentario y las etiquetas de la entrada existente."},
|
||||||
|
"duplicateLinkDifferentUrl": {"message": "Este enlace ya existe. Pero el enlace guardado tiene una URL diferente (parámetros ausentes o distintos).\nSi guardas la entrada, corres el riesgo de crear una entrada duplicada."},
|
||||||
|
"refetchTitle": {"message": "Volver a obtener el título"},
|
||||||
|
"titleFetchFailed": {"message": "No se pudo obtener el título"},
|
||||||
"publishingErrors": {"message": "Errores de publicación: $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
"publishingErrors": {"message": "Errores de publicación: $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
||||||
"submissionFailedConnection": {"message": "Error al enviar. Comprueba la conexión con el servidor."},
|
"submissionFailedConnection": {"message": "Error al enviar. Comprueba la conexión con el servidor."},
|
||||||
"loggedInAt": {"message": "$USERNAME$ ha iniciado sesión en $BACKEND$", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
"loggedInAt": {"message": "$USERNAME$ ha iniciado sesión en $BACKEND$", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
||||||
|
|||||||
@@ -42,7 +42,10 @@
|
|||||||
"submissionFailed": {"message": "Échec de l’envoi"},
|
"submissionFailed": {"message": "Échec de l’envoi"},
|
||||||
"linkSaved": {"message": "Lien enregistré sur $URL$.", "placeholders": {"url": {"content": "$1"}}},
|
"linkSaved": {"message": "Lien enregistré sur $URL$.", "placeholders": {"url": {"content": "$1"}}},
|
||||||
"linkAlreadyExists": {"message": "Ce lien existe déjà. Le commentaire et les étiquettes ont été mis à jour et la publication a été relancée."},
|
"linkAlreadyExists": {"message": "Ce lien existe déjà. Le commentaire et les étiquettes ont été mis à jour et la publication a été relancée."},
|
||||||
"duplicateLinkWarning": {"message": "Ce lien existe déjà. Le commentaire et les étiquettes peuvent être mis à jour ; l’envoi relancera la publication."},
|
"duplicateLinkSameUrl": {"message": "Ce lien existe déjà.\nVous pouvez tout de même enregistrer l’entrée ; le commentaire et les étiquettes de l’entrée existante seront mis à jour."},
|
||||||
|
"duplicateLinkDifferentUrl": {"message": "Ce lien existe déjà. Mais le lien enregistré a une URL différente (paramètres manquants ou différents).\nSi vous enregistrez l’entrée, vous risquez de créer un doublon."},
|
||||||
|
"refetchTitle": {"message": "Récupérer à nouveau le titre"},
|
||||||
|
"titleFetchFailed": {"message": "Impossible de récupérer le titre"},
|
||||||
"publishingErrors": {"message": "Erreurs de publication : $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
"publishingErrors": {"message": "Erreurs de publication : $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
||||||
"submissionFailedConnection": {"message": "Échec de l’envoi. Vérifiez la connexion au serveur."},
|
"submissionFailedConnection": {"message": "Échec de l’envoi. Vérifiez la connexion au serveur."},
|
||||||
"loggedInAt": {"message": "$USERNAME$ est connecté à $BACKEND$", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
"loggedInAt": {"message": "$USERNAME$ est connecté à $BACKEND$", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
||||||
|
|||||||
@@ -42,7 +42,10 @@
|
|||||||
"submissionFailed": {"message": "Verzenden mislukt"},
|
"submissionFailed": {"message": "Verzenden mislukt"},
|
||||||
"linkSaved": {"message": "Koppeling opgeslagen op $URL$.", "placeholders": {"url": {"content": "$1"}}},
|
"linkSaved": {"message": "Koppeling opgeslagen op $URL$.", "placeholders": {"url": {"content": "$1"}}},
|
||||||
"linkAlreadyExists": {"message": "Deze koppeling bestaat al. De opmerking en tags zijn bijgewerkt en publiceren is opnieuw gestart."},
|
"linkAlreadyExists": {"message": "Deze koppeling bestaat al. De opmerking en tags zijn bijgewerkt en publiceren is opnieuw gestart."},
|
||||||
"duplicateLinkWarning": {"message": "Deze koppeling bestaat al. De opmerking en tags kunnen worden bijgewerkt; na verzenden wordt publiceren opnieuw gestart."},
|
"duplicateLinkSameUrl": {"message": "Deze koppeling bestaat al.\nJe kunt de invoer nog steeds opslaan; de opmerking en tags van de bestaande koppeling worden dan bijgewerkt."},
|
||||||
|
"duplicateLinkDifferentUrl": {"message": "Deze koppeling bestaat al. De opgeslagen koppeling heeft echter een andere URL (ontbrekende of andere parameters).\nAls je de invoer opslaat, loop je het risico op een dubbele koppeling."},
|
||||||
|
"refetchTitle": {"message": "Titel opnieuw ophalen"},
|
||||||
|
"titleFetchFailed": {"message": "Titel kon niet worden opgehaald"},
|
||||||
"publishingErrors": {"message": "Publicatiefouten: $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
"publishingErrors": {"message": "Publicatiefouten: $ERRORS$", "placeholders": {"errors": {"content": "$1"}}},
|
||||||
"submissionFailedConnection": {"message": "Verzenden mislukt. Controleer de verbinding met de backend."},
|
"submissionFailedConnection": {"message": "Verzenden mislukt. Controleer de verbinding met de backend."},
|
||||||
"loggedInAt": {"message": "$USERNAME$ is ingelogd op $BACKEND$", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
"loggedInAt": {"message": "$USERNAME$ is ingelogd op $BACKEND$", "placeholders": {"username": {"content": "$1"}, "backend": {"content": "$2"}}},
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 3,
|
"manifest_version": 3,
|
||||||
"name": "__MSG_extensionName__",
|
"name": "__MSG_extensionName__",
|
||||||
"version": "0.1.0",
|
"version": "0.2.0",
|
||||||
"description": "__MSG_extensionDescription__",
|
"description": "__MSG_extensionDescription__",
|
||||||
"default_locale": "en-US",
|
"default_locale": "en-US",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
<span data-i18n="titleLabel">Title</span>
|
<span data-i18n="titleLabel">Title</span>
|
||||||
<input id="title" name="title" type="text" />
|
<input id="title" name="title" type="text" />
|
||||||
</label>
|
</label>
|
||||||
|
<button type="button" id="refetch-title" class="secondary" data-i18n="refetchTitle">Re-fetch title</button>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n="urlLabel">URL</span>
|
<span data-i18n="urlLabel">URL</span>
|
||||||
|
|||||||
+60
-4
@@ -13,6 +13,7 @@ const feedLink = document.getElementById('feed-link');
|
|||||||
const authWarning = document.getElementById('auth-warning');
|
const authWarning = document.getElementById('auth-warning');
|
||||||
const warningSettingsButton = document.getElementById('warning-settings');
|
const warningSettingsButton = document.getElementById('warning-settings');
|
||||||
const authSession = document.getElementById('auth-session');
|
const authSession = document.getElementById('auth-session');
|
||||||
|
const refetchTitleButton = document.getElementById('refetch-title');
|
||||||
const sessionStore = browser.storage.session;
|
const sessionStore = browser.storage.session;
|
||||||
|
|
||||||
const t = window.linklogI18n;
|
const t = window.linklogI18n;
|
||||||
@@ -35,8 +36,14 @@ async function hasBackendPermission(backendUrl) {
|
|||||||
return browser.permissions.contains({origins: [`${origin}/*`]});
|
return browser.permissions.contains({origins: [`${origin}/*`]});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Splits on \n into real <br> line breaks without using innerHTML.
|
||||||
function setStatus(message, isError = false) {
|
function setStatus(message, isError = false) {
|
||||||
statusEl.textContent = message;
|
const lines = message.split('\n');
|
||||||
|
statusEl.replaceChildren(
|
||||||
|
...lines.flatMap((line, index) => (
|
||||||
|
index === 0 ? [document.createTextNode(line)] : [document.createElement('br'), document.createTextNode(line)]
|
||||||
|
)),
|
||||||
|
);
|
||||||
statusEl.classList.remove('hidden');
|
statusEl.classList.remove('hidden');
|
||||||
statusEl.classList.toggle('error', isError);
|
statusEl.classList.toggle('error', isError);
|
||||||
statusEl.classList.toggle('success', !isError);
|
statusEl.classList.toggle('success', !isError);
|
||||||
@@ -225,20 +232,54 @@ async function checkExistingLink() {
|
|||||||
const settings = await getSettings();
|
const settings = await getSettings();
|
||||||
if (!settings.backendUrl || !settings.accessToken || !(await hasBackendPermission(settings.backendUrl)) || !titleInput.value || !urlInput.value) return;
|
if (!settings.backendUrl || !settings.accessToken || !(await hasBackendPermission(settings.backendUrl)) || !titleInput.value || !urlInput.value) return;
|
||||||
try {
|
try {
|
||||||
|
const url = removeKnownTrackingParams(urlInput.value);
|
||||||
const response = await fetch(`${settings.backendUrl}/api/links/check?${new URLSearchParams({
|
const response = await fetch(`${settings.backendUrl}/api/links/check?${new URLSearchParams({
|
||||||
title: titleInput.value,
|
title: titleInput.value,
|
||||||
url: removeKnownTrackingParams(urlInput.value),
|
url,
|
||||||
})}`, {
|
})}`, {
|
||||||
headers: {'Authorization': `Bearer ${settings.accessToken}`},
|
headers: {'Authorization': `Bearer ${settings.accessToken}`},
|
||||||
});
|
});
|
||||||
if (response.ok && (await response.json()).exists) {
|
if (!response.ok) return;
|
||||||
setStatus(t('duplicateLinkWarning'), true);
|
const data = await response.json();
|
||||||
|
if (data.exists) {
|
||||||
|
// Re-derive the match locally: browser URL normalization (e.g. trailing slashes) can
|
||||||
|
// make the server's raw string comparison disagree even when the URLs are equivalent.
|
||||||
|
const urlMatches = data.url_matches || (data.stored_url && removeKnownTrackingParams(data.stored_url) === url);
|
||||||
|
const message = urlMatches ? t('duplicateLinkSameUrl') : t('duplicateLinkDifferentUrl');
|
||||||
|
setStatus(message, true);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Duplicate checking is advisory; submission remains available.
|
// Duplicate checking is advisory; submission remains available.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Re-fetch the title from the backend scraper, for when the URL was edited after the initial tab-based fill.
|
||||||
|
let lastScrapedUrl = null;
|
||||||
|
async function fetchTitle(url, { force = false } = {}) {
|
||||||
|
const settings = await getSettings();
|
||||||
|
if (!settings.backendUrl || !settings.accessToken || !(await hasBackendPermission(settings.backendUrl))) return;
|
||||||
|
if (!url || (!force && (titleInput.value.trim() || url === lastScrapedUrl))) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${settings.backendUrl}/api/scrape?url=${encodeURIComponent(url)}`, {
|
||||||
|
headers: {'Authorization': `Bearer ${settings.accessToken}`},
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
if (force) setStatus(t('titleFetchFailed'), true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastScrapedUrl = url;
|
||||||
|
const data = await response.json();
|
||||||
|
if (data.title) {
|
||||||
|
titleInput.value = data.title;
|
||||||
|
} else if (force) {
|
||||||
|
setStatus(t('titleFetchFailed'), true);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
if (force) setStatus(t('titleFetchFailed'), true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function handleSubmit(event) {
|
async function handleSubmit(event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
setStatus(t('submitting'), false);
|
setStatus(t('submitting'), false);
|
||||||
@@ -305,6 +346,21 @@ async function handleSubmit(event) {
|
|||||||
openSettingsButton.addEventListener('click', () => browser.runtime.openOptionsPage());
|
openSettingsButton.addEventListener('click', () => browser.runtime.openOptionsPage());
|
||||||
warningSettingsButton.addEventListener('click', () => browser.runtime.openOptionsPage());
|
warningSettingsButton.addEventListener('click', () => browser.runtime.openOptionsPage());
|
||||||
form.addEventListener('submit', handleSubmit);
|
form.addEventListener('submit', handleSubmit);
|
||||||
|
urlInput.addEventListener('blur', async () => {
|
||||||
|
await fetchTitle(removeKnownTrackingParams(urlInput.value.trim()));
|
||||||
|
checkExistingLink();
|
||||||
|
});
|
||||||
|
titleInput.addEventListener('blur', checkExistingLink);
|
||||||
|
refetchTitleButton.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const url = removeKnownTrackingParams(urlInput.value.trim());
|
||||||
|
if (!url) {
|
||||||
|
setStatus(t('titleFetchFailed'), true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
titleInput.value = '';
|
||||||
|
fetchTitle(url, { force: true });
|
||||||
|
});
|
||||||
populateCurrentTab().then(checkExistingLink);
|
populateCurrentTab().then(checkExistingLink);
|
||||||
loadExistingTags();
|
loadExistingTags();
|
||||||
updateFeedLink();
|
updateFeedLink();
|
||||||
|
|||||||
@@ -2,9 +2,25 @@
|
|||||||
"addons": {
|
"addons": {
|
||||||
"linklog@kolkman.org": {
|
"linklog@kolkman.org": {
|
||||||
"updates": [
|
"updates": [
|
||||||
|
{
|
||||||
|
"version": "0.2.0",
|
||||||
|
"update_link": "https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-0.2.0.xpi",
|
||||||
|
"update_hash": "sha256:86619ec9aa35345c5c2bcad8fa5701762b8bd237ad9457b131404ff68bc2ce6b",
|
||||||
|
"applications": {
|
||||||
|
"gecko": {
|
||||||
|
"strict_min_version": "142.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"update_link": "https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-0.1.0.xpi"
|
"update_link": "https://git.kolkman.org/olaf/Link-Log/raw/branch/main/XPI/signed/LinkLog-0.1.0.xpi",
|
||||||
|
"update_hash": "sha256:d95e23339facfa2a499bb35f9130d41739f622a3c0ac197ac3fd8cb76d6d6110",
|
||||||
|
"applications": {
|
||||||
|
"gecko": {
|
||||||
|
"strict_min_version": "142.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user