From 02fb64d6892f89d0497e397266b574e2ab772f3b Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Sat, 30 May 2026 10:50:41 +0000
Subject: [PATCH] appview/timeline: add recently visited pages to timeline

Signed-off-by: oppiliappan <me@oppi.li>
---
 appview/pages/pages.go | 8 ++++++++
 appview/pages/templates/notifications/fragments/item.html | 3 +--
 appview/pages/templates/timeline/fragments/recents.html | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 appview/pages/templates/timeline/fragments/vouchSuggestions.html | 4 ++--
 appview/pages/templates/timeline/timeline.html | 3 ++-
 appview/state/timeline.go | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 6 file(s) changed, 192 insertion(s)(+), 6 deletion(s)(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -400,6 +400,13 @@ func (p *Pages) Brand(w io.Writer, params BrandParams) error {
 	return p.execute("brand/brand", w, params)
 }
 
+type RecentItem struct {
+	Link  *models.RecentLink
+	Repo  *models.Repo
+	Issue *models.Issue
+	Pull  *models.Pull
+}
+
 type TimelineParams struct {
 	LoggedInUser     *oauth.MultiAccountUser
 	Timeline         []models.TimelineGroup
@@ -408,6 +415,7 @@ GfiLabel         *models.LabelDefinition
 	BlueskyPosts     []models.BskyPost
 	VouchSuggestions []models.VouchSuggestion
 	Notifications    []*models.NotificationWithEntity
+	Recents          []RecentItem
 	// ShowNewsletter controls whether the newsletter widget/CTA is rendered.
 	// For logged-in users it reflects their newsletter_preferences row; for
 	// anonymous visitors it is always true (dismissal falls back to
diff --git a/appview/pages/templates/notifications/fragments/item.html b/appview/pages/templates/notifications/fragments/item.html
--- a/appview/pages/templates/notifications/fragments/item.html
+++ b/appview/pages/templates/notifications/fragments/item.html
@@ -5,8 +5,7 @@ class="block no-underline hover:no-underline group">
     <div
       class="
         w-full mx-auto dark:text-white px-2 md:px-6 py-4
-        {{ if not .Read }}bg-indigo-50/50 dark:bg-indigo-950/20 hover:bg-indigo-50 dark:hover:bg-indigo-950/50{{ else }}bg-white dark:bg-gray-800 hover:bg-gray-100 dark:hover:bg-gray-700/30{{ end }}
-        transition-colors duration-150
+        {{ if not .Read }}bg-indigo-50/50 dark:bg-indigo-950/20 hover:bg-gray-100/50 dark:hover:bg-gray-700/50{{ else }}bg-white dark:bg-gray-800 hover:bg-gray-100/50 dark:hover:bg-gray-700/50{{ end }}
         grid grid-cols-[auto_1fr_auto] gap-x-4 gap-y-1 items-center
         ">
       {{/* row 1, col 1: icon */}}
diff --git a/appview/pages/templates/timeline/fragments/recents.html b/appview/pages/templates/timeline/fragments/recents.html
new file mode 100644
--- /dev/null
+++ b/appview/pages/templates/timeline/fragments/recents.html
@@ -0,0 +1,84 @@
+{{ define "timeline/fragments/recents" }}
+  {{ if .LoggedInUser }}
+  <div class="border border-gray-200 dark:border-gray-700 rounded-sm divide-y divide-gray-200 dark:divide-gray-700">
+    <h3 class="text-base dark:text-white flex items-center gap-2 px-4 py-2 bg-white/50 dark:bg-gray-800/50">
+      {{ i "history" "size-4 flex-shrink-0" }}
+      Recents
+    </h3>
+
+    {{ if not .Recents }}
+    <div class="px-4 py-8 text-sm text-center text-gray-400 dark:text-gray-500">
+      <div class="w-10 h-10 mx-auto mb-3 text-gray-300 dark:text-gray-600">
+        {{ i "route" "size-10" }}
+      </div>
+      <p class="text-sm text-gray-500 dark:text-gray-400">No recent pages yet.</p>
+    </div>
+    {{ else }}
+      <div class="relative flex flex-col bg-white dark:bg-gray-800">
+        <div class="absolute top-0 bottom-0 w-px bg-gray-200 dark:bg-gray-700" style="left: 1.875rem"></div>
+        {{ range .Recents }}
+          {{ if .Repo }}
+            {{ template "timeline/fragments/recentRepo" . }}
+          {{ else if .Issue }}
+            {{ template "timeline/fragments/recentIssue" . }}
+          {{ else if .Pull }}
+            {{ template "timeline/fragments/recentPull" . }}
+          {{ end }}
+        {{ end }}
+      </div>
+    {{ end }}
+  </div>
+  {{ end }}
+{{ end }}
+
+{{ define "recentRowClass" }}
+  relative grid grid-cols-[1.75rem_1fr_auto] grid-rows-2 gap-x-3 pl-4 pr-4 py-3 text-sm no-underline hover:no-underline hover:bg-gray-100/50 dark:hover:bg-gray-700/50 overflow-hidden
+{{ end }}
+
+{{/* call with dict "color" "text-*" "icon" "icon-name" */}}
+{{ define "recentIconCircle" }}
+  <span class="col-start-1 row-start-1 row-span-2 self-center relative z-10 flex items-center justify-center w-7 h-7 rounded-full bg-white dark:bg-gray-800 {{ .color }} shrink-0 border border-gray-200 dark:border-gray-700">
+    {{ i .icon "w-3.5 h-3.5" }}
+  </span>
+{{ end }}
+
+{{ define "timeline/fragments/recentRepo" }}
+  {{ $repoOwner := resolve .Repo.Did }}
+  <a href="/{{ $repoOwner }}/{{ .Repo.Slug }}" class="{{ template "recentRowClass" }}">
+    <span class="col-start-1 row-start-1 row-span-2 self-center relative z-10">
+      {{ template "user/fragments/pic" (list .Repo.Did "size-7") }}
+    </span>
+    <span class="col-start-2 row-start-1 row-span-2 self-center truncate font-medium dark:text-white">{{ $repoOwner }}/{{ .Repo.Name }}</span>
+    <span class="col-start-3 row-start-1 row-span-2 self-center text-gray-500 dark:text-gray-400 text-xs shrink-0">{{ template "repo/fragments/shortTime" .Link.Visited }}</span>
+  </a>
+{{ end }}
+
+{{ define "timeline/fragments/recentIssue" }}
+  {{ $repoOwner := resolve .Issue.Repo.Did }}
+  <a href="/{{ $repoOwner }}/{{ .Issue.Repo.Slug }}/issues/{{ .Issue.IssueId }}" class="{{ template "recentRowClass" }}">
+    {{ if .Issue.Open }}
+      {{ template "recentIconCircle" (dict "color" "text-green-600 dark:text-green-500" "icon" "circle-dot") }}
+    {{ else }}
+      {{ template "recentIconCircle" (dict "color" "text-gray-500 dark:text-gray-400" "icon" "ban") }}
+    {{ end }}
+    <span class="col-start-2 row-start-1 truncate dark:text-white">{{ .Issue.Title }}</span>
+    <span class="col-start-2 row-start-2 truncate text-xs text-gray-500 dark:text-gray-400">{{ $repoOwner }}/{{ .Issue.Repo.Name }}</span>
+    <span class="col-start-3 row-start-1 self-center text-gray-500 dark:text-gray-400 text-xs shrink-0">{{ template "repo/fragments/shortTime" .Link.Visited }}</span>
+  </a>
+{{ end }}
+
+{{ define "timeline/fragments/recentPull" }}
+  {{ $repoOwner := resolve .Pull.Repo.Did }}
+  <a href="/{{ $repoOwner }}/{{ .Pull.Repo.Slug }}/pulls/{{ .Pull.PullId }}" class="{{ template "recentRowClass" }}">
+    {{ if .Pull.State.IsOpen }}
+      {{ template "recentIconCircle" (dict "color" "text-green-600 dark:text-green-500" "icon" "git-pull-request") }}
+    {{ else if .Pull.State.IsMerged }}
+      {{ template "recentIconCircle" (dict "color" "text-purple-600 dark:text-purple-500" "icon" "git-merge") }}
+    {{ else }}
+      {{ template "recentIconCircle" (dict "color" "text-gray-600 dark:text-gray-300" "icon" "git-pull-request-closed") }}
+    {{ end }}
+    <span class="col-start-2 row-start-1 truncate dark:text-white">{{ .Pull.Title }}</span>
+    <span class="col-start-2 row-start-2 truncate text-xs text-gray-500 dark:text-gray-400">{{ $repoOwner }}/{{ .Pull.Repo.Name }}</span>
+    <span class="col-start-3 row-start-1 self-center text-gray-500 dark:text-gray-400 text-xs shrink-0">{{ template "repo/fragments/shortTime" .Link.Visited }}</span>
+  </a>
+{{ end }}
diff --git a/appview/pages/templates/timeline/fragments/vouchSuggestions.html b/appview/pages/templates/timeline/fragments/vouchSuggestions.html
--- a/appview/pages/templates/timeline/fragments/vouchSuggestions.html
+++ b/appview/pages/templates/timeline/fragments/vouchSuggestions.html
@@ -8,8 +8,8 @@ Suggested
         </h3>
         <span class="text-sm font-normal flex items-center gap-1 pr-4">
           View all {{ i "arrow-right" "size-3.5" }}
-        </a>
-      </div>
+        </span>
+      </a>
       <div class="flex flex-col gap-4 bg-white dark:bg-gray-800 p-4">
         {{ range .VouchSuggestions }}
         <div class="flex items-center gap-3 ">
diff --git a/appview/pages/templates/timeline/timeline.html b/appview/pages/templates/timeline/timeline.html
--- a/appview/pages/templates/timeline/timeline.html
+++ b/appview/pages/templates/timeline/timeline.html
@@ -16,8 +16,9 @@
 {{ define "content" }}
 <div id="timeline-grid" class="flex flex-col md:grid md:grid-cols-8">
 
-    <div class="hidden md:flex md:col-span-2 md:flex-col md:gap-6 md:pt-4 md:px-4">
+    <div class="hidden md:flex md:col-span-2 md:flex-col md:gap-4 md:pt-4 md:px-4">
         {{ template "timeline/fragments/notifications" . }}
+        {{ template "timeline/fragments/recents" . }}
     </div>
 
     <div class="order-2 md:order-none md:col-start-3 md:row-start-1 md:col-span-4">
diff --git a/appview/state/timeline.go b/appview/state/timeline.go
--- a/appview/state/timeline.go
+++ b/appview/state/timeline.go
@@ -2,6 +2,7 @@ package state
 
 import (
 	"net/http"
+	"sort"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"tangled.org/core/appview/db"
@@ -79,7 +80,6 @@ notifications, err = db.GetNotificationsWithEntities(
 			s.db,
 			pagination.Page{Limit: 5, Offset: 0},
 			orm.FilterEq("recipient_did", user.Did),
-			orm.FilterEq("read", 0),
 		)
 		if err != nil {
 			s.logger.Error("failed to get notifications for timeline", "err", err)
@@ -108,6 +108,14 @@ }
 		}
 	}
 
+	var recents []pages.RecentItem
+	if user != nil {
+		recents, err = s.buildRecents(user.Did)
+		if err != nil {
+			s.logger.Error("failed to build recents for timeline", "err", err)
+		}
+	}
+
 	s.pages.Timeline(w, pages.TimelineParams{
 		LoggedInUser:     user,
 		Timeline:         timeline,
@@ -115,8 +123,94 @@ Repos:            repos,
 		GfiLabel:         gfiLabel,
 		VouchSuggestions: vouchSuggestions,
 		Notifications:    notifications,
+		Recents:          recents,
 		ShowNewsletter:   s.showNewsletter(user),
 	})
+}
+
+func (s *State) buildRecents(userDid string) ([]pages.RecentItem, error) {
+	links, err := db.GetRecentLinks(s.db, orm.FilterEq("user_did", userDid))
+	if err != nil {
+		return nil, err
+	}
+	if len(links) == 0 {
+		return nil, nil
+	}
+
+	// group targets by type.
+	var repoDids, issueAtUris, pullAtUris []string
+	for _, l := range links {
+		switch l.LinkType {
+		case models.RecentLinkTypeRepo:
+			repoDids = append(repoDids, l.Target)
+		case models.RecentLinkTypeIssue:
+			issueAtUris = append(issueAtUris, l.Target)
+		case models.RecentLinkTypePull:
+			pullAtUris = append(pullAtUris, l.Target)
+		}
+	}
+
+	// fetch repos by DID.
+	repoByDid := make(map[string]*models.Repo)
+	if len(repoDids) > 0 {
+		fetched, err := db.GetRepos(s.db, orm.FilterIn("repo_did", repoDids))
+		if err != nil {
+			return nil, err
+		}
+		for i := range fetched {
+			repoByDid[fetched[i].RepoDid] = &fetched[i]
+		}
+	}
+
+	// fetch issues by aturi
+	issueByAtUri := make(map[string]*models.Issue)
+	if len(issueAtUris) > 0 {
+		issues, err := db.GetIssues(s.db, orm.FilterIn("at_uri", issueAtUris))
+		if err != nil {
+			return nil, err
+		}
+		for _, issue := range issues {
+			issueByAtUri[issue.AtUri().String()] = &issue
+		}
+	}
+
+	// fetch pulls by aturi
+	pullByAtUri := make(map[string]*models.Pull)
+	if len(pullAtUris) > 0 {
+		fetched, err := db.GetPulls(s.db, orm.FilterIn("at_uri", pullAtUris))
+		if err != nil {
+			return nil, err
+		}
+		for _, p := range fetched {
+			pullByAtUri[p.AtUri().String()] = p
+		}
+	}
+
+	// build result in original link order
+	var items []pages.RecentItem
+	for _, l := range links {
+		item := pages.RecentItem{Link: l}
+		switch l.LinkType {
+		case models.RecentLinkTypeRepo:
+			item.Repo = repoByDid[l.Target]
+		case models.RecentLinkTypeIssue:
+			item.Issue = issueByAtUri[l.Target]
+		case models.RecentLinkTypePull:
+			item.Pull = pullByAtUri[l.Target]
+		}
+		// skip if the entity could not be resolved (e.g. deleted).
+		if item.Repo == nil && item.Issue == nil && item.Pull == nil {
+			continue
+		}
+		items = append(items, item)
+	}
+
+	// re-sort by visited descending to restore recency order after map lookups.
+	sort.Slice(items, func(i, j int) bool {
+		return items[i].Link.Visited.After(items[j].Link.Visited)
+	})
+
+	return items, nil
 }
 
 // showNewsletter decides whether the newsletter widget/CTA should render.

--
tangled.sh