pkg/internal/server/api/news_api.go

@@ -9,23 +9,15 @@ import (
 func listNewsArticles(c *fiber.Ctx) error {
 	take := c.QueryInt("take", 0)
 	offset := c.QueryInt("offset", 0)
-	source := c.Query("source")
-
-	tx := database.C
-
-	if len(source) > 0 {
-		tx = tx.Where("source = ?", source)
-	}
 
 	var count int64
-	countTx := tx
+	if err := database.C.Model(&models.NewsArticle{}).Count(&count).Error; err != nil {
-	if err := countTx.Model(&models.NewsArticle{}).Count(&count).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}
 
 	var articles []models.NewsArticle
-	if err := tx.Limit(take).Offset(offset).
+	if err := database.C.Limit(take).Offset(offset).
-		Omit("Content").Order("COALESCE(published_at, created_at) DESC").
+		Omit("Content").Order("created_at DESC").
 		Find(&articles).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}

pkg/internal/server/api/well_known_api.go

@@ -1,14 +1,10 @@
 package api
 
 import (
-	"git.solsynth.dev/hypernet/reader/pkg/internal/models"
 	"git.solsynth.dev/hypernet/reader/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
-	"github.com/samber/lo"
 )
 
 func getNewsSources(c *fiber.Ctx) error {
-	return c.JSON(lo.Filter(services.NewsSources, func(item models.NewsSource, index int) bool {
+	return c.JSON(services.NewsSources)
-		return item.Enabled
-	}))
 }