Skip to content

fix: do not serve user feed from PDS #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scanash00 merged 1 commit into from
Feb 16, 2026
Merged

fix: do not serve user feed from PDS #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 0 additions & 154 deletions backend/internal/api/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"sort"
"strconv"
"strings"
"sync"
"time"

"github.com/go-chi/chi/v5"
Expand Down Expand Up @@ -173,11 +172,6 @@ func (h *Handler) GetFeed(w http.ResponseWriter, r *http.Request) {

viewerDID := h.getViewerDID(r)

if viewerDID != "" && (feedType == "my-feed" || creator == viewerDID) {
h.serveUserFeedFromPDS(w, r, viewerDID, tag, r.URL.Query().Get("motivation"), limit, offset)
return
}

var annotations []db.Annotation
var highlights []db.Highlight
var bookmarks []db.Bookmark
Expand Down Expand Up @@ -484,154 +478,6 @@ func (h *Handler) GetFeed(w http.ResponseWriter, r *http.Request) {
})
}

func (h *Handler) serveUserFeedFromPDS(w http.ResponseWriter, r *http.Request, did, tag, motivation string, limit, offset int) {
var wg sync.WaitGroup
var rawAnnos, rawHighs, rawBooks []interface{}
var errAnnos, errHighs, errBooks error

fetchLimit := limit + offset
if fetchLimit < 50 {
fetchLimit = 50
}

if motivation == "" || motivation == "commenting" {
wg.Add(1)
go func() {
defer wg.Done()
rawAnnos, errAnnos = h.FetchLatestUserRecords(r, did, xrpc.CollectionAnnotation, fetchLimit)
}()
}
if motivation == "" || motivation == "highlighting" {
wg.Add(1)
go func() {
defer wg.Done()
rawHighs, errHighs = h.FetchLatestUserRecords(r, did, xrpc.CollectionHighlight, fetchLimit)
}()
}
if motivation == "" || motivation == "bookmarking" {
wg.Add(1)
go func() {
defer wg.Done()
rawBooks, errBooks = h.FetchLatestUserRecords(r, did, xrpc.CollectionBookmark, fetchLimit)
}()
}
wg.Wait()

if errAnnos != nil {
log.Printf("PDS Fetch Error (Annos): %v", errAnnos)
}
if errHighs != nil {
log.Printf("PDS Fetch Error (Highs): %v", errHighs)
}
if errBooks != nil {
log.Printf("PDS Fetch Error (Books): %v", errBooks)
}

var annotations []db.Annotation
var highlights []db.Highlight
var bookmarks []db.Bookmark

for _, r := range rawAnnos {
if a, ok := r.(*db.Annotation); ok {
if tag == "" || containsTag(a.TagsJSON, tag) {
annotations = append(annotations, *a)
}
}
}
for _, r := range rawHighs {
if h, ok := r.(*db.Highlight); ok {
if tag == "" || containsTag(h.TagsJSON, tag) {
highlights = append(highlights, *h)
}
}
}
for _, r := range rawBooks {
if b, ok := r.(*db.Bookmark); ok {
if tag == "" || containsTag(b.TagsJSON, tag) {
bookmarks = append(bookmarks, *b)
}
}
}

go func() {
for _, a := range annotations {
h.db.CreateAnnotation(&a)
}
for _, hi := range highlights {
h.db.CreateHighlight(&hi)
}
for _, b := range bookmarks {
h.db.CreateBookmark(&b)
}
}()

collectionItems := []db.CollectionItem{}
if tag == "" && motivation == "" {
items, err := h.db.GetCollectionItemsByAuthor(did)
if err != nil {
log.Printf("Error fetching collection items for user feed: %v", err)
} else {
collectionItems = items
}
}

if len(collectionItems) > 0 {
var sembleURIs []string
for _, item := range collectionItems {
if strings.Contains(item.AnnotationURI, "network.cosmik.card") {
sembleURIs = append(sembleURIs, item.AnnotationURI)
}
}
if len(sembleURIs) > 0 {
ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second)
defer cancel()
ensureSembleCardsIndexed(ctx, h.db, sembleURIs)
}
}

authAnnos, _ := hydrateAnnotations(h.db, annotations, did)
authHighs, _ := hydrateHighlights(h.db, highlights, did)
authBooks, _ := hydrateBookmarks(h.db, bookmarks, did)
authCollectionItems, _ := hydrateCollectionItems(h.db, collectionItems, did)

var feed []interface{}
for _, a := range authAnnos {
feed = append(feed, a)
}
for _, h := range authHighs {
feed = append(feed, h)
}
for _, b := range authBooks {
feed = append(feed, b)
}
if motivation == "" {
for _, ci := range authCollectionItems {
feed = append(feed, ci)
}
}

sortFeed(feed)

if offset < len(feed) {
feed = feed[offset:]
} else {
feed = []interface{}{}
}

if len(feed) > limit {
feed = feed[:limit]
}

w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(map[string]interface{}{
"@context": "http://www.w3.org/ns/anno.jsonld",
"type": "Collection",
"items": feed,
"totalItems": len(feed),
})

}

func containsTag(tagsJSON *string, tag string) bool {
if tagsJSON == nil || *tagsJSON == "" {
return false
Expand Down