drop support for listing of public activities

dimkr · Nov 18, 2024 · df00d35 · df00d35
1 parent a4f41ba
commit df00d35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 86 deletions.
diff --git a/FEDERATION.md b/FEDERATION.md
@@ -54,7 +54,7 @@ tootik does not fetch missing posts to complete threads with "ghost replies".
 
 ## Outbox
 
-tootik sets the `outbox` attribute on users, so servers that don't rely on reply forwarding and fetch missing replies can do so. However, this collection only lists public activities.
+tootik sets the `outbox` attribute on users, but it always leads to an empty collection.
 
 ## Account Migration
 

diff --git a/fed/outbox.go b/fed/outbox.go
@@ -27,53 +27,20 @@ import (
 	"strings"
 )
 
-const activitiesPerPage = 30
+func (l *Listener) getCollection(w http.ResponseWriter, username string) {
+	first := fmt.Sprintf("https://%s/outbox/%s?0", l.Domain, username)
 
-func (l *Listener) getCollection(w http.ResponseWriter, r *http.Request, username, actorID string) {
 	collection := map[string]any{
-		"@context": "https://www.w3.org/ns/activitystreams",
-		"id":       fmt.Sprintf("https://%s/outbox/%s", l.Domain, username),
-		"type":     "OrderedCollection",
+		"@context":   "https://www.w3.org/ns/activitystreams",
+		"id":         fmt.Sprintf("https://%s/outbox/%s", l.Domain, username),
+		"type":       "OrderedCollection",
+		"first":      first,
+		"last":       first,
+		"totalItems": 0,
 	}
 
 	slog.Info("Listing activities by user", "username", username)
 
-	var totalItems sql.NullInt64
-	if err := l.DB.QueryRowContext(r.Context(), `select count(*) from notes join outbox on outbox.activity->>'$.object.id' = notes.id where outbox.sender = $1 and notes.author = $1 and notes.public = 1`, actorID).Scan(&totalItems); err != nil {
-		slog.Warn("Failed to count activities", "username", username, "error", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	if totalItems.Valid {
-		collection["totalItems"] = totalItems.Int64
-	} else {
-		collection["totalItems"] = 0
-	}
-
-	var firstSince sql.NullInt64
-	if err := l.DB.QueryRowContext(r.Context(), `select min(outbox.inserted) from notes join outbox on outbox.activity->>'$.object.id' = notes.id where outbox.sender = $1 and notes.author = $1 and notes.public = 1`, actorID, activitiesPerPage).Scan(&firstSince); err != nil {
-		slog.Warn("Failed to get first page timestamp", "username", username, "error", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	if firstSince.Valid {
-		collection["first"] = fmt.Sprintf("https://%s/outbox/%s?0%d", l.Domain, username, firstSince.Int64)
-	}
-
-	if totalItems.Valid && totalItems.Int64 > activitiesPerPage {
-		var lastSince sql.NullInt64
-		if err := l.DB.QueryRowContext(r.Context(), `select min(inserted) from (select outbox.inserted from notes join outbox on outbox.activity->>'$.object.id' = notes.id where outbox.sender = $1 and notes.author = $1 and notes.public = 1 order by outbox.inserted desc limit $2)`, actorID, activitiesPerPage).Scan(&lastSince); err != nil {
-			slog.Warn("Failed to get last page timestamp", "username", username, "error", err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		if lastSince.Valid {
-			collection["last"] = fmt.Sprintf("https://%s/outbox/%s?%d", l.Domain, username, lastSince.Int64)
-		}
-	} else if firstSince.Valid {
-		collection["last"] = collection["first"]
-	}
-
 	j, err := json.Marshal(collection)
 	if err != nil {
 		slog.Warn("Failed to marshal collection", "username", username, "error", err)
@@ -110,7 +77,7 @@ func (l *Listener) handleOutbox(w http.ResponseWriter, r *http.Request) {
 	slog.Info("Fetching activities by user", "username", username)
 
 	if r.URL.RawQuery == "" {
-		l.getCollection(w, r, username, actorID.String)
+		l.getCollection(w, username)
 		return
 	}
 
@@ -126,55 +93,16 @@ func (l *Listener) handleOutbox(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	rows, err := l.DB.QueryContext(r.Context(), `select outbox.activity from notes join outbox on outbox.activity->>'$.object.id' = notes.id where outbox.sender = $1 and outbox.activity->>'$.actor' = $1 and notes.author = $1 and notes.public = 1 and outbox.inserted >= $2 order by notes.inserted limit $3`, actorID.String, since, activitiesPerPage)
-	if err != nil {
-		slog.Warn("Failed to fetch activities", "username", username, "since", since, "error", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	defer rows.Close()
-
-	activities := make([]ap.Activity, 0, activitiesPerPage)
-
-	for rows.Next() {
-		var activity ap.Activity
-		if err := rows.Scan(&activity); err != nil {
-			slog.Warn("Failed to scan activity", "error", err)
-			continue
-		}
-
-		activity.Context = nil
-		activities = append(activities, activity)
-	}
-	rows.Close()
+	first := fmt.Sprintf("https://%s/outbox/%s?0", l.Domain, username)
 
 	page := map[string]any{
 		"@context":     []string{"https://www.w3.org/ns/activitystreams"},
 		"id":           fmt.Sprintf("https://%s/outbox/%s?%d", l.Domain, username, since),
 		"type":         "OrderedCollectionPage",
 		"partOf":       fmt.Sprintf("https://%s/outbox/%s", l.Domain, username),
-		"orderedItems": activities,
-	}
-
-	var nextSince sql.NullInt64
-	if err := l.DB.QueryRowContext(r.Context(), `select max(inserted) from (select outbox.inserted from notes join outbox on outbox.activity->>'$.object.id' = notes.id where outbox.sender = $1 and outbox.activity->>'$.actor' = $1 and notes.author = $1 and notes.public = 1 and outbox.inserted > $2 order by outbox.inserted limit $2 offset $3)`, actorID, since, activitiesPerPage).Scan(&nextSince); err != nil {
-		slog.Warn("Failed to get next page timestamp", "username", username, "since", since, "error", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	if nextSince.Valid {
-		page["next"] = fmt.Sprintf("https://%s/outbox/%s?%d", l.Domain, username, nextSince.Int64)
-	}
-
-	var prevSince sql.NullInt64
-	if err := l.DB.QueryRowContext(r.Context(), `select min(inserted) from (select outbox.inserted from notes join outbox on outbox.activity->>'$.object.id' = notes.id where outbox.sender = $1 and outbox.activity->>'$.actor' = $1 and notes.author = $1 and notes.public = 1 and outbox.inserted < $2 order by outbox.inserted desc limit $3)`, actorID, since, activitiesPerPage).Scan(&prevSince); err != nil {
-		slog.Warn("Failed to get previous page timestamp", "username", username, "since", since, "error", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	if prevSince.Valid {
-		page["prev"] = fmt.Sprintf("https://%s/outbox/%s?%d", l.Domain, username, prevSince.Int64)
+		"orderedItems": []ap.Activity{},
+		"next":         first,
+		"prev":         first,
 	}
 
 	j, err := json.Marshal(page)