brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes duplicate trails

Browse Source
This commit is contained in:
Christian Beutel
2025-08-31 16:41:03 +02:00
parent c6042db9a8
commit 64579808a9
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
db/util/activitypub.go
View File

@@ -13,6 +13,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"path"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@@ -162,7 +163,19 @@ func TrailFromActivity(activity pub.Activity, app core.App, actor *core.Record)
return nil, err 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 != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
collection, err := app.FindCollectionByNameOrId("trails") collection, err := app.FindCollectionByNameOrId("trails")
@@ -279,7 +292,7 @@ func TrailFromActivity(activity pub.Activity, app core.App, actor *core.Record)
} }
if len(photoURLs) > 0 { if len(photoURLs) > 0 {
photos := make([]*filesystem.File, len(photoURLs)) photos := []*filesystem.File{}
for i, purl := range photoURLs { for i, purl := range photoURLs {
photo, err := filesystem.NewFileFromURL(context.Background(), purl) photo, err := filesystem.NewFileFromURL(context.Background(), purl)
if err != nil { if err != nil {