From 6b0bdcfff6a360ed978e71502e3dd3d37ec86d07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 11:51:45 +0000
Subject: [PATCH 01/15] Bump actions/setup-go from 4 to 5

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 68458977..6110a793 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,7 +58,7 @@ jobs:
           ref: ${{ github.ref }}
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.22'
 

From 9597435dffb6d9a67a83ed439a7227d05805f05a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 12:17:46 +0000
Subject: [PATCH 02/15] Bump actions/setup-node from 3 to 4

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 68458977..9d2305b1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
 
       # 2. Setup node & npm
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '22'
 

From 66e482c6fc1a244619b28a0da430fc44fa8c0d60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 12:36:05 +0000
Subject: [PATCH 03/15] Bump actions/checkout from 3 to 5

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 68458977..2dfc7551 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
     steps:
       # 1. Checkout the repository
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       # 2. Setup node & npm
       - name: Setup Node.js
@@ -53,7 +53,7 @@ jobs:
     steps:
       # 1. Checkout the repository
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.ref }}
 
@@ -106,7 +106,7 @@ jobs:
     steps:
       # 1. Checkout the repository
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.ref }}
       # 2. Extract release notes from CHANGELOG.md

From c6042db9a802394379c5d0b4b9d68130e11f1158 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Fri, 29 Aug 2025 15:18:24 +0200
Subject: [PATCH 04/15] fixes permission issues for non-public trails

---
 db/migrations/1756471290_updated_trails.go    | 42 +++++++++++++++++++
 db/migrations/1756473199_updated_waypoints.go | 42 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 db/migrations/1756471290_updated_trails.go
 create mode 100644 db/migrations/1756473199_updated_waypoints.go

diff --git a/db/migrations/1756471290_updated_trails.go b/db/migrations/1756471290_updated_trails.go
new file mode 100644
index 00000000..3c131c5c
--- /dev/null
+++ b/db/migrations/1756471290_updated_trails.go
@@ -0,0 +1,42 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("e864strfxo14pm4")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"listRule": "author.user = @request.auth.id || public = true || (@request.auth.id != \"\" && trail_share_via_trail.actor.user ?= @request.auth.id) || (trail_link_share_via_trail.token != \"\" && trail_link_share_via_trail.token = @request.query.share)",
+			"viewRule": "author.user = @request.auth.id || public = true || (@request.auth.id != \"\" && trail_share_via_trail.actor.user ?= @request.auth.id) || (trail_link_share_via_trail.token != \"\" && trail_link_share_via_trail.token = @request.query.share)"
+		}`), &collection); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	}, func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("e864strfxo14pm4")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"listRule": "author.user = @request.auth.id || public = true || (@request.auth.id != \"\" && trail_share_via_trail.actor.user ?= @request.auth.id) || trail_link_share_via_trail.token = @request.query.share",
+			"viewRule": "author.user = @request.auth.id || public = true || (@request.auth.id != \"\" && trail_share_via_trail.actor.user ?= @request.auth.id) || trail_link_share_via_trail.token = @request.query.share "
+		}`), &collection); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	})
+}
diff --git a/db/migrations/1756473199_updated_waypoints.go b/db/migrations/1756473199_updated_waypoints.go
new file mode 100644
index 00000000..e8fca54f
--- /dev/null
+++ b/db/migrations/1756473199_updated_waypoints.go
@@ -0,0 +1,42 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("goeo2ubp103rzp9")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"listRule": "author = @request.auth.id || trails_via_waypoints.author.user ?= @request.auth.id || trails_via_waypoints.public ?= true || \n(@collection.trail_share.trail.id ?= trails_via_waypoints.id && @collection.trail_share.actor.user ?= @request.auth.id)\n|| \n(@collection.trail_link_share.token !=  \"\" && @collection.trail_link_share.trail.waypoints.id ?= id)",
+			"viewRule": "author = @request.auth.id || trails_via_waypoints.author.user ?= @request.auth.id || trails_via_waypoints.public ?= true || \n(@collection.trail_share.trail.id ?= trails_via_waypoints.id && @collection.trail_share.actor.user ?= @request.auth.id)\n|| \n(@collection.trail_link_share.token !=  \"\" && @collection.trail_link_share.trail.waypoints.id ?= id)"
+		}`), &collection); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	}, func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("goeo2ubp103rzp9")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"listRule": "author = @request.auth.id || trails_via_waypoints.author.user ?= @request.auth.id || trails_via_waypoints.public ?= true || \n(@collection.trail_share.trail.id ?= trails_via_waypoints.id && @collection.trail_share.actor.user ?= @request.auth.id)\n|| \n(@collection.trail_link_share.trail.id ?= trails_via_waypoints.id && @collection.trail_link_share.token = @request.query.share)",
+			"viewRule": "author = @request.auth.id || trails_via_waypoints.author.user ?= @request.auth.id || trails_via_waypoints.public ?= true || \n(@collection.trail_share.trail.id ?= trails_via_waypoints.id && @collection.trail_share.actor.user ?= @request.auth.id)\n|| \n(@collection.trail_link_share.trail.id ?= trails_via_waypoints.id && @collection.trail_link_share.token = @request.query.share)"
+		}`), &collection); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	})
+}

From 64579808a9b3fa1e6dd2f7303c772fc0875c38b1 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sun, 31 Aug 2025 16:41:03 +0200
Subject: [PATCH 05/15] fixes duplicate trails

---
 db/util/activitypub.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/db/util/activitypub.go b/db/util/activitypub.go
index 197f25fd..b4c4f505 100644
--- a/db/util/activitypub.go
+++ b/db/util/activitypub.go
@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path"
 	"strconv"
 	"strings"
 	"time"
@@ -162,7 +163,19 @@ func TrailFromActivity(activity pub.Activity, app core.App, actor *core.Record)
 		return nil, err
 	}
 
-	record, err := app.FindFirstRecordByData("trails", "iri", t.ID.String())
+	iri := t.ID.String()
+	var record *core.Record
+	if actor.GetBool(("isLocal")) {
+		trailUrl, parseErr := url.Parse(iri)
+		if parseErr != nil {
+			return nil, parseErr
+		}
+		trailId := path.Base(trailUrl.Path)
+		record, err = app.FindRecordById("trails", trailId)
+	} else {
+		record, err = app.FindFirstRecordByData("trails", "iri", iri)
+	}
+
 	if err != nil {
 		if err == sql.ErrNoRows {
 			collection, err := app.FindCollectionByNameOrId("trails")
@@ -279,7 +292,7 @@ func TrailFromActivity(activity pub.Activity, app core.App, actor *core.Record)
 		}
 
 		if len(photoURLs) > 0 {
-			photos := make([]*filesystem.File, len(photoURLs))
+			photos := []*filesystem.File{}
 			for i, purl := range photoURLs {
 				photo, err := filesystem.NewFileFromURL(context.Background(), purl)
 				if err != nil {

From 5174663104090bcd5971fac9675cb10d32e3d415 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sun, 7 Sep 2025 16:32:28 +0200
Subject: [PATCH 06/15] fixes link to new trail on empty profiles

---
 web/src/routes/profile/[handle]/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/routes/profile/[handle]/+page.svelte b/web/src/routes/profile/[handle]/+page.svelte
index 63e9887b..8f340cdc 100644
--- a/web/src/routes/profile/[handle]/+page.svelte
+++ b/web/src/routes/profile/[handle]/+page.svelte
@@ -136,7 +136,7 @@
     <div class="space-y-4">
         <h4 class="text-xl font-semibold">Timeline</h4>
         {#if !feed.items?.length && data.isOwnProfile}
-            <a class="btn-primary inline-block" href="/trails/edit/new"
+            <a class="btn-primary inline-block" href="/trail/edit/new"
                 >+ {$_("new-trail")}</a
             >
         {:else if !feed.items?.length}

From 8cc70292437671ac57ecb510e83502d32abb4c2d Mon Sep 17 00:00:00 2001
From: slothful-vassal <89943360+slothful-vassal@users.noreply.github.com>
Date: Sun, 7 Sep 2025 16:34:25 +0200
Subject: [PATCH 07/15] fix opening trail from map search (#562)

---
 .gitignore                      | 2 +-
 web/src/routes/map/+page.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 61487c08..5c5302b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@ search/dumps
 
 run.sh
 build*.sh
-start.*
+start*.*
 
 data*/
diff --git a/web/src/routes/map/+page.svelte b/web/src/routes/map/+page.svelte
index 9b0e2b36..de73ddc7 100644
--- a/web/src/routes/map/+page.svelte
+++ b/web/src/routes/map/+page.svelte
@@ -101,7 +101,7 @@
         const trailItems = r[0].hits.map((t: TrailSearchResult) => ({
             text: t.name,
             description: `Trail ${t.location.length ? ", " + t.location : ""}`,
-            value: `@${t.author}${t.domain ? `@${t.domain}` : ""}/${t.id}`,
+            value: `@${t.author_name}${t.domain ? `@${t.domain}` : ""}/${t.id}`,
             icon: "route",
         }));
         const listItems = r[1].hits.map((t: ListSearchResult) => ({

From 3b7f30908cc171d7123010b0b122f9098adb291e Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sun, 7 Sep 2025 17:59:35 +0200
Subject: [PATCH 08/15] fixes sorting by difficulty

---
 db/util/meilisearch.go                        | 15 ++++++++++++++-
 .../trail/trail_filter_panel.svelte           |  6 +++---
 web/src/lib/models/trail.ts                   |  4 ++--
 web/src/lib/stores/trail_store.ts             |  2 +-
 web/src/routes/map/+page.ts                   |  2 +-
 .../routes/profile/[handle]/trails/+page.ts   |  2 +-
 web/src/routes/trails/+page.svelte            | 19 ++++++++++++++++++-
 web/src/routes/trails/+page.ts                |  2 +-
 8 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/db/util/meilisearch.go b/db/util/meilisearch.go
index a986909d..98a122a0 100644
--- a/db/util/meilisearch.go
+++ b/db/util/meilisearch.go
@@ -69,7 +69,7 @@ func documentFromTrailRecord(app core.App, r *core.Record, author *core.Record,
 		"elevation_gain": r.GetFloat("elevation_gain"),
 		"elevation_loss": r.GetFloat("elevation_loss"),
 		"duration":       r.GetFloat("duration"),
-		"difficulty":     r.Get("difficulty"),
+		"difficulty":     difficultyToNumber(r.GetString("difficulty")),
 		"category":       category,
 		"completed":      logCount > 0,
 		"date":           r.GetDateTime("date").Time().Unix(),
@@ -97,6 +97,19 @@ func documentFromTrailRecord(app core.App, r *core.Record, author *core.Record,
 	return document, nil
 }
 
+func difficultyToNumber(difficulty string) int32 {
+	switch difficulty {
+	case "easy":
+		return 0
+	case "moderate":
+		return 1
+	case "difficult":
+		return 2
+	}
+
+	return 0
+}
+
 func getPolyline(app core.App, r *core.Record) (string, error) {
 	gpxPath := r.GetString("gpx")
 	if len(gpxPath) == 0 {
diff --git a/web/src/lib/components/trail/trail_filter_panel.svelte b/web/src/lib/components/trail/trail_filter_panel.svelte
index 446bfc35..7979edfd 100644
--- a/web/src/lib/components/trail/trail_filter_panel.svelte
+++ b/web/src/lib/components/trail/trail_filter_panel.svelte
@@ -51,9 +51,9 @@
     ];
 
     const difficultyItems: SelectItem[] = [
-        { text: $_("easy"), value: "easy" },
-        { text: $_("moderate"), value: "moderate" },
-        { text: $_("difficult"), value: "difficult" },
+        { text: $_("easy"), value: 0 },
+        { text: $_("moderate"), value: 1 },
+        { text: $_("difficult"), value: 2 },
     ];
 
     let searchDropdownItems: SearchItem[] = $state([]);
diff --git a/web/src/lib/models/trail.ts b/web/src/lib/models/trail.ts
index 566c861b..e5946d93 100644
--- a/web/src/lib/models/trail.ts
+++ b/web/src/lib/models/trail.ts
@@ -111,7 +111,7 @@ interface TrailFilter {
     q: string,
     category: string[],
     tags: string[],
-    difficulty: ("easy" | "moderate" | "difficult")[]
+    difficulty: (0 | 1 | 2)[]
     author?: string;
     public?: boolean;
     shared?: boolean;
@@ -169,7 +169,7 @@ interface TrailSearchResult {
     elevation_gain: number;
     elevation_loss: number;
     duration: number;
-    difficulty: "easy" | "moderate" | "difficult";
+    difficulty: 0 | 1 | 2;
     category: string;
     completed: boolean;
     date: number;
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index 2f60d5f7..c6f90a37 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -457,7 +457,7 @@ export async function searchResultToTrailList(hits: Hits<TrailSearchResult>): Pr
             created: new Date(h.created * 1000).toISOString(),
             date: new Date(h.date * 1000).toISOString(),
             description: h.description,
-            difficulty: h.difficulty,
+            difficulty: h.difficulty == 0 ? "easy" : h.difficulty == 1 ? "moderate" : "difficult",
             distance: h.distance,
             duration: h.duration,
             elevation_gain: h.elevation_gain,
diff --git a/web/src/routes/map/+page.ts b/web/src/routes/map/+page.ts
index a5b5c7e4..aa53828a 100644
--- a/web/src/routes/map/+page.ts
+++ b/web/src/routes/map/+page.ts
@@ -11,7 +11,7 @@ export const load: ServerLoad = async ({ params, locals, fetch }) => {
         q: "",
         category: [],
         tags: [],
-        difficulty: ["easy", "moderate", "difficult"],
+        difficulty: [0, 1, 2],
         author: "",
         public: true,
         shared: true,
diff --git a/web/src/routes/profile/[handle]/trails/+page.ts b/web/src/routes/profile/[handle]/trails/+page.ts
index fead8afe..07adeb7a 100644
--- a/web/src/routes/profile/[handle]/trails/+page.ts
+++ b/web/src/routes/profile/[handle]/trails/+page.ts
@@ -12,7 +12,7 @@ export const load: Load = async ({ params, fetch, parent }) => {
         q: "",
         category: [],
         tags: [],
-        difficulty: ["easy", "moderate", "difficult"],
+        difficulty: [0, 1, 2],
         author: actor.id,
         public: true,
         shared: true,
diff --git a/web/src/routes/trails/+page.svelte b/web/src/routes/trails/+page.svelte
index feef0328..09bd7e55 100644
--- a/web/src/routes/trails/+page.svelte
+++ b/web/src/routes/trails/+page.svelte
@@ -25,7 +25,24 @@
     export const snapshot: Snapshot<TrailFilter> = {
         capture: () => filter,
         restore: (value) => {
-            filter = value;
+            const difficultyMap: Record<string, 0 | 1 | 2> = {
+                easy: 0,
+                moderate: 1,
+                difficult: 2,
+            };
+            // defensive copy
+            const migrated = { ...value };
+
+            if (Array.isArray(migrated.difficulty)) {
+                migrated.difficulty = migrated.difficulty.map((d: any) => {
+                    if (typeof d === "string" && d in difficultyMap) {
+                        return difficultyMap[d];
+                    }
+                    return d;
+                });
+            }
+
+            filter = migrated;
             handleFilterUpdate();
         },
     };
diff --git a/web/src/routes/trails/+page.ts b/web/src/routes/trails/+page.ts
index e9f8e12c..97e1d269 100644
--- a/web/src/routes/trails/+page.ts
+++ b/web/src/routes/trails/+page.ts
@@ -10,7 +10,7 @@ export const load: ServerLoad = async ({ params, locals, url, fetch }) => {
         q: "",
         category: [],
         tags: [],
-        difficulty: ["easy", "moderate", "difficult"],
+        difficulty: [0, 1, 2],
         author: "",
         public: true,
         shared: true,

From 9c628c6511b0c1a7ba030f2a2f76bdea7c51f357 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Fri, 12 Sep 2025 16:45:50 +0200
Subject: [PATCH 09/15] cache public meilisearch key

---
 db/main.go              | 200 +++++++++++++++++++++++++++-------------
 web/src/hooks.server.ts |   9 +-
 2 files changed, 143 insertions(+), 66 deletions(-)

diff --git a/db/main.go b/db/main.go
index 2245b938..6758ac50 100644
--- a/db/main.go
+++ b/db/main.go
@@ -1308,94 +1308,166 @@ func bootstrapCategories(app core.App) error {
 }
 
 func bootstrapMeilisearchDocuments(app core.App, client meilisearch.ServiceManager) error {
-	query := app.RecordQuery("trails")
-	trails := []*core.Record{}
+	// --- Trails ---
+	const pageSize = 100
+	var page int64 = 0
 
-	if err := query.All(&trails); err != nil {
+	// Clear index before re-indexing
+	if _, err := client.Index("trails").DeleteAllDocuments(); err != nil {
 		return err
 	}
 
-	_, err := client.Index("trails").DeleteAllDocuments()
-	if err != nil {
-		return err
-	}
-	for _, trail := range trails {
-		author, err := app.FindRecordById("activitypub_actors", trail.GetString(("author")))
+	for {
+		trails := []*core.Record{}
+		err := app.RecordQuery("trails").
+			Limit(pageSize).
+			Offset(page * int64(pageSize)).
+			All(&trails)
 		if err != nil {
 			return err
 		}
-		if err := util.IndexTrail(app, trail, author, client); err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to index trail '%s': %v", trail.GetString("name"), err))
-			continue
+		if len(trails) == 0 {
+			break
 		}
 
-		shares, err := app.FindAllRecords("trail_share",
-			dbx.NewExp("trail = {:trailId}", dbx.Params{"trailId": trail.Id}),
+		// Collect author IDs to fetch in batch
+		authorIDs := make([]string, 0, len(trails))
+		for _, t := range trails {
+			if id := t.GetString("author"); id != "" {
+				authorIDs = append(authorIDs, id)
+			}
+		}
+
+		// Fetch all authors in one go
+		authorArgs := make([]interface{}, len(authorIDs))
+		for i, v := range authorIDs {
+			authorArgs[i] = v
+		}
+
+		authors, err := app.FindAllRecords("activitypub_actors",
+			dbx.In("id", authorArgs...),
 		)
 		if err != nil {
 			return err
 		}
-		actorIds := make([]string, len(shares))
-		for i, r := range shares {
-			actorIds[i] = r.GetString("actor")
+		authorMap := make(map[string]*core.Record, len(authors))
+		for _, a := range authors {
+			authorMap[a.Id] = a
 		}
-		err = util.UpdateTrailShares(trail.Id, actorIds, client)
+
+		for _, trail := range trails {
+			author := authorMap[trail.GetString("author")]
+
+			if err := util.IndexTrail(app, trail, author, client); err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to index trail '%s': %v", trail.GetString("name"), err))
+				continue
+			}
+
+			// Shares
+			shares, err := app.FindAllRecords("trail_share",
+				dbx.NewExp("trail = {:trailId}", dbx.Params{"trailId": trail.Id}),
+			)
+			if err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to fetch shares for trail '%s': %v", trail.GetString("name"), err))
+				continue
+			}
+			shareActors := make([]string, len(shares))
+			for i, r := range shares {
+				shareActors[i] = r.GetString("actor")
+			}
+			if err := util.UpdateTrailShares(trail.Id, shareActors, client); err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to update trail shares '%s': %v", trail.GetString("name"), err))
+			}
+
+			// Likes
+			likes, err := app.FindAllRecords("trail_like",
+				dbx.NewExp("trail = {:trailId}", dbx.Params{"trailId": trail.Id}),
+			)
+			if err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to fetch likes for trail '%s': %v", trail.GetString("name"), err))
+				continue
+			}
+			likeActors := make([]string, len(likes))
+			for i, r := range likes {
+				likeActors[i] = r.GetString("actor")
+			}
+			if err := util.UpdateTrailLikes(trail.Id, likeActors, client); err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to update trail likes '%s': %v", trail.GetString("name"), err))
+			}
+		}
+
+		page++
+	}
+
+	// --- Lists ---
+	if _, err := client.Index("lists").DeleteAllDocuments(); err != nil {
+		return err
+	}
+
+	page = 0
+	for {
+		lists := []*core.Record{}
+		err := app.RecordQuery("lists").
+			Limit(pageSize).
+			Offset(page * pageSize).
+			All(&lists)
 		if err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to update trail shares '%s': %v", trail.GetString("name"), err))
-			continue
+			return err
 		}
-		likes, err := app.FindAllRecords("trail_like",
-			dbx.NewExp("trail = {:trailId}", dbx.Params{"trailId": trail.Id}),
+		if len(lists) == 0 {
+			break
+		}
+
+		// Collect author IDs in batch
+		authorIDs := make([]string, 0, len(lists))
+		for _, l := range lists {
+			if id := l.GetString("author"); id != "" {
+				authorIDs = append(authorIDs, id)
+			}
+		}
+		// Fetch all authors in one go
+		authorArgs := make([]interface{}, len(authorIDs))
+		for i, v := range authorIDs {
+			authorArgs[i] = v
+		}
+
+		authors, err := app.FindAllRecords("activitypub_actors",
+			dbx.In("id", authorArgs...),
 		)
 		if err != nil {
 			return err
 		}
-		actorIds = make([]string, len(likes))
-		for i, r := range likes {
-			actorIds[i] = r.GetString("actor")
-		}
-		err = util.UpdateTrailLikes(trail.Id, actorIds, client)
-		if err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to update trail likes '%s': %v", trail.GetString("name"), err))
-			continue
-		}
-	}
-
-	lists, err := app.FindAllRecords("lists")
-	if err != nil {
-		return err
-	}
-	_, err = client.Index("lists").DeleteAllDocuments()
-	if err != nil {
-		return err
-	}
-
-	for _, list := range lists {
-		author, err := app.FindRecordById("activitypub_actors", list.GetString(("author")))
-		if err != nil {
-			return err
-		}
-		if err := util.IndexList(app, list, author, client); err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to index list '%s': %v", list.GetString("name"), err))
-			continue
+		authorMap := make(map[string]*core.Record, len(authors))
+		for _, a := range authors {
+			authorMap[a.Id] = a
 		}
 
-		shares, err := app.FindAllRecords("list_share",
-			dbx.NewExp("list = {:listId}", dbx.Params{"listId": list.Id}),
-		)
-		if err != nil {
-			return err
-		}
-		actorIds := make([]string, len(shares))
-		for i, r := range shares {
-			actorIds[i] = r.GetString("actor")
-		}
-		err = util.UpdateListShares(list.Id, actorIds, client)
+		for _, list := range lists {
+			author := authorMap[list.GetString("author")]
 
-		if err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to update list shares '%s': %v", list.GetString("name"), err))
-			continue
+			if err := util.IndexList(app, list, author, client); err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to index list '%s': %v", list.GetString("name"), err))
+				continue
+			}
+
+			shares, err := app.FindAllRecords("list_share",
+				dbx.NewExp("list = {:listId}", dbx.Params{"listId": list.Id}),
+			)
+			if err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to fetch list shares '%s': %v", list.GetString("name"), err))
+				continue
+			}
+			shareActors := make([]string, len(shares))
+			for i, r := range shares {
+				shareActors[i] = r.GetString("actor")
+			}
+			if err := util.UpdateListShares(list.Id, shareActors, client); err != nil {
+				app.Logger().Warn(fmt.Sprintf("Unable to update list shares '%s': %v", list.GetString("name"), err))
+			}
 		}
+
+		page++
 	}
+
 	return nil
 }
diff --git a/web/src/hooks.server.ts b/web/src/hooks.server.ts
index d7cf6c8c..32fdb41a 100644
--- a/web/src/hooks.server.ts
+++ b/web/src/hooks.server.ts
@@ -48,6 +48,7 @@ function isFormContentType(request: Request) {
   );
 }
 
+let publicMeilisearchKey: string | undefined = undefined;
 
 const auth: Handle = async ({ event, resolve }) => {
   const pb = new PocketBase(envPub.PUBLIC_POCKETBASE_URL)
@@ -84,8 +85,12 @@ const auth: Handle = async ({ event, resolve }) => {
     settings = await pb.collection('settings').getFirstListItem<Settings>(`user="${pb.authStore.record.id}"`, { requestKey: null })
     actor = await pb.collection("activitypub_actors").getFirstListItem(`user='${pb.authStore.record.id}'`)
   } else {
-    const response = await pb.send("/public/search/token", { method: "GET", fetch: event.fetch });
-    meiliApiKey = response.token;
+    if (!publicMeilisearchKey) {
+      const response = await pb.send("/public/search/token", { method: "GET", fetch: event.fetch });
+      publicMeilisearchKey = response.token;
+    }
+
+    meiliApiKey = publicMeilisearchKey!;
   }
   const ms = new MeiliSearch({ host: env.MEILI_URL, apiKey: meiliApiKey });
 

From 73d20b1cbcc4c3f49fd1ee9e04ff237c47992057 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Fri, 12 Sep 2025 17:48:41 +0200
Subject: [PATCH 10/15] reverses waypoint relation

---
 db/integrations/komoot/komoot.go              | 46 +++++++-------
 db/integrations/strava/strava.go              | 39 ++++++------
 db/migrations/1757689107_updated_waypoints.go | 62 +++++++++++++++++++
 .../1757689185_migrate_waypoint_trails.go     | 34 ++++++++++
 db/migrations/1757690946_updated_trails.go    | 44 +++++++++++++
 .../components/trail/trail_info_panel.svelte  |  2 +-
 .../components/trail/trail_timeline.svelte    |  2 +-
 web/src/lib/models/api/trail_schema.ts        |  2 -
 web/src/lib/models/api/waypoint_schema.ts     | 13 ++--
 web/src/lib/models/trail.ts                   |  6 +-
 web/src/lib/models/waypoint.ts                |  4 +-
 web/src/lib/stores/trail_store.ts             | 45 +++++---------
 web/src/lib/util/gpx_util.ts                  |  4 +-
 web/src/routes/api/v1/trail/+server.ts        |  2 +-
 web/src/routes/api/v1/trail/[id]/+server.ts   |  4 +-
 .../lists/[[handle]]/[[id]]/+page.svelte      |  2 +-
 .../map/trail/[handle]/[id]/+page.svelte      |  2 +-
 .../trail/[handle]/[id]/print/+page.svelte    |  6 +-
 web/src/routes/trail/edit/[id]/+page.svelte   | 34 +++++-----
 19 files changed, 238 insertions(+), 115 deletions(-)
 create mode 100644 db/migrations/1757689107_updated_waypoints.go
 create mode 100644 db/migrations/1757689185_migrate_waypoint_trails.go
 create mode 100644 db/migrations/1757690946_updated_trails.go

diff --git a/db/integrations/komoot/komoot.go b/db/integrations/komoot/komoot.go
index a2041d5a..51b62ee8 100644
--- a/db/integrations/komoot/komoot.go
+++ b/db/integrations/komoot/komoot.go
@@ -205,27 +205,27 @@ func syncTrailWithTours(app core.App, k *KomootApi, i KomootIntegration, user st
 			app.Logger().Warn(fmt.Sprintf("Unable to generate GPX for tour '%s': %v", tour.Name, err))
 			continue
 		}
-		wpIds, err := createWaypointsFromTour(app, detailedTour, user)
-		if err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to create waypoints for tour '%s': %v", tour.Name, err))
-			continue
-		}
-		err = createTrailFromTour(app, k, detailedTour, gpx, actor, wpIds)
+		trailid, err := createTrailFromTour(app, k, detailedTour, gpx, actor)
 		if err != nil {
 			app.Logger().Warn(fmt.Sprintf("Unable to create trail for tour '%s': %v", tour.Name, err))
 			continue
 		}
+		err = createWaypointsFromTour(app, detailedTour, user, trailid)
+		if err != nil {
+			app.Logger().Warn(fmt.Sprintf("Unable to create waypoints for tour '%s': %v", tour.Name, err))
+			continue
+		}
 
 	}
 	return hasNewTours, nil
 }
 
-func createTrailFromTour(app core.App, k *KomootApi, detailedTour *DetailedKomootTour, gpx *filesystem.File, actor string, wpIds []string) error {
+func createTrailFromTour(app core.App, k *KomootApi, detailedTour *DetailedKomootTour, gpx *filesystem.File, actor string) (string, error) {
 	trailid := security.RandomStringWithAlphabet(core.DefaultIdLength, core.DefaultIdAlphabet)
 
 	collection, err := app.FindCollectionByNameOrId("trails")
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	record := core.NewRecord(collection)
@@ -251,12 +251,12 @@ func createTrailFromTour(app core.App, k *KomootApi, detailedTour *DetailedKomoo
 	if len(detailedTour.Embedded.CoverImages.Embedded.Items) > 0 {
 		photos, err = fetchRoutePhotos(k, detailedTour)
 		if err != nil {
-			return err
+			return "", err
 		}
 	} else {
 		photo, err := fetchPhoto(detailedTour.MapImage.Src, "", "")
 		if err != nil {
-			return err
+			return "", err
 		}
 		photos = append(photos, photo)
 	}
@@ -281,7 +281,6 @@ func createTrailFromTour(app core.App, k *KomootApi, detailedTour *DetailedKomoo
 		"lon":               detailedTour.StartPoint.Lng,
 		"difficulty":        diffculty,
 		"category":          categoryId,
-		"waypoints":         wpIds,
 		"author":            actor,
 	})
 
@@ -293,13 +292,13 @@ func createTrailFromTour(app core.App, k *KomootApi, detailedTour *DetailedKomoo
 	}
 
 	if err := app.Save(record); err != nil {
-		return err
+		return "", err
 	}
 
 	if detailedTour.Type == "tour_recorded" {
 		collection, err := app.FindCollectionByNameOrId("summit_logs")
 		if err != nil {
-			return err
+			return "", err
 		}
 
 		summitLogRecord := core.NewRecord(collection)
@@ -313,25 +312,23 @@ func createTrailFromTour(app core.App, k *KomootApi, detailedTour *DetailedKomoo
 			"trail":          trailid,
 		})
 		if err := app.Save(summitLogRecord); err != nil {
-			return err
+			return "", err
 		}
 	}
 
-	return nil
+	return trailid, nil
 }
 
-func createWaypointsFromTour(app core.App, tour *DetailedKomootTour, user string) ([]string, error) {
+func createWaypointsFromTour(app core.App, tour *DetailedKomootTour, user string, trailid string) error {
 	collection, err := app.FindCollectionByNameOrId("waypoints")
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	wpIds := make([]string, len(tour.Embedded.Timeline.Embedded.Items))
-
-	for i, wp := range tour.Embedded.Timeline.Embedded.Items {
+	for _, wp := range tour.Embedded.Timeline.Embedded.Items {
 		photos, err := fetchWaypointPhotos(wp)
 		if err != nil {
-			return nil, err
+			return err
 		}
 		record := core.NewRecord(collection)
 
@@ -358,6 +355,7 @@ func createWaypointsFromTour(app core.App, tour *DetailedKomootTour, user string
 			"icon":                "circle",
 			"author":              user,
 			"distance_from_start": 0,
+			"trail":               trailid,
 		})
 
 		if photos != nil {
@@ -365,13 +363,11 @@ func createWaypointsFromTour(app core.App, tour *DetailedKomootTour, user string
 		}
 
 		if err := app.Save(record); err != nil {
-			return nil, err
+			return err
 		}
-
-		wpIds[i] = record.Id
 	}
 
-	return wpIds, nil
+	return nil
 }
 
 func fetchRoutePhotos(k *KomootApi, tour *DetailedKomootTour) ([]*filesystem.File, error) {
diff --git a/db/integrations/strava/strava.go b/db/integrations/strava/strava.go
index e291ea9d..974af4f0 100644
--- a/db/integrations/strava/strava.go
+++ b/db/integrations/strava/strava.go
@@ -251,17 +251,16 @@ func syncTrailsWithRoutes(app core.App, accessToken string, user string, actor s
 			app.Logger().Warn(fmt.Sprintf("Unable to fetch GPX for route '%s': %v", route.Name, err))
 			continue
 		}
-		wpIds, err := createWaypointsFromRoute(app, route, user)
-		if err != nil {
-			app.Logger().Warn(fmt.Sprintf("Unable to create waypoints for route '%s': %v", route.Name, err))
-			continue
-		}
-		err = createTrailFromRoute(app, route, gpx, actor, wpIds)
+		trailid, err := createTrailFromRoute(app, route, gpx, actor)
 		if err != nil {
 			app.Logger().Warn(fmt.Sprintf("Unable to create trail for route '%s': %v", route.Name, err))
 			continue
 		}
-
+		err = createWaypointsFromRoute(app, route, user, trailid)
+		if err != nil {
+			app.Logger().Warn(fmt.Sprintf("Unable to create waypoints for route '%s': %v", route.Name, err))
+			continue
+		}
 	}
 
 	return hasNewRoutes, nil
@@ -305,10 +304,12 @@ func fetchRouteGPX(route StravaRoute, accessToken string) (*filesystem.File, err
 	return gpxFile, nil
 }
 
-func createTrailFromRoute(app core.App, route StravaRoute, gpx *filesystem.File, actor string, wpIds []string) error {
+func createTrailFromRoute(app core.App, route StravaRoute, gpx *filesystem.File, actor string) (string, error) {
+	trailid := security.RandomStringWithAlphabet(core.DefaultIdLength, core.DefaultIdAlphabet)
+
 	collection, err := app.FindCollectionByNameOrId("trails")
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	record := core.NewRecord(collection)
@@ -337,6 +338,7 @@ func createTrailFromRoute(app core.App, route StravaRoute, gpx *filesystem.File,
 	}
 
 	record.Load(map[string]any{
+		"id":                trailid,
 		"name":              route.Name,
 		"description":       route.Description,
 		"public":            !route.Private,
@@ -348,7 +350,6 @@ func createTrailFromRoute(app core.App, route StravaRoute, gpx *filesystem.File,
 		"external_id":       route.IDStr,
 		"lat":               lat,
 		"lon":               lon,
-		"waypoints":         wpIds,
 		"difficulty":        "easy",
 		"category":          category,
 		"author":            actor,
@@ -359,20 +360,18 @@ func createTrailFromRoute(app core.App, route StravaRoute, gpx *filesystem.File,
 	}
 
 	if err := app.Save(record); err != nil {
-		return err
+		return "", err
 	}
 
-	return nil
+	return trailid, err
 }
 
-func createWaypointsFromRoute(app core.App, route StravaRoute, user string) ([]string, error) {
+func createWaypointsFromRoute(app core.App, route StravaRoute, user string, trailid string) error {
 	collection, err := app.FindCollectionByNameOrId("waypoints")
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	wpIds := make([]string, len(route.Waypoints))
-
 	for i, wp := range route.Waypoints {
 		record := core.NewRecord(collection)
 
@@ -383,13 +382,15 @@ func createWaypointsFromRoute(app core.App, route StravaRoute, user string) ([]s
 		record.Set("icon", "circle")
 		record.Set("author", user)
 		record.Set("distance_from_start", wp.DistanceIntoRoute)
+		record.Set("trail", trailid)
 
-		app.Save(record)
+		if err := app.Save(record); err != nil {
+			return err
+		}
 
-		wpIds[i] = record.Id
 	}
 
-	return wpIds, nil
+	return nil
 }
 
 func syncTrailsWithActivities(app core.App, accessToken string, user string, actor string, activities []StravaActivity) (bool, error) {
diff --git a/db/migrations/1757689107_updated_waypoints.go b/db/migrations/1757689107_updated_waypoints.go
new file mode 100644
index 00000000..14e9e99c
--- /dev/null
+++ b/db/migrations/1757689107_updated_waypoints.go
@@ -0,0 +1,62 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("goeo2ubp103rzp9")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"listRule": "author = @request.auth.id || trail.author.user ?= @request.auth.id || trail.public ?= true || trail.trail_share_via_trail.actor.user ?= @request.auth.id\n|| \n(trail.trail_link_share_via_trail.token != \"\" && trail.trail_link_share_via_trail.token = @request.query.share)",
+			"viewRule": "author = @request.auth.id || trail.author.user ?= @request.auth.id || trail.public ?= true || trail.trail_share_via_trail.actor.user ?= @request.auth.id\n|| \n(trail.trail_link_share_via_trail.token != \"\" && trail.trail_link_share_via_trail.token = @request.query.share)"
+		}`), &collection); err != nil {
+			return err
+		}
+
+		// add field
+		if err := collection.Fields.AddMarshaledJSONAt(9, []byte(`{
+			"cascadeDelete": true,
+			"collectionId": "e864strfxo14pm4",
+			"hidden": false,
+			"id": "relation2993194383",
+			"maxSelect": 1,
+			"minSelect": 0,
+			"name": "trail",
+			"presentable": false,
+			"required": true,
+			"system": false,
+			"type": "relation"
+		}`)); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	}, func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("goeo2ubp103rzp9")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"listRule": "author = @request.auth.id || trails_via_waypoints.author.user ?= @request.auth.id || trails_via_waypoints.public ?= true || \n(@collection.trail_share.trail.id ?= trails_via_waypoints.id && @collection.trail_share.actor.user ?= @request.auth.id)\n|| \n(@collection.trail_link_share.token !=  \"\" && @collection.trail_link_share.trail.waypoints.id ?= id)",
+			"viewRule": "author = @request.auth.id || trails_via_waypoints.author.user ?= @request.auth.id || trails_via_waypoints.public ?= true || \n(@collection.trail_share.trail.id ?= trails_via_waypoints.id && @collection.trail_share.actor.user ?= @request.auth.id)\n|| \n(@collection.trail_link_share.token !=  \"\" && @collection.trail_link_share.trail.waypoints.id ?= id)"
+		}`), &collection); err != nil {
+			return err
+		}
+
+		// remove field
+		collection.Fields.RemoveById("relation2993194383")
+
+		return app.Save(collection)
+	})
+}
diff --git a/db/migrations/1757689185_migrate_waypoint_trails.go b/db/migrations/1757689185_migrate_waypoint_trails.go
new file mode 100644
index 00000000..e92d2d1a
--- /dev/null
+++ b/db/migrations/1757689185_migrate_waypoint_trails.go
@@ -0,0 +1,34 @@
+package migrations
+
+import (
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		wps, err := app.FindAllRecords("waypoints")
+		if err != nil {
+			return err
+		}
+
+		for _, wp := range wps {
+			trail, err := app.FindFirstRecordByFilter("trails", "waypoints ?~ {:id}", dbx.Params{"id": wp.Id})
+			if err != nil {
+				continue
+			}
+			wp.Set("trail", trail.Id)
+			err = app.UnsafeWithoutHooks().Save(wp)
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}, func(app core.App) error {
+		// add down queries...
+
+		return nil
+	})
+}
diff --git a/db/migrations/1757690946_updated_trails.go b/db/migrations/1757690946_updated_trails.go
new file mode 100644
index 00000000..d0cdeea7
--- /dev/null
+++ b/db/migrations/1757690946_updated_trails.go
@@ -0,0 +1,44 @@
+package migrations
+
+import (
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("e864strfxo14pm4")
+		if err != nil {
+			return err
+		}
+
+		// remove field
+		collection.Fields.RemoveById("ppq2sist")
+
+		return app.Save(collection)
+	}, func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("e864strfxo14pm4")
+		if err != nil {
+			return err
+		}
+
+		// add field
+		if err := collection.Fields.AddMarshaledJSONAt(16, []byte(`{
+			"cascadeDelete": false,
+			"collectionId": "goeo2ubp103rzp9",
+			"hidden": false,
+			"id": "ppq2sist",
+			"maxSelect": 2147483647,
+			"minSelect": 0,
+			"name": "waypoints",
+			"presentable": false,
+			"required": false,
+			"system": false,
+			"type": "relation"
+		}`)); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	})
+}
diff --git a/web/src/lib/components/trail/trail_info_panel.svelte b/web/src/lib/components/trail/trail_info_panel.svelte
index 47ebdb4c..d674441b 100644
--- a/web/src/lib/components/trail/trail_info_panel.svelte
+++ b/web/src/lib/components/trail/trail_info_panel.svelte
@@ -658,7 +658,7 @@
                     <MapWithElevationMaplibre
                         trails={[trail]}
                         activeTrail={0}
-                        waypoints={trail.expand?.waypoints}
+                        waypoints={trail.expand?.waypoints_via_trail}
                         showElevation={true}
                         elevationProfileContainer={"epc-container"}
                         showStyleSwitcher={false}
diff --git a/web/src/lib/components/trail/trail_timeline.svelte b/web/src/lib/components/trail/trail_timeline.svelte
index b98b08ea..5531b0ca 100644
--- a/web/src/lib/components/trail/trail_timeline.svelte
+++ b/web/src/lib/components/trail/trail_timeline.svelte
@@ -25,7 +25,7 @@
     <div class="">
         <p class="font-semibold">{$_("start")}</p>
     </div>
-    {#each trail.expand?.waypoints ?? [] as wp, i}
+    {#each trail.expand?.waypoints_via_trail ?? [] as wp, i}
         <div
             class="bg-background cursor-pointer"
             role="presentation"
diff --git a/web/src/lib/models/api/trail_schema.ts b/web/src/lib/models/api/trail_schema.ts
index 738e0066..f2f86de6 100644
--- a/web/src/lib/models/api/trail_schema.ts
+++ b/web/src/lib/models/api/trail_schema.ts
@@ -18,7 +18,6 @@ const TrailCreateSchema = z.object({
     duration: z.number({ coerce: true }).nonnegative().optional(),
     photos: z.array(z.string()).default([]),
     thumbnail: z.number().int().nonnegative().optional(),
-    waypoints: z.array(z.string()).default([]),
     like_count: z.number().int().min(0).optional().default(0),
     category: z.string().length(15).optional().or(z.literal('')),
     tags: z.array(z.string()).default([]),
@@ -44,7 +43,6 @@ const TrailUpdateSchema = z.object({
     "photos-": z.string().optional(),
     "photos+": z.string().optional(),
     thumbnail: z.number().int().nonnegative().optional(),
-    waypoints: z.array(z.string()).optional(),
     like_count: z.number().int().min(0).optional().default(0),
     category: z.string().optional(),
     tags: z.array(z.string()).optional(),
diff --git a/web/src/lib/models/api/waypoint_schema.ts b/web/src/lib/models/api/waypoint_schema.ts
index 33339af6..8f201e9d 100644
--- a/web/src/lib/models/api/waypoint_schema.ts
+++ b/web/src/lib/models/api/waypoint_schema.ts
@@ -6,20 +6,21 @@ const WaypointCreateSchema = z.object({
     id: z.string().length(15).optional(),
     name: z.string().optional(),
     description: z.string().optional(),
-    lat: z.number({coerce: true}).min(-90).max(90),
-    lon: z.number({coerce: true}).min(-180).max(180),
-    distance_from_start: z.number({coerce: true}).min(0).optional(),
+    lat: z.number({ coerce: true }).min(-90).max(90),
+    lon: z.number({ coerce: true }).min(-180).max(180),
+    distance_from_start: z.number({ coerce: true }).min(0).optional(),
     icon: z.enum(icons).optional(),
     author: z.string().length(15),
     photos: z.array(z.string()).default([]),
+    trail: z.string().length(15).optional()
 }) satisfies ZodType<Partial<Waypoint>>
 
 const WaypointUpdateSchema = z.object({
     name: z.string().optional(),
     description: z.string().optional(),
-    lat: z.number({coerce: true}).min(-90).max(90).optional(),
-    lon: z.number({coerce: true}).min(-180).max(180).optional(),
-    distance_from_start: z.number({coerce: true}).min(0).optional(),
+    lat: z.number({ coerce: true }).min(-90).max(90).optional(),
+    lon: z.number({ coerce: true }).min(-180).max(180).optional(),
+    distance_from_start: z.number({ coerce: true }).min(0).optional(),
     icon: z.enum(icons).default("circle").optional(),
     photos: z.array(z.string()).optional(),
     "photos-": z.string().optional(),
diff --git a/web/src/lib/models/trail.ts b/web/src/lib/models/trail.ts
index e5946d93..b0d22991 100644
--- a/web/src/lib/models/trail.ts
+++ b/web/src/lib/models/trail.ts
@@ -28,7 +28,6 @@ class Trail {
     updated?: string;
     category?: string;
     tags: string[];
-    waypoints: string[];
     polyline?: string;
     domain?: string;
     iri?: string;
@@ -36,7 +35,7 @@ class Trail {
     expand?: {
         tags?: Tag[]
         category?: Category;
-        waypoints?: Waypoint[]
+        waypoints_via_trail?: Waypoint[]
         summit_logs_via_trail?: SummitLog[]
         author?: Actor
         comments_via_trail?: Comment[]
@@ -90,13 +89,12 @@ class Trail {
         this.lon = params?.lon;
         this.thumbnail = params?.thumbnail ?? 0;
         this.photos = params?.photos ?? [];
-        this.waypoints = [];
         this.tags = []
         this.gpx = params?.gpx;
         this.like_count = 0
         this.expand = {
             category: params?.category,
-            waypoints: params?.waypoints ?? [],
+            waypoints_via_trail: params?.waypoints ?? [],
             summit_logs_via_trail: params?.summit_logs ?? [],
             comments_via_trail: params?.comments ?? [],
             trail_share_via_trail: params?.shares ?? []
diff --git a/web/src/lib/models/waypoint.ts b/web/src/lib/models/waypoint.ts
index e985bd8d..c86cca46 100644
--- a/web/src/lib/models/waypoint.ts
+++ b/web/src/lib/models/waypoint.ts
@@ -13,10 +13,12 @@ class Waypoint {
     photos: string[];
     _photos?: File[];
     author: string;
+    trail?: string;
 
     constructor(lat: number, lon: number, params?: {
-        id?: string, name?: string, description?: string, icon?: typeof icons[number], marker?: M.Marker, photos?: string[];
+        id?: string, name?: string, description?: string, icon?: typeof icons[number], marker?: M.Marker, photos?: string[], trail?: string
     }) {
+        this.trail = params?.trail;
         this.id = params?.id;
         this.name = params?.name ?? "";
         this.description = params?.description ?? "";
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index c6f90a37..bfed8e43 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -22,7 +22,7 @@ export const editTrail: Writable<Trail> = writable(new Trail(""));
 export async function trails_index(perPage: number = 21, random: boolean = false, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
     const r = await f('/api/v1/trail?' + new URLSearchParams({
         "perPage": perPage.toString(),
-        expand: "category,waypoints,summit_logs_via_trail,tags",
+        expand: "category,waypoints_via_trail,summit_logs_via_trail,tags",
         sort: random ? "@random" : "",
     }), {
         method: 'GET',
@@ -136,7 +136,7 @@ export async function trails_search_bounding_box(northEast: M.LngLat, southWest:
 export async function trails_show(id: string, handle?: string, share?: string, loadGPX?: boolean, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
 
     const r = await f(`/api/v1/trail/${id}?` + new URLSearchParams({
-        expand: "category,waypoints,summit_logs_via_trail,summit_logs_via_trail.author,trail_share_via_trail.actor,trail_like_via_trail,tags,author",
+        expand: "category,waypoints_via_trail,summit_logs_via_trail,summit_logs_via_trail.author,trail_share_via_trail.actor,trail_like_via_trail,tags,author",
         ...(handle ? { handle } : {}),
         ...(share ? { share } : {})
     }), {
@@ -148,7 +148,7 @@ export async function trails_show(id: string, handle?: string, share?: string, l
         throw new APIError(r.status, response.message, response.detail)
     }
 
-    const response = await r.json()
+    const response: Trail = await r.json()
 
     if (loadGPX) {
         if (!response.expand) {
@@ -171,8 +171,8 @@ export async function trails_show(id: string, handle?: string, share?: string, l
         }
     }
 
-    response.expand.waypoints = response.expand.waypoints || [];
-    response.expand.summit_logs = response.expand.summit_logs?.sort((a: SummitLog, b: SummitLog) => Date.parse(a.date) - Date.parse(b.date)) || [];
+    response.expand!.waypoints_via_trail = response.expand!.waypoints_via_trail || [];
+    response.expand!.summit_logs_via_trail = response.expand!.summit_logs_via_trail?.sort((a: SummitLog, b: SummitLog) => Date.parse(a.date) - Date.parse(b.date)) || [];
 
     trail.set(response);
 
@@ -185,13 +185,6 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
         throw Error("Unauthenticated")
     }
 
-    for (const waypoint of trail.expand?.waypoints ?? []) {
-        const model = await waypoints_create({
-            ...waypoint,
-            marker: undefined,
-        }, f, user);
-        trail.waypoints.push(model.id!);
-    }
     for (const tag of trail.expand?.tags ?? []) {
         if (!tag.id) {
             const model = await tags_create(tag)
@@ -214,7 +207,7 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
     }
 
     let r = await f(`/api/v1/trail/form?` + new URLSearchParams({
-        expand: "category,waypoints,summit_logs_via_trail,trail_share_via_trail,tags",
+        expand: "category,waypoints_via_trail,summit_logs_via_trail,trail_share_via_trail,tags",
     }), {
         method: 'PUT',
         body: formData,
@@ -232,6 +225,14 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
         await summit_logs_create(summitLog, f);
     }
 
+    for (const wp of trail.expand?.waypoints_via_trail ?? []) {
+        wp.trail = model.id!;
+        await waypoints_create({
+            ...wp,
+            marker: undefined,
+        }, f, user);
+    }
+
     return model;
 
 }
@@ -239,18 +240,17 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
 export async function trails_update(oldTrail: Trail, newTrail: Trail, photos?: File[], gpx?: File | Blob | null) {
     newTrail.author = oldTrail.author
 
-    const waypointUpdates = compareObjectArrays<Waypoint>(oldTrail.expand?.waypoints ?? [], newTrail.expand?.waypoints ?? []);
+    const waypointUpdates = compareObjectArrays<Waypoint>(oldTrail.expand?.waypoints_via_trail ?? [], newTrail.expand?.waypoints_via_trail ?? []);
 
     for (const addedWaypoint of waypointUpdates.added) {
         const model = await waypoints_create({
             ...addedWaypoint,
             marker: undefined,
         },);
-        newTrail.waypoints.push(model.id!);
     }
 
     for (const updatedWaypoint of waypointUpdates.updated) {
-        const oldWaypoint = oldTrail.expand?.waypoints?.find(w => w.id == updatedWaypoint.id);
+        const oldWaypoint = oldTrail.expand?.waypoints_via_trail?.find(w => w.id == updatedWaypoint.id);
         const model = await waypoints_update(oldWaypoint!, {
             ...updatedWaypoint,
             marker: undefined,
@@ -313,7 +313,7 @@ export async function trails_update(oldTrail: Trail, newTrail: Trail, photos?: F
 
 
     let r = await fetch(`/api/v1/trail/form/${newTrail.id}?` + new URLSearchParams({
-        expand: "category,waypoints,summit_logs_via_trail,trail_share_via_trail,tags",
+        expand: "category,waypoints_via_trail,summit_logs_via_trail,trail_share_via_trail,tags",
     }), {
         method: 'POST',
         body: formData,
@@ -340,17 +340,6 @@ export async function trails_update(oldTrail: Trail, newTrail: Trail, photos?: F
 
 
 export async function trails_delete(trail: Trail) {
-    if (trail.expand?.waypoints) {
-        for (const waypoint of trail.expand.waypoints) {
-            await waypoints_delete(waypoint);
-        }
-    }
-    if (trail.expand?.summit_logs_via_trail) {
-        for (const summit_log of trail.expand.summit_logs_via_trail) {
-            await summit_logs_delete(summit_log);
-        }
-    }
-
     const r = await fetch('/api/v1/trail/' + trail.id, {
         method: 'DELETE',
     })
diff --git a/web/src/lib/util/gpx_util.ts b/web/src/lib/util/gpx_util.ts
index 6a64c92b..85d48222 100644
--- a/web/src/lib/util/gpx_util.ts
+++ b/web/src/lib/util/gpx_util.ts
@@ -45,7 +45,7 @@ export async function gpx2trail(gpxString: string, fallbackName?: string, correc
         wp.id = cryptoRandomString({ length: 15 });
         wp.name = wpt.name ?? ""
         wp.description = wpt.desc;
-        trail.expand!.waypoints?.push(wp);
+        trail.expand!.waypoints_via_trail?.push(wp);
     }
 
     const totals = gpx.features
@@ -108,7 +108,7 @@ export async function trail2gpx(trail: Trail, user?: AuthRecord) {
         gpx.wpt = [];
     }
 
-    for (const wp of gpxTrail.expand!.waypoints ?? []) {
+    for (const wp of gpxTrail.expand!.waypoints_via_trail ?? []) {
         const gpxWpt = gpx.wpt.find((w) => w.$.lat == wp.lat && w.$.lon == wp.lon)
         if (!gpxWpt) {
             gpx.wpt.push(new GPXWaypoint({
diff --git a/web/src/routes/api/v1/trail/+server.ts b/web/src/routes/api/v1/trail/+server.ts
index bd3e784e..317c1021 100644
--- a/web/src/routes/api/v1/trail/+server.ts
+++ b/web/src/routes/api/v1/trail/+server.ts
@@ -15,7 +15,7 @@ export async function GET(event: RequestEvent) {
                 t.expand = {} as any
             }
 
-            t.expand?.waypoints?.sort((a, b) => (a.distance_from_start ?? 0) - (b.distance_from_start ?? 0))
+            t.expand?.waypoints_via_trail?.sort((a, b) => (a.distance_from_start ?? 0) - (b.distance_from_start ?? 0))
         }
         return json(r)
     } catch (e: any) {
diff --git a/web/src/routes/api/v1/trail/[id]/+server.ts b/web/src/routes/api/v1/trail/[id]/+server.ts
index db7a8907..8a6f357e 100644
--- a/web/src/routes/api/v1/trail/[id]/+server.ts
+++ b/web/src/routes/api/v1/trail/[id]/+server.ts
@@ -84,7 +84,7 @@ export async function GET(event: RequestEvent) {
                         l.expand.author.isLocal = false
                     }
                 })
-                t.expand?.waypoints?.forEach(w => {
+                t.expand?.waypoints_via_trail?.forEach(w => {
 
                     w.photos = w.photos.map(p =>
                         `${origin}/api/v1/files/waypoints/${w.id}/${p}`
@@ -131,7 +131,7 @@ export async function GET(event: RequestEvent) {
         await enrichRecord(event.locals.pb, t);
 
         // sort waypoints by distance
-        t.expand?.waypoints?.sort((a, b) => (a.distance_from_start ?? 0) - (b.distance_from_start ?? 0))
+        t.expand?.waypoints_via_trail?.sort((a, b) => (a.distance_from_start ?? 0) - (b.distance_from_start ?? 0))
         return json(t)
     } catch (e: any) {
         return handleError(e)
diff --git a/web/src/routes/lists/[[handle]]/[[id]]/+page.svelte b/web/src/routes/lists/[[handle]]/[[id]]/+page.svelte
index 40ef035a..8d1d729f 100644
--- a/web/src/routes/lists/[[handle]]/[[id]]/+page.svelte
+++ b/web/src/routes/lists/[[handle]]/[[id]]/+page.svelte
@@ -71,7 +71,7 @@
     let selectedTrailIndex = $derived(selectedTrail ? 0 : null);
 
     let selectedTrailWaypoints = $derived(
-        (selectedTrail as Trail | null)?.expand?.waypoints,
+        (selectedTrail as Trail | null)?.expand?.waypoints_via_trail,
     );
 
     onMount(() => {
diff --git a/web/src/routes/map/trail/[handle]/[id]/+page.svelte b/web/src/routes/map/trail/[handle]/[id]/+page.svelte
index 2c2d0627..8c053a5d 100644
--- a/web/src/routes/map/trail/[handle]/[id]/+page.svelte
+++ b/web/src/routes/map/trail/[handle]/[id]/+page.svelte
@@ -45,7 +45,7 @@
     <div id="trail-details">
         <MapWithElevationMaplibre
             trails={[trail]}
-            waypoints={trail.expand?.waypoints}
+            waypoints={trail.expand?.waypoints_via_trail}
             activeTrail={0}
             bind:markers
             showTerrain={true}
diff --git a/web/src/routes/map/trail/[handle]/[id]/print/+page.svelte b/web/src/routes/map/trail/[handle]/[id]/print/+page.svelte
index 3ab61810..e48b3b02 100644
--- a/web/src/routes/map/trail/[handle]/[id]/print/+page.svelte
+++ b/web/src/routes/map/trail/[handle]/[id]/print/+page.svelte
@@ -390,7 +390,7 @@
                 currentHeight += getTextHeight($trail.description, doc, width - 32) + 8;
             }
 
-            if (includeWaypoints && $trail.expand?.waypoints) {
+            if (includeWaypoints && $trail.expand?.waypoints_via_trail) {
                 const header = $_("waypoints", { values: { n: 2 } })
                 let textHeight = getTextHeight(header, doc, width - 32)
                 if (currentHeight + textHeight + 8 > height) {
@@ -401,7 +401,7 @@
                 currentHeight += textHeight + 8;
                 doc.setFont("IBMPlexSans-Regular", "normal");
 
-                ($trail.expand.waypoints || []).forEach(waypoint => {
+                ($trail.expand.waypoints_via_trail || []).forEach(waypoint => {
                     let description = waypoint.description || "";
                     let name = waypoint.name || "";
 
@@ -616,7 +616,7 @@
             <div class="basis-full">
                 <MapWithElevationMaplibre
                     trails={[$trail]}
-                    waypoints={$trail.expand?.waypoints}
+                    waypoints={$trail.expand?.waypoints_via_trail}
                     activeTrail={0}
                     onzoom={updateScale}
                     bind:map
diff --git a/web/src/routes/trail/edit/[id]/+page.svelte b/web/src/routes/trail/edit/[id]/+page.svelte
index a54bca2c..35298864 100644
--- a/web/src/routes/trail/edit/[id]/+page.svelte
+++ b/web/src/routes/trail/edit/[id]/+page.svelte
@@ -139,7 +139,7 @@
                 summit_logs_via_trail: z
                     .array(SummitLogCreateSchema)
                     .optional(),
-                waypoints: z
+                waypoints_via_trail: z
                     .array(
                         WaypointCreateSchema.extend({
                             marker: z.any().optional(),
@@ -384,11 +384,10 @@
     }
 
     function clearWaypoints() {
-        for (const waypoint of $formData.expand!.waypoints ?? []) {
+        for (const waypoint of $formData.expand!.waypoints_via_trail ?? []) {
             waypoint.marker?.remove();
         }
-        $formData.expand!.waypoints = [];
-        $formData.waypoints = [];
+        $formData.expand!.waypoints_via_trail = [];
     }
 
     function initRouteAnchors(gpx: GPX, addToMap: boolean = false) {
@@ -445,29 +444,28 @@
     }
 
     function deleteWaypoint(index: number) {
-        const wp = $formData.expand!.waypoints?.splice(index, 1);
-        $formData.waypoints.splice(index, 1);
+        const wp = $formData.expand!.waypoints_via_trail?.splice(index, 1);
 
-        if (!$formData.expand!.waypoints?.length) {
-            $formData.expand!.waypoints = [];
+        if (!$formData.expand!.waypoints_via_trail?.length) {
+            $formData.expand!.waypoints_via_trail = [];
         }
-        $formData.expand!.waypoints = $formData.expand!.waypoints;
+        $formData.expand!.waypoints_via_trail = $formData.expand!.waypoints_via_trail;
 
         // updateTrailOnMap();
     }
 
     function saveWaypoint(savedWaypoint: Waypoint) {
         let editedWaypointIndex =
-            $formData.expand!.waypoints?.findIndex(
+            $formData.expand!.waypoints_via_trail?.findIndex(
                 (s) => s.id == savedWaypoint.id,
             ) ?? -1;
 
         if (editedWaypointIndex >= 0) {
-            $formData.expand!.waypoints![editedWaypointIndex] = savedWaypoint;
+            $formData.expand!.waypoints_via_trail![editedWaypointIndex] = savedWaypoint;
         } else {
             savedWaypoint.id = cryptoRandomString({ length: 15 });
-            $formData.expand!.waypoints = [
-                ...($formData.expand!.waypoints ?? []),
+            $formData.expand!.waypoints_via_trail = [
+                ...($formData.expand!.waypoints_via_trail ?? []),
                 savedWaypoint,
             ];
 
@@ -478,15 +476,15 @@
     function moveMarker(marker: M.Marker, wpId?: string) {
         const position = marker.getLngLat();
         const editableWaypointIndex =
-            $formData.expand!.waypoints?.findIndex((w) => w.id == wpId) ?? -1;
+            $formData.expand!.waypoints_via_trail?.findIndex((w) => w.id == wpId) ?? -1;
         const editableWaypoint =
-            $formData.expand!.waypoints![editableWaypointIndex];
+            $formData.expand!.waypoints_via_trail![editableWaypointIndex];
         if (!editableWaypoint) {
             return;
         }
         editableWaypoint.lat = position.lat;
         editableWaypoint.lon = position.lng;
-        $formData.expand!.waypoints = [...($formData.expand!.waypoints ?? [])];
+        $formData.expand!.waypoints_via_trail = [...($formData.expand!.waypoints_via_trail ?? [])];
         // updateTrailOnMap();
     }
 
@@ -1369,7 +1367,7 @@
             {$_("waypoints", { values: { n: 2 } })}
         </h3>
         <ul>
-            {#each $formData.expand?.waypoints ?? [] as waypoint, i}
+            {#each $formData.expand?.waypoints_via_trail ?? [] as waypoint, i}
                 <li
                     onmouseenter={() => openMarkerPopup(waypoint)}
                     onmouseleave={() => openMarkerPopup(waypoint)}
@@ -1501,7 +1499,7 @@
         <div id="trail-map">
             <MapWithElevationMaplibre
                 trails={mapTrail}
-                waypoints={$formData.expand?.waypoints}
+                waypoints={$formData.expand?.waypoints_via_trail}
                 drawing={drawingActive}
                 showTerrain={true}
                 onmarkerdragend={moveMarker}

From b2be48a282f190901d6441fd80c8b6c18db60262 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sat, 13 Sep 2025 11:33:19 +0200
Subject: [PATCH 11/15] improves initial meilisearch indexing speed

---
 db/main.go             | 138 ++++-------------------------------------
 db/util/meilisearch.go | 124 ++++++++++++++++++++++++++++--------
 2 files changed, 109 insertions(+), 153 deletions(-)

diff --git a/db/main.go b/db/main.go
index 6758ac50..31184b4b 100644
--- a/db/main.go
+++ b/db/main.go
@@ -233,7 +233,7 @@ func createTrailHandler(client meilisearch.ServiceManager) func(e *core.RecordEv
 		if err != nil {
 			return err
 		}
-		if err := util.IndexTrail(e.App, record, author, client); err != nil {
+		if err := util.IndexTrails(e.App, []*core.Record{record}, client); err != nil {
 			return err
 		}
 		if !author.GetBool("isLocal") {
@@ -340,12 +340,7 @@ func createSummitLogHandler(client meilisearch.ServiceManager) func(e *core.Reco
 			return err
 		}
 
-		trailAuthor, err := e.App.FindFirstRecordByData("activitypub_actors", "id", trail.GetString("author"))
-		if err != nil {
-			return err
-		}
-
-		if err := util.IndexTrail(e.App, trail, trailAuthor, client); err != nil {
+		if err := util.IndexTrails(e.App, []*core.Record{trail}, client); err != nil {
 			return err
 		}
 
@@ -391,12 +386,7 @@ func deleteSummitLogHandler(client meilisearch.ServiceManager) func(e *core.Reco
 			return err
 		}
 
-		trailAuthor, err := e.App.FindFirstRecordByData("activitypub_actors", "id", trail.GetString("author"))
-		if err != nil {
-			return err
-		}
-
-		if err := util.IndexTrail(e.App, trail, trailAuthor, client); err != nil {
+		if err := util.IndexTrails(e.App, []*core.Record{trail}, client); err != nil {
 			return err
 		}
 
@@ -616,7 +606,7 @@ func createListHandler(client meilisearch.ServiceManager) func(e *core.RecordEve
 			return err
 		}
 
-		if err := util.IndexList(e.App, record, author, client); err != nil {
+		if err := util.IndexLists(e.App, []*core.Record{record}, client); err != nil {
 			return err
 		}
 
@@ -1309,7 +1299,7 @@ func bootstrapCategories(app core.App) error {
 
 func bootstrapMeilisearchDocuments(app core.App, client meilisearch.ServiceManager) error {
 	// --- Trails ---
-	const pageSize = 100
+	const pageSize int64 = 100
 	var page int64 = 0
 
 	// Clear index before re-indexing
@@ -1321,7 +1311,7 @@ func bootstrapMeilisearchDocuments(app core.App, client meilisearch.ServiceManag
 		trails := []*core.Record{}
 		err := app.RecordQuery("trails").
 			Limit(pageSize).
-			Offset(page * int64(pageSize)).
+			Offset(page * pageSize).
 			All(&trails)
 		if err != nil {
 			return err
@@ -1330,70 +1320,9 @@ func bootstrapMeilisearchDocuments(app core.App, client meilisearch.ServiceManag
 			break
 		}
 
-		// Collect author IDs to fetch in batch
-		authorIDs := make([]string, 0, len(trails))
-		for _, t := range trails {
-			if id := t.GetString("author"); id != "" {
-				authorIDs = append(authorIDs, id)
-			}
-		}
-
-		// Fetch all authors in one go
-		authorArgs := make([]interface{}, len(authorIDs))
-		for i, v := range authorIDs {
-			authorArgs[i] = v
-		}
-
-		authors, err := app.FindAllRecords("activitypub_actors",
-			dbx.In("id", authorArgs...),
-		)
-		if err != nil {
-			return err
-		}
-		authorMap := make(map[string]*core.Record, len(authors))
-		for _, a := range authors {
-			authorMap[a.Id] = a
-		}
-
-		for _, trail := range trails {
-			author := authorMap[trail.GetString("author")]
-
-			if err := util.IndexTrail(app, trail, author, client); err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to index trail '%s': %v", trail.GetString("name"), err))
-				continue
-			}
-
-			// Shares
-			shares, err := app.FindAllRecords("trail_share",
-				dbx.NewExp("trail = {:trailId}", dbx.Params{"trailId": trail.Id}),
-			)
-			if err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to fetch shares for trail '%s': %v", trail.GetString("name"), err))
-				continue
-			}
-			shareActors := make([]string, len(shares))
-			for i, r := range shares {
-				shareActors[i] = r.GetString("actor")
-			}
-			if err := util.UpdateTrailShares(trail.Id, shareActors, client); err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to update trail shares '%s': %v", trail.GetString("name"), err))
-			}
-
-			// Likes
-			likes, err := app.FindAllRecords("trail_like",
-				dbx.NewExp("trail = {:trailId}", dbx.Params{"trailId": trail.Id}),
-			)
-			if err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to fetch likes for trail '%s': %v", trail.GetString("name"), err))
-				continue
-			}
-			likeActors := make([]string, len(likes))
-			for i, r := range likes {
-				likeActors[i] = r.GetString("actor")
-			}
-			if err := util.UpdateTrailLikes(trail.Id, likeActors, client); err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to update trail likes '%s': %v", trail.GetString("name"), err))
-			}
+		if err := util.IndexTrails(app, trails, client); err != nil {
+			app.Logger().Warn(fmt.Sprintf("Unable to index trails page %d: %v", page, err))
+			continue
 		}
 
 		page++
@@ -1418,52 +1347,9 @@ func bootstrapMeilisearchDocuments(app core.App, client meilisearch.ServiceManag
 			break
 		}
 
-		// Collect author IDs in batch
-		authorIDs := make([]string, 0, len(lists))
-		for _, l := range lists {
-			if id := l.GetString("author"); id != "" {
-				authorIDs = append(authorIDs, id)
-			}
-		}
-		// Fetch all authors in one go
-		authorArgs := make([]interface{}, len(authorIDs))
-		for i, v := range authorIDs {
-			authorArgs[i] = v
-		}
-
-		authors, err := app.FindAllRecords("activitypub_actors",
-			dbx.In("id", authorArgs...),
-		)
-		if err != nil {
-			return err
-		}
-		authorMap := make(map[string]*core.Record, len(authors))
-		for _, a := range authors {
-			authorMap[a.Id] = a
-		}
-
-		for _, list := range lists {
-			author := authorMap[list.GetString("author")]
-
-			if err := util.IndexList(app, list, author, client); err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to index list '%s': %v", list.GetString("name"), err))
-				continue
-			}
-
-			shares, err := app.FindAllRecords("list_share",
-				dbx.NewExp("list = {:listId}", dbx.Params{"listId": list.Id}),
-			)
-			if err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to fetch list shares '%s': %v", list.GetString("name"), err))
-				continue
-			}
-			shareActors := make([]string, len(shares))
-			for i, r := range shares {
-				shareActors[i] = r.GetString("actor")
-			}
-			if err := util.UpdateListShares(list.Id, shareActors, client); err != nil {
-				app.Logger().Warn(fmt.Sprintf("Unable to update list shares '%s': %v", list.GetString("name"), err))
-			}
+		if err := util.IndexLists(app, lists, client); err != nil {
+			app.Logger().Warn(fmt.Sprintf("Unable to index list page %d: %v", page, err))
+			continue
 		}
 
 		page++
diff --git a/db/util/meilisearch.go b/db/util/meilisearch.go
index 98a122a0..a2cb0f0e 100644
--- a/db/util/meilisearch.go
+++ b/db/util/meilisearch.go
@@ -88,9 +88,33 @@ func documentFromTrailRecord(app core.App, r *core.Record, author *core.Record,
 	}
 
 	if includeShares {
-		document["shares"] = []string{}
-		document["likes"] = []string{}
-		document["like_count"] = 0
+		trailShares := r.ExpandedAll("trail_share_via_trail")
+		if trailShares != nil {
+			sharedIDs := make([]string, len(trailShares))
+			for i, v := range trailShares {
+				sharedIDs[i] = v.GetString("actor")
+			}
+
+			document["shares"] = sharedIDs
+
+		} else {
+			document["shares"] = []string{}
+		}
+
+		trailLikes := r.ExpandedAll("trail_like_via_trail")
+		if trailLikes != nil {
+			likeIDs := make([]string, len(trailLikes))
+			for i, v := range trailLikes {
+				likeIDs[i] = v.GetString("actor")
+			}
+
+			document["likes"] = likeIDs
+			document["like_count"] = len(trailLikes)
+
+		} else {
+			document["likes"] = []string{}
+			document["like_count"] = 0
+		}
 
 	}
 
@@ -186,7 +210,7 @@ func documentFromListRecord(r *core.Record, author *core.Record, includeShares b
 		domain = author.GetString("domain")
 	}
 
-	document := map[string]interface{}{
+	document := map[string]any{
 		"id":             r.Id,
 		"author":         author.Id,
 		"author_name":    author.GetString("preferred_username"),
@@ -206,7 +230,18 @@ func documentFromListRecord(r *core.Record, author *core.Record, includeShares b
 	}
 
 	if includeShares {
-		document["shares"] = []string{}
+		listShares := r.ExpandedAll("list_share_via_list")
+		if listShares != nil {
+			sharedIDs := make([]string, len(listShares))
+			for i, v := range listShares {
+				sharedIDs[i] = v.GetString("actor")
+			}
+
+			document["shares"] = sharedIDs
+
+		} else {
+			document["shares"] = []string{}
+		}
 	}
 
 	return document, nil
@@ -266,20 +301,40 @@ func documentFromRemoteRecord(r *core.Record, index string) (map[string]interfac
 	return document, nil
 }
 
-func IndexTrail(app core.App, r *core.Record, author *core.Record, client meilisearch.ServiceManager) error {
-	errs := app.ExpandRecord(r, []string{"tags"}, nil)
-	if len(errs) > 0 {
-		return fmt.Errorf("failed to expand tags: %v", errs)
+func IndexTrails(app core.App, trails []*core.Record, client meilisearch.ServiceManager) error {
+	documents := make([]map[string]any, len(trails))
+
+	for i, r := range trails {
+		errs := app.ExpandRecord(r, []string{"tags"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand tags: %v", errs)
+		}
+		errs = app.ExpandRecord(r, []string{"category"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand category: %v", errs)
+		}
+		errs = app.ExpandRecord(r, []string{"trail_share_via_trail"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand trail_share_via_trail: %v", errs)
+		}
+		errs = app.ExpandRecord(r, []string{"trail_like_via_trail"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand trail_like_via_trail: %v", errs)
+		}
+		errs = app.ExpandRecord(r, []string{"author"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand author: %v", errs)
+		}
+
+		author := r.ExpandedOne("author")
+
+		doc, err := documentFromTrailRecord(app, r, author, true)
+		if err != nil {
+			return err
+		}
+
+		documents[i] = doc
 	}
-	errs = app.ExpandRecord(r, []string{"category"}, nil)
-	if len(errs) > 0 {
-		return fmt.Errorf("failed to expand category: %v", errs)
-	}
-	doc, err := documentFromTrailRecord(app, r, author, true)
-	if err != nil {
-		return err
-	}
-	documents := []map[string]interface{}{doc}
 
 	if _, err := client.Index("trails").AddDocuments(documents); err != nil {
 		return err
@@ -338,17 +393,32 @@ func UpdateTrailLikes(trailId string, likes []string, client meilisearch.Service
 	return nil
 }
 
-func IndexList(app core.App, r *core.Record, author *core.Record, client meilisearch.ServiceManager) error {
-	errs := app.ExpandRecord(r, []string{"trails"}, nil)
-	if len(errs) > 0 {
-		return fmt.Errorf("failed to expand trails: %v", errs)
-	}
+func IndexLists(app core.App, lists []*core.Record, client meilisearch.ServiceManager) error {
+	documents := make([]map[string]any, len(lists))
 
-	documents, err := documentFromListRecord(r, author, true)
-	if err != nil {
-		return err
+	for i, r := range lists {
+		errs := app.ExpandRecord(r, []string{"trails"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand trails: %v", errs)
+		}
+		errs = app.ExpandRecord(r, []string{"list_share_via_list"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand list_share_via_list: %v", errs)
+		}
+		errs = app.ExpandRecord(r, []string{"author"}, nil)
+		if len(errs) > 0 {
+			return fmt.Errorf("failed to expand author: %v", errs)
+		}
+
+		author := r.ExpandedOne("author")
+
+		doc, err := documentFromListRecord(r, author, true)
+		if err != nil {
+			return err
+		}
+		documents[i] = doc
 	}
-	if _, err = client.Index("lists").AddDocuments(documents); err != nil {
+	if _, err := client.Index("lists").AddDocuments(documents); err != nil {
 		return err
 	}
 

From 24908993fae677782860e9c46585d4cd5e2d2ef2 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sat, 13 Sep 2025 12:36:22 +0200
Subject: [PATCH 12/15] adds index to activity_actors table

---
 .../1757759342_updated_activitypub_actors.go  | 46 +++++++++++++++++++
 web/src/hooks.server.ts                       |  2 +-
 .../v1/activitypub/user/[handle]/+server.ts   |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 db/migrations/1757759342_updated_activitypub_actors.go

diff --git a/db/migrations/1757759342_updated_activitypub_actors.go b/db/migrations/1757759342_updated_activitypub_actors.go
new file mode 100644
index 00000000..40fd046a
--- /dev/null
+++ b/db/migrations/1757759342_updated_activitypub_actors.go
@@ -0,0 +1,46 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("pbc_1295301207")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"indexes": [
+				"CREATE UNIQUE INDEX `+"`"+`idx_rpT7QJwWTm`+"`"+` ON `+"`"+`activitypub_actors`+"`"+` (`+"`"+`iri`+"`"+`)",
+				"CREATE INDEX idx_actors_username_domain\nON activitypub_actors(preferred_username, domain);",
+				"CREATE INDEX idx_activitypub_actors_user ON activitypub_actors(user);"
+			]
+		}`), &collection); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	}, func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("pbc_1295301207")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"indexes": [
+				"CREATE UNIQUE INDEX `+"`"+`idx_rpT7QJwWTm`+"`"+` ON `+"`"+`activitypub_actors`+"`"+` (`+"`"+`iri`+"`"+`)"
+			]
+		}`), &collection); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	})
+}
diff --git a/web/src/hooks.server.ts b/web/src/hooks.server.ts
index 32fdb41a..ddf3e400 100644
--- a/web/src/hooks.server.ts
+++ b/web/src/hooks.server.ts
@@ -83,7 +83,7 @@ const auth: Handle = async ({ event, resolve }) => {
   if (pb.authStore.record) {
     meiliApiKey = pb.authStore.record.token
     settings = await pb.collection('settings').getFirstListItem<Settings>(`user="${pb.authStore.record.id}"`, { requestKey: null })
-    actor = await pb.collection("activitypub_actors").getFirstListItem(`user='${pb.authStore.record.id}'`)
+    actor = await pb.collection("activitypub_actors").getFirstListItem(`isLocal=1&&user='${pb.authStore.record.id}'`)
   } else {
     if (!publicMeilisearchKey) {
       const response = await pb.send("/public/search/token", { method: "GET", fetch: event.fetch });
diff --git a/web/src/routes/api/v1/activitypub/user/[handle]/+server.ts b/web/src/routes/api/v1/activitypub/user/[handle]/+server.ts
index bc8460b2..0d77cbfa 100644
--- a/web/src/routes/api/v1/activitypub/user/[handle]/+server.ts
+++ b/web/src/routes/api/v1/activitypub/user/[handle]/+server.ts
@@ -20,7 +20,7 @@ export async function GET(event: RequestEvent) {
 
         const [username, domain] = splitUsername(fullUsername, env.ORIGIN)
 
-        const actor: Actor = await event.locals.pb.collection("activitypub_actors").getFirstListItem(`preferred_username:lower='${username?.toLowerCase()}'&&isLocal=true`)
+        const actor: Actor = await event.locals.pb.collection("activitypub_actors").getFirstListItem(`preferred_username:lower='${username?.toLowerCase()}'&&isLocal=1`)
         const user: UserAnonymous = await event.locals.pb.collection("users_anonymous").getOne(actor.user!)
 
 

From 962fddc1e25f756df7b5a9613c1593c72f9ee599 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sat, 13 Sep 2025 13:27:23 +0200
Subject: [PATCH 13/15] adds dedup command

---
 db/commands/dedup.go | 121 +++++++++++++++++++++++++++++++++++++++++++
 db/main.go           |   7 +++
 2 files changed, 128 insertions(+)
 create mode 100644 db/commands/dedup.go

diff --git a/db/commands/dedup.go b/db/commands/dedup.go
new file mode 100644
index 00000000..ec3fb524
--- /dev/null
+++ b/db/commands/dedup.go
@@ -0,0 +1,121 @@
+package commands
+
+import (
+	"crypto/sha1"
+	"fmt"
+	"log"
+	"sort"
+
+	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/spf13/cobra"
+)
+
+func Dedup(app *pocketbase.PocketBase) *cobra.Command {
+	var dryRun bool
+
+	cmd := &cobra.Command{
+		Use:   "dedup",
+		Short: "Deduplicate trails by all matching fields",
+		Run: func(cmd *cobra.Command, args []string) {
+			records, err := app.FindAllRecords("trails")
+			if err != nil {
+				log.Fatalf("failed to fetch trails: %v", err)
+			}
+
+			// group by composite key
+			trailsByKey := make(map[string][]*core.Record)
+			for _, r := range records {
+				key := makeKey(r)
+				trailsByKey[key] = append(trailsByKey[key], r)
+			}
+
+			var duplicates []*core.Record
+			for _, recs := range trailsByKey {
+				if len(recs) <= 1 {
+					continue
+				}
+
+				// sort by created date ascending
+				sort.Slice(recs, func(i, j int) bool {
+					return recs[i].GetDateTime("created").Time().Before(recs[j].GetDateTime("created").Time())
+				})
+
+				original := recs[0]
+				dupes := recs[1:]
+
+				// print header row for original
+				// print original as header
+				fmt.Printf("\nOriginal: id=%s, name=%s, distance=%.2f, elevation_gain=%.2f, elevation_loss=%.2f, lat=%.5f, lon=%.5f, duration=%.2f, location=%s, category=%s, author=%s, created=%s\n",
+					original.Id,
+					original.GetString("name"),
+					original.GetFloat("distance"),
+					original.GetFloat("elevation_gain"),
+					original.GetFloat("elevation_loss"),
+					original.GetFloat("lat"),
+					original.GetFloat("lon"),
+					original.GetFloat("duration"),
+					original.GetString("location"),
+					original.GetString("category"),
+					original.GetString("author"),
+					original.GetDateTime("created"),
+				)
+
+				// print duplicates indented
+				for _, d := range dupes {
+					fmt.Printf("  Duplicate: id=%s, name=%s, distance=%.2f, elevation_gain=%.2f, elevation_loss=%.2f, lat=%.5f, lon=%.5f, duration=%.2f, location=%s, category=%s, author=%s, created=%s\n",
+						d.Id,
+						d.GetString("name"),
+						d.GetFloat("distance"),
+						d.GetFloat("elevation_gain"),
+						d.GetFloat("elevation_loss"),
+						d.GetFloat("lat"),
+						d.GetFloat("lon"),
+						d.GetFloat("duration"),
+						d.GetString("location"),
+						d.GetString("category"),
+						d.GetString("author"),
+						d.GetDateTime("created"),
+					)
+					duplicates = append(duplicates, d)
+				}
+			}
+
+			if dryRun {
+				fmt.Printf("\n[Dry Run] Found %d duplicates (no deletions performed)\n", len(duplicates))
+				return
+			}
+
+			// delete duplicates
+			for _, d := range duplicates {
+				if err := app.Delete(d); err != nil {
+					fmt.Printf("Failed to delete duplicate %s: %v\n", d.Id, err)
+				} else {
+					fmt.Printf("Deleted duplicate %s\n", d.Id)
+				}
+			}
+		},
+	}
+
+	cmd.Flags().BoolVar(&dryRun, "dry-run", false, "Show duplicates without deleting them")
+
+	return cmd
+}
+
+// makeKey creates a composite key string for duplicate detection
+func makeKey(r *core.Record) string {
+	data := fmt.Sprintf("%s|%f|%f|%f|%f|%f|%f|%s|%s|%s",
+		r.GetString("name"),
+		r.GetFloat("distance"),
+		r.GetFloat("elevation_gain"),
+		r.GetFloat("elevation_loss"),
+		r.GetFloat("lat"),
+		r.GetFloat("lon"),
+		r.GetFloat("duration"),
+		r.GetString("location"),
+		r.GetString("category"),
+		r.GetString("author"),
+	)
+	h := sha1.Sum([]byte(data))
+	return fmt.Sprintf("%x", h)
+}
diff --git a/db/main.go b/db/main.go
index 31184b4b..67b5957f 100644
--- a/db/main.go
+++ b/db/main.go
@@ -21,6 +21,7 @@ import (
 	"github.com/pocketbase/pocketbase/tools/security"
 	"github.com/spf13/cast"
 
+	"pocketbase/commands"
 	"pocketbase/federation"
 	"pocketbase/integrations/komoot"
 	"pocketbase/integrations/strava"
@@ -73,6 +74,8 @@ func main() {
 	registerMigrations(app)
 	setupEventHandlers(app, client)
 
+	setupCommands(app)
+
 	if err := app.Start(); err != nil {
 		log.Fatal(err)
 	}
@@ -140,6 +143,10 @@ func setupEventHandlers(app *pocketbase.PocketBase, client meilisearch.ServiceMa
 	app.OnBootstrap().BindFunc(onBootstrapHandler())
 }
 
+func setupCommands(app *pocketbase.PocketBase) {
+	app.RootCmd.AddCommand(commands.Dedup(app))
+}
+
 func sanitizeHTML() func(e *core.RecordRequestEvent) error {
 	return func(e *core.RecordRequestEvent) error {
 		fieldsToSanitize := map[string][]string{

From 72acac072c700d104c1b4b59e988804a1e22b122 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sat, 13 Sep 2025 16:04:48 +0200
Subject: [PATCH 14/15] fixes strava integration

---
 db/integrations/strava/models.go              |  1 +
 db/integrations/strava/strava.go              | 70 +++++++++++--------
 .../integrations/strava_settings_modal.svelte | 37 +++++++++-
 web/src/lib/i18n/locales/de.json              |  3 +-
 web/src/lib/i18n/locales/en.json              |  3 +-
 web/src/lib/i18n/locales/es.json              |  3 +-
 web/src/lib/i18n/locales/eu.json              |  4 +-
 web/src/lib/i18n/locales/fr.json              |  3 +-
 web/src/lib/i18n/locales/hu.json              |  3 +-
 web/src/lib/i18n/locales/it.json              |  3 +-
 web/src/lib/i18n/locales/nl.json              |  3 +-
 web/src/lib/i18n/locales/pl.json              |  3 +-
 web/src/lib/i18n/locales/pt.json              |  3 +-
 web/src/lib/i18n/locales/ru.json              |  6 +-
 web/src/lib/i18n/locales/zh.json              |  3 +-
 web/src/lib/models/api/integration_schema.ts  |  3 +-
 web/src/lib/models/integration.ts             |  1 +
 17 files changed, 102 insertions(+), 50 deletions(-)

diff --git a/db/integrations/strava/models.go b/db/integrations/strava/models.go
index 6b8fead8..8fa4f0fd 100644
--- a/db/integrations/strava/models.go
+++ b/db/integrations/strava/models.go
@@ -29,6 +29,7 @@ type StravaIntegration struct {
 	AccessToken  string `json:"accessToken,omitempty"`
 	RefreshToken string `json:"refreshToken,omitempty"`
 	ExpiresAt    int64  `json:"expiresAt,omitempty"`
+	After        string `json:"after,omitempty"`
 }
 type StravaRoute struct {
 	Athlete             Athlete     `json:"athlete"`
diff --git a/db/integrations/strava/strava.go b/db/integrations/strava/strava.go
index 974af4f0..bf347381 100644
--- a/db/integrations/strava/strava.go
+++ b/db/integrations/strava/strava.go
@@ -89,22 +89,12 @@ func SyncStrava(app core.App) error {
 			stravaIntegration.ExpiresAt = r.ExpiresAt
 		}
 
-		b, err := json.Marshal(stravaIntegration)
-		if err != nil {
-			return err
-		}
-		i.Set("strava", string(b))
-		err = app.Save(i)
-		if err != nil {
-			return err
-		}
-
 		if stravaIntegration.Routes {
 			page := 1
-			hasNewRoutes := true
-			for hasNewRoutes {
-
+			hasMore := true
+			for hasMore {
 				routes, err := fetchStravaRoutes(r.AccessToken, page)
+				hasMore = len(routes) > 0
 				page += 1
 				if err != nil {
 					warning := fmt.Sprintf("error fetching routes from strava: %v\n", err)
@@ -112,7 +102,7 @@ func SyncStrava(app core.App) error {
 					app.Logger().Warn(warning)
 					break
 				}
-				hasNewRoutes, err = syncTrailsWithRoutes(app, r.AccessToken, userId, actorId, routes)
+				err = syncTrailsWithRoutes(app, r.AccessToken, userId, actorId, routes)
 				if err != nil {
 					warning := fmt.Sprintf("error syncing strava routes with trails: %v\n", err)
 					fmt.Print(warning)
@@ -123,9 +113,20 @@ func SyncStrava(app core.App) error {
 		}
 		if stravaIntegration.Activities {
 			page := 1
-			hasNewActivities := true
-			for hasNewActivities {
-				activities, err := fetchStravaActivities(r.AccessToken, page)
+			hasMore := true
+			for hasMore {
+				var after int64 = 0
+				if stravaIntegration.After != "" {
+					t, err := time.Parse("2006-01-02", stravaIntegration.After)
+					if err != nil {
+						return err
+					}
+					t = t.UTC()
+
+					after = t.Unix()
+				}
+				activities, err := fetchStravaActivities(r.AccessToken, page, after)
+				hasMore = len(activities) > 0
 				page += 1
 				if err != nil {
 					warning := fmt.Sprintf("error fetching activities from strava: %v", err)
@@ -133,7 +134,8 @@ func SyncStrava(app core.App) error {
 					app.Logger().Warn(warning)
 					break
 				}
-				hasNewActivities, err = syncTrailsWithActivities(app, r.AccessToken, userId, actorId, activities)
+				err = syncTrailsWithActivities(app, r.AccessToken, actorId, activities)
+
 				if err != nil {
 					warning := fmt.Sprintf("error syncing strava activities with trails: %v", err)
 					fmt.Print(warning)
@@ -141,6 +143,17 @@ func SyncStrava(app core.App) error {
 					continue
 				}
 			}
+
+		}
+
+		b, err := json.Marshal(stravaIntegration)
+		if err != nil {
+			return err
+		}
+		i.Set("strava", string(b))
+		err = app.Save(i)
+		if err != nil {
+			return err
 		}
 	}
 
@@ -208,8 +221,8 @@ func fetchStravaRoutes(accessToken string, page int) ([]StravaRoute, error) {
 	return routes, nil
 }
 
-func fetchStravaActivities(accessToken string, page int) ([]StravaActivity, error) {
-	stravaRoutesURL := fmt.Sprintf("https://www.strava.com/api/v3/athlete/activities?page=%d", page)
+func fetchStravaActivities(accessToken string, page int, after int64) ([]StravaActivity, error) {
+	stravaRoutesURL := fmt.Sprintf("https://www.strava.com/api/v3/athlete/activities?page=%d&after=%d", page, after)
 	req, err := http.NewRequest("GET", stravaRoutesURL, nil)
 	if err != nil {
 		return nil, err
@@ -235,17 +248,15 @@ func fetchStravaActivities(accessToken string, page int) ([]StravaActivity, erro
 	return activities, nil
 }
 
-func syncTrailsWithRoutes(app core.App, accessToken string, user string, actor string, routes []StravaRoute) (bool, error) {
-	hasNewRoutes := false
+func syncTrailsWithRoutes(app core.App, accessToken string, user string, actor string, routes []StravaRoute) error {
 	for _, route := range routes {
 		trails, err := app.FindRecordsByFilter("trails", "external_id = {:id}", "", 1, 0, dbx.Params{"id": route.IDStr})
 		if err != nil {
-			return hasNewRoutes, err
+			return err
 		}
 		if len(trails) != 0 {
 			continue
 		}
-		hasNewRoutes = true
 		gpx, err := fetchRouteGPX(route, accessToken)
 		if err != nil {
 			app.Logger().Warn(fmt.Sprintf("Unable to fetch GPX for route '%s': %v", route.Name, err))
@@ -263,7 +274,7 @@ func syncTrailsWithRoutes(app core.App, accessToken string, user string, actor s
 		}
 	}
 
-	return hasNewRoutes, nil
+	return nil
 }
 
 func fetchRouteGPX(route StravaRoute, accessToken string) (*filesystem.File, error) {
@@ -393,17 +404,15 @@ func createWaypointsFromRoute(app core.App, route StravaRoute, user string, trai
 	return nil
 }
 
-func syncTrailsWithActivities(app core.App, accessToken string, user string, actor string, activities []StravaActivity) (bool, error) {
-	hasNewActivites := false
+func syncTrailsWithActivities(app core.App, accessToken string, actor string, activities []StravaActivity) error {
 	for _, activity := range activities {
 		trails, err := app.FindRecordsByFilter("trails", "external_id = {:id}", "", 1, 0, dbx.Params{"id": strconv.Itoa(int(activity.ID))})
 		if err != nil {
-			return hasNewActivites, err
+			return err
 		}
 		if len(trails) != 0 {
 			continue
 		}
-		hasNewActivites = true
 		detailedActivity, err := fetchDetailedActivity(activity, accessToken)
 		if err != nil {
 			app.Logger().Warn(fmt.Sprintf("Unable to fetch detailed activity '%s': %v", activity.Name, err))
@@ -419,10 +428,9 @@ func syncTrailsWithActivities(app core.App, accessToken string, user string, act
 			app.Logger().Warn(fmt.Sprintf("Unable to create trail from activity '%s': %v", activity.Name, err))
 			continue
 		}
-
 	}
 
-	return hasNewActivites, nil
+	return nil
 }
 
 func fetchDetailedActivity(activity StravaActivity, accessToken string) (*DetailedStravaActivity, error) {
diff --git a/web/src/lib/components/settings/integrations/strava_settings_modal.svelte b/web/src/lib/components/settings/integrations/strava_settings_modal.svelte
index b9a3c822..601d6afb 100644
--- a/web/src/lib/components/settings/integrations/strava_settings_modal.svelte
+++ b/web/src/lib/components/settings/integrations/strava_settings_modal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import Datepicker from "$lib/components/base/datepicker.svelte";
     import Modal from "$lib/components/base/modal.svelte";
     import TextField from "$lib/components/base/text_field.svelte";
     import Toggle from "$lib/components/base/toggle.svelte";
@@ -25,23 +26,32 @@
         modal.openModal();
     }
 
-    const { form, errors } = createForm({
+    const {
+        form,
+        errors,
+        data: formData,
+    } = createForm({
         initialValues: {
             clientId: integration?.strava?.clientId ?? "",
             clientSecret: integration?.strava?.clientSecret ?? "",
             routes: integration?.strava?.routes ?? true,
             activities: integration?.strava?.activities ?? true,
             active: integration?.strava?.active ?? false,
+            after: integration?.strava?.after,
         },
         extend: validator({
             schema: StravaSchema,
         }),
         onSubmit: async (form) => {
-            form.active = integration?.strava?.active ?? form.active
+            form.active = integration?.strava?.active ?? form.active;
             onsave?.(form);
             modal.closeModal();
         },
     });
+
+    function clearAfterDate() {
+        ($formData as any).after = undefined;
+    }
 </script>
 
 <Modal
@@ -60,7 +70,9 @@
             ></TextField>
             <TextField
                 label="Client Secret"
-                placeholder={integration?.strava ? `(${$_("unchanged")})` : "de8b3789bd7116d..."}
+                placeholder={integration?.strava
+                    ? `(${$_("unchanged")})`
+                    : "de8b3789bd7116d..."}
                 name="clientSecret"
                 type="password"
                 error={$errors.clientSecret}
@@ -73,6 +85,25 @@
                     label={$_("activity", { values: { n: 2 } })}
                 ></Toggle>
             </div>
+            <p
+                class="text-xs text-gray-500 max-w-lg pt-4 pb-1 border-t border-input-border"
+            >
+                {$_("strava-integration-after-date-hint")}
+            </p>
+            <div class="flex items-end relative gap-x-2">
+                <Datepicker
+                    error={$errors.after}
+                    label={$_("after")}
+                    bind:value={$formData.after}
+                ></Datepicker>
+                <button
+                    class="btn-icon mb-[10px]"
+                    type="button"
+                    onclick={clearAfterDate}
+                    aria-label="Clear 'after' date"
+                    ><i class="fa fa-close"></i></button
+                >
+            </div>
         </form>
     {/snippet}
     {#snippet footer()}
diff --git a/web/src/lib/i18n/locales/de.json b/web/src/lib/i18n/locales/de.json
index cb5545be..1e4ff9a3 100644
--- a/web/src/lib/i18n/locales/de.json
+++ b/web/src/lib/i18n/locales/de.json
@@ -32,6 +32,7 @@
   "bakery": "Bäckerei",
   "barrier": "Barriere",
   "basic-info": "Basisinformation",
+  "basque": "Baskisch",
   "before": "Vor",
   "bicycle-parking": "Fahrrad Parkplatz",
   "bicycle-rental": "Fahrradverleih",
@@ -56,7 +57,6 @@
   "car": "Auto",
   "car-motorcycle": "Auto/Motorrad",
   "card": "{n, plural, =1 {Karte} other {Karten}}",
-  "basque": "Baskisch",
   "categories": "Kategorien",
   "category": "Kategorie",
   "change": "Ändern",
@@ -390,6 +390,7 @@
   "statistics": "Statistiken",
   "stop-drawing": "Zeichnen beenden",
   "stop-editing": "Bearbeiten beenden",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "U-Bahn Eingang",
   "summit": "Gipfel",
   "summit-book": "Gipfelbuch",
diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json
index e8650b59..c3171a98 100644
--- a/web/src/lib/i18n/locales/en.json
+++ b/web/src/lib/i18n/locales/en.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Basic Info",
+  "basque": "Basque",
   "before": "Before",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Car",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Card} other {Cards}}",
-  "basque": "Basque",
   "categories": "Categories",
   "category": "Category",
   "change": "Change",
@@ -390,6 +390,7 @@
   "statistics": "Statistics",
   "stop-drawing": "Stop drawing",
   "stop-editing": "Stop editing",
+  "strava-integration-after-date-hint": "If your account has a large amount of acitivities you may run into Strava's API rate limit preventing you from syncing all activities at once. To mitigate this issue you can set an \"After\" date below so that only activities that were recorded after this date are synced.",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Summit Book",
diff --git a/web/src/lib/i18n/locales/es.json b/web/src/lib/i18n/locales/es.json
index 11b4f976..2678c064 100644
--- a/web/src/lib/i18n/locales/es.json
+++ b/web/src/lib/i18n/locales/es.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Información básica",
+  "basque": "Basque",
   "before": "Antes",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Coche",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, one {}=1 {Ficha} other {Fichas}}",
-  "basque": "Basque",
   "categories": "Categorías",
   "category": "Categoría",
   "change": "Modificar",
@@ -390,6 +390,7 @@
   "statistics": "Estadísticas",
   "stop-drawing": "Parar de diseñar",
   "stop-editing": "Parar de editar",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Libro de ascensos",
diff --git a/web/src/lib/i18n/locales/eu.json b/web/src/lib/i18n/locales/eu.json
index 3d069b2b..f1746b53 100644
--- a/web/src/lib/i18n/locales/eu.json
+++ b/web/src/lib/i18n/locales/eu.json
@@ -32,6 +32,7 @@
   "bakery": "Okindegia",
   "barrier": "Oztopoa",
   "basic-info": "Oinarrizko informazioa",
+  "basque": "Basque",
   "before": "Aurretik",
   "bicycle-parking": "Bizikleta-parkina",
   "bicycle-rental": "Bizikleta-alokairua",
@@ -56,7 +57,6 @@
   "car": "Kotxea",
   "car-motorcycle": "Kotxea/Motozikleta",
   "card": "{n, plural, one {}=1 {Txartea} other {Txartelak}}",
-  "basque": "Basque",
   "categories": "Kategoriak",
   "category": "Kategoria",
   "change": "Aldatu",
@@ -338,7 +338,6 @@
   "route-point": "Ibilbideko puntua",
   "russian": "Russian",
   "save": "Gorde",
-  "russian": "Russian",
   "save-list": "Gorde zerrenda",
   "save-trail": "Gorde ibilaldia",
   "save-your-trail-first": "Gorde zure ibilaldia lehenengo",
@@ -391,6 +390,7 @@
   "statistics": "Estatistikak",
   "stop-drawing": "Utzi marrazteari",
   "stop-editing": "Utzi editatzeari",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Metro sarbidea",
   "summit": "Gailurra",
   "summit-book": "Igoeren liburua",
diff --git a/web/src/lib/i18n/locales/fr.json b/web/src/lib/i18n/locales/fr.json
index 7f4dd481..35f74061 100644
--- a/web/src/lib/i18n/locales/fr.json
+++ b/web/src/lib/i18n/locales/fr.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Informations de base",
+  "basque": "Basque",
   "before": "Avant le",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Voiture",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Tuile} other {Tuiles}}",
-  "basque": "Basque",
   "categories": "Catégories",
   "category": "Catégorie",
   "change": "Changement",
@@ -390,6 +390,7 @@
   "statistics": "Statistiques",
   "stop-drawing": "Arrêter de tracer",
   "stop-editing": "Arrêter la modification",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Liste des ascensions",
diff --git a/web/src/lib/i18n/locales/hu.json b/web/src/lib/i18n/locales/hu.json
index da62034c..f5ac3a50 100644
--- a/web/src/lib/i18n/locales/hu.json
+++ b/web/src/lib/i18n/locales/hu.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Alap információk",
+  "basque": "Basque",
   "before": "Before",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Car",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Kártya} other {Kártyák}}",
-  "basque": "Basque",
   "categories": "Kategóriák",
   "category": "Kategória",
   "change": "Változás",
@@ -390,6 +390,7 @@
   "statistics": "Statistics",
   "stop-drawing": "Stop drawing",
   "stop-editing": "Stop editing",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Csúcspont könyv",
diff --git a/web/src/lib/i18n/locales/it.json b/web/src/lib/i18n/locales/it.json
index bdbcf06b..6c5926d3 100644
--- a/web/src/lib/i18n/locales/it.json
+++ b/web/src/lib/i18n/locales/it.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Informazioni di base",
+  "basque": "Basque",
   "before": "Prima",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Car",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Carta} other {Carte}}",
-  "basque": "Basque",
   "categories": "Categorie",
   "category": "Categoria",
   "change": "Modifica",
@@ -390,6 +390,7 @@
   "statistics": "Statistiche",
   "stop-drawing": "Smettere di disegnare",
   "stop-editing": "Stop editing",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Libro di vetta",
diff --git a/web/src/lib/i18n/locales/nl.json b/web/src/lib/i18n/locales/nl.json
index 995aefde..56044cb5 100644
--- a/web/src/lib/i18n/locales/nl.json
+++ b/web/src/lib/i18n/locales/nl.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Algemene informatie",
+  "basque": "Basque",
   "before": "Voor",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Wagen",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Kaart} other {Kaarten}}",
-  "basque": "Basque",
   "categories": "Categorieën",
   "category": "Categorie",
   "change": "Wijzigen",
@@ -390,6 +390,7 @@
   "statistics": "Statistieken",
   "stop-drawing": "Stop met tekenen",
   "stop-editing": "Stop met bewerken",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Bergtopboek",
diff --git a/web/src/lib/i18n/locales/pl.json b/web/src/lib/i18n/locales/pl.json
index a769c7f4..517d1234 100644
--- a/web/src/lib/i18n/locales/pl.json
+++ b/web/src/lib/i18n/locales/pl.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Podstawowe informacje",
+  "basque": "Basque",
   "before": "Przed",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Samochód",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Karta} other {Karty}}",
-  "basque": "Basque",
   "categories": "Kategorie",
   "category": "Kategoria",
   "change": "Zmień",
@@ -390,6 +390,7 @@
   "statistics": "Statystyki",
   "stop-drawing": "Przestań rysować",
   "stop-editing": "Zakończ edycję",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Logbook",
diff --git a/web/src/lib/i18n/locales/pt.json b/web/src/lib/i18n/locales/pt.json
index ac224ec5..b4815750 100644
--- a/web/src/lib/i18n/locales/pt.json
+++ b/web/src/lib/i18n/locales/pt.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Informações básicas",
+  "basque": "Basque",
   "before": "Antes",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Car",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Cartão} other {Cartões}}",
-  "basque": "Basque",
   "categories": "Categorias",
   "category": "Categoria",
   "change": "Alterar",
@@ -390,6 +390,7 @@
   "statistics": "Statistics",
   "stop-drawing": "Parar desenho",
   "stop-editing": "Stop editing",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "Livro da cimeira",
diff --git a/web/src/lib/i18n/locales/ru.json b/web/src/lib/i18n/locales/ru.json
index 9865603e..398e4800 100644
--- a/web/src/lib/i18n/locales/ru.json
+++ b/web/src/lib/i18n/locales/ru.json
@@ -32,6 +32,7 @@
   "bakery": "Bakery",
   "barrier": "Barrier",
   "basic-info": "Основная информация",
+  "basque": "Basque",
   "before": "До",
   "bicycle-parking": "Bicycle Parking",
   "bicycle-rental": "Bicycle Rental",
@@ -56,7 +57,6 @@
   "car": "Автомобиль:",
   "car-motorcycle": "Car/Motorcycle",
   "card": "{n, plural, =1 {Карточка} other {Карточки}}",
-  "basque": "Basque",
   "categories": "Категории",
   "category": "Категория",
   "change": "Изменить",
@@ -339,7 +339,6 @@
   "russian": "Russian",
   "save": "Сохранить",
   "save-list": "Сохранить список",
-  "russian": "Russian",
   "save-trail": "Сохранить трек",
   "save-your-trail-first": "Сначала сохраните трек",
   "search-cities": "Поиск по городам",
@@ -391,6 +390,7 @@
   "statistics": "Статистика",
   "stop-drawing": "Закончить рисование",
   "stop-editing": "Закончить редактирование",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "Subway entrance",
   "summit": "Summit",
   "summit-book": "История поездок",
@@ -426,4 +426,4 @@
   "width": "Ширина",
   "wrong-username-or-password": "Неверный логин или пароль",
   "you-can": "Вы можете"
-}
\ No newline at end of file
+}
diff --git a/web/src/lib/i18n/locales/zh.json b/web/src/lib/i18n/locales/zh.json
index 50dce55a..e5b836d5 100644
--- a/web/src/lib/i18n/locales/zh.json
+++ b/web/src/lib/i18n/locales/zh.json
@@ -32,6 +32,7 @@
   "bakery": "面包店",
   "barrier": "障碍",
   "basic-info": "基本信息",
+  "basque": "Basque",
   "before": "之前",
   "bicycle-parking": "自行车停车场",
   "bicycle-rental": "自行车租车",
@@ -56,7 +57,6 @@
   "car": "汽车",
   "car-motorcycle": "汽车/摩托车",
   "card": "{n, plural, =1 {卡片} other {卡片}}",
-  "basque": "Basque",
   "categories": "分类",
   "category": "分类",
   "change": "更换",
@@ -390,6 +390,7 @@
   "statistics": "统计",
   "stop-drawing": "停止绘制",
   "stop-editing": "停止编辑",
+  "strava-integration-after-date-hint": "",
   "subway-stop": "地铁入口",
   "summit": "山峰",
   "summit-book": "详细日程",
diff --git a/web/src/lib/models/api/integration_schema.ts b/web/src/lib/models/api/integration_schema.ts
index 6895e341..fce918d3 100644
--- a/web/src/lib/models/api/integration_schema.ts
+++ b/web/src/lib/models/api/integration_schema.ts
@@ -6,7 +6,8 @@ const StravaSchema = z.object({
     clientSecret: z.string().length(40).optional().or(z.literal('')),
     routes: z.boolean(),
     activities: z.boolean(),
-    active: z.boolean()
+    active: z.boolean(),
+    after: z.string().date().optional(),
 })
 
 const KomootSchema = z.object({
diff --git a/web/src/lib/models/integration.ts b/web/src/lib/models/integration.ts
index 91a587e2..ca845c8d 100644
--- a/web/src/lib/models/integration.ts
+++ b/web/src/lib/models/integration.ts
@@ -11,6 +11,7 @@ export interface StravaIntegration extends BaseIntegration {
     accessToken?: string;
     refreshToken?: string;
     expiresAt?: number;
+    after?: string
 }
 
 export interface KomootIntegration extends BaseIntegration {

From adf41c370b66df7de90f4c9dee17f92b64f7d9e7 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sat, 13 Sep 2025 16:39:37 +0200
Subject: [PATCH 15/15] updates changelog

---
 CHANGELOG.md                       | 14 ++++++++++++++
 docs/src/content/docs/changelog.md | 13 +++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb2c139c..c605d0ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+##v0.18.2
+## Features
+- Adds `dedup` command to pocketbase. This command allows an admin to quickly identify duplicate trails and delete them. Use the `--dry-run` flag to only log duplicate trails without deleting them. To execute the command run `docker exec -it wanderer-db ./pocketbase dedup --dry-run`.
+- Adds option to only sync strava activities after a certain date
+- Singificant performance improvements for instances with larger userbases
+- Greatly improved initial indexing speed when starting wanderer
+## Bug fixes
+- Fixes permission issues for public trails
+- Fixes bug that caused trails to be duplicated multiple times (to clean up see the `dedup` command above)
+- Fixes link to "New Trail" from empty profiles
+- Fixes link when opening a trail from the map searchbar
+- Sorting by difficulty no longer sorts by difficulty alphabetically
+- Fixes strava integration stopping after only one page
+
 # v0.18.1
 ## Bug fixes
 - Fixes permission issues that prevented federation from working properly
diff --git a/docs/src/content/docs/changelog.md b/docs/src/content/docs/changelog.md
index 452e2d41..349805c4 100644
--- a/docs/src/content/docs/changelog.md
+++ b/docs/src/content/docs/changelog.md
@@ -2,6 +2,19 @@
 title: Changelog
 description: What changed in the last patch?
 ---
+## v0.18.2
+### Features
+- Adds `dedup` command to pocketbase. This command allows an admin to quickly identify duplicate trails and delete them. Use the `--dry-run` flag to only log duplicate trails without deleting them. To execute the command run `docker exec -it wanderer-db ./pocketbase dedup --dry-run`.
+- Adds option to only sync strava activities after a certain date
+- Singificant performance improvements for instances with larger userbases
+- Greatly improved initial indexing speed when starting wanderer
+### Bug fixes
+- Fixes permission issues for public trails
+- Fixes bug that caused trails to be duplicated multiple times (to clean up see the `dedup` command above)
+- Fixes link to "New Trail" from empty profiles
+- Fixes link when opening a trail from the map searchbar
+- Sorting by difficulty no longer sorts by difficulty alphabetically
+- Fixes strava integration stopping after only one page
 ## v0.18.1
 ### Bug fixes
 - Fixes permission issues that prevented federation from working properly