From f7936804b0cb05ff1a778a487de6c312a059b935 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Fri, 12 Jun 2026 08:54:15 +0000 Subject: [PATCH] appview/db: fix timeline queries to work with repoDids when selecting fork sources, we were selecting by at_uri, which was causing the queries to sliently fail. switching to repoDids here fixes fork sources, and as a result, fixes the templates to render the right repo card text: ` forked to `. Signed-off-by: oppiliappan --- appview/db/timeline.go | 8 ++++---- appview/timeline/timeline.go | 5 ++++- 2 file(s) changed, 8 insertion(s)(+), 5 deletion(s)(-) diff --git a/appview/db/timeline.go b/appview/db/timeline.go --- a/appview/db/timeline.go +++ b/appview/db/timeline.go @@ -142,15 +142,15 @@ var origRepos []models.Repo if args != nil { - origRepos, err = GetRepos(e, orm.FilterIn("at_uri", args)) + origRepos, err = GetRepos(e, orm.FilterIn("repo_did", args)) } if err != nil { return nil, err } - uriToRepo := make(map[string]models.Repo) + didToRepo := make(map[string]models.Repo) for _, r := range origRepos { - uriToRepo[r.RepoAt().String()] = r + didToRepo[r.RepoDid] = r } starStatuses, err := fetchStarStatuses(e, loggedInUserDid, repos) @@ -162,7 +162,7 @@ for _, r := range repos { var source *models.Repo if r.Source != "" { - if origRepo, ok := uriToRepo[r.Source]; ok { + if origRepo, ok := didToRepo[r.Source]; ok { source = &origRepo } } diff --git a/appview/timeline/timeline.go b/appview/timeline/timeline.go --- a/appview/timeline/timeline.go +++ b/appview/timeline/timeline.go @@ -82,7 +82,7 @@ } } - t.pages.Timeline(w, pages.TimelineParams{ + err = t.pages.Timeline(w, pages.TimelineParams{ LoggedInUser: user, Timeline: timeline, Repos: repos, @@ -94,6 +94,9 @@ RecentBlogPosts: t.recentPosts, ShowNewsletter: t.showNewsletter(user), }) + if err != nil { + t.logger.Error("failed to render timeline", "err", err) + } } func (t *Timeline) buildRecents(userDid string) ([]pages.RecentItem, error) { -- tangled.sh