forked from
tangled.org/core
Monorepo for Tangled
appview: adds issues into timeline
Signed-off-by: Will Andrews <did:plc:dadhhalkfcq3gucaq25hjqon>
+115
+57
appview/db/timeline.go
+57
appview/db/timeline.go
···
1
1
package db
2
2
3
3
import (
4
+
"fmt"
5
+
"slices"
4
6
"sort"
5
7
6
8
"github.com/bluesky-social/indigo/atproto/syntax"
9
+
"tangled.org/core/api/tangled"
7
10
"tangled.org/core/appview/models"
8
11
"tangled.org/core/appview/pagination"
9
12
"tangled.org/core/orm"
···
47
50
return nil, err
48
51
}
49
52
53
+
issues, err := getTimelineIssues(e, limit, loggedInUserDid, userIsFollowing)
54
+
if err != nil {
55
+
return nil, err
56
+
}
57
+
50
58
events = append(events, repos...)
51
59
events = append(events, stars...)
52
60
events = append(events, follows...)
61
+
events = append(events, issues...)
53
62
54
63
sort.Slice(events, func(i, j int) bool {
55
64
return events[i].EventAt.After(events[j].EventAt)
···
278
287
279
288
return events, nil
280
289
}
290
+
291
+
func getTimelineIssues(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) {
292
+
filters := make([]orm.Filter, 0)
293
+
if userIsFollowing != nil {
294
+
filters = append(filters, orm.FilterIn("owner_did", userIsFollowing))
295
+
}
296
+
filters = append(filters, orm.FilterEq("open", 1))
297
+
298
+
issues, err := GetIssuesPaginated(e, pagination.Page{Limit: limit}, filters...)
299
+
if err != nil {
300
+
return nil, err
301
+
}
302
+
303
+
var labels []string
304
+
305
+
for _, issue := range issues {
306
+
for uri := range issue.Labels.Inner() {
307
+
if !slices.Contains(labels, uri) {
308
+
labels = append(labels, uri)
309
+
}
310
+
}
311
+
}
312
+
313
+
labelDefs, err := GetLabelDefinitions(
314
+
e,
315
+
orm.FilterIn("at_uri", labels),
316
+
orm.FilterContains("scope", tangled.RepoIssueNSID),
317
+
)
318
+
if err != nil {
319
+
return nil, fmt.Errorf("fetching labels for issues: %w", err)
320
+
}
321
+
322
+
defs := make(map[string]*models.LabelDefinition)
323
+
for _, l := range labelDefs {
324
+
defs[l.AtUri().String()] = &l
325
+
}
326
+
327
+
var events []models.TimelineEvent
328
+
for _, issue := range issues {
329
+
events = append(events, models.TimelineEvent{
330
+
Issue: &issue,
331
+
EventAt: issue.Created,
332
+
LabelDefs: defs,
333
+
})
334
+
}
335
+
336
+
return events, nil
337
+
}
+4
appview/models/timeline.go
+4
appview/models/timeline.go
···
6
6
*Repo
7
7
*Follow
8
8
*RepoStar
9
+
*Issue
9
10
10
11
EventAt time.Time
11
12
···
20
21
// optional: populate only if event is Repo
21
22
IsStarred bool
22
23
StarCount int64
24
+
25
+
// optional: populate only if event if Issue
26
+
LabelDefs map[string]*LabelDefinition
23
27
}
24
28
25
29
// TimelineGroup is a primary TimelineEvent plus zero or more peer events
+54
appview/pages/templates/timeline/fragments/timeline.html
+54
appview/pages/templates/timeline/fragments/timeline.html
···
19
19
{{ template "timeline/fragments/starEvent" (list $ $g) }}
20
20
{{ else if $primary.Follow }}
21
21
{{ template "timeline/fragments/followEvent" (list $ $g) }}
22
+
{ else if $primary.Issue }}
23
+
{{ template "timeline/fragments/issueEvent" (list $ $g) }}
22
24
{{ end }}
23
25
</div>
24
26
</div>
···
82
84
{{ with .Repo }}
83
85
{{ template "user/fragments/repoCard" (list $root . true true (dict "IsStarred" $event.IsStarred "SubjectAt" .RepoAt "StarCount" $event.StarCount)) }}
84
86
{{ end }}
87
+
{{ end }}
88
+
{{ end }}
89
+
90
+
{{ define "timeline/fragments/issueEvent" }}
91
+
{{ $root := index . 0 }}
92
+
{{ $event := index . 1 }}
93
+
{{ $issue := $event.Issue }}
94
+
{{ with $issue }}
95
+
{{ $repo := .Repo}}
96
+
{{ $userHandle := resolve .Did }}
97
+
{{ $repoOwnerHandle := resolve $repo.Did }}
98
+
<div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">
99
+
{{ template "user/fragments/picHandleLink" .Did }}
100
+
created an issue in
101
+
<a href="/{{ $repoOwnerHandle }}/{{ $repo.Name }}" class="no-underline hover:underline">
102
+
{{ $repoOwnerHandle | truncateAt30 }}/{{ $repo.Name }}
103
+
</a>
104
+
<span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" .Created }}</span>
105
+
</div>
106
+
<div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700">
107
+
<div class="pb-2">
108
+
<a href="/{{ $repoOwnerHandle }}/{{ $repo.Name }}/issues/{{ .IssueId }}" class="no-underline hover:underline">
109
+
{{ .Title }}
110
+
<span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span>
111
+
</a>
112
+
</div>
113
+
<div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1">
114
+
{{ $bgColor := "bg-gray-800 dark:bg-gray-700" }}
115
+
{{ $icon := "ban" }}
116
+
{{ $state := "closed" }}
117
+
{{ if .Open }}
118
+
{{ $bgColor = "bg-green-600 dark:bg-green-700" }}
119
+
{{ $icon = "circle-dot" }}
120
+
{{ $state = "open" }}
121
+
{{ end }}
122
+
123
+
<span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}">
124
+
{{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }}
125
+
<span class="text-white dark:text-white text-sm">{{ $state }}</span>
126
+
</span>
127
+
128
+
<span class="before:content-['·']">
129
+
{{ template "repo/fragments/time" .Created }}
130
+
</span>
131
+
{{ $state := .Labels }}
132
+
{{ range $k, $d := $event.LabelDefs }}
133
+
{{ range $v, $s := $state.GetValSet $d.AtUri.String }}
134
+
{{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}
135
+
{{ end }}
136
+
{{ end }}
137
+
</div>
138
+
</div>
85
139
{{ end }}
86
140
{{ end }}
87
141