♻️ Refactored feed module

pkg/internal/server/api/admin_api.go

@@ -2,14 +2,9 @@ package api
 
 import (
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
-	"git.solsynth.dev/hypernet/reader/pkg/internal/database"
-	"git.solsynth.dev/hypernet/reader/pkg/internal/models"
 	"git.solsynth.dev/hypernet/reader/pkg/internal/server/exts"
 	"git.solsynth.dev/hypernet/reader/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
-	"github.com/rs/zerolog/log"
-	"github.com/samber/lo"
-	"gorm.io/gorm/clause"
 )
 
 func adminTriggerScanTask(c *fiber.Ctx) error {
@@ -26,36 +21,7 @@ func adminTriggerScanTask(c *fiber.Ctx) error {
 		return err
 	}
 
-	go func() {
-		count := 0
-		for _, src := range services.GetNewsSources() {
-			if !src.Enabled {
-				continue
-			}
-			if len(data.Sources) > 0 && !lo.Contains(data.Sources, src.ID) {
-				continue
-			}
-
-			log.Debug().Str("source", src.ID).Msg("Scanning news source...")
-			result, err := services.NewsSourceRead(src, data.Eager)
-			if err != nil {
-				log.Warn().Err(err).Str("source", src.ID).Msg("Failed to scan a news source.")
-			}
-
-			result = lo.UniqBy(result, func(item models.NewsArticle) string {
-				return item.Hash
-			})
-			database.C.Clauses(clause.OnConflict{
-				Columns:   []clause.Column{{Name: "hash"}},
-				DoUpdates: clause.AssignmentColumns([]string{"thumbnail", "title", "content", "description", "published_at"}),
-			}).Create(&result)
-
-			log.Info().Str("source", src.ID).Int("count", len(result)).Msg("Scanned a news sources.")
-			count += len(result)
-		}
-
-		log.Info().Int("count", count).Msg("Scanned all news sources.")
-	}()
+	go services.FetchFeedTimed()
 
 	return c.SendStatus(fiber.StatusOK)
 }

pkg/internal/server/api/feed_subscriptions_api.go

@@ -0,0 +1,170 @@
+package api
+
+import (
+	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
+	"git.solsynth.dev/hypernet/reader/pkg/internal/database"
+	"git.solsynth.dev/hypernet/reader/pkg/internal/models"
+	"git.solsynth.dev/hypernet/reader/pkg/internal/server/exts"
+	"github.com/gofiber/fiber/v2"
+)
+
+func listFeedSubscriptions(c *fiber.Ctx) error {
+	take := c.QueryInt("take", 10)
+	offset := c.QueryInt("offset", 0)
+
+	var count int64
+	if err := database.C.Model(&models.SubscriptionFeed{}).Count(&count).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+	var feeds []models.SubscriptionFeed
+	if err := database.C.Take(take).Offset(offset).Find(&feeds).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(fiber.Map{
+		"count": count,
+		"data":  feeds,
+	})
+}
+
+func listCreatedFeedSubscriptions(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("nex_user").(*sec.UserInfo)
+
+	take := c.QueryInt("take", 10)
+	offset := c.QueryInt("offset", 0)
+
+	tx := database.C.Where("account_id = ?", user.ID)
+
+	var count int64
+	countTx := tx
+	if err := countTx.Model(&models.SubscriptionFeed{}).Count(&count).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+	var feeds []models.SubscriptionFeed
+	if err := tx.Take(take).Offset(offset).Find(&feeds).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(fiber.Map{
+		"count": count,
+		"data":  feeds,
+	})
+}
+
+func getFeedSubscription(c *fiber.Ctx) error {
+	id, _ := c.ParamsInt("id", 0)
+
+	var feed models.SubscriptionFeed
+	if err := database.C.Where("id = ?", id).First(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	return c.JSON(feed)
+}
+
+func createFeedSubscription(c *fiber.Ctx) error {
+	if err := sec.EnsureGrantedPerm(c, "CreateFeedSubscription", true); err != nil {
+		return err
+	}
+	user := c.Locals("nex_user").(*sec.UserInfo)
+
+	var data struct {
+		URL          string `json:"url" validate:"required,url"`
+		PullInterval int    `json:"pull_interval" validate:"required,min=6,max=720"`
+		Adapter      string `json:"adapter"`
+	}
+	if err := exts.BindAndValidate(c, &data); err != nil {
+		return err
+	}
+
+	feed := models.SubscriptionFeed{
+		URL:          data.URL,
+		PullInterval: data.PullInterval,
+		Adapter:      data.Adapter,
+		AccountID:    &user.ID,
+	}
+
+	if err := database.C.Create(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(feed)
+}
+
+func updateFeedSubscription(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("nex_user").(*sec.UserInfo)
+
+	id, _ := c.ParamsInt("id", 0)
+
+	var data struct {
+		URL          string `json:"url" validate:"required,url"`
+		PullInterval int    `json:"pull_interval" validate:"required,min=6,max=720"`
+		Adapter      string `json:"adapter"`
+	}
+	if err := exts.BindAndValidate(c, &data); err != nil {
+		return err
+	}
+
+	var feed models.SubscriptionFeed
+	if err := database.C.Where("account_id = ? AND id = ?", user.ID, id).First(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	feed.URL = data.URL
+	feed.PullInterval = data.PullInterval
+	feed.Adapter = data.Adapter
+
+	if err := database.C.Save(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(feed)
+}
+
+func toggleFeedSubscription(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("nex_user").(*sec.UserInfo)
+
+	id, _ := c.ParamsInt("id", 0)
+
+	var feed models.SubscriptionFeed
+	if err := database.C.Where("account_id = ? AND id = ?", user.ID, id).First(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	feed.IsEnabled = !feed.IsEnabled
+
+	if err := database.C.Save(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(feed)
+}
+
+func deleteFeedSubscription(c *fiber.Ctx) error {
+	if err := sec.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("nex_user").(*sec.UserInfo)
+
+	id, _ := c.ParamsInt("id", 0)
+
+	var feed models.SubscriptionFeed
+	if err := database.C.Where("account_id = ? AND id = ?", user.ID, id).First(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusNotFound, err.Error())
+	}
+
+	if err := database.C.Delete(&feed).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.SendStatus(fiber.StatusOK)
+}

pkg/internal/server/api/index.go

@@ -8,8 +8,6 @@ import (
 func MapAPIs(app *fiber.App, baseURL string) {
 	api := app.Group(baseURL).Name("API")
 	{
-		api.Get("/well-known/sources", getNewsSources)
-
 		admin := api.Group("/admin").Name("Admin")
 		{
 			admin.Post("/scan", sec.ValidatorMiddleware, adminTriggerScanTask)
@@ -17,11 +15,18 @@ func MapAPIs(app *fiber.App, baseURL string) {
 
 		api.Get("/link/*", getLinkMeta)
 
-		news := api.Group("/news").Name("News")
+		subscription := api.Group("/subscriptions").Name("Subscriptions")
 		{
-			news.Get("/today", getTodayNews)
-			news.Get("/", listNewsArticles)
-			news.Get("/:hash", getNewsArticle)
+			feed := subscription.Group("/feed").Name("Feed")
+			{
+				feed.Get("/", listFeedSubscriptions)
+				feed.Get("/me", listCreatedFeedSubscriptions)
+				feed.Get("/:id", getFeedSubscription)
+				feed.Post("/", createFeedSubscription)
+				feed.Put("/:id", updateFeedSubscription)
+				feed.Post("/:id/toggle", toggleFeedSubscription)
+				feed.Delete("/:id", deleteFeedSubscription)
+			}
 		}
 	}
 }

pkg/internal/server/api/news_api.go

@@ -1,96 +0,0 @@
-package api
-
-import (
-	"time"
-
-	"git.solsynth.dev/hypernet/reader/pkg/internal/services"
-
-	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
-	"git.solsynth.dev/hypernet/reader/pkg/internal/database"
-	"git.solsynth.dev/hypernet/reader/pkg/internal/models"
-	"github.com/gofiber/fiber/v2"
-)
-
-func getTodayNews(c *fiber.Ctx) error {
-	tx := database.C
-	today := time.Now().Format("2006-01-02")
-	tx = tx.Where("DATE(COALESCE(published_at, created_at)) = ?", today)
-
-	var count int64
-	countTx := tx
-	if err := countTx.Model(&models.NewsArticle{}).Count(&count).Error; err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
-	}
-
-	var article models.NewsArticle
-	if err := tx.
-		Omit("Content").Order("COALESCE(published_at, created_at) DESC").
-		First(&article).Error; err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
-	}
-
-	return c.JSON(fiber.Map{
-		"count": count,
-		"data":  article,
-	})
-}
-
-func listNewsArticles(c *fiber.Ctx) error {
-	if err := sec.EnsureGrantedPerm(c, "ListNews", true); err != nil {
-		return err
-	}
-
-	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)
-	}
-
-	isAdvanced := false
-	if err := sec.EnsureGrantedPerm(c, "ListNewsAdvanced", true); err == nil {
-		isAdvanced = true
-	}
-
-	var sources []string
-	for _, srv := range services.GetNewsSources() {
-		if !isAdvanced && srv.Advanced {
-			continue
-		}
-		sources = append(sources, srv.ID)
-	}
-
-	tx = tx.Where("source IN ?", sources)
-
-	var count int64
-	countTx := tx
-	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).
-		Omit("Content").Order("COALESCE(published_at, created_at) DESC").
-		Find(&articles).Error; err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
-	}
-
-	return c.JSON(fiber.Map{
-		"count": count,
-		"data":  articles,
-	})
-}
-
-func getNewsArticle(c *fiber.Ctx) error {
-	hash := c.Params("hash")
-
-	var article models.NewsArticle
-	if err := database.C.Where("hash = ?", hash).First(&article).Error; err != nil {
-		return fiber.NewError(fiber.StatusNotFound, err.Error())
-	}
-
-	return c.JSON(article)
-}

pkg/internal/server/api/well_known_api.go

@@ -1,23 +0,0 @@
-package api
-
-import (
-	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
-	"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 {
-	isAdvanced := false
-	if err := sec.EnsureGrantedPerm(c, "ListNewsAdvanced", true); err == nil {
-		isAdvanced = true
-	}
-
-	return c.JSON(lo.Filter(services.GetNewsSources(), func(item models.NewsSource, index int) bool {
-		if !isAdvanced && item.Advanced {
-			return false
-		}
-		return item.Enabled
-	}))
-}