switch to chronological order in /local and drop /federated

README.md

@@ -31,7 +31,6 @@ Welcome, fedinaut! localhost.localdomain:8443 is an instance of tootik, a federa
 ⚡️ Followed users
 😈 My profile
 📡 This planet
-✨ FOMO from outer space
 🔥 Hashtags
 🔭 Find user
 🔎 Search posts

front/README.md

@@ -4,7 +4,6 @@
 
 * /local shows a compact list of local posts; each entry contains a link to /view.
 * / is the homepage: it shows an ASCII art logo, a short description of this server and a list of local posts.
-* /federated shows a compact list of federated posts.
 * /hashtag shows a compact list of posts with a given hashtag.
 * /search shows an input prompt and redirects to /hashtag.
 * /hashtags shows a list of popular hashtags.
@@ -42,7 +41,6 @@ Users are authenticated using TLS client certificates; see [Gemini protocol spec
 Some clients generate a certificate for / (all pages of this capsule) when /foo requests a client certificate, while others use the certificate requested by /foo only for /foo and /foo/bar. Therefore, pages that don't require authentication are also mirrored under /users:
 
 * /users/local
-* /users/federated
 * /users/hashtag
 * /users/hashtags
 * /users/fts

front/handler.go

@@ -76,9 +76,6 @@ func NewHandler(domain string, closed bool, cfg *cfg.Config) (Handler, error) {
 	h.handlers[regexp.MustCompile(`^/local$`)] = withCache(withUserMenu(h.local), time.Minute*15, &cache, cfg)
 	h.handlers[regexp.MustCompile(`^/users/local$`)] = withCache(withUserMenu(h.local), time.Minute*15, &cache, cfg)
 
-	h.handlers[regexp.MustCompile(`^/federated$`)] = withCache(withUserMenu(h.federated), time.Minute*10, &cache, cfg)
-	h.handlers[regexp.MustCompile(`^/users/federated$`)] = withCache(withUserMenu(h.federated), time.Minute*10, &cache, cfg)
-
 	h.handlers[regexp.MustCompile(`^/outbox/(\S+)$`)] = withUserMenu(h.userOutbox)
 	h.handlers[regexp.MustCompile(`^/users/outbox/(\S+)$`)] = withUserMenu(h.userOutbox)
 	h.handlers[regexp.MustCompile(`^/users/me$`)] = withUserMenu(me)

front/local.go

@@ -29,44 +29,23 @@ func (h *Handler) local(w text.Writer, r *request, args ...string) {
 		func(offset int) (*sql.Rows, error) {
 			return r.Query(
 				`
-					select u.object, u.actor, u.sharer, u.inserted from
+					select object, actor, sharer, inserted from
 					(
-						select notes.id, notes.author, notes.object, notes.inserted, persons.actor, null as sharer from persons
+						select notes.object, persons.actor, null as sharer, notes.inserted from persons
 						join notes
 						on notes.author = persons.id
 						where notes.public = 1 and persons.host = $1
-						union
-						select notes.id, notes.author, notes.object, shares.inserted, persons.actor, sharers.actor as sharer from persons sharers
+						union all
+						select notes.object, persons.actor, sharers.actor as sharer, shares.inserted from persons sharers
 						join shares
 						on shares.by = sharers.id
 						join notes
 						on notes.id = shares.note
 						join persons
 						on persons.id = notes.author
-						where notes.public = 1 and notes.host != $1 and sharers.host = $1
-					) u
-					left join (
-						select object->>'$.inReplyTo' as id, count(*) as count from notes
-						where host = $1 and inserted > unixepoch()-60*60*24*7
-						group by object->>'$.inReplyTo'
-					) replies
-					on
-						replies.id = u.id
-					left join (
-						select author, max(inserted) as last, round(count(*)/7.0, 1) as avg from notes
-						where host = $1 and inserted > unixepoch()-60*60*24*7
-						group by author
-					) stats
-					on
-						stats.author = u.author
-					group by
-						u.id
-					order by
-						u.inserted / 86400 desc,
-						replies.count desc,
-						stats.avg asc,
-						stats.last asc,
-						u.inserted desc
+						where notes.public = 1 and sharers.host = $1
+					)
+					order by inserted desc
 					limit $2
 					offset $3
 				`,

front/menu.go

@@ -38,7 +38,6 @@ func writeUserMenu(w text.Writer, user *ap.Actor) {
 	}
 
 	w.Link(prefix+"/local", "📡 This planet")
-	w.Link(prefix+"/federated", "✨ FOMO from outer space")
 
 	if user == nil {
 		w.Link("/hashtags", "🔥 Hashtags")

front/static/help.gmi

@@ -11,23 +11,6 @@ This is an instance of tootik, a "slow", "boring" and non-addictive social netwo
 
 This page shows public posts published on this server.
 
-Posts are sorted by:
-* Day of posting
-* Number of replies
-* Author's number of posts
-* Time since the author's previous post
-* Exact time of posting
-
-> ✨ FOMO from outer space
-
-This page shows public posts from the fediverse.
-
-Posts are sorted by:
-* Hour of posting
-* Author's number of posts
-* Time since the author's previous post
-* Exact time of posting
-
 > 🔥 Hashtags
 
 This page shows popular hashtags, allowing you to discover trends and shared interests.

front/static/users/help.gmi

@@ -27,23 +27,6 @@ This page shows your profile.
 
 This page shows public posts published on this server.
 
-Posts are sorted by:
-* Day of posting
-* Number of replies
-* Author's number of posts
-* Time since the author's previous post
-* Exact time of posting
-
-> ✨ FOMO from outer space
-
-This page shows public posts from the fediverse.
-
-Posts are sorted by:
-* Hour of posting
-* Author's number of posts
-* Time since the author's previous post
-* Exact time of posting
-
 > 🔥 Hashtags
 
 This page shows popular hashtags, allowing you to discover trends and shared interests.