lumina/lumina-relay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

refactor trending history retrieval: clean up whitespace and improve code readability

Browse Source
This commit is contained in:
highperfocused 2025-03-08 22:20:19 +01:00
parent 4aac6b6afa
commit f98b118168
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
relay/main.go
View File

@ -283,45 +283,45 @@ func main() {
// Parse query parameters for pagination // Parse query parameters for pagination
limitStr := r.URL.Query().Get("limit") limitStr := r.URL.Query().Get("limit")
offsetStr := r.URL.Query().Get("offset") offsetStr := r.URL.Query().Get("offset")
limit := 10 // Default limit limit := 10 // Default limit
offset := 0 // Default offset offset := 0 // Default offset
if limitStr != "" { if limitStr != "" {
if val, err := strconv.Atoi(limitStr); err == nil && val > 0 { if val, err := strconv.Atoi(limitStr); err == nil && val > 0 {
limit = val limit = val
} }
} }
if offsetStr != "" { if offsetStr != "" {
if val, err := strconv.Atoi(offsetStr); err == nil && val >= 0 { if val, err := strconv.Atoi(offsetStr); err == nil && val >= 0 {
offset = val offset = val
} }
} }
// Get trending history for kind 20 // Get trending history for kind 20
history, err := trending.GetTrendingHistoryForKind(db.DB.DB, 20, limit, offset) history, err := trending.GetTrendingHistoryForKind(db.DB.DB, 20, limit, offset)
if err != nil { if err != nil {
http.Error(w, fmt.Sprintf("Error getting trending history: %v", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("Error getting trending history: %v", err), http.StatusInternalServerError)
return return
} }
// Get total count for pagination info // Get total count for pagination info
totalCount, err := trending.GetTrendingHistoryCount(db.DB.DB, 20) totalCount, err := trending.GetTrendingHistoryCount(db.DB.DB, 20)
if err != nil { if err != nil {
http.Error(w, fmt.Sprintf("Error getting trending history count: %v", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("Error getting trending history count: %v", err), http.StatusInternalServerError)
return return
} }
response := map[string]interface{}{ response := map[string]interface{}{
"history": history, "history": history,
"pagination": map[string]interface{}{ "pagination": map[string]interface{}{
"total": totalCount, "total": totalCount,
"limit": limit, "limit": limit,
"offset": offset, "offset": offset,
}, },
} }
if err := json.NewEncoder(w).Encode(response); err != nil { if err := json.NewEncoder(w).Encode(response); err != nil {
http.Error(w, fmt.Sprintf("Error encoding JSON: %v", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("Error encoding JSON: %v", err), http.StatusInternalServerError)
} }
@ -330,7 +330,7 @@ func main() {
// Add UI for trending history // Add UI for trending history
mux.HandleFunc("/trending/history", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/trending/history", func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("content-type", "text/html") w.Header().Set("content-type", "text/html")
fmt.Fprintf(w, ` fmt.Fprintf(w, `
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">

12
relay/trending/kinds.go
View File

@ -134,23 +134,23 @@ func calculateTrendingKind20(db *sql.DB) ([]Post, error) {
// Update in-memory cache // Update in-memory cache
trendingCache.Set("trending_kind_20", trendingPosts, cacheDuration) trendingCache.Set("trending_kind_20", trendingPosts, cacheDuration)
// Save to database for historical records // Save to database for historical records
postsJSON, err := json.Marshal(trendingPosts) postsJSON, err := json.Marshal(trendingPosts)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to marshal trending posts to JSON: %w", err) return nil, fmt.Errorf("failed to marshal trending posts to JSON: %w", err)
} }
_, err = db.Exec(` _, err = db.Exec(`
INSERT INTO trending_history (calculation_time, kind, trending_data) INSERT INTO trending_history (calculation_time, kind, trending_data)
VALUES (NOW(), 20, $1) VALUES (NOW(), 20, $1)
`, postsJSON) `, postsJSON)
if err != nil { if err != nil {
fmt.Printf("Warning: failed to store trending data in database: %v\n", err) fmt.Printf("Warning: failed to store trending data in database: %v\n", err)
// Don't return error here as we want to still return the trending posts even if saving fails // Don't return error here as we want to still return the trending posts even if saving fails
} }
return trendingPosts, nil return trendingPosts, nil
} }
@ -171,10 +171,10 @@ func GetTrendingHistoryCount(db *sql.DB, kind int) (int, error) {
FROM trending_history FROM trending_history
WHERE kind = $1 WHERE kind = $1
`, kind).Scan(&count) `, kind).Scan(&count)
if err != nil { if err != nil {
return 0, fmt.Errorf("failed to count trending history: %w", err) return 0, fmt.Errorf("failed to count trending history: %w", err)
} }
return count, nil return count, nil
} }

2
relay/trending/schema.go
View File

@ -137,4 +137,4 @@ type TrendingHistoryEntry struct {
ID int `json:"id"` ID int `json:"id"`
CalculationTime time.Time `json:"calculation_time"` CalculationTime time.Time `json:"calculation_time"`
Posts []Post `json:"posts"` Posts []Post `json:"posts"`
} }