A social RSS reader built on the AT Protocol.
glean.at
glean
atproto
atmosphere
rss
feed
social
app
Improve article links and annotation enhancements
+59
-25
+21
internal/db/article.go
+21
internal/db/article.go
···
355
355
return a, nil
356
356
}
357
357
358
+
func (db *DB) GetReadCount(ctx context.Context, userDID, feedURL string) (int, error) {
359
+
var count int
360
+
if feedURL != "" {
361
+
err := db.QueryRowContext(ctx, `
362
+
SELECT COUNT(*)
363
+
FROM articles a
364
+
JOIN read_state r ON r.user_did = ? AND r.article_id = a.id
365
+
WHERE a.feed_url = ? AND r.is_read = 1
366
+
`, userDID, feedURL).Scan(&count)
367
+
return count, err
368
+
}
369
+
err := db.QueryRowContext(ctx, `
370
+
SELECT COUNT(*)
371
+
FROM articles a
372
+
JOIN subscriptions s ON a.feed_url = s.feed_url AND s.user_did = ?
373
+
JOIN read_state r ON r.user_did = ? AND r.article_id = a.id
374
+
WHERE r.is_read = 1
375
+
`, userDID, userDID).Scan(&count)
376
+
return count, err
377
+
}
378
+
358
379
func (db *DB) CountNewArticles(ctx context.Context, userDID string, since time.Time) (int, error) {
359
380
var count int
360
381
err := db.QueryRowContext(ctx, `
+7
internal/server/articles_handler.go
+7
internal/server/articles_handler.go
+5
-5
internal/tmpl/article_detail.html
+5
-5
internal/tmpl/article_detail.html
···
1
1
{{define "article_detail.html"}}
2
2
<div class="max-w-3xl mx-auto">
3
-
<a href="/articles" class="text-sm text-spot-secondary hover:text-spot-text mb-6 inline-flex items-center gap-1.5 transition">
3
+
<a href="javascript:history.back()" class="text-sm text-spot-secondary hover:text-spot-text mb-6 inline-flex items-center gap-1.5 transition">
4
4
<svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M15.75 19.5L8.25 12l7.5-7.5"/></svg>
5
-
Back to articles
5
+
Back
6
6
</a>
7
7
8
8
<article>
···
138
138
</div>
139
139
</section>
140
140
141
-
<a href="/articles" class="text-sm text-spot-secondary hover:text-spot-text mt-8 inline-flex items-center gap-1.5 transition">
141
+
<a href="javascript:history.back()" class="text-sm text-spot-secondary hover:text-spot-text mt-8 inline-flex items-center gap-1.5 transition">
142
142
<svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M15.75 19.5L8.25 12l7.5-7.5"/></svg>
143
-
Back to articles
143
+
Back
144
144
</a>
145
145
</div>
146
146
···
255
255
var rbtn = document.getElementById('read-btn');
256
256
if (rbtn) rbtn.click();
257
257
} else if (e.key === 'Escape') {
258
-
window.location.href = '/articles';
258
+
history.back();
259
259
} else if (e.key === 'o') {
260
260
var origLink = document.querySelector('a[target="_blank"]');
261
261
if (origLink && origLink.href) window.open(origLink.href, '_blank');
+10
-10
internal/tmpl/articles.html
+10
-10
internal/tmpl/articles.html
···
48
48
</div>
49
49
</form>
50
50
<div class="flex items-center gap-2 shrink-0">
51
-
<a href="/articles?status=all{{if .FeedURL}}&feed={{.FeedURL}}{{end}}"
52
-
class="px-4 py-1.5 rounded-full text-xs font-bold uppercase tracking-button transition
53
-
{{if or (eq .Status "") (eq .Status "all")}}bg-spot-active-pill-bg text-spot-active-pill-text{{else}}bg-spot-hover text-spot-secondary hover:text-spot-text{{end}}">
54
-
All
55
-
</a>
56
-
<a href="/articles?status=unread{{if .FeedURL}}&feed={{.FeedURL}}{{end}}"
57
-
class="px-4 py-1.5 rounded-full text-xs font-bold uppercase tracking-button transition
58
-
{{if eq .Status "unread"}}bg-spot-active-pill-bg text-spot-active-pill-text{{else}}bg-spot-hover text-spot-secondary hover:text-spot-text{{end}}">
59
-
Unread
60
-
</a>
51
+
<a href="/articles?status=all{{if .FeedURL}}&feed={{.FeedURL}}{{end}}"
52
+
class="px-4 py-1.5 rounded-full text-xs font-bold uppercase tracking-button transition
53
+
{{if eq .Status "all"}}bg-spot-active-pill-bg text-spot-active-pill-text{{else}}bg-spot-hover text-spot-secondary hover:text-spot-text{{end}}">
54
+
All
55
+
</a>
56
+
<a href="/articles?status=unread{{if .FeedURL}}&feed={{.FeedURL}}{{end}}"
57
+
class="px-4 py-1.5 rounded-full text-xs font-bold uppercase tracking-button transition
58
+
{{if or (eq .Status "unread") (eq .Status "")}}bg-spot-active-pill-bg text-spot-active-pill-text{{else}}bg-spot-hover text-spot-secondary hover:text-spot-text{{end}}">
59
+
Unread
60
+
</a>
61
61
<a href="/articles?status=read{{if .FeedURL}}&feed={{.FeedURL}}{{end}}"
62
62
class="px-4 py-1.5 rounded-full text-xs font-bold uppercase tracking-button transition
63
63
{{if eq .Status "read"}}bg-spot-active-pill-bg text-spot-active-pill-text{{else}}bg-spot-hover text-spot-secondary hover:text-spot-text{{end}}">
+5
-2
internal/tmpl/partials/annotation-card.html
+5
-2
internal/tmpl/partials/annotation-card.html
···
1
1
{{define "annotation-card.html"}}
2
2
<div id="annotation-{{.annotation.ID}}" class="bg-spot-surface rounded-xl p-5 border border-spot-divider shadow-sm">
3
3
{{if .annotation.ArticleURL}}
4
-
<div class="text-xs mb-3">
5
-
<a href="{{.annotation.ArticleURL}}" class="text-spot-secondary hover:text-spot-green transition truncate block">{{.annotation.ArticleURL}}</a>
4
+
<div class="text-xs mb-3 flex items-center gap-2">
5
+
{{if .annotation.ArticleID.Valid}}<a href="/articles/{{.annotation.ArticleID.Int64}}" class="text-spot-green hover:text-spot-text transition truncate inline-flex items-center gap-1">
6
+
<svg class="w-3 h-3 shrink-0" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"/></svg>
7
+
</a>{{end}}
8
+
<a href="{{.annotation.ArticleURL}}" class="text-spot-secondary hover:text-spot-green transition truncate">{{.annotation.ArticleURL}}</a>
6
9
</div>
7
10
{{end}}
8
11
{{if .annotation.Quote.Valid}}