Bump version

.coveragerc

@@ -1,3 +0,0 @@
-[run]
-source = bookmarks
-omit = bookmarks/tests/*

.devcontainer/devcontainer.json

@@ -1,29 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/python
-{
-	"name": "Python 3",
-	"image": "mcr.microsoft.com/devcontainers/python:3.12",
-	"features": {
-		"ghcr.io/devcontainers/features/node:1": {}
-	},
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [8000],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "pip3 install --user -r requirements.txt -r requirements.dev.txt && npm install && mkdir -p data && python3 manage.py migrate",
-
-	// Configure tool-specific properties.
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-python.python"
-			]
-		}
-	},
-
-	"remoteUser": "vscode"
-}

.dockerignore

@@ -1,22 +1,17 @@
-# Ignore everything
-*
+# Remove project files, data, tmp files, build files
+/.env
+/.idea
+/data
+/node_modules
+/tmp
+/docs
 
-# Include files required for build or at runtime
-!/bookmarks
-!/siteroot
+/.dockerignore
+/.gitignore
+/build-*.sh
+/Dockerfile
+/*.iml
+/package*.json
 
-!/bootstrap.sh
-!/LICENSE.txt
-!/manage.py
-!/package.json
-!/package-lock.json
-!/postcss.config.js
-!/requirements.dev.txt
-!/requirements.txt
-!/rollup.config.mjs
-!/supervisord.conf
-!/uwsgi.ini
-!/version.txt
-
- # Remove dev settings
+# Remove development settings
 /siteroot/settings/dev.py

.env.sample

@@ -5,45 +5,5 @@ LD_HOST_PORT=9090
 # Directory on the host system that should be mounted as data dir into the Docker container
 LD_HOST_DATA_DIR=./data
 
-# Can be used to run linkding under a context path, for example: linkding/
-# Must end with a slash `/`
-LD_CONTEXT_PATH=
-# Username of the initial superuser to create, leave empty to not create one
-LD_SUPERUSER_NAME=
-# Password for the initial superuser, leave empty to disable credentials authentication and rely on proxy authentication instead
-LD_SUPERUSER_PASSWORD=
-# Option to disable background tasks
-LD_DISABLE_BACKGROUND_TASKS=False
 # Option to disable URL validation for bookmarks completely
-LD_DISABLE_URL_VALIDATION=False
-# Enables support for authentication proxies such as Authelia
-LD_ENABLE_AUTH_PROXY=False
-# Name of the request header that the auth proxy passes to the application to identify the user
-# See docs/Options.md for more details
-LD_AUTH_PROXY_USERNAME_HEADER=
-# The URL that linkding should redirect to after a logout, when using an auth proxy
-# See docs/Options.md for more details
-LD_AUTH_PROXY_LOGOUT_URL=
-# List of trusted origins from which to accept POST requests
-# See docs/Options.md for more details
-LD_CSRF_TRUSTED_ORIGINS=
-
-# Database settings
-# These are currently only required for configuring PostreSQL.
-# By default, linkding uses SQLite for which you don't need to configure anything.
-
-# Database engine, can be sqlite (default) or postgres
-LD_DB_ENGINE=
-# Database name (default: linkding)
-LD_DB_DATABASE=
-# Username to connect to the database server  (default: linkding)
-LD_DB_USER=
-# Password to connect to the database server
-LD_DB_PASSWORD=
-# The hostname where the database is hosted (default: localhost)
-LD_DB_HOST=
-# Port use to connect to the database server
-# Should use the default port if not set
-LD_DB_PORT=
-# Any additional options to pass to the database (default: {})
-LD_DB_OPTIONS=
+LD_DISABLE_URL_VALIDATION=False

.gitattributes

@@ -1,2 +0,0 @@
-* text=auto
-*.sh text eol=lf

.github/workflows/main.yaml

@@ -1,58 +1,18 @@
 name: linkding CI
 
-on:
-  pull_request:
-  push:
-    branches:
-      - master
+on: [push]
 
 jobs:
-  unit_tests:
-    name: Unit Tests
+  run_tests:
+    name: Run Django Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v1
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v1
         with:
-          python-version: "3.12"
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'npm'
-      - name: Install Node dependencies
-        run: npm ci
-      - name: Setup Python environment
-        run: |
-          pip install -r requirements.txt -r requirements.dev.txt
-          mkdir data
+          python-version: 3.7
+      - name: Install dependencies
+        run: pip install -r requirements.txt
       - name: Run tests
-        run: python manage.py test bookmarks.tests
-  e2e_tests:
-    name: E2E Tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'npm'
-      - name: Install Node dependencies
-        run: npm ci
-      - name: Setup Python environment
-        run: |
-          pip install -r requirements.txt -r requirements.dev.txt
-          playwright install chromium
-          mkdir data
-      - name: Run build
-        run: |
-          npm run build
-          python manage.py collectstatic
-      - name: Run tests
-        run: python manage.py test bookmarks.e2e --pattern="e2e_test_*.py"
+        run: python manage.py test

.gitignore

@@ -3,14 +3,55 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
 # File-based project format
 *.iws
 
 # IntelliJ
-.idea
-*.iml
 out/
 
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
 ### Python template
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -182,17 +223,10 @@ typings/
 
 ### Custom
 # Rollup compilation output
-/bookmarks/static/bundle.js*
-# CSS compilation output
-/bookmarks/static/theme-*.css*
+/build
 # Collected static files for deployment
 /static
 # Build output, etc.
 /tmp
 # Database file
 /data
-# ublock + chromium
-/uBlock0.chromium
-/chromium-profile
-# direnv
-/.direnv

.grenrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+    ignoreIssuesWith: [
+        "wontfix",
+        "duplicate"
+    ]
+}

.idea/compiler.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
+  </component>
+</project>

.idea/dataSources.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="SQLite - db.sqlite3" uuid="c880bd6d-554c-484d-a5be-45581d9a9377">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/data/db.sqlite3</jdbc-url>
+    </data-source>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,12 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="E402" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="HaskellBuildOptions">
+    <ghcPath>/usr/local/bin/ghc</ghcPath>
+    <stackPath>/usr/local/bin/stack</stackPath>
+  </component>
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="Python 3.7 (linkding)" project-jdk-type="Python SDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/linkdings.iml" filepath="$PROJECT_DIR$/linkdings.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/watcherTasks.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
+</project>

API.md

@@ -0,0 +1,188 @@
+# API
+
+The application provides a REST API that can be used by 3rd party applications to manage bookmarks.
+
+## Authentication
+
+All requests against the API must be authorized using an authorization token. The application automatically generates an API token for each user, which can be accessed through the *Settings* page.
+
+The token needs to be passed as `Authorization` header in the HTTP request:
+
+```
+Authorization: Token <Token>
+```
+
+## Resources
+
+The following resources are available:
+
+### Bookmarks
+
+**List**
+
+```
+GET /api/bookmarks/
+```
+
+List bookmarks. 
+
+Parameters:
+
+- `q` - Filters results using a search phrase using the same logic as through the UI
+- `limit` - Limits the max. number of results. Default is `100`.
+- `offset` - Index from which to start returning results
+
+Example response:
+
+```json
+{
+  "count": 123,
+  "next": "http://127.0.0.1:8000/api/bookmarks/?limit=100&offset=100",
+  "previous": null,
+  "results": [
+    {
+      "id": 1,
+      "url": "https://example.com",
+      "title": "Example title",
+      "description": "Example description",
+      "website_title": "Website title",
+      "website_description": "Website description",
+      "tag_names": [
+        "tag1",
+        "tag2"
+      ],
+      "date_added": "2020-09-26T09:46:23.006313Z",
+      "date_modified": "2020-09-26T16:01:14.275335Z"
+    },
+    ...
+  ]
+}
+```
+
+**Archived**
+
+```
+GET /api/bookmarks/archived/
+```
+
+List archived bookmarks. 
+
+Parameters and response are the same as for the regular list endpoint.
+
+**Retrieve**
+
+```
+GET /api/bookmarks/<id>/
+```
+
+Retrieves a single bookmark by ID.
+
+**Create**
+
+```
+POST /api/bookmarks/
+```
+
+Creates a new bookmark. Tags are simply assigned using their names.
+
+Example payload:
+
+```json
+{
+  "url": "https://example.com",
+  "title": "Example title",
+  "description": "Example description",
+  "tag_names": [
+    "tag1",
+    "tag2"
+  ]
+}
+```
+
+**Update**
+
+```
+PUT /api/bookmarks/<id>/
+```
+
+Updates a bookmark. Tags are simply assigned using their names.
+
+Example payload:
+
+```json
+{
+  "url": "https://example.com",
+  "title": "Example title",
+  "description": "Example description",
+  "tag_names": [
+    "tag1",
+    "tag2"
+  ]
+}
+```
+
+**Delete**
+
+```
+DELETE /api/bookmarks/<id>/
+```
+
+Deletes a bookmark by ID.
+
+### Tags
+
+**List**
+
+```
+GET /api/tags/
+```
+
+List tags.
+
+Parameters:
+
+- `limit` - Limits the max. number of results. Default is `100`.
+- `offset` - Index from which to start returning results
+
+Example response:
+
+```json
+{
+  "count": 123,
+  "next": "http://127.0.0.1:8000/api/tags/?limit=100&offset=100",
+  "previous": null,
+  "results": [
+    {
+      "id": 1,
+      "name": "example",
+      "date_added": "2020-09-26T09:46:23.006313Z"
+    },
+    ...
+  ]
+}
+```
+
+**Retrieve**
+
+```
+GET /api/tags/<id>/
+```
+
+Retrieves a single tag by ID.
+
+**Create**
+
+```
+POST /api/tags/
+```
+
+Creates a new tag.
+
+Example payload:
+
+```json
+{
+  "name": "example"
+}
+```
+

CHANGELOG.md

@@ -1,885 +1,27 @@
 # Changelog
 
-## v1.34.0 (16/09/2024)
-
-### What's Changed
-* Fix several issues around browser back navigation by @sissbruecker in https://github.com/sissbruecker/linkding/pull/825
-* Speed up response times for certain actions by @sissbruecker in https://github.com/sissbruecker/linkding/pull/829
-* Implement IPv6 capability by @itz-Jana in https://github.com/sissbruecker/linkding/pull/826
-
-### New Contributors
-* @itz-Jana made their first contribution in https://github.com/sissbruecker/linkding/pull/826
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.33.0...v1.34.0
-
----
-
-## v1.33.0 (14/09/2024)
-
-### What's Changed
-* Theme improvements by @sissbruecker in https://github.com/sissbruecker/linkding/pull/822
-* Speed up navigation by @sissbruecker in https://github.com/sissbruecker/linkding/pull/824
-* Rename "SingeFileError" to "SingleFileError" by @curiousleo in https://github.com/sissbruecker/linkding/pull/823
-* Bump svelte from 4.2.12 to 4.2.19 by @dependabot in https://github.com/sissbruecker/linkding/pull/806
-
-### New Contributors
-* @curiousleo made their first contribution in https://github.com/sissbruecker/linkding/pull/823
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.32.0...v1.33.0
-
----
-
-## v1.32.0 (10/09/2024)
-
-### What's Changed
-* Allow configuring landing page for unauthenticated users by @sissbruecker in https://github.com/sissbruecker/linkding/pull/808
-* Allow configuring guest user profile by @sissbruecker in https://github.com/sissbruecker/linkding/pull/809
-* Return bookmark tags in RSS feeds by @sissbruecker in https://github.com/sissbruecker/linkding/pull/810
-* Additional filter parameters for RSS feeds by @sissbruecker in https://github.com/sissbruecker/linkding/pull/811
-* Allow pre-filling notes in new bookmark form by @sissbruecker in https://github.com/sissbruecker/linkding/pull/812
-* Fix inconsistent tag order in bookmarks by @sissbruecker in https://github.com/sissbruecker/linkding/pull/819
-* Fix auto-tagging when URL includes port by @sissbruecker in https://github.com/sissbruecker/linkding/pull/820
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.31.1...v1.32.0
-
----
-
-## v1.31.1 (30/08/2024)
-
-### What's Changed
-* Include favicons and thumbnails in REST API by @sissbruecker in https://github.com/sissbruecker/linkding/pull/763
-* Add Pinkt to the Community section by @fibelatti in https://github.com/sissbruecker/linkding/pull/772
-* removed version line from docker compose yaml by @volumedata21 in https://github.com/sissbruecker/linkding/pull/800
-* Add resource linkding logo by @QYG2297248353 in https://github.com/sissbruecker/linkding/pull/788
-* Allow use of standard docker `TZ` env var by @watsonbox in https://github.com/sissbruecker/linkding/pull/765
-* Add OCI source annotation to link back to source repo by @Ramblurr in https://github.com/sissbruecker/linkding/pull/701
-* Generate fallback URLs for web archive links by @sissbruecker in https://github.com/sissbruecker/linkding/pull/804
-* Fix overflow in settings page by @sissbruecker in https://github.com/sissbruecker/linkding/pull/805
-* Bump django from 5.0.3 to 5.0.8 by @dependabot in https://github.com/sissbruecker/linkding/pull/795
-* Bump certifi from 2023.11.17 to 2024.7.4 by @dependabot in https://github.com/sissbruecker/linkding/pull/775
-* Bump djangorestframework from 3.14.0 to 3.15.2 by @dependabot in https://github.com/sissbruecker/linkding/pull/769
-* Bump urllib3 from 2.1.0 to 2.2.2 by @dependabot in https://github.com/sissbruecker/linkding/pull/762
-
-### New Contributors
-* @fibelatti made their first contribution in https://github.com/sissbruecker/linkding/pull/772
-* @volumedata21 made their first contribution in https://github.com/sissbruecker/linkding/pull/800
-* @QYG2297248353 made their first contribution in https://github.com/sissbruecker/linkding/pull/788
-* @watsonbox made their first contribution in https://github.com/sissbruecker/linkding/pull/765
-* @Ramblurr made their first contribution in https://github.com/sissbruecker/linkding/pull/701
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.31.0...v1.31.1
-
----
-
-## v1.31.0 (16/06/2024)
-
-### What's Changed
-* Add support for bookmark thumbnails by @vslinko in https://github.com/sissbruecker/linkding/pull/721
-* Automatically add tags to bookmarks based on URL pattern by @vslinko in https://github.com/sissbruecker/linkding/pull/736
-* Load bookmark thumbnails after import by @vslinko in https://github.com/sissbruecker/linkding/pull/724
-* Load missing thumbnails after enabling the feature by @sissbruecker in https://github.com/sissbruecker/linkding/pull/725
-* Thumbnails lazy loading by @vslinko in https://github.com/sissbruecker/linkding/pull/734
-* Add option for disabling tag grouping by @vslinko in https://github.com/sissbruecker/linkding/pull/735
-* Preview auto tags in bookmark form by @sissbruecker in https://github.com/sissbruecker/linkding/pull/737
-* Hide tooltip on mobile by @vslinko in https://github.com/sissbruecker/linkding/pull/733
-* Bump requests from 2.31.0 to 2.32.0 by @dependabot in https://github.com/sissbruecker/linkding/pull/740
-
-### New Contributors
-* @vslinko made their first contribution in https://github.com/sissbruecker/linkding/pull/721
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.30.0...v1.31.0
-
----
-
-## v1.30.0 (20/04/2024)
-
-### What's Changed
-* Add reader mode by @sissbruecker in https://github.com/sissbruecker/linkding/pull/703
-* Allow uploading custom files for bookmarks by @sissbruecker in https://github.com/sissbruecker/linkding/pull/713
-* Add option for marking bookmarks as unread by default by @ab623 in https://github.com/sissbruecker/linkding/pull/706
-* Make blocking cookie banners more reliable by @sissbruecker in https://github.com/sissbruecker/linkding/pull/699
-* Close bookmark details with escape by @sissbruecker in https://github.com/sissbruecker/linkding/pull/702
-* Show proper name for bookmark assets in admin by @ab623 in https://github.com/sissbruecker/linkding/pull/708
-* Bump sqlparse from 0.4.4 to 0.5.0 by @dependabot in https://github.com/sissbruecker/linkding/pull/704
-
-### New Contributors
-* @ab623 made their first contribution in https://github.com/sissbruecker/linkding/pull/706
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.29.0...v1.30.0
-
----
-
-## v1.29.0 (14/04/2024)
-
-### What's Changed
-* Remove ads and cookie banners from HTML snapshots by @sissbruecker in https://github.com/sissbruecker/linkding/pull/695
-* Add button for creating missing HTML snapshots by @sissbruecker in https://github.com/sissbruecker/linkding/pull/696
-* Refresh file list when there are queued snapshots by @sissbruecker in https://github.com/sissbruecker/linkding/pull/697
-* Bump idna from 3.6 to 3.7 by @dependabot in https://github.com/sissbruecker/linkding/pull/694
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.28.0...v1.29.0
-
----
-
-## v1.28.0 (09/04/2024)
-
-### What's Changed
-* Add option to disable SSL verification for OIDC by @akaSyntaax in https://github.com/sissbruecker/linkding/pull/684
-* Add full backup method by @sissbruecker in https://github.com/sissbruecker/linkding/pull/686
-* Truncate snapshot filename for long URLs by @sissbruecker in https://github.com/sissbruecker/linkding/pull/687
-* Add option for customizing single-file timeout by @pettijohn in https://github.com/sissbruecker/linkding/pull/688
-* Add option for passing arguments to single-file command by @pettijohn in https://github.com/sissbruecker/linkding/pull/691
-* Fix typo by @tianheg in https://github.com/sissbruecker/linkding/pull/689
-
-### New Contributors
-* @akaSyntaax made their first contribution in https://github.com/sissbruecker/linkding/pull/684
-* @pettijohn made their first contribution in https://github.com/sissbruecker/linkding/pull/688
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.27.1...v1.28.0
-
----
-
-## v1.27.1 (07/04/2024)
-
-### What's Changed
-* Fix HTML snapshot errors related to single-file-cli by @sissbruecker in https://github.com/sissbruecker/linkding/pull/683
-* Replace django-background-tasks with huey by @sissbruecker in https://github.com/sissbruecker/linkding/pull/657
-* Add Authelia OIDC example to docs by @hugo-vrijswijk in https://github.com/sissbruecker/linkding/pull/675
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.27.0...v1.27.1
-
----
-
-## v1.27.0 (01/04/2024)
-
-### What's Changed
-* Archive snapshots of websites locally by @sissbruecker in https://github.com/sissbruecker/linkding/pull/672
-* Add Railway hosting option by @tianheg in https://github.com/sissbruecker/linkding/pull/661
-* Add how to for increasing the font size by @sissbruecker in https://github.com/sissbruecker/linkding/pull/667
-
-### New Contributors
-* @tianheg made their first contribution in https://github.com/sissbruecker/linkding/pull/661
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.26.0...v1.27.0
-
----
-
-## v1.26.0 (30/03/2024)
-
-### What's Changed
-* Add option for showing bookmark description as separate block by @sissbruecker in https://github.com/sissbruecker/linkding/pull/663
-* Add bookmark details view by @sissbruecker in https://github.com/sissbruecker/linkding/pull/665
-* Make bookmark list actions configurable by @sissbruecker in https://github.com/sissbruecker/linkding/pull/666
-* Bump black from 24.1.1 to 24.3.0 by @dependabot in https://github.com/sissbruecker/linkding/pull/662
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.25.0...v1.26.0
-
----
-
-## v1.25.0 (18/03/2024)
-
-### What's Changed
-* Improve PWA capabilities by @hugo-vrijswijk in https://github.com/sissbruecker/linkding/pull/630
-* build improvements by @hugo-vrijswijk in https://github.com/sissbruecker/linkding/pull/649
-* Add support for oidc by @Nighmared in https://github.com/sissbruecker/linkding/pull/389
-* Add option for custom CSS by @sissbruecker in https://github.com/sissbruecker/linkding/pull/652
-* Update backup location to safe directory by @bphenriques in https://github.com/sissbruecker/linkding/pull/653
-* Include web archive link in /api/bookmarks/ by @sissbruecker in https://github.com/sissbruecker/linkding/pull/655
-* Add RSS feeds for shared bookmarks by @sissbruecker in https://github.com/sissbruecker/linkding/pull/656
-* Bump django from 5.0.2 to 5.0.3 by @dependabot in https://github.com/sissbruecker/linkding/pull/658
-
-### New Contributors
-* @hugo-vrijswijk made their first contribution in https://github.com/sissbruecker/linkding/pull/630
-* @Nighmared made their first contribution in https://github.com/sissbruecker/linkding/pull/389
-* @bphenriques made their first contribution in https://github.com/sissbruecker/linkding/pull/653
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.24.2...v1.25.0
-
----
-
-## v1.24.2 (16/03/2024)
-
-### What's Changed
-* Fix logout button by @sissbruecker in https://github.com/sissbruecker/linkding/pull/648
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.24.1...v1.24.2
-
----
-
-## v1.24.1 (16/03/2024)
-
-### What's Changed
-* Bump dependencies by @sissbruecker in https://github.com/sissbruecker/linkding/pull/618
-* Persist secret key in data folder by @sissbruecker in https://github.com/sissbruecker/linkding/pull/620
-* Group ideographic characters in tag cloud by @jonathan-s in https://github.com/sissbruecker/linkding/pull/613
-* Bump django from 5.0.1 to 5.0.2 by @dependabot in https://github.com/sissbruecker/linkding/pull/625
-* Add k8s setup to community section by @jzck in https://github.com/sissbruecker/linkding/pull/633
-* Added a new Linkding client to community section by @JGeek00 in https://github.com/sissbruecker/linkding/pull/638
-
-### New Contributors
-* @jzck made their first contribution in https://github.com/sissbruecker/linkding/pull/633
-* @JGeek00 made their first contribution in https://github.com/sissbruecker/linkding/pull/638
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.24.0...v1.24.1
-
----
-
-## v1.24.0 (27/01/2024)
-
-### What's Changed
-* Support Open Graph description by @jonathan-s in https://github.com/sissbruecker/linkding/pull/602
-* Add tooltip to truncated bookmark titles by @jonathan-s in https://github.com/sissbruecker/linkding/pull/607
-* Improve bulk tag performance by @sissbruecker in https://github.com/sissbruecker/linkding/pull/612
-* Increase tag limit in tag autocomplete by @hypebeast in https://github.com/sissbruecker/linkding/pull/581
-* Add CapRover as managed hosting option by @adamshand in https://github.com/sissbruecker/linkding/pull/585
-* Bump playwright dependencies by @jonathan-s in https://github.com/sissbruecker/linkding/pull/601
-* Adjust archive.org donation link in general.html by @JnsDornbusch in https://github.com/sissbruecker/linkding/pull/603
-
-### New Contributors
-* @hypebeast made their first contribution in https://github.com/sissbruecker/linkding/pull/581
-* @adamshand made their first contribution in https://github.com/sissbruecker/linkding/pull/585
-* @jonathan-s made their first contribution in https://github.com/sissbruecker/linkding/pull/601
-* @JnsDornbusch made their first contribution in https://github.com/sissbruecker/linkding/pull/603
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.23.1...v1.24.0
-
----
-
-## v1.23.1 (08/12/2023)
-
-### What's Changed
-* Properly encode search query param by @sissbruecker in https://github.com/sissbruecker/linkding/pull/587
-
-> [!WARNING] 
-> *This resolves a security vulnerability in linkding. Everyone is encouraged to upgrade to the latest version as soon as possible.*
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.23.0...v1.23.1
-
----
-
-## v1.23.0 (24/11/2023)
-
-### What's Changed
-* Add Alpine based Docker image (experimental) by @sissbruecker in https://github.com/sissbruecker/linkding/pull/570
-* Add backup CLI command by @sissbruecker in https://github.com/sissbruecker/linkding/pull/571
-* Update browser extension links by @OPerepadia in https://github.com/sissbruecker/linkding/pull/574
-* Include archived bookmarks in export by @sissbruecker in https://github.com/sissbruecker/linkding/pull/579
-
-### New Contributors
-* @OPerepadia made their first contribution in https://github.com/sissbruecker/linkding/pull/574
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.22.3...v1.23.0
-
----
-
-## v1.22.3 (04/11/2023)
-
-### What's Changed
-* Fix RSS feed not handling None values  by @vitormarcal in https://github.com/sissbruecker/linkding/pull/569
-* Bump django from 4.1.10 to 4.1.13 by @dependabot in https://github.com/sissbruecker/linkding/pull/567
-
-### New Contributors
-* @vitormarcal made their first contribution in https://github.com/sissbruecker/linkding/pull/569
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.22.2...v1.22.3
-
----
-
-## v1.22.2 (27/10/2023)
-
-### What's Changed
-* Fix search options not opening on iOS by @sissbruecker in https://github.com/sissbruecker/linkding/pull/549
-* Bump urllib3 from 1.26.11 to 1.26.17 by @dependabot in https://github.com/sissbruecker/linkding/pull/542
-* Add iOS shortcut to community section by @andrewdolphin in https://github.com/sissbruecker/linkding/pull/550
-* Disable editing of search preferences in user admin by @sissbruecker in https://github.com/sissbruecker/linkding/pull/555
-* Add feed2linkding to community section by @Strubbl in https://github.com/sissbruecker/linkding/pull/544
-* Sanitize RSS feed to remove control characters by @sissbruecker in https://github.com/sissbruecker/linkding/pull/565
-* Bump urllib3 from 1.26.17 to 1.26.18 by @dependabot in https://github.com/sissbruecker/linkding/pull/560
-
-### New Contributors
-* @andrewdolphin made their first contribution in https://github.com/sissbruecker/linkding/pull/550
-* @Strubbl made their first contribution in https://github.com/sissbruecker/linkding/pull/544
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.22.1...v1.22.2
-
----
-
-## v1.22.1 (06/10/2023)
-
-### What's Changed
-* Fix memory leak with SQLite by @sissbruecker in https://github.com/sissbruecker/linkding/pull/548
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.22.0...v1.22.1
-
----
-
-## v1.22.0 (01/10/2023)
-
-### What's Changed
-* Fix case-insensitive search for unicode characters in SQLite by @sissbruecker in https://github.com/sissbruecker/linkding/pull/520
-* Add sort option to bookmark list by @sissbruecker in https://github.com/sissbruecker/linkding/pull/522
-* Add button to show tags on smaller screens by @sissbruecker in https://github.com/sissbruecker/linkding/pull/529
-* Make code blocks in notes scrollable by @sissbruecker in https://github.com/sissbruecker/linkding/pull/530
-* Add filter for shared state by @sissbruecker in https://github.com/sissbruecker/linkding/pull/531
-* Add support for exporting/importing bookmark notes by @sissbruecker in https://github.com/sissbruecker/linkding/pull/532
-* Add filter for unread state by @sissbruecker in https://github.com/sissbruecker/linkding/pull/535
-* Allow saving search preferences by @sissbruecker in https://github.com/sissbruecker/linkding/pull/540
-* Add user profile endpoint by @sissbruecker in https://github.com/sissbruecker/linkding/pull/541
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.21.0...v1.22.0
-
----
-
-## v1.21.1 (26/09/2023)
-
-### What's Changed
-* Fix bulk edit to respect searched tags by @sissbruecker in https://github.com/sissbruecker/linkding/pull/537
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.21.0...v1.21.1
-
----
-
-## v1.21.0 (25/08/2023)
-
-### What's Changed
-* Make search autocomplete respect link target setting by @sissbruecker in https://github.com/sissbruecker/linkding/pull/513
-* Various CSS improvements by @sissbruecker in https://github.com/sissbruecker/linkding/pull/514
-* Display shared state in bookmark list by @sissbruecker in https://github.com/sissbruecker/linkding/pull/515
-* Allow bulk editing unread and shared state of bookmarks by @sissbruecker in https://github.com/sissbruecker/linkding/pull/517
-* Bump uwsgi from 2.0.20 to 2.0.22 by @dependabot in https://github.com/sissbruecker/linkding/pull/516
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.20.1...v1.21.0
-
----
-
-## v1.20.1 (23/08/2023)
-
-### What's Changed
-* Update cached styles and scripts after version change by @sissbruecker in https://github.com/sissbruecker/linkding/pull/510
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.20.0...v1.20.1
-
----
-
-## v1.20.0 (22/08/2023)
-
-### What's Changed
-* Add option to share bookmarks publicly by @sissbruecker in https://github.com/sissbruecker/linkding/pull/503
-* Various improvements to favicons by @sissbruecker in https://github.com/sissbruecker/linkding/pull/504
-* Add support for PRIVATE flag in import and export by @sissbruecker in https://github.com/sissbruecker/linkding/pull/505
-* Avoid page reload when triggering actions in bookmark list by @sissbruecker in https://github.com/sissbruecker/linkding/pull/506
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.19.1...v1.20.0
-
----
-
-## v1.19.1 (29/07/2023)
-
-### What's Changed
-* Add Postman Collection to Community section of README by @gingerbeardman in https://github.com/sissbruecker/linkding/pull/476
-* Added Dev Container support by @acbgbca in https://github.com/sissbruecker/linkding/pull/474
-* Added Apple web-app meta tag #358 by @acbgbca in https://github.com/sissbruecker/linkding/pull/359
-* Bump requests from 2.28.1 to 2.31.0 by @dependabot in https://github.com/sissbruecker/linkding/pull/478
-* Allow passing title and description to new bookmark form by @acbgbca in https://github.com/sissbruecker/linkding/pull/479
-* Enable WAL to avoid locked database lock errors by @sissbruecker in https://github.com/sissbruecker/linkding/pull/480
-* Fix website loader content encoding detection by @sissbruecker in https://github.com/sissbruecker/linkding/pull/482
-* Bump certifi from 2022.12.7 to 2023.7.22 by @dependabot in https://github.com/sissbruecker/linkding/pull/497
-* Bump django from 4.1.9 to 4.1.10 by @dependabot in https://github.com/sissbruecker/linkding/pull/494
-
-### New Contributors
-* @gingerbeardman made their first contribution in https://github.com/sissbruecker/linkding/pull/476
-* @acbgbca made their first contribution in https://github.com/sissbruecker/linkding/pull/474
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.19.0...v1.19.1
-
----
-
-## v1.19.0 (20/05/2023)
-
-### What's Changed
-* Add notes to bookmarks by @sissbruecker in https://github.com/sissbruecker/linkding/pull/472
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.18.0...v1.19.0
-
----
-
-## v1.18.0 (18/05/2023)
-
-### What's Changed
-* Make search case-insensitive on Postgres by @sissbruecker in https://github.com/sissbruecker/linkding/pull/432
-* Allow searching for tags without hash character by @sissbruecker in https://github.com/sissbruecker/linkding/pull/449
-* Prevent zoom-in after focusing an input on small viewports on iOS devices by @puresick in https://github.com/sissbruecker/linkding/pull/440
-* Add database options by @plockaby in https://github.com/sissbruecker/linkding/pull/406
-* Allow to log real client ip in logs when using a reverse proxy by @fmenabe in https://github.com/sissbruecker/linkding/pull/398
-* Add option to display URL below title by @bah0 in https://github.com/sissbruecker/linkding/pull/365
-* Add LinkThing iOS app to community section by @amoscardino in https://github.com/sissbruecker/linkding/pull/446
-* Bump django from 4.1.7 to 4.1.9 by @dependabot in https://github.com/sissbruecker/linkding/pull/466
-* Bump sqlparse from 0.4.2 to 0.4.4 by @dependabot in https://github.com/sissbruecker/linkding/pull/455
-
-### New Contributors
-* @amoscardino made their first contribution in https://github.com/sissbruecker/linkding/pull/446
-* @puresick made their first contribution in https://github.com/sissbruecker/linkding/pull/440
-* @plockaby made their first contribution in https://github.com/sissbruecker/linkding/pull/406
-* @fmenabe made their first contribution in https://github.com/sissbruecker/linkding/pull/398
-* @bah0 made their first contribution in https://github.com/sissbruecker/linkding/pull/365
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.17.2...v1.18.0
-
----
-
-## v1.17.2 (18/02/2023)
-
-### What's Changed
-* Escape texts in exported HTML by @sissbruecker in https://github.com/sissbruecker/linkding/pull/429
-* Bump django from 4.1.2 to 4.1.7 by @dependabot in https://github.com/sissbruecker/linkding/pull/427
-* Make health check in Dockerfile honor context path setting by @mrex in https://github.com/sissbruecker/linkding/pull/407
-* Disable autocapitalization for tag input form by @joshdick in https://github.com/sissbruecker/linkding/pull/395
-
-### New Contributors
-* @mrex made their first contribution in https://github.com/sissbruecker/linkding/pull/407
-* @joshdick made their first contribution in https://github.com/sissbruecker/linkding/pull/395
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.17.1...v1.17.2
-
----
-
-## v1.17.1 (22/01/2023)
-
-### What's Changed
-* Fix favicon being cleared by web archive snapshot task by @sissbruecker in https://github.com/sissbruecker/linkding/pull/405
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.17.0...v1.17.1
-
----
-
-## v1.17.0 (21/01/2023)
-
-### What's Changed
-* Add Health Check endpoint  by @mckennajones in https://github.com/sissbruecker/linkding/pull/392
-* Cache website metadata to avoid duplicate scraping by @sissbruecker in https://github.com/sissbruecker/linkding/pull/401
-* Prefill form if URL is already bookmarked by @sissbruecker in https://github.com/sissbruecker/linkding/pull/402
-* Add option for showing bookmark favicons by @sissbruecker in https://github.com/sissbruecker/linkding/pull/390
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.16.1...v1.17.0
-
----
-
-## v1.16.1 (20/01/2023)
-
-### What's Changed
-* Fix bookmark website metadata not being updated when URL changes by @sissbruecker in https://github.com/sissbruecker/linkding/pull/400
-* Bump django from 4.1 to 4.1.2 by @dependabot in https://github.com/sissbruecker/linkding/pull/391
-* Bump certifi from 2022.6.15 to 2022.12.7 by @dependabot in https://github.com/sissbruecker/linkding/pull/374
-* Bump minimatch from 3.0.4 to 3.1.2 by @dependabot in https://github.com/sissbruecker/linkding/pull/366
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.16.0...v1.16.1
-
----
-
-## v1.16.0 (12/01/2023)
-
-### What's Changed
-* Add postgres as database engine by @tomamplius in https://github.com/sissbruecker/linkding/pull/388
-* Gracefully stop docker container when it receives SIGTERM by @mckennajones in https://github.com/sissbruecker/linkding/pull/368
-* Limit document size for website scraper by @sissbruecker in https://github.com/sissbruecker/linkding/pull/354
-* Add error handling for checking latest version by @sissbruecker in https://github.com/sissbruecker/linkding/pull/360
-* Trim website metadata title and description by @luca1197 in https://github.com/sissbruecker/linkding/pull/383
-* Only show admin link for superusers by @AlexanderS in https://github.com/sissbruecker/linkding/pull/384
-* Add apache reverse proxy documentation. by @jhauris in https://github.com/sissbruecker/linkding/pull/371
-* Correct LD_ENABLE_AUTH_PROXY documentation by @jhauris in https://github.com/sissbruecker/linkding/pull/379
-* Android HTTP shortcuts v3 by @kzshantonu in https://github.com/sissbruecker/linkding/pull/387
-
-### New Contributors
-* @jhauris made their first contribution in https://github.com/sissbruecker/linkding/pull/371
-* @AlexanderS made their first contribution in https://github.com/sissbruecker/linkding/pull/384
-* @mckennajones made their first contribution in https://github.com/sissbruecker/linkding/pull/368
-* @tomamplius made their first contribution in https://github.com/sissbruecker/linkding/pull/388
-* @luca1197 made their first contribution in https://github.com/sissbruecker/linkding/pull/383
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.15.1...v1.16.0
-
----
-
-## v1.15.1 (05/10/2022)
-
-### What's Changed
-* Fix static file dir warning by @sissbruecker in https://github.com/sissbruecker/linkding/pull/350
-* Add setting and documentation for fixing CSRF errors by @sissbruecker in https://github.com/sissbruecker/linkding/pull/349
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.15.0...v1.15.1
-
----
-
-## v1.15.0 (11/09/2022)
-
-### What's Changed
-* Bump Django and other dependencies by @sissbruecker in https://github.com/sissbruecker/linkding/pull/331
-* Add option to create initial superuser by @sissbruecker in https://github.com/sissbruecker/linkding/pull/323
-* Improved Android HTTP Shortcuts doc by @kzshantonu in https://github.com/sissbruecker/linkding/pull/330
-* Minify bookmark list HTML by @sissbruecker in https://github.com/sissbruecker/linkding/pull/332
-* Bump python version to 3.10 by @sissbruecker in https://github.com/sissbruecker/linkding/pull/333
-* Fix error when deleting all bookmarks in admin by @sissbruecker in https://github.com/sissbruecker/linkding/pull/336
-* Improve bookmark query performance by @sissbruecker in https://github.com/sissbruecker/linkding/pull/334
-* Prevent rate limit errors in wayback machine API by @sissbruecker in https://github.com/sissbruecker/linkding/pull/339
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.14.0...v1.15.0
-
----
-
-## v1.14.0 (14/08/2022)
-
-### What's Changed
-* Add support for context path by @s2marine in https://github.com/sissbruecker/linkding/pull/313
-* Add support for authentication proxies by @sissbruecker in https://github.com/sissbruecker/linkding/pull/321
-* Add bookmark list keyboard navigation by @sissbruecker in https://github.com/sissbruecker/linkding/pull/320
-* Skip updating website metadata on edit unless URL has changed by @sissbruecker in https://github.com/sissbruecker/linkding/pull/318
-* Add simple docs of the new `shared` API parameter by @bachya in https://github.com/sissbruecker/linkding/pull/312
-* Add project linka to community section in README by @cmsax in https://github.com/sissbruecker/linkding/pull/319
-* Order tags in test_should_create_new_bookmark by @RoGryza in https://github.com/sissbruecker/linkding/pull/310
-* Bump django from 3.2.14 to 3.2.15 by @dependabot in https://github.com/sissbruecker/linkding/pull/316
-
-### New Contributors
-* @s2marine made their first contribution in https://github.com/sissbruecker/linkding/pull/313
-* @RoGryza made their first contribution in https://github.com/sissbruecker/linkding/pull/310
-* @cmsax made their first contribution in https://github.com/sissbruecker/linkding/pull/319
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.13.0...v1.14.0
-
----
-
-## v1.13.0 (04/08/2022)
-
-### What's Changed
-* Add bookmark sharing by @sissbruecker in https://github.com/sissbruecker/linkding/pull/311
-* Display selected tags in tag cloud by @sissbruecker and @jhauris in https://github.com/sissbruecker/linkding/pull/307
-* Update unread flag when saving duplicate URL by @sissbruecker in https://github.com/sissbruecker/linkding/pull/306
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.12.0...v1.13.0
-
----
-
-## v1.12.0 (23/07/2022)
-
-### What's Changed
-* Add read it later functionality by @sissbruecker in https://github.com/sissbruecker/linkding/pull/304
-* Add RSS feeds by @sissbruecker in https://github.com/sissbruecker/linkding/pull/305
-* Add bookmarklet to community by @ukcuddlyguy in https://github.com/sissbruecker/linkding/pull/293
-* Shorten and simplify example bookmarklet in documentation by @FunctionDJ in https://github.com/sissbruecker/linkding/pull/297
-* Fix typo by @kianmeng in https://github.com/sissbruecker/linkding/pull/295
-* Bump django from 3.2.13 to 3.2.14 by @dependabot in https://github.com/sissbruecker/linkding/pull/294
-* Bump svelte from 3.46.4 to 3.49.0 by @dependabot in https://github.com/sissbruecker/linkding/pull/299
-* Bump terser from 5.5.1 to 5.14.2 by @dependabot in https://github.com/sissbruecker/linkding/pull/302
-
-### New Contributors
-* @ukcuddlyguy made their first contribution in https://github.com/sissbruecker/linkding/pull/293
-* @FunctionDJ made their first contribution in https://github.com/sissbruecker/linkding/pull/297
-* @kianmeng made their first contribution in https://github.com/sissbruecker/linkding/pull/295
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.11.1...v1.12.0
-
----
-
-## v1.11.1 (03/07/2022)
-
-### What's Changed
-* Fix duplicate tags on import by @wahlm in https://github.com/sissbruecker/linkding/pull/289
-* Add apple-touch-icon by @daveonkels in https://github.com/sissbruecker/linkding/pull/282
-* Bump waybackpy to 3.0.6 by @dustinblackman in https://github.com/sissbruecker/linkding/pull/281
-
-### New Contributors
-* @wahlm made their first contribution in https://github.com/sissbruecker/linkding/pull/289
-* @daveonkels made their first contribution in https://github.com/sissbruecker/linkding/pull/282
-* @dustinblackman made their first contribution in https://github.com/sissbruecker/linkding/pull/281
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.11.0...v1.11.1
-
----
-
-## v1.11.0 (26/05/2022)
-
-### What's Changed
-* Add background tasks to admin by @sissbruecker in https://github.com/sissbruecker/linkding/pull/264
-* Improve about section by @sissbruecker in https://github.com/sissbruecker/linkding/pull/265
-* Allow creating archived bookmark through REST API by @kencx in https://github.com/sissbruecker/linkding/pull/268
-* Add PATCH support to bookmarks endpoint by @sissbruecker in https://github.com/sissbruecker/linkding/pull/269
-* Add community reference to linkding-cli by @bachya in https://github.com/sissbruecker/linkding/pull/270
-
-### New Contributors
-* @kencx made their first contribution in https://github.com/sissbruecker/linkding/pull/268
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.10.1...v1.11.0
-
----
-
-## v1.10.1 (21/05/2022)
-
-### What's Changed
-* Fake request headers to reduce bot detection by @sissbruecker in https://github.com/sissbruecker/linkding/pull/263
-
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.10.0...v1.10.1
-
----
-
-## v1.10.0 (21/05/2022)
-
-### What's Changed
-* Add to managed hosting options by @m3nu in https://github.com/sissbruecker/linkding/pull/253
-* Add community reference to aiolinkding by @bachya in https://github.com/sissbruecker/linkding/pull/259
-* Improve import performance by @sissbruecker in https://github.com/sissbruecker/linkding/pull/261
-* Update how-to.md to fix unclear/paraphrased Safari action in IOS Shortcuts by @feoh in https://github.com/sissbruecker/linkding/pull/260
-* Allow searching for untagged bookmarks by @sissbruecker in https://github.com/sissbruecker/linkding/pull/226
-
-### New Contributors
-* @m3nu made their first contribution in https://github.com/sissbruecker/linkding/pull/253
-* @bachya made their first contribution in https://github.com/sissbruecker/linkding/pull/259
-* @feoh made their first contribution in https://github.com/sissbruecker/linkding/pull/260
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.9.0...v1.10.0
-
----
-
-## v1.9.0 (14/05/2022)
-
-### What's Changed
-* Scroll menu items into view when using keyboard by @sissbruecker in https://github.com/sissbruecker/linkding/pull/248
-* Add whitespace after auto-completed tag by @sissbruecker in https://github.com/sissbruecker/linkding/pull/249
-* Bump django from 3.2.12 to 3.2.13 by @dependabot in https://github.com/sissbruecker/linkding/pull/244
-* Add community helm chart reference to readme by @pascaliske in https://github.com/sissbruecker/linkding/pull/242
-* Feature: Shortcut key for new bookmark by @rithask in https://github.com/sissbruecker/linkding/pull/241
-* Clarify archive.org feature by @clach04 in https://github.com/sissbruecker/linkding/pull/229
-* Make Internet Archive integration opt-in by @sissbruecker in https://github.com/sissbruecker/linkding/pull/250
-
-### New Contributors
-* @pascaliske made their first contribution in https://github.com/sissbruecker/linkding/pull/242
-* @rithask made their first contribution in https://github.com/sissbruecker/linkding/pull/241
-* @clach04 made their first contribution in https://github.com/sissbruecker/linkding/pull/229
-
-**Full Changelog**: https://github.com/sissbruecker/linkding/compare/v1.8.8...v1.9.0
-
----
-
-## v1.8.8 (27/03/2022)
-
-- [**bug**] Prevent bookmark actions through get requests
-- [**bug**] Prevent external redirects
-
----
-
-## v1.8.7 (26/03/2022)
-
-- [**bug**] Increase request buffer size [#28](https://github.com/sissbruecker/linkding/issues/28)
-- [**enhancement**]  Allow specifying port through LINKDING_PORT environment variable [#156](https://github.com/sissbruecker/linkding/pull/156)
-- [**chore**] Bump NPM packages [#224](https://github.com/sissbruecker/linkding/pull/224)
-
----
-
-## v1.8.6 (25/03/2022)
-
-- [bug] fix bookmark access restrictions
-- [bug] prevent external redirects
-- [chore] bump dependencies
-
----
-
-## v1.8.5 (12/12/2021)
-
-- [**bug**] Ensure tag names do not contain spaces [#182](https://github.com/sissbruecker/linkding/issues/182)
-- [**bug**] Consider not copying whole GIT repository to Docker image [#174](https://github.com/sissbruecker/linkding/issues/174)
-- [**enhancement**] Make bookmarks count column in admin sortable [#183](https://github.com/sissbruecker/linkding/pull/183)
-
----
-
-## v1.8.4 (16/10/2021)
-
-- [**enhancement**] Allow non-admin users to change their password [#166](https://github.com/sissbruecker/linkding/issues/166)
-
----
-
-## v1.8.3 (03/10/2021)
-
-- [**enhancement**] Enhancement: let user configure to open links in same tab instead on a new window/tab [#27](https://github.com/sissbruecker/linkding/issues/27)
-
----
-
-## v1.8.2 (02/10/2021)
-
-- [**bug**] Fix jumping search box [#163](https://github.com/sissbruecker/linkding/pull/163)
-
----
-
-## v1.8.1 (01/10/2021)
-
-- [**enhancement**] Add global shortcut for search [#161](https://github.com/sissbruecker/linkding/pull/161)
-  - allows to press `s` to focus the search input
-
----
-
-## v1.8.0 (04/09/2021)
-
-- [**enhancement**] Wayback Machine Integration [#59](https://github.com/sissbruecker/linkding/issues/59)
-  - Automatically creates snapshots of bookmarked websites on [web archive](https://archive.org/web/)
-  - This is one of the largest changes yet and adds a task processor that runs as a separate process in the background. If you run into issues with this feature, it can be disabled using the [LD_DISABLE_BACKGROUND_TASKS](https://github.com/sissbruecker/linkding/blob/master/docs/Options.md#ld_disable_background_tasks) option
-
----
-
-## v1.7.2 (26/08/2021)
-
-- [**enhancement**] Add support for nanosecond resolution timestamps for bookmark import (e.g. Google Bookmarks) [#146](https://github.com/sissbruecker/linkding/issues/146)
-
----
-
-## v1.7.1 (25/08/2021)
-
-- [**bug**] umlaut/non-ascii characters broken when using bookmarklet (firefox) [#148](https://github.com/sissbruecker/linkding/issues/148)
-- [**bug**] Bookmark import accepts empty URL values [#124](https://github.com/sissbruecker/linkding/issues/124)
-- [**enhancement**] Show the version in the settings [#104](https://github.com/sissbruecker/linkding/issues/104)
-
----
-
-## v1.7.0 (17/08/2021)
-
-- Upgrade to Django 3
-- Bump other dependencies
-
----
-
-## v1.6.5 (15/08/2021)
-
-- [**enhancement**] query with multiple hashtags very slow [#112](https://github.com/sissbruecker/linkding/issues/112)
-
----
-
-## v1.6.4 (13/05/2021)
-
-- Update dependencies for security fixes
-
----
-
-## v1.6.3 (06/04/2021)
-
-- [**bug**] relative names use the wrong "today" after day change [#107](https://github.com/sissbruecker/linkding/issues/107)
-
----
-
-## v1.6.2 (04/04/2021)
-
-- [**enhancement**] Expose `date_added` in UI [#85](https://github.com/sissbruecker/linkding/issues/85)
-- [**closed**] Archived bookmarks - no result when searching for a word which is used only as tag [#83](https://github.com/sissbruecker/linkding/issues/83)
-- [**closed**] Add archive/unarchive button to edit bookmark page [#82](https://github.com/sissbruecker/linkding/issues/82)
-- [**enhancement**] Make scraped title and description editable [#80](https://github.com/sissbruecker/linkding/issues/80)
-
----
-
-## v1.6.1 (31/03/2021)
-
-- Expose date_added in UI [#85](https://github.com/sissbruecker/linkding/issues/85)
-
----
-
-## v1.6.0 (28/03/2021)
-
-- Bulk edit mode [#101](https://github.com/sissbruecker/linkding/pull/101)
-
----
-
-## v1.5.0 (28/03/2021)
-
-- [**closed**] Add a dark mode [#49](https://github.com/sissbruecker/linkding/issues/49)
-
----
-
-## v1.4.1 (20/03/2021)
-
-- Security patches
-- Documentation improvements
-
----
-
-## v1.4.0 (24/02/2021)
-
-- [**enhancement**] Improve admin utilization [#76](https://github.com/sissbruecker/linkding/issues/76)
-
----
-
-## v1.3.3 (18/02/2021)
-
-- [**closed**] Missing "description" request body parameter in API causes 500 [#78](https://github.com/sissbruecker/linkding/issues/78)
-
----
-
-## v1.3.2 (18/02/2021)
-
-- [**closed**] /archive and /unarchive API routes return 404 [#77](https://github.com/sissbruecker/linkding/issues/77)
-- [**closed**] API - /api/check_url?url= with token authetification [#55](https://github.com/sissbruecker/linkding/issues/55)
-
----
-
-## v1.3.1 (15/02/2021)
-
-[enhancement] Enhance delete links with inline confirmation
-
----
-
-## v1.3.0 (14/02/2021)
-
-- [**closed**] Novice help. [#71](https://github.com/sissbruecker/linkding/issues/71)
-- [**closed**] Option to create bookmarks public [#70](https://github.com/sissbruecker/linkding/issues/70)
-- [**enhancement**] Show URL if title is not available [#64](https://github.com/sissbruecker/linkding/issues/64)
-- [**bug**] minor ui nitpicks [#62](https://github.com/sissbruecker/linkding/issues/62)
-- [**enhancement**] add an archive function [#46](https://github.com/sissbruecker/linkding/issues/46)
-- [**closed**] remove non fqdn check and alert [#36](https://github.com/sissbruecker/linkding/issues/36)
-- [**closed**] Add Lotus Notes links [#22](https://github.com/sissbruecker/linkding/issues/22)
-
----
-
 ## v1.2.1 (12/01/2021)
-
 - [**bug**] Bug: Two equal tags with different capitalisation lead to 500 server errors [#65](https://github.com/sissbruecker/linkding/issues/65)
 - [**closed**] Enhancement: category and pagination [#11](https://github.com/sissbruecker/linkding/issues/11)
 
 ---
 
 ## v1.2.0 (09/01/2021)
-
 - [**closed**] Add Favicon [#58](https://github.com/sissbruecker/linkding/issues/58)
 - [**closed**] Make tags case-insensitive [#45](https://github.com/sissbruecker/linkding/issues/45)
 
 ---
 
 ## v1.1.1 (01/01/2021)
-
 - [**enhancement**] Add docker-compose support [#54](https://github.com/sissbruecker/linkding/pull/54)
-
 ---
 
 ## v1.1.0 (31/12/2020)
-
-- [**enhancement**] Search autocomplete [#52](https://github.com/sissbruecker/linkding/issues/52)
+- [**enhancement**] Search autocomplete [#52](https://github.com/sissbruecker/linkding/issues/52)
 - [**enhancement**] Improve Netscape bookmarks file parsing [#50](https://github.com/sissbruecker/linkding/issues/50)
-
 ---
 
 ## v1.0.0 (31/12/2020)
-
 - [**bug**] Import does not import bookmark descriptions [#47](https://github.com/sissbruecker/linkding/issues/47)
 - [**enhancement**] Enhancement: return to same page we were on after editing a bookmark [#26](https://github.com/sissbruecker/linkding/issues/26)
 - [**bug**] Increase limit on bookmark URL length [#25](https://github.com/sissbruecker/linkding/issues/25)
@@ -888,4 +30,4 @@
 - [**bug**] Error importing bookmarks [#18](https://github.com/sissbruecker/linkding/issues/18)
 - [**enhancement**] Enhancement: better administration page [#4](https://github.com/sissbruecker/linkding/issues/4)
 - [**enhancement**] Bug: Navigation bar active link stays on add bookmark [#3](https://github.com/sissbruecker/linkding/issues/3)
-- [**bug**] CSS Stylesheet presented as text/plain [#2](https://github.com/sissbruecker/linkding/issues/2)
+- [**bug**] CSS Stylesheet presented as text/plain [#2](https://github.com/sissbruecker/linkding/issues/2)

Dockerfile

@@ -0,0 +1,22 @@
+FROM python:3.7-slim-stretch
+
+# Install packages required for uswgi
+RUN apt-get update
+RUN apt-get -y install build-essential
+RUN apt-get -y install mime-support
+
+# Install requirements and uwsgi server for running python web apps
+WORKDIR /etc/linkding
+COPY requirements.prod.txt ./requirements.txt
+RUN pip install -U pip
+RUN pip install -Ur requirements.txt
+
+# Copy application
+COPY . .
+
+# Expose uwsgi server at port 9090
+EXPOSE 9090
+
+# Run bootstrap logic
+RUN ["chmod", "+x", "./bootstrap.sh"]
+CMD ["./bootstrap.sh"]

Makefile

@@ -1,16 +0,0 @@
-.PHONY: serve
-
-serve:
-	python manage.py runserver
-
-tasks:
-	python manage.py process_tasks
-
-test:
-	pytest -n auto
-
-format:
-	black bookmarks
-	black siteroot
-	npx prettier bookmarks/frontend --write
-	npx prettier bookmarks/styles --write

Options.md

@@ -0,0 +1,38 @@
+# Options
+
+This document lists the options that linkding can be configured with and explains how to use them in the individual install scenarios.
+
+## Using options
+
+### Docker
+
+Options are passed as environment variables to the Docker container by using the `-e` argument when using `docker run`. For example:
+
+```
+docker run --name linkding -p 9090:9090 -d -e LD_DISABLE_URL_VALIDATION=True sissbruecker/linkding:latest
+```
+
+For multiple options, use one `-e` argument per option.
+
+### Docker-compose
+
+For docker-compose options are configured using an `.env` file. 
+Follow the docker-compose setup in the README and copy `.env.sample` to `.env`. Then modify the options in `.env`.
+
+### Manual setup
+
+All options need to be defined as environment variables in the environment that linkding runs in.
+
+## List of options
+
+### `LD_DISABLE_URL_VALIDATION`
+
+Values: `True`, `False` | Default = `False`
+
+Completely disables URL validation for bookmarks. This can be useful if you intend to store non fully qualified domain name URLs, such as network paths, or you want to store URLs that use another protocol than `http` or `https`.
+
+### `LD_REQUEST_TIMEOUT`
+
+Values: `Integer` as seconds | Default = `60`
+
+Configures the request timeout in the uwsgi application server. This can be useful if you want to import a bookmark file with a high number of bookmarks and run into request timeouts.

README.md

@@ -1,67 +1,112 @@
-<div align="center">
-    <br>
-    <a href="https://github.com/sissbruecker/linkding">
-        <img src="assets/header.svg" height="50">
-    </a>
-    <br>
-</div>
+#  linkding
 
-##  Introduction
-
-linkding is a bookmark manager that you can host yourself.
-It's designed be to be minimal, fast, and easy to set up using Docker.
+*linkding* is a simple bookmark service that you can host yourself. It supports managing bookmarks, categorizing them with tags and has a search function. It provides a bookmarklet for quickly adding new bookmarks while browsing the web. It also supports import / export of bookmarks in the Netscape HTML format. And that's basically it 🙂.
 
 The name comes from:
 - *link* which is often used as a synonym for URLs and bookmarks in common language
-- *Ding* which is German for thing
-- ...so basically something for managing your links
+- *Ding* which is german for *thing*
+- ...so basically some thing for managing your links
 
-**Feature Overview:**
-- Clean UI optimized for readability
-- Organize bookmarks with tags
-- Bulk editing, Markdown notes, read it later functionality
-- Share bookmarks with other users or guests
-- Automatically provides titles, descriptions and icons of bookmarked websites
-- Automatically archive websites, either as local HTML file or on Internet Archive
-- Import and export bookmarks in Netscape HTML format
-- Installable as a Progressive Web App (PWA)
-- Extensions for [Firefox](https://addons.mozilla.org/firefox/addon/linkding-extension/) and [Chrome](https://chrome.google.com/webstore/detail/linkding-extension/beakmhbijpdhipnjhnclmhgjlddhidpe), as well as a bookmarklet
-- SSO support via OIDC or authentication proxies
-- REST API for developing 3rd party apps
-- Admin panel for user self-service and raw data access
-
-
-**Demo:** https://demo.linkding.link/
+**Demo:** https://demo.linkding.link/ (configured with open registration)
 
 **Screenshot:**
 
-![Screenshot](/docs/public/linkding-screenshot.png?raw=true "Screenshot")
+![Screenshot](/docs/linkding-screenshot.png?raw=true "Screenshot")
 
-## Getting Started
+## Installation
 
-The following links help you to get started with linkding:
-- [Install linkding on your own server](https://linkding.link/installation) or [check managed hosting options](https://linkding.link/managed-hosting)
-- [Install the browser extension](https://linkding.link/browser-extension)
-- [Check out community projects](https://linkding.link/community), which include mobile apps, browser extensions, libraries and more
+The easiest way to run linkding is to use [Docker](https://docs.docker.com/get-started/).  The Docker image should be compatible with ARM platforms, so it can be run on a Raspberry Pi.
 
-## Documentation
+There is also the option to set up the installation manually which I do not support, but can give some pointers on below.
 
-The full documentation is now available at [linkding.link](https://linkding.link/).
+###  Docker setup
 
-If you want to contribute to the documentation, you can find the source files in the `docs` folder.
+To install linkding using Docker you can just run the image from the Docker registry:
+```
+docker run --name linkding -p 9090:9090 -d sissbruecker/linkding:latest
+```
+By default the application runs on port `9090`, but you can map it to a different host port by modifying the command above.
 
-If you want to contribute a community project, feel free to [submit a PR](https://github.com/sissbruecker/linkding/edit/master/docs/src/content/docs/community.md).
+However for **production use** you also want to mount a data folder on your system, so that the applications database is not stored in the container, but on your hosts file system. This is safer in case something happens to the container and makes it easier to update the container later on, or to run backups. To do so you can use the following extended command, where you replace `{host-data-folder}` with the absolute path to a folder on your system where you want to store the data:
+```shell
+docker run --name linkding -p 9090:9090 -v {host-data-folder}:/etc/linkding/data -d sissbruecker/linkding:latest
+```
 
-## Contributing
+If everything completed successfully the application should now be running and can be accessed at http://localhost:9090, provided you did not change the port mapping. 
 
-Small improvements, bugfixes and documentation improvements are always welcome. If you want to contribute a larger feature, consider opening an issue first to discuss it. I may choose to ignore PRs for features that don't align with the project's goals or that I don't want to maintain.
+### Automated Docker setup
+
+If you are using a Linux system you can use the following [shell script](https://github.com/sissbruecker/linkding/blob/master/install-linkding.sh) for an automated setup. The script does basically everything described above, but also handles updating an existing container to a new application version (technically replaces the existing container with a new container built from a newer image, while mounting the same data folder).
+
+The script can be configured using shell variables - for more details have a look at the script itself.
+
+###  Docker-compose setup
+
+To install linkding using docker-compose you can use the `docker-compose.yml` file. Copy the `.env.sample` file to `.env` and set your parameters, then run:
+```shell
+docker-compose up -d
+```
+
+### User setup
+
+Finally you need to create a user so that you can access the frontend. Replace the credentials in the following command and run it:
+
+**Docker**
+```shell
+docker exec -it linkding python manage.py createsuperuser --username=joe --email=joe@example.com
+```
+
+**Docker-compose**
+```shell
+docker-compose exec linkding python manage.py createsuperuser --username=joe --email=joe@example.com
+```
+
+The command will prompt you for a secure password. After the command has completed you can start using the application by logging into the UI with your credentials.
+
+### Manual setup
+
+If you can not or don't want to use Docker you can install the application manually on your server. To do so you can basically follow the steps from the *Development* section below while cross-referencing the `Dockerfile` and `bootstrap.sh` on how to make the application production-ready.
+
+### Options
+
+Check the [options document](Options.md) on how to configure your linkding installation.
+
+### Hosting
+
+The application runs in a web-server called [uWSGI](https://uwsgi-docs.readthedocs.io/en/latest/) that is production-ready and that you can expose to the web. If you don't know how to configure your server to expose the application to the web there are several more steps involved. I can not support support the process here, but I can give some pointers on what to search for:
+- first get the app running (described in this document)
+- open the port that the application is running on in your servers firewall
+- depending on your network configuration, forward the opened port in your network router, so that the application can be addressed from the internet using your public IP address and the opened port
+
+### Backups
+
+For backups you have two options: manually or automatic.
+
+For manual backups you can export your bookmarks from the UI and store them on a backup device or online service.
+
+For automatic backups you want to backup the applications database. As described above, for production setups you should [mount](https://stackoverflow.com/questions/23439126/how-to-mount-a-host-directory-in-a-docker-container) the `/etc/linkding/data` directory from the Docker container to a directory on your host system. You can then use a backup tool of your choice to backup the contents of that directory.
+
+## API
+
+The application provides a REST API that can be used by 3rd party applications to manage bookmarks. Check the [API docs](API.md) for further information.
+
+## Troubleshooting
+
+**Import fails with `502 Bad Gateway`**
+
+The default timeout for requests is 60 seconds, after which the application server will cancel the request and return the above error.
+Depending on the system that the application runs on, and the number of bookmarks that need to be imported, the import may take longer than the default 60 seconds.
+
+To increase the timeout you can configure the [`LD_REQUEST_TIMEOUT` option](Options.md#LD_REQUEST_TIMEOUT).
+
+Note that any proxy servers that you are running in front of linkding may have their own timeout settings, which are not affected by the variable.
 
 ## Development
 
-The application is built using the Django web framework. You can get started by checking out the excellent [Django docs](https://docs.djangoproject.com/en/4.1/). The `bookmarks` folder contains the actual bookmark application, `siteroot` is the Django root application. Other than that the code should be self-explanatory / standard Django stuff 🙂.
+The application is open source, so you are free to modify or contribute. The application is built using the Django web framework. You can get started by checking out the excellent Django docs: https://docs.djangoproject.com/en/3.0/. The `bookmarks` folder contains the actual bookmark application, `siteroot` is the Django root application. Other than that the code should be self-explanatory / standard Django stuff 🙂.
 
 ### Prerequisites
-- Python 3.12
+- Python 3
 - Node.js
 
 ### Setup
@@ -76,7 +121,7 @@ source ~/environments/linkding/bin/activate[.csh|.fish]
 ```
 Within the active environment install the application dependencies from the application folder:
 ```
-pip3 install -r requirements.txt -r requirements.dev.txt
+pip3 install -Ur requirements.txt
 ```
 Install frontend dependencies:
 ```
@@ -101,36 +146,6 @@ python3 manage.py runserver
 ```
 The frontend is now available under http://localhost:8000
 
-### Tests
+## Community
 
-Run all tests with pytest:
-```
-make test
-```
-
-### Formatting
-
-Format Python code with black, and JavaScript code with prettier:
-```
-make format
-```
-
-### DevContainers
-
-This repository also supports DevContainers: [![Open in Remote - Containers](https://img.shields.io/static/v1?label=Remote%20-%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/sissbruecker/linkding.git)
-
-Once checked out, only the following commands are required to get started:
-
-Create a user for the frontend:
-```
-python3 manage.py createsuperuser --username=joe --email=joe@example.com
-```
-Start the Node.js development server (used for compiling JavaScript components like tag auto-completion) with:
-```
-npm run dev
-```
-Start the Django development server with:
-```
-python3 manage.py runserver
-```
-The frontend is now available under http://localhost:8000
+- [linkding-extension](https://github.com/jeroenpardon/linkding-extension) Chromium compatible extension that wraps the linkding bookmarklet. Tested with Chrome, Edge, Brave. By [jeroenpardon](https://github.com/jeroenpardon)

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.10.x   | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-To report a vulnerability, please send a mail to: 588ex5zl8@mozmail.com
-
-I'll try to get back to you as soon as possible.

assets/header.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 2126 591" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1.18075,0,0,1.18075,-1265.31,-1395.82)">
-        <circle cx="1314.98" cy="1424.52" r="190.496" style="fill:rgb(88,86,224);"/>
-    </g>
-    <g transform="matrix(0.823127,0,0,0.823127,-786.171,-888.198)">
-        <g transform="matrix(0.707351,0.706862,-0.706862,0.707351,1331.93,-512.804)">
-            <path d="M1244.39,1293.95L1244.39,1493.59C1244.39,1493.59 1243.58,1561.48 1319.29,1562.47C1395.27,1563.46 1394.17,1493.59 1394.17,1493.59L1394.17,1293.95" style="fill:none;stroke:white;stroke-width:35.43px;"/>
-        </g>
-        <g transform="matrix(-0.710067,-0.704134,0.704134,-0.710067,1284.12,3366.41)">
-            <path d="M1244.39,1293.95L1244.39,1493.59C1244.39,1493.59 1243.58,1561.48 1319.29,1562.47C1395.27,1563.46 1394.17,1493.59 1394.17,1493.59L1394.17,1293.95" style="fill:none;stroke:white;stroke-width:35.43px;"/>
-        </g>
-    </g>
-    <g transform="matrix(8.26174,0,0,8.26174,-5762.21,-2037.46)">
-        <text x="770.835px" y="299.13px" style="font-family:'HelveticaNeue', 'Helvetica Neue';font-size:50px;fill:rgb(94,94,219);">l<tspan x="782.685px 794.535px 823.085px 849.785px 880.185px 892.035px 920.585px " y="299.13px 299.13px 299.13px 299.13px 299.13px 299.13px 299.13px ">inkding</tspan></text>
-    </g>
-</svg>

assets/logo.svg

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 450 450" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,-70.3466,-70.3466)">
-        <g transform="matrix(1.18075,0,0,1.18075,-1257.39,-1386.74)">
-            <circle cx="1314.98" cy="1424.52" r="190.496" style="fill:rgb(88,86,224);"/>
-        </g>
-        <g transform="matrix(0.793058,0,0,0.793058,-739.034,-836.215)">
-            <g transform="matrix(0.707351,0.706862,-0.706862,0.707351,1331.93,-512.804)">
-                <path d="M1244.39,1293.95L1244.39,1493.59C1244.39,1493.59 1243.58,1561.48 1319.29,1562.47C1395.27,1563.46 1394.17,1493.59 1394.17,1493.59L1394.17,1293.95" style="fill:none;stroke:white;stroke-width:34.15px;"/>
-            </g>
-            <g transform="matrix(-0.710067,-0.704134,0.704134,-0.710067,1284.12,3366.41)">
-                <path d="M1244.39,1293.95L1244.39,1493.59C1244.39,1493.59 1243.58,1561.48 1319.29,1562.47C1395.27,1563.46 1394.17,1493.59 1394.17,1493.59L1394.17,1293.95" style="fill:none;stroke:white;stroke-width:34.15px;"/>
-            </g>
-        </g>
-    </g>
-</svg>

bookmarks/admin.py

@@ -1,295 +1,17 @@
-from django.contrib import admin, messages
-from django.contrib.admin import AdminSite
-from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.models import User
-from django.core.paginator import Paginator
-from django.db.models import Count, QuerySet
-from django.shortcuts import render
-from django.urls import path
-from django.utils.translation import ngettext, gettext
-from huey.contrib.djhuey import HUEY as huey
-from rest_framework.authtoken.admin import TokenAdmin
-from rest_framework.authtoken.models import TokenProxy
-
-from bookmarks.models import Bookmark, BookmarkAsset, Tag, UserProfile, Toast, FeedToken
-from bookmarks.services.bookmarks import archive_bookmark, unarchive_bookmark
-
-
-# Custom paginator to paginate through Huey tasks
-class TaskPaginator(Paginator):
-    def __init__(self):
-        super().__init__(self, 100)
-        self.task_count = huey.storage.queue_size()
-
-    @property
-    def count(self):
-        return self.task_count
-
-    def page(self, number):
-        limit = self.per_page
-        offset = (number - 1) * self.per_page
-        return self._get_page(
-            self.enqueued_items(limit, offset),
-            number,
-            self,
-        )
-
-    # Copied from Huey's SqliteStorage with some modifications to allow pagination
-    def enqueued_items(self, limit, offset):
-        to_bytes = lambda b: bytes(b) if not isinstance(b, bytes) else b
-        sql = "select data from task where queue=? order by priority desc, id limit ? offset ?"
-        params = (huey.storage.name, limit, offset)
-
-        serialized_tasks = [
-            to_bytes(i) for i, in huey.storage.sql(sql, params, results=True)
-        ]
-        return [huey.deserialize_task(task) for task in serialized_tasks]
-
-
-# Custom view to display Huey tasks in the admin
-def background_task_view(request):
-    page_number = int(request.GET.get("p", 1))
-    paginator = TaskPaginator()
-    page = paginator.get_page(page_number)
-    page_range = paginator.get_elided_page_range(page_number, on_each_side=2, on_ends=2)
-    context = {
-        **linkding_admin_site.each_context(request),
-        "title": "Background tasks",
-        "page": page,
-        "page_range": page_range,
-        "tasks": page.object_list,
-    }
-    return render(request, "admin/background_tasks.html", context)
-
-
-class LinkdingAdminSite(AdminSite):
-    site_header = "linkding administration"
-    site_title = "linkding Admin"
-
-    def get_urls(self):
-        urls = super().get_urls()
-        custom_urls = [
-            path("tasks/", background_task_view, name="background_tasks"),
-        ]
-        return custom_urls + urls
-
-    def get_app_list(self, request, app_label=None):
-        app_list = super().get_app_list(request, app_label)
-        app_list += [
-            {
-                "name": "Huey",
-                "app_label": "huey_app",
-                "models": [
-                    {
-                        "name": "Queued tasks",
-                        "object_name": "background_tasks",
-                        "admin_url": "/admin/tasks/",
-                        "view_only": True,
-                    }
-                ],
-            }
-        ]
-        return app_list
+from django.contrib import admin
 
+from bookmarks.models import Bookmark, Tag
 
+@admin.register(Bookmark)
 class AdminBookmark(admin.ModelAdmin):
-    list_display = ("resolved_title", "url", "is_archived", "owner", "date_added")
-    search_fields = (
-        "title",
-        "description",
-        "website_title",
-        "website_description",
-        "url",
-        "tags__name",
-    )
-    list_filter = (
-        "owner__username",
-        "is_archived",
-        "unread",
-        "tags",
-    )
-    ordering = ("-date_added",)
-    actions = [
-        "delete_selected_bookmarks",
-        "archive_selected_bookmarks",
-        "unarchive_selected_bookmarks",
-        "mark_as_read",
-        "mark_as_unread",
-    ]
-
-    def get_actions(self, request):
-        actions = super().get_actions(request)
-        # Remove default delete action, which gets replaced by delete_selected_bookmarks below
-        # The default action shows a confirmation page which can fail in production when selecting all bookmarks and the
-        # number of objects to delete exceeds the value in DATA_UPLOAD_MAX_NUMBER_FIELDS (1000 by default)
-        del actions["delete_selected"]
-        return actions
-
-    def delete_selected_bookmarks(self, request, queryset: QuerySet):
-        bookmarks_count = queryset.count()
-        for bookmark in queryset:
-            bookmark.delete()
-        self.message_user(
-            request,
-            ngettext(
-                "%d bookmark was successfully deleted.",
-                "%d bookmarks were successfully deleted.",
-                bookmarks_count,
-            )
-            % bookmarks_count,
-            messages.SUCCESS,
-        )
-
-    def archive_selected_bookmarks(self, request, queryset: QuerySet):
-        for bookmark in queryset:
-            archive_bookmark(bookmark)
-        bookmarks_count = queryset.count()
-        self.message_user(
-            request,
-            ngettext(
-                "%d bookmark was successfully archived.",
-                "%d bookmarks were successfully archived.",
-                bookmarks_count,
-            )
-            % bookmarks_count,
-            messages.SUCCESS,
-        )
-
-    def unarchive_selected_bookmarks(self, request, queryset: QuerySet):
-        for bookmark in queryset:
-            unarchive_bookmark(bookmark)
-        bookmarks_count = queryset.count()
-        self.message_user(
-            request,
-            ngettext(
-                "%d bookmark was successfully unarchived.",
-                "%d bookmarks were successfully unarchived.",
-                bookmarks_count,
-            )
-            % bookmarks_count,
-            messages.SUCCESS,
-        )
-
-    def mark_as_read(self, request, queryset: QuerySet):
-        bookmarks_count = queryset.count()
-        queryset.update(unread=False)
-        self.message_user(
-            request,
-            ngettext(
-                "%d bookmark marked as read.",
-                "%d bookmarks marked as read.",
-                bookmarks_count,
-            )
-            % bookmarks_count,
-            messages.SUCCESS,
-        )
-
-    def mark_as_unread(self, request, queryset: QuerySet):
-        bookmarks_count = queryset.count()
-        queryset.update(unread=True)
-        self.message_user(
-            request,
-            ngettext(
-                "%d bookmark marked as unread.",
-                "%d bookmarks marked as unread.",
-                bookmarks_count,
-            )
-            % bookmarks_count,
-            messages.SUCCESS,
-        )
-
-
-class AdminBookmarkAsset(admin.ModelAdmin):
-    @admin.display(description="Display Name")
-    def custom_display_name(self, obj):
-        return str(obj)
-
-    list_display = ("custom_display_name", "date_created", "status")
-    search_fields = (
-        "custom_display_name",
-        "file",
-    )
-    list_filter = ("status",)
-
+  list_display = ('title', 'url', 'date_added')
+  search_fields = ('title', 'url', 'tags__name')
+  list_filter = ('tags',)
+  ordering = ('-date_added', )
 
+@admin.register(Tag)
 class AdminTag(admin.ModelAdmin):
-    list_display = ("name", "bookmarks_count", "owner", "date_added")
-    search_fields = ("name", "owner__username")
-    list_filter = ("owner__username",)
-    ordering = ("-date_added",)
-    actions = ["delete_unused_tags"]
-
-    def get_queryset(self, request):
-        queryset = super().get_queryset(request)
-        queryset = queryset.annotate(bookmarks_count=Count("bookmark"))
-        return queryset
-
-    def bookmarks_count(self, obj):
-        return obj.bookmarks_count
-
-    bookmarks_count.admin_order_field = "bookmarks_count"
-
-    def delete_unused_tags(self, request, queryset: QuerySet):
-        unused_tags = queryset.filter(bookmark__isnull=True)
-        unused_tags_count = unused_tags.count()
-        for tag in unused_tags:
-            tag.delete()
-
-        if unused_tags_count > 0:
-            self.message_user(
-                request,
-                ngettext(
-                    "%d unused tag was successfully deleted.",
-                    "%d unused tags were successfully deleted.",
-                    unused_tags_count,
-                )
-                % unused_tags_count,
-                messages.SUCCESS,
-            )
-        else:
-            self.message_user(
-                request,
-                gettext(
-                    "There were no unused tags in the selection",
-                ),
-                messages.SUCCESS,
-            )
-
-
-class AdminUserProfileInline(admin.StackedInline):
-    model = UserProfile
-    can_delete = False
-    verbose_name_plural = "Profile"
-    fk_name = "user"
-    readonly_fields = ("search_preferences",)
-
-
-class AdminCustomUser(UserAdmin):
-    inlines = (AdminUserProfileInline,)
-
-    def get_inline_instances(self, request, obj=None):
-        if not obj:
-            return list()
-        return super(AdminCustomUser, self).get_inline_instances(request, obj)
-
-
-class AdminToast(admin.ModelAdmin):
-    list_display = ("key", "message", "owner", "acknowledged")
-    search_fields = ("key", "message")
-    list_filter = ("owner__username",)
-
-
-class AdminFeedToken(admin.ModelAdmin):
-    list_display = ("key", "user")
-    search_fields = ["key"]
-    list_filter = ("user__username",)
-
-
-linkding_admin_site = LinkdingAdminSite()
-linkding_admin_site.register(Bookmark, AdminBookmark)
-linkding_admin_site.register(BookmarkAsset, AdminBookmarkAsset)
-linkding_admin_site.register(Tag, AdminTag)
-linkding_admin_site.register(User, AdminCustomUser)
-linkding_admin_site.register(TokenProxy, TokenAdmin)
-linkding_admin_site.register(Toast, AdminToast)
-linkding_admin_site.register(FeedToken, AdminFeedToken)
+  list_display = ('name', 'date_added', 'owner')
+  search_fields = ('name', 'owner__username')
+  list_filter = ('owner__username', )
+  ordering = ('-date_added', )

bookmarks/api/routes.py

@@ -1,141 +1,49 @@
-import logging
-
 from rest_framework import viewsets, mixins, status
 from rest_framework.decorators import action
-from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from rest_framework.routers import DefaultRouter
 
 from bookmarks import queries
-from bookmarks.api.serializers import (
-    BookmarkSerializer,
-    TagSerializer,
-    UserProfileSerializer,
-)
-from bookmarks.models import Bookmark, BookmarkSearch, Tag, User
-from bookmarks.services import auto_tagging
-from bookmarks.services.bookmarks import (
-    archive_bookmark,
-    unarchive_bookmark,
-    website_loader,
-)
-from bookmarks.services.website_loader import WebsiteMetadata
-
-logger = logging.getLogger(__name__)
+from bookmarks.api.serializers import BookmarkSerializer, TagSerializer
+from bookmarks.models import Bookmark, Tag
 
 
-class BookmarkViewSet(
-    viewsets.GenericViewSet,
-    mixins.ListModelMixin,
-    mixins.RetrieveModelMixin,
-    mixins.CreateModelMixin,
-    mixins.UpdateModelMixin,
-    mixins.DestroyModelMixin,
-):
+class BookmarkViewSet(viewsets.GenericViewSet,
+                      mixins.ListModelMixin,
+                      mixins.RetrieveModelMixin,
+                      mixins.CreateModelMixin,
+                      mixins.UpdateModelMixin,
+                      mixins.DestroyModelMixin):
     serializer_class = BookmarkSerializer
 
-    def get_permissions(self):
-        # Allow unauthenticated access to shared bookmarks.
-        # The shared action should still filter bookmarks so that
-        # unauthenticated users only see bookmarks from users that have public
-        # sharing explicitly enabled
-        if self.action == "shared":
-            return [AllowAny()]
-
-        # Otherwise use default permissions which should require authentication
-        return super().get_permissions()
-
     def get_queryset(self):
         user = self.request.user
         # For list action, use query set that applies search and tag projections
-        if self.action == "list":
-            search = BookmarkSearch.from_request(self.request.GET)
-            return queries.query_bookmarks(user, user.profile, search)
+        if self.action == 'list':
+            query_string = self.request.GET.get('q')
+            return queries.query_bookmarks(user, query_string)
 
         # For single entity actions use default query set without projections
         return Bookmark.objects.all().filter(owner=user)
 
     def get_serializer_context(self):
-        disable_scraping = "disable_scraping" in self.request.GET
-        return {
-            "request": self.request,
-            "user": self.request.user,
-            "disable_scraping": disable_scraping,
-        }
+        return {'user': self.request.user}
 
-    @action(methods=["get"], detail=False)
+    @action(methods=['get'], detail=False)
     def archived(self, request):
         user = request.user
-        search = BookmarkSearch.from_request(request.GET)
-        query_set = queries.query_archived_bookmarks(user, user.profile, search)
+        query_string = request.GET.get('q')
+        query_set = queries.query_archived_bookmarks(user, query_string)
         page = self.paginate_queryset(query_set)
-        serializer = self.get_serializer(page, many=True)
-        data = serializer.data
+        serializer = self.get_serializer_class()
+        data = serializer(page, many=True).data
         return self.get_paginated_response(data)
 
-    @action(methods=["get"], detail=False)
-    def shared(self, request):
-        search = BookmarkSearch.from_request(request.GET)
-        user = User.objects.filter(username=search.user).first()
-        public_only = not request.user.is_authenticated
-        query_set = queries.query_shared_bookmarks(
-            user, request.user_profile, search, public_only
-        )
-        page = self.paginate_queryset(query_set)
-        serializer = self.get_serializer(page, many=True)
-        data = serializer.data
-        return self.get_paginated_response(data)
 
-    @action(methods=["post"], detail=True)
-    def archive(self, request, pk):
-        bookmark = self.get_object()
-        archive_bookmark(bookmark)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    @action(methods=["post"], detail=True)
-    def unarchive(self, request, pk):
-        bookmark = self.get_object()
-        unarchive_bookmark(bookmark)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    @action(methods=["get"], detail=False)
-    def check(self, request):
-        url = request.GET.get("url")
-        bookmark = Bookmark.objects.filter(owner=request.user, url=url).first()
-        existing_bookmark_data = (
-            self.get_serializer(bookmark).data if bookmark else None
-        )
-
-        metadata = website_loader.load_website_metadata(url)
-
-        # Return tags that would be automatically applied to the bookmark
-        profile = request.user.profile
-        auto_tags = []
-        if profile.auto_tagging_rules:
-            try:
-                auto_tags = auto_tagging.get_tags(profile.auto_tagging_rules, url)
-            except Exception as e:
-                logger.error(
-                    f"Failed to auto-tag bookmark. url={url}",
-                    exc_info=e,
-                )
-
-        return Response(
-            {
-                "bookmark": existing_bookmark_data,
-                "metadata": metadata.to_dict(),
-                "auto_tags": auto_tags,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-
-class TagViewSet(
-    viewsets.GenericViewSet,
-    mixins.ListModelMixin,
-    mixins.RetrieveModelMixin,
-    mixins.CreateModelMixin,
-):
+class TagViewSet(viewsets.GenericViewSet,
+                 mixins.ListModelMixin,
+                 mixins.RetrieveModelMixin,
+                 mixins.CreateModelMixin):
     serializer_class = TagSerializer
 
     def get_queryset(self):
@@ -143,16 +51,9 @@ class TagViewSet(
         return Tag.objects.all().filter(owner=user)
 
     def get_serializer_context(self):
-        return {"user": self.request.user}
-
-
-class UserViewSet(viewsets.GenericViewSet):
-    @action(methods=["get"], detail=False)
-    def profile(self, request):
-        return Response(UserProfileSerializer(request.user.profile).data)
+        return {'user': self.request.user}
 
 
 router = DefaultRouter()
-router.register(r"bookmarks", BookmarkViewSet, basename="bookmark")
-router.register(r"tags", TagViewSet, basename="tag")
-router.register(r"user", UserViewSet, basename="user")
+router.register(r'bookmarks', BookmarkViewSet, basename='bookmark')
+router.register(r'tags', TagViewSet, basename='tag')

bookmarks/api/serializers.py

@@ -1,14 +1,7 @@
-from django.db.models import prefetch_related_objects
-from django.templatetags.static import static
 from rest_framework import serializers
-from rest_framework.serializers import ListSerializer
 
-from bookmarks.models import Bookmark, Tag, build_tag_string, UserProfile
-from bookmarks.services.bookmarks import (
-    create_bookmark,
-    update_bookmark,
-    enhance_with_website_metadata,
-)
+from bookmarks.models import Bookmark, Tag, build_tag_string
+from bookmarks.services.bookmarks import create_bookmark, update_bookmark
 from bookmarks.services.tags import get_or_create_tag
 
 
@@ -16,139 +9,51 @@ class TagListField(serializers.ListField):
     child = serializers.CharField()
 
 
-class BookmarkListSerializer(ListSerializer):
-    def to_representation(self, data):
-        # Prefetch nested relations to avoid n+1 queries
-        prefetch_related_objects(data, "tags")
-
-        return super().to_representation(data)
-
-
 class BookmarkSerializer(serializers.ModelSerializer):
     class Meta:
         model = Bookmark
         fields = [
-            "id",
-            "url",
-            "title",
-            "description",
-            "notes",
-            "web_archive_snapshot_url",
-            "favicon_url",
-            "preview_image_url",
-            "is_archived",
-            "unread",
-            "shared",
-            "tag_names",
-            "date_added",
-            "date_modified",
-            "website_title",
-            "website_description",
+            'id',
+            'url',
+            'title',
+            'description',
+            'website_title',
+            'website_description',
+            'tag_names',
+            'date_added',
+            'date_modified'
         ]
         read_only_fields = [
-            "web_archive_snapshot_url",
-            "favicon_url",
-            "preview_image_url",
-            "date_added",
-            "date_modified",
-            "website_title",
-            "website_description",
+            'website_title',
+            'website_description',
+            'date_added',
+            'date_modified'
         ]
-        list_serializer_class = BookmarkListSerializer
 
-    # Override optional char fields to provide default value
-    title = serializers.CharField(required=False, allow_blank=True, default="")
-    description = serializers.CharField(required=False, allow_blank=True, default="")
-    notes = serializers.CharField(required=False, allow_blank=True, default="")
-    is_archived = serializers.BooleanField(required=False, default=False)
-    unread = serializers.BooleanField(required=False, default=False)
-    shared = serializers.BooleanField(required=False, default=False)
     # Override readonly tag_names property to allow passing a list of tag names to create/update
-    tag_names = TagListField(required=False, default=[])
-    favicon_url = serializers.SerializerMethodField()
-    preview_image_url = serializers.SerializerMethodField()
-    # Add dummy website title and description fields for backwards compatibility but keep them empty
-    website_title = serializers.SerializerMethodField()
-    website_description = serializers.SerializerMethodField()
-
-    def get_favicon_url(self, obj: Bookmark):
-        if not obj.favicon_file:
-            return None
-        request = self.context.get("request")
-        favicon_file_path = static(obj.favicon_file)
-        favicon_url = request.build_absolute_uri(favicon_file_path)
-        return favicon_url
-
-    def get_preview_image_url(self, obj: Bookmark):
-        if not obj.preview_image_file:
-            return None
-        request = self.context.get("request")
-        preview_image_file_path = static(obj.preview_image_file)
-        preview_image_url = request.build_absolute_uri(preview_image_file_path)
-        return preview_image_url
-
-    def get_website_title(self, obj: Bookmark):
-        return None
-
-    def get_website_description(self, obj: Bookmark):
-        return None
+    tag_names = TagListField()
 
     def create(self, validated_data):
         bookmark = Bookmark()
-        bookmark.url = validated_data["url"]
-        bookmark.title = validated_data["title"]
-        bookmark.description = validated_data["description"]
-        bookmark.notes = validated_data["notes"]
-        bookmark.is_archived = validated_data["is_archived"]
-        bookmark.unread = validated_data["unread"]
-        bookmark.shared = validated_data["shared"]
-        tag_string = build_tag_string(validated_data["tag_names"])
-
-        saved_bookmark = create_bookmark(bookmark, tag_string, self.context["user"])
-        # Unless scraping is explicitly disabled, enhance bookmark with website
-        # metadata to preserve backwards compatibility with clients that expect
-        # title and description to be populated automatically when left empty
-        if not self.context.get("disable_scraping", False):
-            enhance_with_website_metadata(saved_bookmark)
-        return saved_bookmark
+        bookmark.url = validated_data['url']
+        bookmark.title = validated_data['title']
+        bookmark.description = validated_data['description']
+        tag_string = build_tag_string(validated_data['tag_names'], ' ')
+        return create_bookmark(bookmark, tag_string, self.context['user'])
 
     def update(self, instance: Bookmark, validated_data):
-        # Update fields if they were provided in the payload
-        for key in ["url", "title", "description", "notes", "unread", "shared"]:
-            if key in validated_data:
-                setattr(instance, key, validated_data[key])
-
-        # Use tag string from payload, or use bookmark's current tags as fallback
-        tag_string = build_tag_string(instance.tag_names)
-        if "tag_names" in validated_data:
-            tag_string = build_tag_string(validated_data["tag_names"])
-
-        return update_bookmark(instance, tag_string, self.context["user"])
+        instance.url = validated_data['url']
+        instance.title = validated_data['title']
+        instance.description = validated_data['description']
+        tag_string = build_tag_string(validated_data['tag_names'], ' ')
+        return update_bookmark(instance, tag_string, self.context['user'])
 
 
 class TagSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tag
-        fields = ["id", "name", "date_added"]
-        read_only_fields = ["date_added"]
+        fields = ['id', 'name', 'date_added']
+        read_only_fields = ['date_added']
 
     def create(self, validated_data):
-        return get_or_create_tag(validated_data["name"], self.context["user"])
-
-
-class UserProfileSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = UserProfile
-        fields = [
-            "theme",
-            "bookmark_date_display",
-            "bookmark_link_target",
-            "web_archive_integration",
-            "tag_search",
-            "enable_sharing",
-            "enable_public_sharing",
-            "enable_favicons",
-            "display_url",
-            "permanent_notes",
-            "search_preferences",
-        ]
+        return get_or_create_tag(validated_data['name'], self.context['user'])

bookmarks/apps.py

@@ -2,8 +2,4 @@ from django.apps import AppConfig
 
 
 class BookmarksConfig(AppConfig):
-    name = "bookmarks"
-
-    def ready(self):
-        # Register signal handlers
-        import bookmarks.signals
+    name = 'bookmarks'

bookmarks/components/SearchAutoComplete.svelte

@@ -0,0 +1,280 @@
+<script>
+    import {SearchHistory} from "./SearchHistory";
+    import {clampText, debounce, getCurrentWord, getCurrentWordBounds} from "./util";
+
+    const searchHistory = new SearchHistory()
+
+    export let name;
+    export let placeholder;
+    export let value;
+    export let tags;
+    export let mode = 'default';
+    export let apiClient;
+
+    let isFocus = false;
+    let isOpen = false;
+    let suggestions = []
+    let selectedIndex = undefined;
+    let input = null;
+
+    // Track current search query after loading the page
+    searchHistory.pushCurrent()
+    updateSuggestions()
+
+    function handleFocus() {
+        isFocus = true;
+    }
+
+    function handleBlur() {
+        isFocus = false;
+        close();
+    }
+
+    function handleInput(e) {
+        value = e.target.value
+        debouncedLoadSuggestions()
+    }
+
+    function handleKeyDown(e) {
+        // Enter
+        if (isOpen && selectedIndex !== undefined && (e.keyCode === 13 || e.keyCode === 9)) {
+            const suggestion = suggestions.total[selectedIndex];
+            if (suggestion) completeSuggestion(suggestion);
+            e.preventDefault();
+        }
+        // Escape
+        if (e.keyCode === 27) {
+            close();
+            e.preventDefault();
+        }
+        // Up arrow
+        if (e.keyCode === 38) {
+            updateSelection(-1);
+            e.preventDefault();
+        }
+        // Down arrow
+        if (e.keyCode === 40) {
+            if (!isOpen) {
+                loadSuggestions()
+            } else {
+                updateSelection(1);
+            }
+            e.preventDefault();
+        }
+    }
+
+    function open() {
+        isOpen = true;
+    }
+
+    function close() {
+        isOpen = false;
+        updateSuggestions()
+        selectedIndex = undefined
+    }
+
+    function hasSuggestions() {
+        return suggestions.total.length > 0
+    }
+
+    async function loadSuggestions() {
+
+        let suggestionIndex = 0
+
+        function nextIndex() {
+            return suggestionIndex++
+        }
+
+        // Tag suggestions
+        let tagSuggestions = []
+        const currentWord = getCurrentWord(input)
+        if (currentWord && currentWord.length > 1 && currentWord[0] === '#') {
+            const searchTag = currentWord.substring(1, currentWord.length)
+            tagSuggestions = (tags || []).filter(tagName => tagName.toLowerCase().indexOf(searchTag.toLowerCase()) === 0)
+                .slice(0, 5)
+                .map(tagName => ({
+                    type: 'tag',
+                    index: nextIndex(),
+                    label: `#${tagName}`,
+                    tagName: tagName
+                }))
+        }
+
+        // Recent search suggestions
+        const search = searchHistory.getRecentSearches(value, 5).map(value => ({
+            type: 'search',
+            index: nextIndex(),
+            label: value,
+            value
+        }))
+
+        // Bookmark suggestions
+        let bookmarks = []
+
+        if (value && value.length >= 3) {
+            const fetchedBookmarks = mode === 'archive'
+                ? await apiClient.getArchivedBookmarks(value, {limit: 5, offset: 0})
+                : await apiClient.getBookmarks(value, {limit: 5, offset: 0})
+            bookmarks = fetchedBookmarks.map(bookmark => {
+                const fullLabel = bookmark.title || bookmark.website_title || bookmark.url
+                const label = clampText(fullLabel, 60)
+                return {
+                    type: 'bookmark',
+                    index: nextIndex(),
+                    label,
+                    bookmark
+                }
+            })
+        }
+
+        updateSuggestions(search, bookmarks, tagSuggestions)
+
+        if (hasSuggestions()) {
+            open()
+        } else {
+            close()
+        }
+    }
+
+    const debouncedLoadSuggestions = debounce(loadSuggestions)
+
+    function updateSuggestions(search, bookmarks, tagSuggestions) {
+        search = search || []
+        bookmarks = bookmarks || []
+        tagSuggestions = tagSuggestions || []
+        suggestions = {
+            search,
+            bookmarks,
+            tags: tagSuggestions,
+            total: [
+                ...tagSuggestions,
+                ...search,
+                ...bookmarks,
+            ]
+        }
+    }
+
+    function completeSuggestion(suggestion) {
+        if (suggestion.type === 'search') {
+            value = suggestion.value
+            close()
+        }
+        if (suggestion.type === 'bookmark') {
+            window.open(suggestion.bookmark.url, '_blank')
+            close()
+        }
+        if (suggestion.type === 'tag') {
+            const bounds = getCurrentWordBounds(input);
+            const inputValue = input.value;
+            input.value = inputValue.substring(0, bounds.start) + `#${suggestion.tagName} ` + inputValue.substring(bounds.end);
+            close()
+        }
+    }
+
+    function updateSelection(dir) {
+
+        const length = suggestions.total.length;
+
+        if (length === 0) return
+
+        if (selectedIndex === undefined) {
+            selectedIndex = dir > 0 ? 0 : Math.max(length - 1, 0)
+            return
+        }
+
+        let newIndex = selectedIndex + dir;
+
+        if (newIndex < 0) newIndex = Math.max(length - 1, 0);
+        if (newIndex >= length) newIndex = 0;
+
+        selectedIndex = newIndex;
+    }
+</script>
+
+<div class="form-autocomplete">
+    <div class="form-autocomplete-input form-input" class:is-focused={isFocus}>
+        <input type="search" class="form-input" name="{name}" placeholder="{placeholder}" autocomplete="off" value="{value}"
+               bind:this={input}
+               on:input={handleInput} on:keydown={handleKeyDown} on:focus={handleFocus} on:blur={handleBlur}>
+    </div>
+
+    <ul class="menu" class:open={isOpen}>
+        {#if suggestions.tags.length > 0}
+            <li class="menu-item group-item">Tags</li>
+        {/if}
+        {#each suggestions.tags as suggestion}
+            <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
+                <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+                    <div class="tile tile-centered">
+                        <div class="tile-content">
+                            {suggestion.label}
+                        </div>
+                    </div>
+                </a>
+            </li>
+        {/each}
+
+        {#if suggestions.search.length > 0}
+            <li class="menu-item group-item">Recent Searches</li>
+        {/if}
+        {#each suggestions.search as suggestion}
+            <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
+                <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+                    <div class="tile tile-centered">
+                        <div class="tile-content">
+                            {suggestion.label}
+                        </div>
+                    </div>
+                </a>
+            </li>
+        {/each}
+
+        {#if suggestions.bookmarks.length > 0}
+            <li class="menu-item group-item">Bookmarks</li>
+        {/if}
+        {#each suggestions.bookmarks as suggestion}
+            <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
+                <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+                    <div class="tile tile-centered">
+                        <div class="tile-content">
+                            {suggestion.label}
+                        </div>
+                    </div>
+                </a>
+            </li>
+        {/each}
+    </ul>
+</div>
+
+<style>
+    .menu {
+        display: none;
+        max-height: 400px;
+        overflow: auto;
+    }
+
+    .menu.open {
+        display: block;
+    }
+
+    .form-autocomplete-input {
+        padding: 0;
+    }
+    .form-autocomplete-input.is-focused {
+        z-index: 2;
+    }
+
+    /* TODO: Should be read from theme */
+    .menu-item.selected > a {
+        background: #f1f1fc;
+        color: #5755d9;
+    }
+
+    .group-item, .group-item:hover {
+        color: #999999;
+        text-transform: uppercase;
+        background: none;
+        font-size: 0.6rem;
+        font-weight: bold;
+    }
+</style>

bookmarks/components/SearchHistory.js

@@ -0,0 +1,48 @@
+const SEARCH_HISTORY_KEY = 'searchHistory'
+const MAX_ENTRIES = 30
+
+export class SearchHistory {
+
+    getHistory() {
+        const historyJson = localStorage.getItem(SEARCH_HISTORY_KEY)
+        return historyJson ? JSON.parse(historyJson) : {
+            recent: []
+        }
+    }
+
+    pushCurrent() {
+        // Skip if browser is not compatible
+        if (!window.URLSearchParams) return
+        const urlParams = new URLSearchParams(window.location.search);
+        const searchParam = urlParams.get('q');
+
+        if (!searchParam) return
+
+        this.push(searchParam)
+    }
+
+    push(search) {
+        const history = this.getHistory()
+
+        history.recent.unshift(search)
+
+        // Remove duplicates and clamp to max entries
+        history.recent = history.recent.reduce((acc, cur) => {
+            if (acc.length >= MAX_ENTRIES) return acc
+            if (acc.indexOf(cur) >= 0) return acc
+            acc.push(cur)
+            return acc
+        }, [])
+
+        const newHistoryJson = JSON.stringify(history)
+        localStorage.setItem(SEARCH_HISTORY_KEY, newHistoryJson)
+    }
+
+    getRecentSearches(query, max) {
+        const history = this.getHistory()
+
+        return history.recent
+            .filter(search => !query || search.toLowerCase().indexOf(query.toLowerCase()) >= 0)
+            .slice(0, max)
+    }
+}

bookmarks/components/TagAutocomplete.svelte

@@ -0,0 +1,133 @@
+<script>
+    import {getCurrentWord, getCurrentWordBounds} from "./util";
+
+    export let id;
+    export let name;
+    export let value;
+    export let tags;
+
+    let isFocus = false;
+    let isOpen = false;
+    let input = null;
+
+    let suggestions = [];
+    let selectedIndex = 0;
+
+    function handleFocus() {
+        isFocus = true;
+    }
+
+    function handleBlur() {
+        isFocus = false;
+        close();
+    }
+
+    function handleInput(e) {
+        input = e.target;
+
+        const word = getCurrentWord(input);
+
+        suggestions = word ? tags.filter(tag => tag.indexOf(word) === 0) : [];
+
+        if (word && suggestions.length > 0) {
+            open();
+        } else {
+            close();
+        }
+    }
+
+    function handleKeyDown(e) {
+        if (isOpen && (e.keyCode === 13 || e.keyCode === 9)) {
+            const suggestion = suggestions[selectedIndex];
+            complete(suggestion);
+            e.preventDefault();
+        }
+        if (e.keyCode === 27) {
+            close();
+            e.preventDefault();
+        }
+        if (e.keyCode === 38) {
+            updateSelection(-1);
+            e.preventDefault();
+        }
+        if (e.keyCode === 40) {
+            updateSelection(1);
+            e.preventDefault();
+        }
+    }
+
+    function open() {
+        isOpen = true;
+        selectedIndex = 0;
+    }
+
+    function close() {
+        isOpen = false;
+        suggestions = [];
+        selectedIndex = 0;
+    }
+
+    function complete(suggestion) {
+        const bounds = getCurrentWordBounds(input);
+        const value = input.value;
+        input.value = value.substring(0, bounds.start) + suggestion + value.substring(bounds.end);
+
+        close();
+    }
+
+    function updateSelection(dir) {
+
+        const length = suggestions.length;
+        let newIndex = selectedIndex + dir;
+
+        if (newIndex < 0) newIndex = Math.max(length - 1, 0);
+        if (newIndex >= length) newIndex = 0;
+
+        selectedIndex = newIndex;
+    }
+</script>
+
+<div class="form-autocomplete">
+    <!-- autocomplete input container -->
+    <div class="form-autocomplete-input form-input" class:is-focused={isFocus}>
+        <!-- autocomplete real input box -->
+        <input id="{id}" name="{name}" value="{value ||''}"
+               class="form-input" type="text" autocomplete="off"
+               on:input={handleInput} on:keydown={handleKeyDown}
+               on:focus={handleFocus} on:blur={handleBlur}>
+    </div>
+
+    <!-- autocomplete suggestion list -->
+    <ul class="menu" class:open={isOpen && suggestions.length > 0}>
+        <!-- menu list items -->
+        {#each suggestions as tag,i}
+            <li class="menu-item" class:selected={selectedIndex === i}>
+                <a href="#" on:mousedown|preventDefault={() => complete(tag)}>
+                    <div class="tile tile-centered">
+                        <div class="tile-content">
+                            {tag}
+                        </div>
+                    </div>
+                </a>
+            </li>
+        {/each}
+    </ul>
+</div>
+
+<style>
+    .menu {
+        display: none;
+        max-height: 200px;
+        overflow: auto;
+    }
+
+    .menu.open {
+        display: block;
+    }
+
+    /* TODO: Should be read from theme */
+    .menu-item.selected > a {
+        background: #f1f1fc;
+        color: #5755d9;
+    }
+</style>

bookmarks/components/api.js

@@ -0,0 +1,23 @@
+export class ApiClient {
+    constructor(baseUrl) {
+        this.baseUrl = baseUrl
+    }
+
+    getBookmarks(query, options = {limit: 100, offset: 0}) {
+        const encodedQuery = encodeURIComponent(query)
+        const url = `${this.baseUrl}bookmarks?q=${encodedQuery}&limit=${options.limit}&offset=${options.offset}`
+
+        return fetch(url)
+            .then(response => response.json())
+            .then(data => data.results)
+    }
+
+    getArchivedBookmarks(query, options = {limit: 100, offset: 0}) {
+        const encodedQuery = encodeURIComponent(query)
+        const url = `${this.baseUrl}bookmarks/archived?q=${encodedQuery}&limit=${options.limit}&offset=${options.offset}`
+
+        return fetch(url)
+            .then(response => response.json())
+            .then(data => data.results)
+    }
+}

bookmarks/components/index.js

@@ -0,0 +1,10 @@
+import TagAutoComplete from './TagAutocomplete.svelte'
+import SearchAutoComplete from './SearchAutoComplete.svelte'
+import {ApiClient} from './api'
+
+export default {
+    ApiClient,
+    TagAutoComplete,
+    SearchAutoComplete
+}
+

bookmarks/components/util.js

@@ -0,0 +1,37 @@
+export function debounce(callback, delay = 250) {
+    let timeoutId
+    return (...args) => {
+        clearTimeout(timeoutId)
+        timeoutId = setTimeout(() => {
+            timeoutId = null
+            callback(...args)
+        }, delay)
+    }
+}
+
+export function clampText(text, maxChars = 30) {
+    if(!text || text.length <= 30) return text
+
+    return text.substr(0, maxChars) + '...'
+}
+
+export function getCurrentWordBounds(input) {
+    const text = input.value;
+    const end = input.selectionStart;
+    let start = end;
+
+    let currentChar = text.charAt(start - 1);
+
+    while (currentChar && currentChar !== ' ' && start > 0) {
+        start--;
+        currentChar = text.charAt(start - 1);
+    }
+
+    return {start, end};
+}
+
+export function getCurrentWord(input) {
+    const bounds = getCurrentWordBounds(input);
+
+    return input.value.substring(bounds.start, bounds.end);
+}

bookmarks/context_processors.py

@@ -1,22 +0,0 @@
-from bookmarks import queries
-from bookmarks.models import BookmarkSearch, Toast
-from bookmarks import utils
-
-
-def toasts(request):
-    user = request.user
-    toast_messages = (
-        Toast.objects.filter(owner=user, acknowledged=False)
-        if user.is_authenticated
-        else []
-    )
-    has_toasts = len(toast_messages) > 0
-
-    return {
-        "has_toasts": has_toasts,
-        "toast_messages": toast_messages,
-    }
-
-
-def app_version(request):
-    return {"app_version": utils.app_version}

bookmarks/e2e/e2e_test_bookmark_details_modal.py

@@ -1,180 +0,0 @@
-from django.test import override_settings
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-from bookmarks.models import Bookmark
-
-
-class BookmarkDetailsModalE2ETestCase(LinkdingE2ETestCase):
-    def test_show_details(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            details_modal = self.open_details_modal(bookmark)
-            title = details_modal.locator("h2")
-            expect(title).to_have_text(bookmark.title)
-
-    def test_close_details(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            # close with close button
-            details_modal = self.open_details_modal(bookmark)
-            details_modal.locator("button.close").click()
-            expect(details_modal).to_be_hidden()
-
-            # close with backdrop
-            details_modal = self.open_details_modal(bookmark)
-            overlay = details_modal.locator(".modal-overlay")
-            overlay.click(position={"x": 0, "y": 0})
-            expect(details_modal).to_be_hidden()
-
-            # close with escape
-            details_modal = self.open_details_modal(bookmark)
-            self.page.keyboard.press("Escape")
-            expect(details_modal).to_be_hidden()
-
-    def test_toggle_archived(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            # archive
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            details_modal = self.open_details_modal(bookmark)
-            details_modal.get_by_text("Archived", exact=False).click()
-            expect(self.locate_bookmark(bookmark.title)).not_to_be_visible()
-            self.assertReloads(0)
-
-            # unarchive
-            url = reverse("bookmarks:archived")
-            self.page.goto(self.live_server_url + url)
-            self.resetReloads()
-
-            details_modal = self.open_details_modal(bookmark)
-            details_modal.get_by_text("Archived", exact=False).click()
-            expect(self.locate_bookmark(bookmark.title)).not_to_be_visible()
-            self.assertReloads(0)
-
-    def test_toggle_unread(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            # mark as unread
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            details_modal = self.open_details_modal(bookmark)
-
-            details_modal.get_by_text("Unread").click()
-            bookmark_item = self.locate_bookmark(bookmark.title)
-            expect(bookmark_item.get_by_text("Unread")).to_be_visible()
-            self.assertReloads(0)
-
-            # mark as read
-            details_modal.get_by_text("Unread").click()
-            bookmark_item = self.locate_bookmark(bookmark.title)
-            expect(bookmark_item.get_by_text("Unread")).not_to_be_visible()
-            self.assertReloads(0)
-
-    def test_toggle_shared(self):
-        profile = self.get_or_create_test_user().profile
-        profile.enable_sharing = True
-        profile.save()
-
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            # share bookmark
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            details_modal = self.open_details_modal(bookmark)
-
-            details_modal.get_by_text("Shared").click()
-            bookmark_item = self.locate_bookmark(bookmark.title)
-            expect(bookmark_item.get_by_text("Shared")).to_be_visible()
-            self.assertReloads(0)
-
-            # unshare bookmark
-            details_modal.get_by_text("Shared").click()
-            bookmark_item = self.locate_bookmark(bookmark.title)
-            expect(bookmark_item.get_by_text("Shared")).not_to_be_visible()
-            self.assertReloads(0)
-
-    def test_edit_return_url(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index") + f"?q={bookmark.title}"
-            self.open(url, p)
-
-            details_modal = self.open_details_modal(bookmark)
-
-            # Navigate to edit page
-            with self.page.expect_navigation():
-                details_modal.get_by_text("Edit").click()
-
-            # Cancel edit, verify return to details url
-            details_url = url + f"&details={bookmark.id}"
-            with self.page.expect_navigation(url=self.live_server_url + details_url):
-                self.page.get_by_text("Nevermind").click()
-
-    def test_delete(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index") + f"?q={bookmark.title}"
-            self.open(url, p)
-
-            details_modal = self.open_details_modal(bookmark)
-
-            # Wait for confirm button to be initialized
-            self.page.wait_for_timeout(1000)
-
-            # Delete bookmark, verify return url
-            with self.page.expect_navigation(url=self.live_server_url + url):
-                details_modal.get_by_text("Delete...").click()
-                details_modal.get_by_text("Confirm").click()
-
-            # verify bookmark is deleted
-            self.locate_bookmark(bookmark.title)
-            expect(self.locate_bookmark(bookmark.title)).not_to_be_visible()
-
-        self.assertEqual(Bookmark.objects.count(), 0)
-
-    @override_settings(LD_ENABLE_SNAPSHOTS=True)
-    def test_create_snapshot_remove_snapshot(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index") + f"?q={bookmark.title}"
-            self.open(url, p)
-
-            details_modal = self.open_details_modal(bookmark)
-            asset_list = details_modal.locator(".assets")
-
-            # No snapshots initially
-            snapshot = asset_list.get_by_text("HTML snapshot from", exact=False)
-            expect(snapshot).not_to_be_visible()
-
-            # Create snapshot
-            details_modal.get_by_text("Create HTML snapshot", exact=False).click()
-            self.assertReloads(0)
-
-            # Has new snapshots
-            expect(snapshot).to_be_visible()
-
-            # Remove snapshot
-            asset_list.get_by_text("Remove", exact=False).click()
-            asset_list.get_by_text("Confirm", exact=False).click()
-
-            # Snapshot is removed
-            expect(snapshot).not_to_be_visible()
-            self.assertReloads(0)

bookmarks/e2e/e2e_test_bookmark_item.py

@@ -1,25 +0,0 @@
-from unittest import skip
-
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-
-
-class BookmarkItemE2ETestCase(LinkdingE2ETestCase):
-    @skip("Fails in CI, needs investigation")
-    def test_toggle_notes_should_show_hide_notes(self):
-        bookmark = self.setup_bookmark(notes="Test notes")
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:index"), p)
-
-            notes = self.locate_bookmark(bookmark.title).locator(".notes")
-            expect(notes).to_be_hidden()
-
-            toggle_notes = page.locator("li button.toggle-notes")
-            toggle_notes.click()
-            expect(notes).to_be_visible()
-
-            toggle_notes.click()
-            expect(notes).to_be_hidden()

bookmarks/e2e/e2e_test_bookmark_page_bulk_edit.py

@@ -1,335 +0,0 @@
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-from bookmarks.models import Bookmark
-
-
-class BookmarkPagePartialUpdatesE2ETestCase(LinkdingE2ETestCase):
-    def setup_test_data(self):
-        self.setup_numbered_bookmarks(50)
-        self.setup_numbered_bookmarks(50, archived=True)
-        self.setup_numbered_bookmarks(50, prefix="foo")
-        self.setup_numbered_bookmarks(50, archived=True, prefix="foo")
-
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=False, title__startswith="Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=True, title__startswith="Archived Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(is_archived=False, title__startswith="foo").count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(is_archived=True, title__startswith="foo").count(),
-        )
-
-    def test_active_bookmarks_bulk_select_across(self):
-        self.setup_test_data()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            bookmark_list = self.locate_bookmark_list()
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-            # Wait until bookmark list is updated (old reference becomes invisible)
-            expect(bookmark_list).not_to_be_visible()
-
-        self.assertEqual(
-            0,
-            Bookmark.objects.filter(
-                is_archived=False, title__startswith="Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=True, title__startswith="Archived Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            0,
-            Bookmark.objects.filter(is_archived=False, title__startswith="foo").count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(is_archived=True, title__startswith="foo").count(),
-        )
-
-    def test_archived_bookmarks_bulk_select_across(self):
-        self.setup_test_data()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:archived"), p)
-
-            bookmark_list = self.locate_bookmark_list()
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-            # Wait until bookmark list is updated (old reference becomes invisible)
-            expect(bookmark_list).not_to_be_visible()
-
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=False, title__startswith="Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            0,
-            Bookmark.objects.filter(
-                is_archived=True, title__startswith="Archived Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(is_archived=False, title__startswith="foo").count(),
-        )
-        self.assertEqual(
-            0,
-            Bookmark.objects.filter(is_archived=True, title__startswith="foo").count(),
-        )
-
-    def test_active_bookmarks_bulk_select_across_respects_query(self):
-        self.setup_test_data()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index") + "?q=foo", p)
-
-            bookmark_list = self.locate_bookmark_list()
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-            # Wait until bookmark list is updated (old reference becomes invisible)
-            expect(bookmark_list).not_to_be_visible()
-
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=False, title__startswith="Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=True, title__startswith="Archived Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            0,
-            Bookmark.objects.filter(is_archived=False, title__startswith="foo").count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(is_archived=True, title__startswith="foo").count(),
-        )
-
-    def test_archived_bookmarks_bulk_select_across_respects_query(self):
-        self.setup_test_data()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:archived") + "?q=foo", p)
-
-            bookmark_list = self.locate_bookmark_list()
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-            # Wait until bookmark list is updated (old reference becomes invisible)
-            expect(bookmark_list).not_to_be_visible()
-
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=False, title__startswith="Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(
-                is_archived=True, title__startswith="Archived Bookmark"
-            ).count(),
-        )
-        self.assertEqual(
-            50,
-            Bookmark.objects.filter(is_archived=False, title__startswith="foo").count(),
-        )
-        self.assertEqual(
-            0,
-            Bookmark.objects.filter(is_archived=True, title__startswith="foo").count(),
-        )
-
-    def test_select_all_toggles_all_checkboxes(self):
-        self.setup_numbered_bookmarks(5)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            page = self.open(url, p)
-
-            self.locate_bulk_edit_toggle().click()
-
-            checkboxes = page.locator("label.bulk-edit-checkbox input")
-            self.assertEqual(6, checkboxes.count())
-            for i in range(checkboxes.count()):
-                expect(checkboxes.nth(i)).not_to_be_checked()
-
-            self.locate_bulk_edit_select_all().click()
-
-            for i in range(checkboxes.count()):
-                expect(checkboxes.nth(i)).to_be_checked()
-
-            self.locate_bulk_edit_select_all().click()
-
-            for i in range(checkboxes.count()):
-                expect(checkboxes.nth(i)).not_to_be_checked()
-
-    def test_select_all_shows_select_across(self):
-        self.setup_numbered_bookmarks(5)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            self.locate_bulk_edit_toggle().click()
-
-            expect(self.locate_bulk_edit_select_across()).not_to_be_visible()
-
-            self.locate_bulk_edit_select_all().click()
-            expect(self.locate_bulk_edit_select_across()).to_be_visible()
-
-            self.locate_bulk_edit_select_all().click()
-            expect(self.locate_bulk_edit_select_across()).not_to_be_visible()
-
-    def test_select_across_is_unchecked_when_toggling_all(self):
-        self.setup_numbered_bookmarks(5)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            self.locate_bulk_edit_toggle().click()
-
-            # Show select across, check it
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-            expect(self.locate_bulk_edit_select_across()).to_be_checked()
-
-            # Hide select across by toggling select all
-            self.locate_bulk_edit_select_all().click()
-            expect(self.locate_bulk_edit_select_across()).not_to_be_visible()
-
-            # Show select across again, verify it is unchecked
-            self.locate_bulk_edit_select_all().click()
-            expect(self.locate_bulk_edit_select_across()).not_to_be_checked()
-
-    def test_select_across_is_unchecked_when_toggling_bookmark(self):
-        self.setup_numbered_bookmarks(5)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            self.locate_bulk_edit_toggle().click()
-
-            # Show select across, check it
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-            expect(self.locate_bulk_edit_select_across()).to_be_checked()
-
-            # Hide select across by toggling a single bookmark
-            self.locate_bookmark("Bookmark 1").locator(
-                "label.bulk-edit-checkbox"
-            ).click()
-            expect(self.locate_bulk_edit_select_across()).not_to_be_visible()
-
-            # Show select across again, verify it is unchecked
-            self.locate_bookmark("Bookmark 1").locator(
-                "label.bulk-edit-checkbox"
-            ).click()
-            expect(self.locate_bulk_edit_select_across()).not_to_be_checked()
-
-    def test_execute_resets_all_checkboxes(self):
-        self.setup_numbered_bookmarks(100)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            page = self.open(url, p)
-
-            bookmark_list = self.locate_bookmark_list()
-
-            # Select all bookmarks, enable select across
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bulk_edit_select_all().click()
-            self.locate_bulk_edit_select_across().click()
-
-            # Execute bulk action
-            self.select_bulk_action("Mark as unread")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-
-            # Wait until bookmark list is updated (old reference becomes invisible)
-            expect(bookmark_list).not_to_be_visible()
-
-            # Verify bulk edit checkboxes are reset
-            checkboxes = page.locator("label.bulk-edit-checkbox input")
-            self.assertEqual(31, checkboxes.count())
-            for i in range(checkboxes.count()):
-                expect(checkboxes.nth(i)).not_to_be_checked()
-
-            # Toggle select all and verify select across is reset
-            self.locate_bulk_edit_select_all().click()
-            expect(self.locate_bulk_edit_select_across()).not_to_be_checked()
-
-    def test_update_select_across_bookmark_count(self):
-        self.setup_numbered_bookmarks(100)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            bookmark_list = self.locate_bookmark_list()
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bulk_edit_select_all().click()
-
-            expect(
-                self.locate_bulk_edit_bar().get_by_text("All pages (100 bookmarks)")
-            ).to_be_visible()
-
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-            # Wait until bookmark list is updated (old reference becomes invisible)
-            expect(bookmark_list).not_to_be_visible()
-
-            expect(self.locate_bulk_edit_select_all()).not_to_be_checked()
-            self.locate_bulk_edit_select_all().click()
-
-            expect(
-                self.locate_bulk_edit_bar().get_by_text("All pages (70 bookmarks)")
-            ).to_be_visible()

bookmarks/e2e/e2e_test_bookmark_page_partial_updates.py

@@ -1,308 +0,0 @@
-from typing import List
-
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-
-
-class BookmarkPagePartialUpdatesE2ETestCase(LinkdingE2ETestCase):
-    def setup_fixture(self):
-        profile = self.get_or_create_test_user().profile
-        profile.enable_sharing = True
-        profile.save()
-
-        # create a number of bookmarks with different states / visibility to
-        # verify correct data is loaded on update
-        self.setup_numbered_bookmarks(3, with_tags=True)
-        self.setup_numbered_bookmarks(3, with_tags=True, archived=True)
-        self.setup_numbered_bookmarks(
-            3,
-            shared=True,
-            prefix="Joe's Bookmark",
-            user=self.setup_user(enable_sharing=True),
-        )
-
-    def assertVisibleBookmarks(self, titles: List[str]):
-        bookmark_tags = self.page.locator("li[ld-bookmark-item]")
-        expect(bookmark_tags).to_have_count(len(titles))
-
-        for title in titles:
-            matching_tag = bookmark_tags.filter(has_text=title)
-            expect(matching_tag).to_be_visible()
-
-    def assertVisibleTags(self, titles: List[str]):
-        tag_tags = self.page.locator(".tag-cloud .unselected-tags a")
-        expect(tag_tags).to_have_count(len(titles))
-
-        for title in titles:
-            matching_tag = tag_tags.filter(has_text=title)
-            expect(matching_tag).to_be_visible()
-
-    def test_partial_update_respects_query(self):
-        self.setup_numbered_bookmarks(5, prefix="foo")
-        self.setup_numbered_bookmarks(5, prefix="bar")
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index") + "?q=foo"
-            self.open(url, p)
-
-            self.assertVisibleBookmarks(["foo 1", "foo 2", "foo 3", "foo 4", "foo 5"])
-
-            self.locate_bookmark("foo 2").get_by_text("Archive").click()
-            self.assertVisibleBookmarks(["foo 1", "foo 3", "foo 4", "foo 5"])
-
-    def test_partial_update_respects_sort(self):
-        self.setup_numbered_bookmarks(5, prefix="foo")
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index") + "?sort=title_asc"
-            page = self.open(url, p)
-
-            first_item = page.locator("li[ld-bookmark-item]").first
-            expect(first_item).to_contain_text("foo 1")
-
-            first_item.get_by_text("Archive").click()
-
-            first_item = page.locator("li[ld-bookmark-item]").first
-            expect(first_item).to_contain_text("foo 2")
-
-    def test_partial_update_respects_page(self):
-        # add a suffix, otherwise 'foo 1' also matches 'foo 10'
-        self.setup_numbered_bookmarks(50, prefix="foo", suffix="-")
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index") + "?q=foo&page=2"
-            self.open(url, p)
-
-            # with descending sort, page two has 'foo 1' to 'foo 20'
-            expected_titles = [f"foo {i}-" for i in range(1, 21)]
-            self.assertVisibleBookmarks(expected_titles)
-
-            self.locate_bookmark("foo 20-").get_by_text("Archive").click()
-
-            expected_titles = [f"foo {i}-" for i in range(1, 20)]
-            self.assertVisibleBookmarks(expected_titles)
-
-    def test_multiple_partial_updates(self):
-        self.setup_numbered_bookmarks(5)
-
-        with sync_playwright() as p:
-            url = reverse("bookmarks:index")
-            self.open(url, p)
-
-            self.locate_bookmark("Bookmark 1").get_by_text("Archive").click()
-            self.assertVisibleBookmarks(
-                ["Bookmark 2", "Bookmark 3", "Bookmark 4", "Bookmark 5"]
-            )
-
-            self.locate_bookmark("Bookmark 2").get_by_text("Archive").click()
-            self.assertVisibleBookmarks(["Bookmark 3", "Bookmark 4", "Bookmark 5"])
-
-            self.locate_bookmark("Bookmark 3").get_by_text("Archive").click()
-            self.assertVisibleBookmarks(["Bookmark 4", "Bookmark 5"])
-
-            self.assertReloads(0)
-
-    def test_active_bookmarks_partial_update_on_archive(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            self.locate_bookmark("Bookmark 2").get_by_text("Archive").click()
-
-            self.assertVisibleBookmarks(["Bookmark 1", "Bookmark 3"])
-            self.assertVisibleTags(["Tag 1", "Tag 3"])
-            self.assertReloads(0)
-
-    def test_active_bookmarks_partial_update_on_delete(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            self.locate_bookmark("Bookmark 2").get_by_text("Remove").click()
-            self.locate_bookmark("Bookmark 2").get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(["Bookmark 1", "Bookmark 3"])
-            self.assertVisibleTags(["Tag 1", "Tag 3"])
-            self.assertReloads(0)
-
-    def test_active_bookmarks_partial_update_on_mark_as_read(self):
-        self.setup_fixture()
-        bookmark2 = self.get_numbered_bookmark("Bookmark 2")
-        bookmark2.unread = True
-        bookmark2.save()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            expect(self.locate_bookmark("Bookmark 2")).to_have_class("unread")
-            self.locate_bookmark("Bookmark 2").get_by_text("Unread").click()
-            self.locate_bookmark("Bookmark 2").get_by_text("Yes").click()
-
-            expect(self.locate_bookmark("Bookmark 2")).not_to_have_class("unread")
-            self.assertReloads(0)
-
-    def test_active_bookmarks_partial_update_on_unshare(self):
-        self.setup_fixture()
-        bookmark2 = self.get_numbered_bookmark("Bookmark 2")
-        bookmark2.shared = True
-        bookmark2.save()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            expect(self.locate_bookmark("Bookmark 2")).to_have_class("shared")
-            self.locate_bookmark("Bookmark 2").get_by_text("Shared").click()
-            self.locate_bookmark("Bookmark 2").get_by_text("Yes").click()
-
-            expect(self.locate_bookmark("Bookmark 2")).not_to_have_class("shared")
-            self.assertReloads(0)
-
-    def test_active_bookmarks_partial_update_on_bulk_archive(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bookmark("Bookmark 2").locator(
-                "label.bulk-edit-checkbox"
-            ).click()
-            self.select_bulk_action("Archive")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(["Bookmark 1", "Bookmark 3"])
-            self.assertVisibleTags(["Tag 1", "Tag 3"])
-            self.assertReloads(0)
-
-    def test_active_bookmarks_partial_update_on_bulk_delete(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:index"), p)
-
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bookmark("Bookmark 2").locator(
-                "label.bulk-edit-checkbox"
-            ).click()
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(["Bookmark 1", "Bookmark 3"])
-            self.assertVisibleTags(["Tag 1", "Tag 3"])
-            self.assertReloads(0)
-
-    def test_archived_bookmarks_partial_update_on_unarchive(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:archived"), p)
-
-            self.locate_bookmark("Archived Bookmark 2").get_by_text("Unarchive").click()
-
-            self.assertVisibleBookmarks(["Archived Bookmark 1", "Archived Bookmark 3"])
-            self.assertVisibleTags(["Archived Tag 1", "Archived Tag 3"])
-            self.assertReloads(0)
-
-    def test_archived_bookmarks_partial_update_on_delete(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:archived"), p)
-
-            self.locate_bookmark("Archived Bookmark 2").get_by_text("Remove").click()
-            self.locate_bookmark("Archived Bookmark 2").get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(["Archived Bookmark 1", "Archived Bookmark 3"])
-            self.assertVisibleTags(["Archived Tag 1", "Archived Tag 3"])
-            self.assertReloads(0)
-
-    def test_archived_bookmarks_partial_update_on_bulk_unarchive(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:archived"), p)
-
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bookmark("Archived Bookmark 2").locator(
-                "label.bulk-edit-checkbox"
-            ).click()
-            self.select_bulk_action("Unarchive")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(["Archived Bookmark 1", "Archived Bookmark 3"])
-            self.assertVisibleTags(["Archived Tag 1", "Archived Tag 3"])
-            self.assertReloads(0)
-
-    def test_archived_bookmarks_partial_update_on_bulk_delete(self):
-        self.setup_fixture()
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:archived"), p)
-
-            self.locate_bulk_edit_toggle().click()
-            self.locate_bookmark("Archived Bookmark 2").locator(
-                "label.bulk-edit-checkbox"
-            ).click()
-            self.select_bulk_action("Delete")
-            self.locate_bulk_edit_bar().get_by_text("Execute").click()
-            self.locate_bulk_edit_bar().get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(["Archived Bookmark 1", "Archived Bookmark 3"])
-            self.assertVisibleTags(["Archived Tag 1", "Archived Tag 3"])
-            self.assertReloads(0)
-
-    def test_shared_bookmarks_partial_update_on_unarchive(self):
-        self.setup_fixture()
-        self.setup_numbered_bookmarks(
-            3, shared=True, prefix="My Bookmark", with_tags=True
-        )
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:shared"), p)
-
-            self.locate_bookmark("My Bookmark 2").get_by_text("Archive").click()
-
-            # Shared bookmarks page also shows archived bookmarks, though it probably shouldn't
-            self.assertVisibleBookmarks(
-                [
-                    "My Bookmark 1",
-                    "My Bookmark 2",
-                    "My Bookmark 3",
-                    "Joe's Bookmark 1",
-                    "Joe's Bookmark 2",
-                    "Joe's Bookmark 3",
-                ]
-            )
-            self.assertVisibleTags(["Shared Tag 1", "Shared Tag 2", "Shared Tag 3"])
-            self.assertReloads(0)
-
-    def test_shared_bookmarks_partial_update_on_delete(self):
-        self.setup_fixture()
-        self.setup_numbered_bookmarks(
-            3, shared=True, prefix="My Bookmark", with_tags=True
-        )
-
-        with sync_playwright() as p:
-            self.open(reverse("bookmarks:shared"), p)
-
-            self.locate_bookmark("My Bookmark 2").get_by_text("Remove").click()
-            self.locate_bookmark("My Bookmark 2").get_by_text("Confirm").click()
-
-            self.assertVisibleBookmarks(
-                [
-                    "My Bookmark 1",
-                    "My Bookmark 3",
-                    "Joe's Bookmark 1",
-                    "Joe's Bookmark 2",
-                    "Joe's Bookmark 3",
-                ]
-            )
-            self.assertVisibleTags(["Shared Tag 1", "Shared Tag 3"])
-            self.assertReloads(0)

bookmarks/e2e/e2e_test_edit_bookmark_form.py

@@ -1,65 +0,0 @@
-from unittest.mock import patch
-
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-from bookmarks.services import website_loader
-
-mock_website_metadata = website_loader.WebsiteMetadata(
-    url="https://example.com",
-    title="Example Domain",
-    description="This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.",
-    preview_image=None,
-)
-
-
-class BookmarkFormE2ETestCase(LinkdingE2ETestCase):
-
-    def setUp(self) -> None:
-        super().setUp()
-        self.website_loader_patch = patch.object(
-            website_loader, "load_website_metadata", return_value=mock_website_metadata
-        )
-        self.website_loader_patch.start()
-
-    def tearDown(self) -> None:
-        super().tearDown()
-        self.website_loader_patch.stop()
-
-    def test_should_not_check_for_existing_bookmark(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:edit", args=[bookmark.id]), p)
-
-            page.wait_for_timeout(timeout=1000)
-            page.get_by_text("This URL is already bookmarked.").wait_for(state="hidden")
-
-    def test_should_not_prefill_title_and_description(self):
-        bookmark = self.setup_bookmark(
-            title="Initial title", description="Initial description"
-        )
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:edit", args=[bookmark.id]), p)
-            page.wait_for_timeout(timeout=1000)
-
-            title = page.get_by_label("Title")
-            description = page.get_by_label("Description")
-            expect(title).to_have_value(bookmark.title)
-            expect(description).to_have_value(bookmark.description)
-
-    def test_enter_url_should_not_prefill_title_and_description(self):
-        bookmark = self.setup_bookmark()
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:edit", args=[bookmark.id]), p)
-
-            page.get_by_label("URL").fill("https://example.com")
-            page.wait_for_timeout(timeout=1000)
-
-            title = page.get_by_label("Title")
-            description = page.get_by_label("Description")
-            expect(title).to_have_value(bookmark.title)
-            expect(description).to_have_value(bookmark.description)

bookmarks/e2e/e2e_test_global_shortcuts.py

@@ -1,30 +0,0 @@
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-
-
-class GlobalShortcutsE2ETestCase(LinkdingE2ETestCase):
-    def test_focus_search(self):
-        with sync_playwright() as p:
-            browser = self.setup_browser(p)
-            page = browser.new_page()
-            page.goto(self.live_server_url + reverse("bookmarks:index"))
-
-            page.press("body", "s")
-
-            expect(page.get_by_placeholder("Search for words or #tags")).to_be_focused()
-
-            browser.close()
-
-    def test_add_bookmark(self):
-        with sync_playwright() as p:
-            browser = self.setup_browser(p)
-            page = browser.new_page()
-            page.goto(self.live_server_url + reverse("bookmarks:index"))
-
-            page.press("body", "n")
-
-            expect(page).to_have_url(self.live_server_url + reverse("bookmarks:new"))
-
-            browser.close()

bookmarks/e2e/e2e_test_new_bookmark_form.py

@@ -1,166 +0,0 @@
-from unittest.mock import patch
-from urllib.parse import quote
-
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-from bookmarks.services import website_loader
-
-mock_website_metadata = website_loader.WebsiteMetadata(
-    url="https://example.com",
-    title="Example Domain",
-    description="This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.",
-    preview_image=None,
-)
-
-
-class BookmarkFormE2ETestCase(LinkdingE2ETestCase):
-
-    def setUp(self) -> None:
-        super().setUp()
-        self.website_loader_patch = patch.object(
-            website_loader, "load_website_metadata", return_value=mock_website_metadata
-        )
-        self.website_loader_patch.start()
-
-    def tearDown(self) -> None:
-        super().tearDown()
-        self.website_loader_patch.stop()
-
-    def test_enter_url_prefills_title_and_description(self):
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:new"), p)
-            url = page.get_by_label("URL")
-            title = page.get_by_label("Title")
-            description = page.get_by_label("Description")
-
-            url.fill("https://example.com")
-            expect(title).to_have_value("Example Domain")
-            expect(description).to_have_value(
-                "This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission."
-            )
-
-    def test_enter_url_does_not_overwrite_modified_title_and_description(self):
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:new"), p)
-            url = page.get_by_label("URL")
-            title = page.get_by_label("Title")
-            description = page.get_by_label("Description")
-
-            title.fill("Modified title")
-            description.fill("Modified description")
-            url.fill("https://example.com")
-            page.wait_for_timeout(timeout=1000)
-
-            expect(title).to_have_value("Modified title")
-            expect(description).to_have_value("Modified description")
-
-    def test_with_initial_url_prefills_title_and_description(self):
-        with sync_playwright() as p:
-            page_url = reverse("bookmarks:new") + f"?url={quote('https://example.com')}"
-            page = self.open(page_url, p)
-            url = page.get_by_label("URL")
-            title = page.get_by_label("Title")
-            description = page.get_by_label("Description")
-
-            page.wait_for_timeout(timeout=1000)
-
-            expect(url).to_have_value("https://example.com")
-            expect(title).to_have_value("Example Domain")
-            expect(description).to_have_value(
-                "This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission."
-            )
-
-    def test_with_initial_url_title_description_does_not_overwrite_title_and_description(
-        self,
-    ):
-        with sync_playwright() as p:
-            page_url = (
-                reverse("bookmarks:new")
-                + f"?url={quote('https://example.com')}&title=Initial+title&description=Initial+description"
-            )
-            page = self.open(page_url, p)
-            url = page.get_by_label("URL")
-            title = page.get_by_label("Title")
-            description = page.get_by_label("Description")
-
-            page.wait_for_timeout(timeout=1000)
-
-            expect(url).to_have_value("https://example.com")
-            expect(title).to_have_value("Initial title")
-            expect(description).to_have_value("Initial description")
-
-    def test_create_should_check_for_existing_bookmark(self):
-        existing_bookmark = self.setup_bookmark(
-            title="Existing title",
-            description="Existing description",
-            notes="Existing notes",
-            tags=[self.setup_tag(name="tag1"), self.setup_tag(name="tag2")],
-            unread=True,
-        )
-        tag_names = " ".join(existing_bookmark.tag_names)
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:new"), p)
-
-            # Enter bookmarked URL
-            page.get_by_label("URL").fill(existing_bookmark.url)
-            # Already bookmarked hint should be visible
-            page.get_by_text("This URL is already bookmarked.").wait_for(timeout=2000)
-            # Form should be pre-filled with data from existing bookmark
-            self.assertEqual(
-                existing_bookmark.title, page.get_by_label("Title").input_value()
-            )
-            self.assertEqual(
-                existing_bookmark.description,
-                page.get_by_label("Description").input_value(),
-            )
-            self.assertEqual(
-                existing_bookmark.notes, page.get_by_label("Notes").input_value()
-            )
-            self.assertEqual(tag_names, page.get_by_label("Tags").input_value())
-            self.assertTrue(tag_names, page.get_by_label("Mark as unread").is_checked())
-
-            # Enter non-bookmarked URL
-            page.get_by_label("URL").fill("https://example.com/unknown")
-            # Already bookmarked hint should be hidden
-            page.get_by_text("This URL is already bookmarked.").wait_for(
-                state="hidden", timeout=2000
-            )
-
-    def test_enter_url_of_existing_bookmark_should_show_notes(self):
-        bookmark = self.setup_bookmark(
-            notes="Existing notes", description="Existing description"
-        )
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:new"), p)
-
-            details = page.locator("details.notes")
-            expect(details).not_to_have_attribute("open", value="")
-
-            page.get_by_label("URL").fill(bookmark.url)
-            expect(details).to_have_attribute("open", value="")
-
-    def test_create_should_preview_auto_tags(self):
-        profile = self.get_or_create_test_user().profile
-        profile.auto_tagging_rules = "github.com dev github"
-        profile.save()
-
-        with sync_playwright() as p:
-            # Open page with URL that should have auto tags
-            url = (
-                reverse("bookmarks:new")
-                + "?url=https%3A%2F%2Fgithub.com%2Fsissbruecker%2Flinkding"
-            )
-            page = self.open(url, p)
-
-            auto_tags_hint = page.locator(".form-input-hint.auto-tags")
-            expect(auto_tags_hint).to_be_visible()
-            expect(auto_tags_hint).to_have_text("Auto tags: dev github")
-
-            # Change to URL without auto tags
-            page.get_by_label("URL").fill("https://example.com")
-
-            expect(auto_tags_hint).to_be_hidden()

bookmarks/e2e/e2e_test_settings_general.py

@@ -1,88 +0,0 @@
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-from bookmarks.models import UserProfile
-
-
-class SettingsGeneralE2ETestCase(LinkdingE2ETestCase):
-    def test_should_only_enable_public_sharing_if_sharing_is_enabled(self):
-        with sync_playwright() as p:
-            browser = self.setup_browser(p)
-            page = browser.new_page()
-            page.goto(self.live_server_url + reverse("bookmarks:settings.general"))
-
-            enable_sharing = page.get_by_label("Enable bookmark sharing")
-            enable_sharing_label = page.get_by_text("Enable bookmark sharing")
-            enable_public_sharing = page.get_by_label("Enable public bookmark sharing")
-            enable_public_sharing_label = page.get_by_text(
-                "Enable public bookmark sharing"
-            )
-
-            # Public sharing is disabled by default
-            expect(enable_sharing).not_to_be_checked()
-            expect(enable_public_sharing).not_to_be_checked()
-            expect(enable_public_sharing).to_be_disabled()
-
-            # Enable sharing
-            enable_sharing_label.click()
-            expect(enable_sharing).to_be_checked()
-            expect(enable_public_sharing).not_to_be_checked()
-            expect(enable_public_sharing).to_be_enabled()
-
-            # Enable public sharing
-            enable_public_sharing_label.click()
-            expect(enable_public_sharing).to_be_checked()
-            expect(enable_public_sharing).to_be_enabled()
-
-            # Disable sharing
-            enable_sharing_label.click()
-            expect(enable_sharing).not_to_be_checked()
-            expect(enable_public_sharing).not_to_be_checked()
-            expect(enable_public_sharing).to_be_disabled()
-
-    def test_should_not_show_bookmark_description_max_lines_when_display_inline(self):
-        profile = self.get_or_create_test_user().profile
-        profile.bookmark_description_display = (
-            UserProfile.BOOKMARK_DESCRIPTION_DISPLAY_INLINE
-        )
-        profile.save()
-
-        with sync_playwright() as p:
-            browser = self.setup_browser(p)
-            page = browser.new_page()
-            page.goto(self.live_server_url + reverse("bookmarks:settings.general"))
-
-            max_lines = page.get_by_label("Bookmark description max lines")
-            expect(max_lines).to_be_hidden()
-
-    def test_should_show_bookmark_description_max_lines_when_display_separate(self):
-        profile = self.get_or_create_test_user().profile
-        profile.bookmark_description_display = (
-            UserProfile.BOOKMARK_DESCRIPTION_DISPLAY_SEPARATE
-        )
-        profile.save()
-
-        with sync_playwright() as p:
-            browser = self.setup_browser(p)
-            page = browser.new_page()
-            page.goto(self.live_server_url + reverse("bookmarks:settings.general"))
-
-            max_lines = page.get_by_label("Bookmark description max lines")
-            expect(max_lines).to_be_visible()
-
-    def test_should_update_bookmark_description_max_lines_when_changing_display(self):
-        with sync_playwright() as p:
-            browser = self.setup_browser(p)
-            page = browser.new_page()
-            page.goto(self.live_server_url + reverse("bookmarks:settings.general"))
-
-            max_lines = page.get_by_label("Bookmark description max lines")
-            expect(max_lines).to_be_hidden()
-
-            display = page.get_by_label("Bookmark description", exact=True)
-            display.select_option("separate")
-            expect(max_lines).to_be_visible()
-
-            display.select_option("inline")
-            expect(max_lines).to_be_hidden()

bookmarks/e2e/e2e_test_tag_cloud_modal.py

@@ -1,74 +0,0 @@
-from django.urls import reverse
-from playwright.sync_api import sync_playwright, expect
-
-from bookmarks.e2e.helpers import LinkdingE2ETestCase
-
-
-class TagCloudModalE2ETestCase(LinkdingE2ETestCase):
-    def test_show_modal_close_modal(self):
-        self.setup_bookmark(tags=[self.setup_tag(name="cooking")])
-        self.setup_bookmark(tags=[self.setup_tag(name="hiking")])
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:index"), p)
-
-            # use smaller viewport to make tags button visible
-            page.set_viewport_size({"width": 375, "height": 812})
-
-            # open tag cloud modal
-            modal_trigger = page.locator(".content-area-header").get_by_role(
-                "button", name="Tags"
-            )
-            modal_trigger.click()
-
-            # verify modal is visible
-            modal = page.locator(".modal")
-            expect(modal).to_be_visible()
-            expect(modal.locator("h2")).to_have_text("Tags")
-
-            # close with close button
-            modal.locator("button.close").click()
-            expect(modal).to_be_hidden()
-
-            # open modal again
-            modal_trigger.click()
-
-            # close with backdrop
-            backdrop = modal.locator(".modal-overlay")
-            backdrop.click(position={"x": 0, "y": 0})
-            expect(modal).to_be_hidden()
-
-    def test_select_tag(self):
-        self.setup_bookmark(tags=[self.setup_tag(name="cooking")])
-        self.setup_bookmark(tags=[self.setup_tag(name="hiking")])
-
-        with sync_playwright() as p:
-            page = self.open(reverse("bookmarks:index"), p)
-
-            # use smaller viewport to make tags button visible
-            page.set_viewport_size({"width": 375, "height": 812})
-
-            # open tag cloud modal
-            modal_trigger = page.locator(".content-area-header").get_by_role(
-                "button", name="Tags"
-            )
-            modal_trigger.click()
-
-            # verify tags are displayed
-            modal = page.locator(".modal")
-            unselected_tags = modal.locator(".unselected-tags")
-            expect(unselected_tags.get_by_text("cooking")).to_be_visible()
-            expect(unselected_tags.get_by_text("hiking")).to_be_visible()
-
-            # select tag
-            unselected_tags.get_by_text("cooking").click()
-
-            # open modal again
-            modal_trigger.click()
-
-            # verify tag is selected, other tag is not visible anymore
-            selected_tags = modal.locator(".selected-tags")
-            expect(selected_tags.get_by_text("cooking")).to_be_visible()
-
-            expect(unselected_tags.get_by_text("cooking")).not_to_be_visible()
-            expect(unselected_tags.get_by_text("hiking")).not_to_be_visible()

bookmarks/e2e/helpers.py

@@ -1,81 +0,0 @@
-from django.contrib.staticfiles.testing import LiveServerTestCase
-from playwright.sync_api import BrowserContext, Playwright, Page
-from playwright.sync_api import expect
-
-from bookmarks.tests.helpers import BookmarkFactoryMixin
-
-
-class LinkdingE2ETestCase(LiveServerTestCase, BookmarkFactoryMixin):
-    def setUp(self) -> None:
-        self.client.force_login(self.get_or_create_test_user())
-        self.cookie = self.client.cookies["sessionid"]
-
-    def setup_browser(self, playwright) -> BrowserContext:
-        browser = playwright.chromium.launch(headless=True)
-        context = browser.new_context()
-        context.add_cookies(
-            [
-                {
-                    "name": "sessionid",
-                    "value": self.cookie.value,
-                    "domain": self.live_server_url.replace("http:", ""),
-                    "path": "/",
-                }
-            ]
-        )
-        return context
-
-    def open(self, url: str, playwright: Playwright) -> Page:
-        browser = self.setup_browser(playwright)
-        self.page = browser.new_page()
-        self.page.goto(self.live_server_url + url)
-        self.page.on("load", self.on_load)
-        self.num_loads = 0
-        return self.page
-
-    def on_load(self):
-        self.num_loads += 1
-
-    def assertReloads(self, count: int):
-        self.assertEqual(self.num_loads, count)
-
-    def resetReloads(self):
-        self.num_loads = 0
-
-    def locate_bookmark_list(self):
-        return self.page.locator("ul[ld-bookmark-list]")
-
-    def locate_bookmark(self, title: str):
-        bookmark_tags = self.page.locator("li[ld-bookmark-item]")
-        return bookmark_tags.filter(has_text=title)
-
-    def locate_details_modal(self):
-        return self.page.locator(".modal.bookmark-details")
-
-    def open_details_modal(self, bookmark):
-        details_button = self.locate_bookmark(bookmark.title).get_by_text("View")
-        details_button.click()
-
-        details_modal = self.locate_details_modal()
-        expect(details_modal).to_be_visible()
-
-        return details_modal
-
-    def locate_bulk_edit_bar(self):
-        return self.page.locator(".bulk-edit-bar")
-
-    def locate_bulk_edit_select_all(self):
-        return self.locate_bulk_edit_bar().locator("label.bulk-edit-checkbox.all")
-
-    def locate_bulk_edit_select_across(self):
-        return self.locate_bulk_edit_bar().locator("label.select-across")
-
-    def locate_bulk_edit_toggle(self):
-        return self.page.get_by_title("Bulk edit")
-
-    def select_bulk_action(self, value: str):
-        return (
-            self.locate_bulk_edit_bar()
-            .locator('select[name="bulk_action"]')
-            .select_option(value)
-        )

bookmarks/feeds.py

@@ -1,117 +0,0 @@
-import unicodedata
-from dataclasses import dataclass
-
-from django.contrib.syndication.views import Feed
-from django.db.models import QuerySet, prefetch_related_objects
-from django.http import HttpRequest
-from django.urls import reverse
-
-from bookmarks import queries
-from bookmarks.models import Bookmark, BookmarkSearch, FeedToken, UserProfile
-
-
-@dataclass
-class FeedContext:
-    request: HttpRequest
-    feed_token: FeedToken | None
-    query_set: QuerySet[Bookmark]
-
-
-def sanitize(text: str):
-    if not text:
-        return ""
-    # remove control characters
-    valid_chars = ["\n", "\r", "\t"]
-    return "".join(
-        ch for ch in text if ch in valid_chars or unicodedata.category(ch)[0] != "C"
-    )
-
-
-class BaseBookmarksFeed(Feed):
-    def get_object(self, request, feed_key: str | None):
-        feed_token = FeedToken.objects.get(key__exact=feed_key) if feed_key else None
-        search = BookmarkSearch(
-            q=request.GET.get("q", ""),
-            unread=request.GET.get("unread", ""),
-            shared=request.GET.get("shared", ""),
-        )
-        query_set = self.get_query_set(feed_token, search)
-        return FeedContext(request, feed_token, query_set)
-
-    def get_query_set(self, feed_token: FeedToken, search: BookmarkSearch):
-        raise NotImplementedError
-
-    def items(self, context: FeedContext):
-        limit = context.request.GET.get("limit", 100)
-        if limit:
-            data = context.query_set[: int(limit)]
-        else:
-            data = list(context.query_set)
-        prefetch_related_objects(data, "tags")
-        return data
-
-    def item_title(self, item: Bookmark):
-        return sanitize(item.resolved_title)
-
-    def item_description(self, item: Bookmark):
-        return sanitize(item.resolved_description)
-
-    def item_link(self, item: Bookmark):
-        return item.url
-
-    def item_pubdate(self, item: Bookmark):
-        return item.date_added
-
-    def item_categories(self, item: Bookmark):
-        return item.tag_names
-
-
-class AllBookmarksFeed(BaseBookmarksFeed):
-    title = "All bookmarks"
-    description = "All bookmarks"
-
-    def get_query_set(self, feed_token: FeedToken, search: BookmarkSearch):
-        return queries.query_bookmarks(feed_token.user, feed_token.user.profile, search)
-
-    def link(self, context: FeedContext):
-        return reverse("bookmarks:feeds.all", args=[context.feed_token.key])
-
-
-class UnreadBookmarksFeed(BaseBookmarksFeed):
-    title = "Unread bookmarks"
-    description = "All unread bookmarks"
-
-    def get_query_set(self, feed_token: FeedToken, search: BookmarkSearch):
-        return queries.query_bookmarks(
-            feed_token.user, feed_token.user.profile, search
-        ).filter(unread=True)
-
-    def link(self, context: FeedContext):
-        return reverse("bookmarks:feeds.unread", args=[context.feed_token.key])
-
-
-class SharedBookmarksFeed(BaseBookmarksFeed):
-    title = "Shared bookmarks"
-    description = "All shared bookmarks"
-
-    def get_query_set(self, feed_token: FeedToken, search: BookmarkSearch):
-        return queries.query_shared_bookmarks(
-            None, feed_token.user.profile, search, False
-        )
-
-    def link(self, context: FeedContext):
-        return reverse("bookmarks:feeds.shared", args=[context.feed_token.key])
-
-
-class PublicSharedBookmarksFeed(BaseBookmarksFeed):
-    title = "Public shared bookmarks"
-    description = "All public shared bookmarks"
-
-    def get_object(self, request):
-        return super().get_object(request, None)
-
-    def get_query_set(self, feed_token: FeedToken, search: BookmarkSearch):
-        return queries.query_shared_bookmarks(None, UserProfile(), search, True)
-
-    def link(self, context: FeedContext):
-        return reverse("bookmarks:feeds.public_shared")

bookmarks/frontend/api.js

@@ -1,32 +0,0 @@
-export class Api {
-  constructor(baseUrl) {
-    this.baseUrl = baseUrl;
-  }
-
-  listBookmarks(search, options = { limit: 100, offset: 0, path: "" }) {
-    const query = [`limit=${options.limit}`, `offset=${options.offset}`];
-    Object.keys(search).forEach((key) => {
-      const value = search[key];
-      if (value) {
-        query.push(`${key}=${encodeURIComponent(value)}`);
-      }
-    });
-    const queryString = query.join("&");
-    const url = `${this.baseUrl}bookmarks${options.path}/?${queryString}`;
-
-    return fetch(url)
-      .then((response) => response.json())
-      .then((data) => data.results);
-  }
-
-  getTags(options = { limit: 100, offset: 0 }) {
-    const url = `${this.baseUrl}tags/?limit=${options.limit}&offset=${options.offset}`;
-
-    return fetch(url)
-      .then((response) => response.json())
-      .then((data) => data.results);
-  }
-}
-
-const apiBaseUrl = document.documentElement.dataset.apiBaseUrl || "";
-export const api = new Api(apiBaseUrl);

bookmarks/frontend/behaviors/bookmark-page.js

@@ -1,37 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class BookmarkItem extends Behavior {
-  constructor(element) {
-    super(element);
-
-    // Toggle notes
-    this.onToggleNotes = this.onToggleNotes.bind(this);
-    this.notesToggle = element.querySelector(".toggle-notes");
-    if (this.notesToggle) {
-      this.notesToggle.addEventListener("click", this.onToggleNotes);
-    }
-
-    // Add tooltip to title if it is truncated
-    const titleAnchor = element.querySelector(".title > a");
-    const titleSpan = titleAnchor.querySelector("span");
-    requestAnimationFrame(() => {
-      if (titleSpan.offsetWidth > titleAnchor.offsetWidth) {
-        titleAnchor.dataset.tooltip = titleSpan.textContent;
-      }
-    });
-  }
-
-  destroy() {
-    if (this.notesToggle) {
-      this.notesToggle.removeEventListener("click", this.onToggleNotes);
-    }
-  }
-
-  onToggleNotes(event) {
-    event.preventDefault();
-    event.stopPropagation();
-    this.element.classList.toggle("show-notes");
-  }
-}
-
-registerBehavior("ld-bookmark-item", BookmarkItem);

bookmarks/frontend/behaviors/bulk-edit.js

@@ -1,128 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class BulkEdit extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.active = element.classList.contains("active");
-
-    this.init = this.init.bind(this);
-    this.onToggleActive = this.onToggleActive.bind(this);
-    this.onToggleAll = this.onToggleAll.bind(this);
-    this.onToggleBookmark = this.onToggleBookmark.bind(this);
-    this.onActionSelected = this.onActionSelected.bind(this);
-
-    this.init();
-    // Reset when bookmarks are updated
-    document.addEventListener("bookmark-list-updated", this.init);
-  }
-
-  destroy() {
-    this.removeListeners();
-    document.removeEventListener("bookmark-list-updated", this.init);
-  }
-
-  init() {
-    // Update elements
-    this.activeToggle = this.element.querySelector(".bulk-edit-active-toggle");
-    this.actionSelect = this.element.querySelector(
-      "select[name='bulk_action']",
-    );
-    this.tagAutoComplete = this.element.querySelector(".tag-autocomplete");
-    this.selectAcross = this.element.querySelector("label.select-across");
-    this.allCheckbox = this.element.querySelector(
-      ".bulk-edit-checkbox.all input",
-    );
-    this.bookmarkCheckboxes = Array.from(
-      this.element.querySelectorAll(".bulk-edit-checkbox:not(.all) input"),
-    );
-
-    // Add listeners, ensure there are no dupes by possibly removing existing listeners
-    this.removeListeners();
-    this.addListeners();
-
-    // Reset checkbox states
-    this.reset();
-
-    // Update total number of bookmarks
-    const totalHolder = this.element.querySelector("[data-bookmarks-total]");
-    const total = totalHolder?.dataset.bookmarksTotal || 0;
-    const totalSpan = this.selectAcross.querySelector("span.total");
-    totalSpan.textContent = total;
-  }
-
-  addListeners() {
-    this.activeToggle.addEventListener("click", this.onToggleActive);
-    this.actionSelect.addEventListener("change", this.onActionSelected);
-    this.allCheckbox.addEventListener("change", this.onToggleAll);
-    this.bookmarkCheckboxes.forEach((checkbox) => {
-      checkbox.addEventListener("change", this.onToggleBookmark);
-    });
-  }
-
-  removeListeners() {
-    this.activeToggle.removeEventListener("click", this.onToggleActive);
-    this.actionSelect.removeEventListener("change", this.onActionSelected);
-    this.allCheckbox.removeEventListener("change", this.onToggleAll);
-    this.bookmarkCheckboxes.forEach((checkbox) => {
-      checkbox.removeEventListener("change", this.onToggleBookmark);
-    });
-  }
-
-  onToggleActive() {
-    this.active = !this.active;
-    if (this.active) {
-      this.element.classList.add("active", "activating");
-      setTimeout(() => {
-        this.element.classList.remove("activating");
-      }, 500);
-    } else {
-      this.element.classList.remove("active");
-    }
-  }
-
-  onToggleBookmark() {
-    const allChecked = this.bookmarkCheckboxes.every((checkbox) => {
-      return checkbox.checked;
-    });
-    this.allCheckbox.checked = allChecked;
-    this.updateSelectAcross(allChecked);
-  }
-
-  onToggleAll() {
-    const allChecked = this.allCheckbox.checked;
-    this.bookmarkCheckboxes.forEach((checkbox) => {
-      checkbox.checked = allChecked;
-    });
-    this.updateSelectAcross(allChecked);
-  }
-
-  onActionSelected() {
-    const action = this.actionSelect.value;
-
-    if (action === "bulk_tag" || action === "bulk_untag") {
-      this.tagAutoComplete.classList.remove("d-none");
-    } else {
-      this.tagAutoComplete.classList.add("d-none");
-    }
-  }
-
-  updateSelectAcross(allChecked) {
-    if (allChecked) {
-      this.selectAcross.classList.remove("d-none");
-    } else {
-      this.selectAcross.classList.add("d-none");
-      this.selectAcross.querySelector("input").checked = false;
-    }
-  }
-
-  reset() {
-    this.allCheckbox.checked = false;
-    this.bookmarkCheckboxes.forEach((checkbox) => {
-      checkbox.checked = false;
-    });
-    this.updateSelectAcross(false);
-  }
-}
-
-registerBehavior("ld-bulk-edit", BulkEdit);

bookmarks/frontend/behaviors/clear-button.js

@@ -1,42 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class ClearButtonBehavior extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.field = document.getElementById(element.dataset.for);
-    if (!this.field) {
-      console.error(`Field with ID ${element.dataset.for} not found`);
-      return;
-    }
-
-    this.update = this.update.bind(this);
-    this.clear = this.clear.bind(this);
-
-    this.element.addEventListener("click", this.clear);
-    this.field.addEventListener("input", this.update);
-    this.field.addEventListener("value-changed", this.update);
-    this.update();
-  }
-
-  destroy() {
-    if (!this.field) {
-      return;
-    }
-    this.element.removeEventListener("click", this.clear);
-    this.field.removeEventListener("input", this.update);
-    this.field.removeEventListener("value-changed", this.update);
-  }
-
-  update() {
-    this.element.style.display = this.field.value ? "inline-flex" : "none";
-  }
-
-  clear() {
-    this.field.value = "";
-    this.field.focus();
-    this.update();
-  }
-}
-
-registerBehavior("ld-clear-button", ClearButtonBehavior);

bookmarks/frontend/behaviors/confirm-button.js

@@ -1,79 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class ConfirmButtonBehavior extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.onClick = this.onClick.bind(this);
-    element.addEventListener("click", this.onClick);
-  }
-
-  destroy() {
-    this.reset();
-    this.element.removeEventListener("click", this.onClick);
-  }
-
-  onClick(event) {
-    event.preventDefault();
-    Behavior.interacting = true;
-
-    const container = document.createElement("span");
-    container.className = "confirmation";
-
-    const icon = this.element.getAttribute("ld-confirm-icon");
-    if (icon) {
-      const iconElement = document.createElementNS(
-        "http://www.w3.org/2000/svg",
-        "svg",
-      );
-      iconElement.style.width = "16px";
-      iconElement.style.height = "16px";
-      iconElement.innerHTML = `<use xlink:href="#${icon}"></use>`;
-      container.append(iconElement);
-    }
-
-    const question = this.element.getAttribute("ld-confirm-question");
-    if (question) {
-      const questionElement = document.createElement("span");
-      questionElement.innerText = question;
-      container.append(question);
-    }
-
-    const buttonClasses = Array.from(this.element.classList.values())
-      .filter((cls) => cls.startsWith("btn"))
-      .join(" ");
-
-    const cancelButton = document.createElement(this.element.nodeName);
-    cancelButton.type = "button";
-    cancelButton.innerText = question ? "No" : "Cancel";
-    cancelButton.className = `${buttonClasses} mr-1`;
-    cancelButton.addEventListener("click", this.reset.bind(this));
-
-    const confirmButton = document.createElement(this.element.nodeName);
-    confirmButton.type = this.element.type;
-    confirmButton.name = this.element.name;
-    confirmButton.value = this.element.value;
-    confirmButton.innerText = question ? "Yes" : "Confirm";
-    confirmButton.className = buttonClasses;
-    confirmButton.addEventListener("click", this.reset.bind(this));
-
-    container.append(cancelButton, confirmButton);
-    this.container = container;
-
-    this.element.before(container);
-    this.element.classList.add("d-none");
-  }
-
-  reset() {
-    setTimeout(() => {
-      Behavior.interacting = false;
-      if (this.container) {
-        this.container.remove();
-        this.container = null;
-      }
-      this.element.classList.remove("d-none");
-    });
-  }
-}
-
-registerBehavior("ld-confirm-button", ConfirmButtonBehavior);

bookmarks/frontend/behaviors/details-modal.js

@@ -1,62 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class DetailsModalBehavior extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.onClose = this.onClose.bind(this);
-    this.onKeyDown = this.onKeyDown.bind(this);
-
-    this.overlayLink = element.querySelector("a:has(.modal-overlay)");
-    this.buttonLink = element.querySelector("a:has(button.close)");
-
-    this.overlayLink.addEventListener("click", this.onClose);
-    this.buttonLink.addEventListener("click", this.onClose);
-    document.addEventListener("keydown", this.onKeyDown);
-  }
-
-  destroy() {
-    this.overlayLink.removeEventListener("click", this.onClose);
-    this.buttonLink.removeEventListener("click", this.onClose);
-    document.removeEventListener("keydown", this.onKeyDown);
-  }
-
-  onKeyDown(event) {
-    // Skip if event occurred within an input element
-    const targetNodeName = event.target.nodeName;
-    const isInputTarget =
-      targetNodeName === "INPUT" ||
-      targetNodeName === "SELECT" ||
-      targetNodeName === "TEXTAREA";
-
-    if (isInputTarget) {
-      return;
-    }
-
-    if (event.key === "Escape") {
-      this.onClose(event);
-    }
-  }
-
-  onClose(event) {
-    event.preventDefault();
-    this.element.classList.add("closing");
-    this.element.addEventListener(
-      "animationend",
-      (event) => {
-        if (event.animationName === "fade-out") {
-          this.element.remove();
-
-          const closeUrl = this.overlayLink.href;
-          Turbo.visit(closeUrl, {
-            action: "replace",
-            frame: "details-modal",
-          });
-        }
-      },
-      { once: true },
-    );
-  }
-}
-
-registerBehavior("ld-details-modal", DetailsModalBehavior);

bookmarks/frontend/behaviors/dropdown.js

@@ -1,44 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class DropdownBehavior extends Behavior {
-  constructor(element) {
-    super(element);
-    this.opened = false;
-    this.onClick = this.onClick.bind(this);
-    this.onOutsideClick = this.onOutsideClick.bind(this);
-
-    this.toggle = element.querySelector(".dropdown-toggle");
-    this.toggle.addEventListener("click", this.onClick);
-  }
-
-  destroy() {
-    this.close();
-    this.toggle.removeEventListener("click", this.onClick);
-  }
-
-  open() {
-    this.element.classList.add("active");
-    document.addEventListener("click", this.onOutsideClick);
-  }
-
-  close() {
-    this.element.classList.remove("active");
-    document.removeEventListener("click", this.onOutsideClick);
-  }
-
-  onClick() {
-    if (this.opened) {
-      this.close();
-    } else {
-      this.open();
-    }
-  }
-
-  onOutsideClick(event) {
-    if (!this.element.contains(event.target)) {
-      this.close();
-    }
-  }
-}
-
-registerBehavior("ld-dropdown", DropdownBehavior);

bookmarks/frontend/behaviors/form.js

@@ -1,55 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class AutoSubmitBehavior extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.submit = this.submit.bind(this);
-    element.addEventListener("change", this.submit);
-  }
-
-  destroy() {
-    this.element.removeEventListener("change", this.submit);
-  }
-
-  submit() {
-    this.element.closest("form").requestSubmit();
-  }
-}
-
-class UploadButton extends Behavior {
-  constructor(element) {
-    super(element);
-    this.fileInput = element.nextElementSibling;
-
-    this.onClick = this.onClick.bind(this);
-    this.onChange = this.onChange.bind(this);
-
-    element.addEventListener("click", this.onClick);
-    this.fileInput.addEventListener("change", this.onChange);
-  }
-
-  destroy() {
-    this.element.removeEventListener("click", this.onClick);
-    this.fileInput.removeEventListener("change", this.onChange);
-  }
-
-  onClick(event) {
-    event.preventDefault();
-    this.fileInput.click();
-  }
-
-  onChange() {
-    // Check if the file input has a file selected
-    if (!this.fileInput.files.length) {
-      return;
-    }
-    const form = this.fileInput.closest("form");
-    form.requestSubmit(this.element);
-    // remove selected file so it doesn't get submitted again
-    this.fileInput.value = "";
-  }
-}
-
-registerBehavior("ld-auto-submit", AutoSubmitBehavior);
-registerBehavior("ld-upload-button", UploadButton);

bookmarks/frontend/behaviors/global-shortcuts.js

@@ -1,80 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class GlobalShortcuts extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.onKeyDown = this.onKeyDown.bind(this);
-    document.addEventListener("keydown", this.onKeyDown);
-  }
-
-  destroy() {
-    document.removeEventListener("keydown", this.onKeyDown);
-  }
-
-  onKeyDown(event) {
-    // Skip if event occurred within an input element
-    const targetNodeName = event.target.nodeName;
-    const isInputTarget =
-      targetNodeName === "INPUT" ||
-      targetNodeName === "SELECT" ||
-      targetNodeName === "TEXTAREA";
-
-    if (isInputTarget) {
-      return;
-    }
-
-    // Handle shortcuts for navigating bookmarks with arrow keys
-    const isArrowUp = event.key === "ArrowUp";
-    const isArrowDown = event.key === "ArrowDown";
-    if (isArrowUp || isArrowDown) {
-      event.preventDefault();
-
-      // Detect current bookmark list item
-      const path = event.composedPath();
-      const currentItem = path.find(
-        (item) => item.hasAttribute && item.hasAttribute("ld-bookmark-item"),
-      );
-
-      // Find next item
-      let nextItem;
-      if (currentItem) {
-        nextItem = isArrowUp
-          ? currentItem.previousElementSibling
-          : currentItem.nextElementSibling;
-      } else {
-        // Select first item
-        nextItem = document.querySelector("[ld-bookmark-item]");
-      }
-      // Focus first link
-      if (nextItem) {
-        nextItem.querySelector("a").focus();
-      }
-    }
-
-    // Handle shortcut for toggling all notes
-    if (event.key === "e") {
-      const list = document.querySelector(".bookmark-list");
-      if (list) {
-        list.classList.toggle("show-notes");
-      }
-    }
-
-    // Handle shortcut for focusing search input
-    if (event.key === "s") {
-      const searchInput = document.querySelector('input[type="search"]');
-
-      if (searchInput) {
-        searchInput.focus();
-        event.preventDefault();
-      }
-    }
-
-    // Handle shortcut for adding new bookmark
-    if (event.key === "n") {
-      window.location.assign("/bookmarks/new");
-    }
-  }
-}
-
-registerBehavior("ld-global-shortcuts", GlobalShortcuts);

bookmarks/frontend/behaviors/index.js

@@ -1,121 +0,0 @@
-const behaviorRegistry = {};
-const debug = false;
-
-const mutationObserver = new MutationObserver((mutations) => {
-  mutations.forEach((mutation) => {
-    mutation.removedNodes.forEach((node) => {
-      if (node instanceof HTMLElement && !node.isConnected) {
-        destroyBehaviors(node);
-      }
-    });
-    mutation.addedNodes.forEach((node) => {
-      if (node instanceof HTMLElement && node.isConnected) {
-        applyBehaviors(node);
-      }
-    });
-  });
-});
-
-// Update behaviors on Turbo events
-// - turbo:load: initial page load, only listen once, afterward can rely on turbo:render
-// - turbo:render: after page navigation, including back/forward, and failed form submissions
-// - turbo:before-cache: before page navigation, reset DOM before caching
-document.addEventListener(
-  "turbo:load",
-  () => {
-    mutationObserver.observe(document.body, {
-      childList: true,
-      subtree: true,
-    });
-
-    applyBehaviors(document.body);
-  },
-  { once: true },
-);
-
-document.addEventListener("turbo:render", () => {
-  mutationObserver.observe(document.body, {
-    childList: true,
-    subtree: true,
-  });
-
-  applyBehaviors(document.body);
-});
-
-document.addEventListener("turbo:before-cache", () => {
-  destroyBehaviors(document.body);
-});
-
-export class Behavior {
-  constructor(element) {
-    this.element = element;
-  }
-
-  destroy() {}
-}
-
-Behavior.interacting = false;
-
-export function registerBehavior(name, behavior) {
-  behaviorRegistry[name] = behavior;
-}
-
-export function applyBehaviors(container, behaviorNames = null) {
-  if (!behaviorNames) {
-    behaviorNames = Object.keys(behaviorRegistry);
-  }
-
-  behaviorNames.forEach((behaviorName) => {
-    const behavior = behaviorRegistry[behaviorName];
-    const elements = Array.from(
-      container.querySelectorAll(`[${behaviorName}]`),
-    );
-
-    // Include the container element if it has the behavior
-    if (container.hasAttribute && container.hasAttribute(behaviorName)) {
-      elements.push(container);
-    }
-
-    elements.forEach((element) => {
-      element.__behaviors = element.__behaviors || [];
-      const hasBehavior = element.__behaviors.some(
-        (b) => b instanceof behavior,
-      );
-
-      if (hasBehavior) {
-        return;
-      }
-
-      const behaviorInstance = new behavior(element);
-      element.__behaviors.push(behaviorInstance);
-      if (debug) {
-        console.log(
-          `[Behavior] ${behaviorInstance.constructor.name} initialized`,
-        );
-      }
-    });
-  });
-}
-
-export function destroyBehaviors(element) {
-  const behaviorNames = Object.keys(behaviorRegistry);
-
-  behaviorNames.forEach((behaviorName) => {
-    const elements = Array.from(element.querySelectorAll(`[${behaviorName}]`));
-    elements.push(element);
-
-    elements.forEach((element) => {
-      if (!element.__behaviors) {
-        return;
-      }
-
-      element.__behaviors.forEach((behavior) => {
-        behavior.destroy();
-        if (debug) {
-          console.log(`[Behavior] ${behavior.constructor.name} destroyed`);
-        }
-      });
-      delete element.__behaviors;
-    });
-  });
-}

bookmarks/frontend/behaviors/search-autocomplete.js

@@ -1,41 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-import SearchAutoCompleteComponent from "../components/SearchAutoComplete.svelte";
-
-class SearchAutocomplete extends Behavior {
-  constructor(element) {
-    super(element);
-    const input = element.querySelector("input");
-    if (!input) {
-      console.warn("SearchAutocomplete: input element not found");
-      return;
-    }
-
-    const container = document.createElement("div");
-
-    new SearchAutoCompleteComponent({
-      target: container,
-      props: {
-        name: "q",
-        placeholder: input.getAttribute("placeholder") || "",
-        value: input.value,
-        linkTarget: input.dataset.linkTarget,
-        mode: input.dataset.mode,
-        search: {
-          user: input.dataset.user,
-          shared: input.dataset.shared,
-          unread: input.dataset.unread,
-        },
-      },
-    });
-
-    this.input = input;
-    this.autocomplete = container.firstElementChild;
-    input.replaceWith(this.autocomplete);
-  }
-
-  destroy() {
-    this.autocomplete.replaceWith(this.input);
-  }
-}
-
-registerBehavior("ld-search-autocomplete", SearchAutocomplete);

bookmarks/frontend/behaviors/tag-autocomplete.js

@@ -1,36 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-import TagAutoCompleteComponent from "../components/TagAutocomplete.svelte";
-
-class TagAutocomplete extends Behavior {
-  constructor(element) {
-    super(element);
-    const input = element.querySelector("input");
-    if (!input) {
-      console.warn("TagAutocomplete: input element not found");
-      return;
-    }
-
-    const container = document.createElement("div");
-
-    new TagAutoCompleteComponent({
-      target: container,
-      props: {
-        id: input.id,
-        name: input.name,
-        value: input.value,
-        placeholder: input.getAttribute("placeholder") || "",
-        variant: input.getAttribute("variant"),
-      },
-    });
-
-    this.input = input;
-    this.autocomplete = container.firstElementChild;
-    input.replaceWith(this.autocomplete);
-  }
-
-  destroy() {
-    this.autocomplete.replaceWith(this.input);
-  }
-}
-
-registerBehavior("ld-tag-autocomplete", TagAutocomplete);

bookmarks/frontend/behaviors/tag-modal.js

@@ -1,68 +0,0 @@
-import { Behavior, registerBehavior } from "./index";
-
-class TagModalBehavior extends Behavior {
-  constructor(element) {
-    super(element);
-
-    this.onClick = this.onClick.bind(this);
-    this.onClose = this.onClose.bind(this);
-
-    element.addEventListener("click", this.onClick);
-  }
-
-  destroy() {
-    this.onClose();
-    this.element.removeEventListener("click", this.onClick);
-  }
-
-  onClick() {
-    const modal = document.createElement("div");
-    modal.classList.add("modal", "active");
-    modal.innerHTML = `
-      <div class="modal-overlay" aria-label="Close"></div>
-      <div class="modal-container">
-        <div class="modal-header">
-          <h2>Tags</h2>
-          <button class="close" aria-label="Close">
-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="2"
-                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-              <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-              <path d="M18 6l-12 12"></path>
-              <path d="M6 6l12 12"></path>
-            </svg>
-          </button>
-        </div>
-        <div class="modal-body">
-          <div class="content"></div>
-        </div>
-      </div>    
-    `;
-
-    const tagCloud = document.querySelector(".tag-cloud");
-    const tagCloudContainer = tagCloud.parentElement;
-
-    const content = modal.querySelector(".content");
-    content.appendChild(tagCloud);
-
-    const overlay = modal.querySelector(".modal-overlay");
-    const closeButton = modal.querySelector(".close");
-    overlay.addEventListener("click", this.onClose);
-    closeButton.addEventListener("click", this.onClose);
-
-    this.modal = modal;
-    this.tagCloud = tagCloud;
-    this.tagCloudContainer = tagCloudContainer;
-    document.body.appendChild(modal);
-  }
-
-  onClose() {
-    if (!this.modal) {
-      return;
-    }
-
-    this.modal.remove();
-    this.tagCloudContainer.appendChild(this.tagCloud);
-  }
-}
-
-registerBehavior("ld-tag-modal", TagModalBehavior);

bookmarks/frontend/cache.js

@@ -1,35 +0,0 @@
-import { api } from "./api.js";
-
-class Cache {
-  constructor(api) {
-    this.api = api;
-
-    // Reset cached tags after a form submission
-    document.addEventListener("turbo:submit-end", () => {
-      this.tagsPromise = null;
-    });
-  }
-
-  getTags() {
-    if (!this.tagsPromise) {
-      this.tagsPromise = this.api
-        .getTags({
-          limit: 5000,
-          offset: 0,
-        })
-        .then((tags) =>
-          tags.sort((left, right) =>
-            left.name.toLowerCase().localeCompare(right.name.toLowerCase()),
-          ),
-        )
-        .catch((e) => {
-          console.warn("Cache: Error loading tags", e);
-          return [];
-        });
-    }
-
-    return this.tagsPromise;
-  }
-}
-
-export const cache = new Cache(api);

bookmarks/frontend/components/SearchAutoComplete.svelte

@@ -1,262 +0,0 @@
-<script>
-  import {SearchHistory} from "./SearchHistory";
-  import {api} from "../api";
-  import {cache} from "../cache";
-  import {clampText, debounce, getCurrentWord, getCurrentWordBounds} from "../util";
-
-  const searchHistory = new SearchHistory()
-
-  export let name;
-  export let placeholder;
-  export let value;
-  export let mode = '';
-  export let search;
-  export let linkTarget = '_blank';
-
-  let isFocus = false;
-  let isOpen = false;
-  let suggestions = []
-  let selectedIndex = undefined;
-  let input = null;
-
-  // Track current search query after loading the page
-  searchHistory.pushCurrent()
-  updateSuggestions()
-
-  function handleFocus() {
-    isFocus = true;
-  }
-
-  function handleBlur() {
-    isFocus = false;
-    close();
-  }
-
-  function handleInput(e) {
-    value = e.target.value
-    debouncedLoadSuggestions()
-  }
-
-  function handleKeyDown(e) {
-    // Enter
-    if (isOpen && selectedIndex !== undefined && (e.keyCode === 13 || e.keyCode === 9)) {
-      const suggestion = suggestions.total[selectedIndex];
-      if (suggestion) completeSuggestion(suggestion);
-      e.preventDefault();
-    }
-    // Escape
-    if (e.keyCode === 27) {
-      close();
-      e.preventDefault();
-    }
-    // Up arrow
-    if (e.keyCode === 38) {
-      updateSelection(-1);
-      e.preventDefault();
-    }
-    // Down arrow
-    if (e.keyCode === 40) {
-      if (!isOpen) {
-        loadSuggestions()
-      } else {
-        updateSelection(1);
-      }
-      e.preventDefault();
-    }
-  }
-
-  function open() {
-    isOpen = true;
-  }
-
-  function close() {
-    isOpen = false;
-    updateSuggestions()
-    selectedIndex = undefined
-  }
-
-  function hasSuggestions() {
-    return suggestions.total.length > 0
-  }
-
-  async function loadSuggestions() {
-
-    let suggestionIndex = 0
-
-    function nextIndex() {
-      return suggestionIndex++
-    }
-
-    // Tag suggestions
-    const tags = await cache.getTags();
-    let tagSuggestions = []
-    const currentWord = getCurrentWord(input)
-    if (currentWord && currentWord.length > 1 && currentWord[0] === '#') {
-      const searchTag = currentWord.substring(1, currentWord.length)
-      tagSuggestions = (tags || []).filter(tag => tag.name.toLowerCase().indexOf(searchTag.toLowerCase()) === 0)
-        .slice(0, 5)
-        .map(tag => ({
-          type: 'tag',
-          index: nextIndex(),
-          label: `#${tag.name}`,
-          tagName: tag.name
-        }))
-    }
-
-    // Recent search suggestions
-    const recentSearches = searchHistory.getRecentSearches(value, 5).map(value => ({
-      type: 'search',
-      index: nextIndex(),
-      label: value,
-      value
-    }))
-
-    // Bookmark suggestions
-    let bookmarks = []
-
-    if (value && value.length >= 3) {
-      const path = mode ? `/${mode}` : ''
-      const suggestionSearch = {
-        ...search,
-        q: value
-      }
-      const fetchedBookmarks = await api.listBookmarks(suggestionSearch, {limit: 5, offset: 0, path})
-      bookmarks = fetchedBookmarks.map(bookmark => {
-        const fullLabel = bookmark.title || bookmark.url
-        const label = clampText(fullLabel, 60)
-        return {
-          type: 'bookmark',
-          index: nextIndex(),
-          label,
-          bookmark
-        }
-      })
-    }
-
-    updateSuggestions(recentSearches, bookmarks, tagSuggestions)
-
-    if (hasSuggestions()) {
-      open()
-    } else {
-      close()
-    }
-  }
-
-  const debouncedLoadSuggestions = debounce(loadSuggestions)
-
-  function updateSuggestions(recentSearches, bookmarks, tagSuggestions) {
-    recentSearches = recentSearches || []
-    bookmarks = bookmarks || []
-    tagSuggestions = tagSuggestions || []
-    suggestions = {
-      recentSearches,
-      bookmarks,
-      tags: tagSuggestions,
-      total: [
-        ...tagSuggestions,
-        ...recentSearches,
-        ...bookmarks,
-      ]
-    }
-  }
-
-  function completeSuggestion(suggestion) {
-    if (suggestion.type === 'search') {
-      value = suggestion.value
-      close()
-    }
-    if (suggestion.type === 'bookmark') {
-      window.open(suggestion.bookmark.url, linkTarget)
-      close()
-    }
-    if (suggestion.type === 'tag') {
-      const bounds = getCurrentWordBounds(input);
-      const inputValue = input.value;
-      input.value = inputValue.substring(0, bounds.start) + `#${suggestion.tagName} ` + inputValue.substring(bounds.end);
-      close()
-    }
-  }
-
-  function updateSelection(dir) {
-
-    const length = suggestions.total.length;
-
-    if (length === 0) return
-
-    if (selectedIndex === undefined) {
-      selectedIndex = dir > 0 ? 0 : Math.max(length - 1, 0)
-      return
-    }
-
-    let newIndex = selectedIndex + dir;
-
-    if (newIndex < 0) newIndex = Math.max(length - 1, 0);
-    if (newIndex >= length) newIndex = 0;
-
-    selectedIndex = newIndex;
-  }
-</script>
-
-<div class="form-autocomplete">
-  <div class="form-autocomplete-input form-input" class:is-focused={isFocus}>
-    <input type="search" class="form-input" name="{name}" placeholder="{placeholder}" autocomplete="off" value="{value}"
-           bind:this={input}
-           on:input={handleInput} on:keydown={handleKeyDown} on:focus={handleFocus} on:blur={handleBlur}>
-  </div>
-
-  <ul class="menu" class:open={isOpen}>
-    {#if suggestions.tags.length > 0}
-      <li class="menu-item group-item">Tags</li>
-    {/if}
-    {#each suggestions.tags as suggestion}
-      <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
-          {suggestion.label}
-        </a>
-      </li>
-    {/each}
-
-    {#if suggestions.recentSearches.length > 0}
-      <li class="menu-item group-item">Recent Searches</li>
-    {/if}
-    {#each suggestions.recentSearches as suggestion}
-      <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
-          {suggestion.label}
-        </a>
-      </li>
-    {/each}
-
-    {#if suggestions.bookmarks.length > 0}
-      <li class="menu-item group-item">Bookmarks</li>
-    {/if}
-    {#each suggestions.bookmarks as suggestion}
-      <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
-          {suggestion.label}
-        </a>
-      </li>
-    {/each}
-  </ul>
-</div>
-
-<style>
-    .menu {
-        display: none;
-        max-height: 400px;
-        overflow: auto;
-    }
-
-    .menu.open {
-        display: block;
-    }
-
-    .form-autocomplete-input {
-        padding: 0;
-    }
-
-    .form-autocomplete-input.is-focused {
-        z-index: 2;
-    }
-
-</style>

bookmarks/frontend/components/SearchHistory.js

@@ -1,52 +0,0 @@
-const SEARCH_HISTORY_KEY = "searchHistory";
-const MAX_ENTRIES = 30;
-
-export class SearchHistory {
-  getHistory() {
-    const historyJson = localStorage.getItem(SEARCH_HISTORY_KEY);
-    return historyJson
-      ? JSON.parse(historyJson)
-      : {
-          recent: [],
-        };
-  }
-
-  pushCurrent() {
-    // Skip if browser is not compatible
-    if (!window.URLSearchParams) return;
-    const urlParams = new URLSearchParams(window.location.search);
-    const searchParam = urlParams.get("q");
-
-    if (!searchParam) return;
-
-    this.push(searchParam);
-  }
-
-  push(search) {
-    const history = this.getHistory();
-
-    history.recent.unshift(search);
-
-    // Remove duplicates and clamp to max entries
-    history.recent = history.recent.reduce((acc, cur) => {
-      if (acc.length >= MAX_ENTRIES) return acc;
-      if (acc.indexOf(cur) >= 0) return acc;
-      acc.push(cur);
-      return acc;
-    }, []);
-
-    const newHistoryJson = JSON.stringify(history);
-    localStorage.setItem(SEARCH_HISTORY_KEY, newHistoryJson);
-  }
-
-  getRecentSearches(query, max) {
-    const history = this.getHistory();
-
-    return history.recent
-      .filter(
-        (search) =>
-          !query || search.toLowerCase().indexOf(query.toLowerCase()) >= 0,
-      )
-      .slice(0, max);
-  }
-}

bookmarks/frontend/components/TagAutocomplete.svelte

@@ -1,168 +0,0 @@
-<script>
-  import {cache} from "../cache";
-  import {getCurrentWord, getCurrentWordBounds} from "../util";
-
-  export let id;
-  export let name;
-  export let value;
-  export let placeholder;
-  export let variant = 'default';
-
-  let isFocus = false;
-  let isOpen = false;
-  let input = null;
-  let suggestionList = null;
-
-  let suggestions = [];
-  let selectedIndex = 0;
-
-  function handleFocus() {
-    isFocus = true;
-  }
-
-  function handleBlur() {
-    isFocus = false;
-    close();
-  }
-
-  async function handleInput(e) {
-    input = e.target;
-
-    const tags = await cache.getTags();
-    const word = getCurrentWord(input);
-
-    suggestions = word
-      ? tags.filter(tag => tag.name.toLowerCase().indexOf(word.toLowerCase()) === 0)
-      : [];
-
-    if (word && suggestions.length > 0) {
-      open();
-    } else {
-      close();
-    }
-  }
-
-  function handleKeyDown(e) {
-    if (isOpen && (e.keyCode === 13 || e.keyCode === 9)) {
-      const suggestion = suggestions[selectedIndex];
-      complete(suggestion);
-      e.preventDefault();
-    }
-    if (e.keyCode === 27) {
-      close();
-      e.preventDefault();
-    }
-    if (e.keyCode === 38) {
-      updateSelection(-1);
-      e.preventDefault();
-    }
-    if (e.keyCode === 40) {
-      updateSelection(1);
-      e.preventDefault();
-    }
-  }
-
-  function open() {
-    isOpen = true;
-    selectedIndex = 0;
-  }
-
-  function close() {
-    isOpen = false;
-    suggestions = [];
-    selectedIndex = 0;
-  }
-
-  function complete(suggestion) {
-    const bounds = getCurrentWordBounds(input);
-    const value = input.value;
-    input.value = value.substring(0, bounds.start) + suggestion.name + ' ' + value.substring(bounds.end);
-
-    close();
-  }
-
-  function updateSelection(dir) {
-
-    const length = suggestions.length;
-    let newIndex = selectedIndex + dir;
-
-    if (newIndex < 0) newIndex = Math.max(length - 1, 0);
-    if (newIndex >= length) newIndex = 0;
-
-    selectedIndex = newIndex;
-
-    // Scroll to selected list item
-    setTimeout(() => {
-      if (suggestionList) {
-        const selectedListItem = suggestionList.querySelector('li.selected');
-        if (selectedListItem) {
-          selectedListItem.scrollIntoView({block: 'center'});
-        }
-      }
-    }, 0);
-  }
-</script>
-
-<div class="form-autocomplete" class:small={variant === 'small'}>
-  <!-- autocomplete input container -->
-  <div class="form-autocomplete-input form-input" class:is-focused={isFocus}>
-    <!-- autocomplete real input box -->
-    <input id="{id}" name="{name}" value="{value ||''}" placeholder="{placeholder || ' '}"
-           class="form-input" type="text" autocomplete="off" autocapitalize="off"
-           on:input={handleInput} on:keydown={handleKeyDown}
-           on:focus={handleFocus} on:blur={handleBlur}>
-  </div>
-
-  <!-- autocomplete suggestion list -->
-  <ul class="menu" class:open={isOpen && suggestions.length > 0}
-      bind:this={suggestionList}>
-    <!-- menu list items -->
-    {#each suggestions as tag,i}
-      <li class="menu-item" class:selected={selectedIndex === i}>
-        <a href="#" on:mousedown|preventDefault={() => complete(tag)}>
-          {tag.name}
-        </a>
-      </li>
-    {/each}
-  </ul>
-</div>
-
-<style>
-    .menu {
-        display: none;
-        max-height: 200px;
-        overflow: auto;
-    }
-
-    .menu.open {
-        display: block;
-    }
-
-    .form-autocomplete-input {
-        box-sizing: border-box;
-        height: var(--control-size);
-        min-height: var(--control-size);
-        padding: 0;
-    }
-
-    .form-autocomplete-input input {
-        width: 100%;
-        height: 100%;
-        border: none;
-        margin: 0;
-    }
-
-    .form-autocomplete.small .form-autocomplete-input {
-        height: var(--control-size-sm);
-        min-height: var(--control-size-sm);
-    }
-
-    .form-autocomplete.small .form-autocomplete-input input {
-        padding: 0.05rem 0.3rem;
-        font-size: var(--font-size-sm);
-    }
-
-    .form-autocomplete.small .menu .menu-item {
-        font-size: var(--font-size-sm);
-    }
-</style>

bookmarks/frontend/index.js

@@ -1,17 +0,0 @@
-import "@hotwired/turbo";
-import "./behaviors/bookmark-page";
-import "./behaviors/bulk-edit";
-import "./behaviors/clear-button";
-import "./behaviors/confirm-button";
-import "./behaviors/dropdown";
-import "./behaviors/form";
-import "./behaviors/details-modal";
-import "./behaviors/global-shortcuts";
-import "./behaviors/search-autocomplete";
-import "./behaviors/tag-autocomplete";
-import "./behaviors/tag-modal";
-
-export { default as TagAutoComplete } from "./components/TagAutocomplete.svelte";
-export { default as SearchAutoComplete } from "./components/SearchAutoComplete.svelte";
-export { api } from "./api";
-export { cache } from "./cache";

bookmarks/frontend/util.js

@@ -1,37 +0,0 @@
-export function debounce(callback, delay = 250) {
-  let timeoutId;
-  return (...args) => {
-    clearTimeout(timeoutId);
-    timeoutId = setTimeout(() => {
-      timeoutId = null;
-      callback(...args);
-    }, delay);
-  };
-}
-
-export function clampText(text, maxChars = 30) {
-  if (!text || text.length <= 30) return text;
-
-  return text.substr(0, maxChars) + "...";
-}
-
-export function getCurrentWordBounds(input) {
-  const text = input.value;
-  const end = input.selectionStart;
-  let start = end;
-
-  let currentChar = text.charAt(start - 1);
-
-  while (currentChar && currentChar !== " " && start > 0) {
-    start--;
-    currentChar = text.charAt(start - 1);
-  }
-
-  return { start, end };
-}
-
-export function getCurrentWord(input) {
-  const bounds = getCurrentWordBounds(input);
-
-  return input.value.substring(bounds.start, bounds.end);
-}

bookmarks/management/commands/backup.py

@@ -1,31 +0,0 @@
-import sqlite3
-import os
-
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    help = "Creates a backup of the linkding database"
-
-    def add_arguments(self, parser):
-        parser.add_argument("destination", type=str, help="Backup file destination")
-
-    def handle(self, *args, **options):
-        destination = options["destination"]
-
-        def progress(status, remaining, total):
-            self.stdout.write(f"Copied {total-remaining} of {total} pages...")
-
-        source_db = sqlite3.connect(os.path.join("data", "db.sqlite3"))
-        backup_db = sqlite3.connect(destination)
-        with backup_db:
-            source_db.backup(backup_db, pages=50, progress=progress)
-        backup_db.close()
-        source_db.close()
-
-        self.stdout.write(self.style.SUCCESS(f"Backup created at {destination}"))
-        self.stdout.write(
-            self.style.WARNING(
-                "This backup method is deprecated and may be removed in the future. Please use the full_backup command instead, which creates backup zip file with all contents of the data folder."
-            )
-        )

bookmarks/management/commands/create_initial_superuser.py

@@ -1,39 +0,0 @@
-import os
-import logging
-
-from django.core.management.base import BaseCommand
-from django.contrib.auth import get_user_model
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Creates an initial superuser for a deployment using env variables"
-
-    def handle(self, *args, **options):
-        User = get_user_model()
-        superuser_name = os.getenv("LD_SUPERUSER_NAME", None)
-        superuser_password = os.getenv("LD_SUPERUSER_PASSWORD", None)
-
-        # Skip if option is undefined
-        if not superuser_name:
-            logger.info(
-                "Skip creating initial superuser, LD_SUPERUSER_NAME option is not defined"
-            )
-            return
-
-        # Skip if user already exists
-        user_exists = User.objects.filter(username=superuser_name).exists()
-        if user_exists:
-            logger.info("Skip creating initial superuser, user already exists")
-            return
-
-        user = User(username=superuser_name, is_superuser=True, is_staff=True)
-
-        if superuser_password:
-            user.set_password(superuser_password)
-        else:
-            user.set_unusable_password()
-
-        user.save()
-        logger.info("Created initial superuser")

bookmarks/management/commands/enable_wal.py

@@ -1,24 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-from django.db import connections
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Enable WAL journal mode when using an SQLite database"
-
-    def handle(self, *args, **options):
-        if not settings.USE_SQLITE:
-            return
-
-        connection = connections["default"]
-        with connection.cursor() as cursor:
-            cursor.execute("PRAGMA journal_mode")
-            current_mode = cursor.fetchone()[0]
-            logger.info(f"Current journal mode: {current_mode}")
-            if current_mode != "wal":
-                cursor.execute("PRAGMA journal_mode=wal;")
-                logger.info("Switched to WAL journal mode")

bookmarks/management/commands/ensure_superuser.py

@@ -6,15 +6,13 @@ class Command(BaseCommand):
     help = "Creates an admin user non-interactively if it doesn't exist"
 
     def add_arguments(self, parser):
-        parser.add_argument("--username", help="Admin's username")
-        parser.add_argument("--email", help="Admin's email")
-        parser.add_argument("--password", help="Admin's password")
+        parser.add_argument('--username', help="Admin's username")
+        parser.add_argument('--email', help="Admin's email")
+        parser.add_argument('--password', help="Admin's password")
 
     def handle(self, *args, **options):
         User = get_user_model()
-        if not User.objects.filter(username=options["username"]).exists():
-            User.objects.create_superuser(
-                username=options["username"],
-                email=options["email"],
-                password=options["password"],
-            )
+        if not User.objects.filter(username=options['username']).exists():
+            User.objects.create_superuser(username=options['username'],
+                                          email=options['email'],
+                                          password=options['password'])

bookmarks/management/commands/full_backup.py

@@ -1,75 +0,0 @@
-import sqlite3
-import os
-import tempfile
-import zipfile
-
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    help = "Creates a backup of the linkding data folder"
-
-    def add_arguments(self, parser):
-        parser.add_argument("backup_file", type=str, help="Backup zip file destination")
-
-    def handle(self, *args, **options):
-        backup_file = options["backup_file"]
-        with zipfile.ZipFile(backup_file, "w", zipfile.ZIP_DEFLATED) as zip_file:
-            # Backup the database
-            self.stdout.write("Create database backup...")
-            with tempfile.TemporaryDirectory() as temp_dir:
-                backup_db_file = os.path.join(temp_dir, "db.sqlite3")
-                self.backup_database(backup_db_file)
-                zip_file.write(backup_db_file, "db.sqlite3")
-
-            # Backup the assets folder
-            if not os.path.exists(os.path.join("data", "assets")):
-                self.stdout.write(
-                    self.style.WARNING("No assets folder found. Skipping...")
-                )
-            else:
-                self.stdout.write("Backup bookmark assets...")
-                assets_folder = os.path.join("data", "assets")
-                for root, _, files in os.walk(assets_folder):
-                    for file in files:
-                        file_path = os.path.join(root, file)
-                        zip_file.write(file_path, os.path.join("assets", file))
-
-            # Backup the favicons folder
-            if not os.path.exists(os.path.join("data", "favicons")):
-                self.stdout.write(
-                    self.style.WARNING("No favicons folder found. Skipping...")
-                )
-            else:
-                self.stdout.write("Backup bookmark favicons...")
-                favicons_folder = os.path.join("data", "favicons")
-                for root, _, files in os.walk(favicons_folder):
-                    for file in files:
-                        file_path = os.path.join(root, file)
-                        zip_file.write(file_path, os.path.join("favicons", file))
-
-            # Backup the previews folder
-            if not os.path.exists(os.path.join("data", "previews")):
-                self.stdout.write(
-                    self.style.WARNING("No previews folder found. Skipping...")
-                )
-            else:
-                self.stdout.write("Backup bookmark previews...")
-                previews_folder = os.path.join("data", "previews")
-                for root, _, files in os.walk(previews_folder):
-                    for file in files:
-                        file_path = os.path.join(root, file)
-                        zip_file.write(file_path, os.path.join("previews", file))
-
-        self.stdout.write(self.style.SUCCESS(f"Backup created at {backup_file}"))
-
-    def backup_database(self, backup_db_file):
-        def progress(status, remaining, total):
-            self.stdout.write(f"Copied {total-remaining} of {total} pages...")
-
-        source_db = sqlite3.connect(os.path.join("data", "db.sqlite3"))
-        backup_db = sqlite3.connect(backup_db_file)
-        with backup_db:
-            source_db.backup(backup_db, pages=50, progress=progress)
-        backup_db.close()
-        source_db.close()

bookmarks/management/commands/generate_secret_key.py

@@ -1,24 +0,0 @@
-import logging
-import os
-
-from django.core.management.base import BaseCommand
-from django.core.management.utils import get_random_secret_key
-
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Generate secret key file if it does not exist"
-
-    def handle(self, *args, **options):
-        secret_key_file = os.path.join("data", "secretkey.txt")
-
-        if os.path.exists(secret_key_file):
-            logger.info(f"Secret key file already exists")
-            return
-
-        secret_key = get_random_secret_key()
-        with open(secret_key_file, "w") as f:
-            f.write(secret_key)
-        logger.info(f"Generated secret key file")

bookmarks/management/commands/import_netscape.py

@@ -5,17 +5,15 @@ from bookmarks.services.importer import import_netscape_html
 
 
 class Command(BaseCommand):
-    help = "Import Netscape HTML bookmark file"
+    help = 'Import Netscape HTML bookmark file'
 
     def add_arguments(self, parser):
-        parser.add_argument("file", type=str, help="Path to file")
-        parser.add_argument(
-            "user", type=str, help="Name of the user for which to import"
-        )
+        parser.add_argument('file', type=str, help='Path to file')
+        parser.add_argument('user', type=str, help='Name of the user for which to import')
 
     def handle(self, *args, **kwargs):
-        filepath = kwargs["file"]
-        username = kwargs["user"]
+        filepath = kwargs['file']
+        username = kwargs['user']
         with open(filepath) as html_file:
             html = html_file.read()
         user = User.objects.get(username=username)

bookmarks/management/commands/migrate_tasks.py

@@ -1,75 +0,0 @@
-import json
-import os
-import sqlite3
-import importlib
-
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    help = "Migrate tasks from django-background-tasks to Huey"
-
-    def handle(self, *args, **options):
-        db = sqlite3.connect(os.path.join("data", "db.sqlite3"))
-
-        # Check if background_task table exists
-        cursor = db.cursor()
-        cursor.execute(
-            "SELECT name FROM sqlite_master WHERE type='table' AND name='background_task'"
-        )
-        row = cursor.fetchone()
-        if not row:
-            self.stdout.write(
-                "Legacy task table does not exist. Skipping task migration"
-            )
-            return
-
-        # Load legacy tasks
-        cursor.execute("SELECT id, task_name, task_params FROM background_task")
-        legacy_tasks = cursor.fetchall()
-
-        if len(legacy_tasks) == 0:
-            self.stdout.write("No legacy tasks found. Skipping task migration")
-            return
-
-        self.stdout.write(
-            f"Found {len(legacy_tasks)} legacy tasks. Migrating to Huey..."
-        )
-
-        # Migrate tasks to Huey
-        succeeded_tasks = []
-        for task in legacy_tasks:
-            task_id = task[0]
-            task_name = task[1]
-            task_params_json = task[2]
-            try:
-                task_params = json.loads(task_params_json)
-                function_params = task_params[0]
-
-                # Resolve task function
-                module_name, func_name = task_name.rsplit(".", 1)
-                module = importlib.import_module(module_name)
-                func = getattr(module, func_name)
-
-                # Call task function
-                func(*function_params)
-                succeeded_tasks.append(task_id)
-            except Exception:
-                self.stderr.write(f"Error migrating task [{task_id}] {task_name}")
-
-        self.stdout.write(f"Migrated {len(succeeded_tasks)} tasks successfully")
-
-        # Clean up
-        try:
-            placeholders = ", ".join("?" for _ in succeeded_tasks)
-            sql = f"DELETE FROM background_task WHERE id IN ({placeholders})"
-            cursor.execute(sql, succeeded_tasks)
-            db.commit()
-            self.stdout.write(
-                f"Deleted {len(succeeded_tasks)} migrated tasks from legacy table"
-            )
-        except Exception:
-            self.stderr.write("Error cleaning up legacy tasks")
-
-        cursor.close()
-        db.close()

bookmarks/middlewares.py

@@ -1,41 +0,0 @@
-from django.conf import settings
-from django.contrib.auth.middleware import RemoteUserMiddleware
-
-from bookmarks.models import UserProfile, GlobalSettings
-
-
-class CustomRemoteUserMiddleware(RemoteUserMiddleware):
-    header = settings.LD_AUTH_PROXY_USERNAME_HEADER
-
-
-default_global_settings = GlobalSettings()
-
-standard_profile = UserProfile()
-standard_profile.enable_favicons = True
-
-
-class LinkdingMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        # add global settings to request
-        try:
-            global_settings = GlobalSettings.get()
-        except:
-            global_settings = default_global_settings
-        request.global_settings = global_settings
-
-        # add user profile to request
-        if request.user.is_authenticated:
-            request.user_profile = request.user.profile
-        else:
-            # check if a custom profile for guests exists, otherwise use standard profile
-            if global_settings.guest_profile_user:
-                request.user_profile = global_settings.guest_profile_user.profile
-            else:
-                request.user_profile = standard_profile
-
-        response = self.get_response(request)
-
-        return response

bookmarks/migrations/0001_initial.py

@@ -15,36 +15,19 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name="Bookmark",
+            name='Bookmark',
             fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("url", models.URLField()),
-                ("title", models.CharField(max_length=512)),
-                ("description", models.TextField()),
-                (
-                    "website_title",
-                    models.CharField(blank=True, max_length=512, null=True),
-                ),
-                ("website_description", models.TextField(blank=True, null=True)),
-                ("unread", models.BooleanField(default=True)),
-                ("date_added", models.DateTimeField()),
-                ("date_modified", models.DateTimeField()),
-                ("date_accessed", models.DateTimeField(blank=True, null=True)),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('url', models.URLField()),
+                ('title', models.CharField(max_length=512)),
+                ('description', models.TextField()),
+                ('website_title', models.CharField(blank=True, max_length=512, null=True)),
+                ('website_description', models.TextField(blank=True, null=True)),
+                ('unread', models.BooleanField(default=True)),
+                ('date_added', models.DateTimeField()),
+                ('date_modified', models.DateTimeField()),
+                ('date_accessed', models.DateTimeField(blank=True, null=True)),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]

bookmarks/migrations/0002_auto_20190629_2303.py

@@ -9,36 +9,22 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("bookmarks", "0001_initial"),
+        ('bookmarks', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name="Tag",
+            name='Tag',
             fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("name", models.CharField(max_length=64)),
-                ("date_added", models.DateTimeField()),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=64)),
+                ('date_added', models.DateTimeField()),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.AddField(
-            model_name="bookmark",
-            name="tags",
-            field=models.ManyToManyField(to="bookmarks.Tag"),
+            model_name='bookmark',
+            name='tags',
+            field=models.ManyToManyField(to='bookmarks.Tag'),
         ),
     ]

bookmarks/migrations/0003_auto_20200913_0656.py

@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookmarks", "0002_auto_20190629_2303"),
+        ('bookmarks', '0002_auto_20190629_2303'),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name="bookmark",
-            name="url",
+            model_name='bookmark',
+            name='url',
             field=models.URLField(max_length=2048),
         ),
     ]

bookmarks/migrations/0004_auto_20200926_1028.py

@@ -6,18 +6,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookmarks", "0003_auto_20200913_0656"),
+        ('bookmarks', '0003_auto_20200913_0656'),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name="bookmark",
-            name="description",
+            model_name='bookmark',
+            name='description',
             field=models.TextField(blank=True),
         ),
         migrations.AlterField(
-            model_name="bookmark",
-            name="title",
+            model_name='bookmark',
+            name='title',
             field=models.CharField(blank=True, max_length=512),
         ),
     ]

bookmarks/migrations/0005_auto_20210103_1212.py

@@ -7,16 +7,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookmarks", "0004_auto_20200926_1028"),
+        ('bookmarks', '0004_auto_20200926_1028'),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name="bookmark",
-            name="url",
-            field=models.CharField(
-                max_length=2048,
-                validators=[bookmarks.validators.BookmarkURLValidator()],
-            ),
+            model_name='bookmark',
+            name='url',
+            field=models.CharField(max_length=2048, validators=[bookmarks.validators.BookmarkURLValidator()]),
         ),
     ]

bookmarks/migrations/0006_bookmark_is_archived.py

@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("bookmarks", "0005_auto_20210103_1212"),
+        ('bookmarks', '0005_auto_20210103_1212'),
     ]
 
     operations = [
         migrations.AddField(
-            model_name="bookmark",
-            name="is_archived",
+            model_name='bookmark',
+            name='is_archived',
             field=models.BooleanField(default=False),
         ),
     ]

bookmarks/migrations/0007_userprofile.py

@@ -1,66 +0,0 @@
-# Generated by Django 2.2.18 on 2021-03-26 22:39
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-def forwards(apps, schema_editor):
-    User = apps.get_model("auth", "User")
-    UserProfile = apps.get_model("bookmarks", "UserProfile")
-    for user in User.objects.all():
-        try:
-            if user.profile:
-                continue
-        except UserProfile.DoesNotExist:
-            profile = UserProfile(user=user)
-            profile.save()
-
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("bookmarks", "0006_bookmark_is_archived"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="UserProfile",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "theme",
-                    models.CharField(
-                        choices=[
-                            ("auto", "Auto"),
-                            ("light", "Light"),
-                            ("dark", "Dark"),
-                        ],
-                        default="auto",
-                        max_length=10,
-                    ),
-                ),
-                (
-                    "user",
-                    models.OneToOneField(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="profile",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-        ),
-        migrations.RunPython(forwards, reverse),
-    ]

bookmarks/migrations/0008_userprofile_bookmark_date_display.py

@@ -1,26 +0,0 @@
-# Generated by Django 2.2.18 on 2021-03-30 10:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookmarks", "0007_userprofile"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="userprofile",
-            name="bookmark_date_display",
-            field=models.CharField(
-                choices=[
-                    ("relative", "Relative"),
-                    ("absolute", "Absolute"),
-                    ("hidden", "Hidden"),
-                ],
-                default="relative",
-                max_length=10,
-            ),
-        ),
-    ]

bookmarks/migrations/0009_bookmark_web_archive_snapshot_url.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-16 14:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookmarks", "0008_userprofile_bookmark_date_display"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="bookmark",
-            name="web_archive_snapshot_url",
-            field=models.CharField(blank=True, max_length=2048),
-        ),
-    ]

bookmarks/migrations/0010_userprofile_bookmark_link_target.py

@@ -1,22 +0,0 @@
-# Generated by Django 3.2.6 on 2021-10-03 06:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookmarks", "0009_bookmark_web_archive_snapshot_url"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="userprofile",
-            name="bookmark_link_target",
-            field=models.CharField(
-                choices=[("_blank", "New page"), ("_self", "Same page")],
-                default="_blank",
-                max_length=10,
-            ),
-        ),
-    ]

bookmarks/migrations/0011_userprofile_web_archive_integration.py

@@ -1,22 +0,0 @@
-# Generated by Django 3.2.6 on 2022-01-08 12:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookmarks", "0010_userprofile_bookmark_link_target"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="userprofile",
-            name="web_archive_integration",
-            field=models.CharField(
-                choices=[("disabled", "Disabled"), ("enabled", "Enabled")],
-                default="disabled",
-                max_length=10,
-            ),
-        ),
-    ]

bookmarks/migrations/0012_toast.py

@@ -1,40 +0,0 @@
-# Generated by Django 3.2.6 on 2022-01-08 19:24
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("bookmarks", "0011_userprofile_web_archive_integration"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Toast",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("key", models.CharField(max_length=50)),
-                ("message", models.TextField()),
-                ("acknowledged", models.BooleanField(default=False)),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-        ),
-    ]

bookmarks/migrations/0013_web_archive_optin_toast.py

@@ -1,32 +0,0 @@
-# Generated by Django 3.2.6 on 2022-01-08 19:27
-
-from django.db import migrations
-from django.contrib.auth import get_user_model
-
-from bookmarks.models import Toast
-
-User = get_user_model()
-
-
-def forwards(apps, schema_editor):
-    for user in User.objects.all():
-        toast = Toast(
-            key="web_archive_opt_in_hint",
-            message="The Internet Archive Wayback Machine integration has been disabled by default. Check the Settings to re-enable it.",
-            owner=user,
-        )
-        toast.save()
-
-
-def reverse(apps, schema_editor):
-    Toast.objects.filter(key="web_archive_opt_in_hint").delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("bookmarks", "0012_toast"),
-    ]
-
-    operations = [
-        migrations.RunPython(forwards, reverse),
-    ]

bookmarks/migrations/0014_alter_bookmark_unread.py

@@ -1,27 +0,0 @@
-# Generated by Django 3.2.13 on 2022-07-23 12:30
-
-from django.db import migrations, models
-
-
-def forwards(apps, schema_editor):
-    Bookmark = apps.get_model("bookmarks", "Bookmark")
-    Bookmark.objects.update(unread=False)
-
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("bookmarks", "0013_web_archive_optin_toast"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="bookmark",
-            name="unread",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.RunPython(forwards, reverse),
-    ]

bookmarks/migrations/0015_feedtoken.py

@@ -1,34 +0,0 @@
-# Generated by Django 3.2.13 on 2022-07-23 20:35
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("bookmarks", "0014_alter_bookmark_unread"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="FeedToken",
-            fields=[
-                (
-                    "key",
-                    models.CharField(max_length=40, primary_key=True, serialize=False),
-                ),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                (
-                    "user",
-                    models.OneToOneField(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="feed_token",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-        ),
-    ]

bookmarks/migrations/0016_bookmark_shared.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.14 on 2022-08-02 18:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookmarks", "0015_feedtoken"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="bookmark",
-            name="shared",
-            field=models.BooleanField(default=False),
-        ),
-    ]

bookmarks/migrations/0017_userprofile_enable_sharing.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.14 on 2022-08-04 09:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookmarks", "0016_bookmark_shared"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="userprofile",
-            name="enable_sharing",
-            field=models.BooleanField(default=False),
-        ),
-    ]