pkg/internal/models/posts.go

@@ -30,7 +30,6 @@ type Post struct {
 
 	IsDraft     bool       `json:"is_draft"`
 	PublishedAt *time.Time `json:"published_at"`
-	PublishedUntil *time.Time `json:"published_until"`
 
 	AuthorID uint    `json:"author_id"`
 	Author   Account `json:"author"`

pkg/internal/server/api/articles_api.go

@@ -23,12 +23,11 @@ func createArticle(c *fiber.Ctx) error {
 		Description *string           `json:"description" validate:"max=2048"`
 		Content     string            `json:"content" validate:"required"`
 		Attachments []uint            `json:"attachments"`
-		Tags           []models.Tag      `json:"tags"`
-		Categories     []models.Category `json:"categories"`
 		PublishedAt *time.Time        `json:"published_at"`
-		PublishedUntil *time.Time        `json:"published_until"`
 		IsDraft     bool              `json:"is_draft"`
 		RealmAlias  *string           `json:"realm"`
+		Tags        []models.Tag      `json:"tags"`
+		Categories  []models.Category `json:"categories"`
 	}
 
 	if err := exts.BindAndValidate(c, &data); err != nil {
@@ -49,12 +48,10 @@ func createArticle(c *fiber.Ctx) error {
 	item := models.Post{
 		Type:        models.PostTypeArticle,
 		Body:        bodyMapping,
-		Language:       services.DetectLanguage(data.Content),
 		Tags:        data.Tags,
 		Categories:  data.Categories,
 		IsDraft:     data.IsDraft,
 		PublishedAt: data.PublishedAt,
-		PublishedUntil: data.PublishedUntil,
 		AuthorID:    user.ID,
 	}
 
@@ -88,11 +85,10 @@ func editArticle(c *fiber.Ctx) error {
 		Description *string           `json:"description" validate:"max=2048"`
 		Content     string            `json:"content" validate:"required"`
 		Attachments []uint            `json:"attachments"`
-		Tags           []models.Tag      `json:"tags"`
-		Categories     []models.Category `json:"categories"`
 		IsDraft     bool              `json:"is_draft"`
 		PublishedAt *time.Time        `json:"published_at"`
-		PublishedUntil *time.Time        `json:"published_until"`
+		Tags        []models.Tag      `json:"tags"`
+		Categories  []models.Category `json:"categories"`
 	}
 
 	if err := exts.BindAndValidate(c, &data); err != nil {
@@ -118,12 +114,10 @@ func editArticle(c *fiber.Ctx) error {
 	_ = jsoniter.Unmarshal(rawBody, &bodyMapping)
 
 	item.Body = bodyMapping
-	item.Language = services.DetectLanguage(data.Content)
-	item.Tags = data.Tags
-	item.Categories = data.Categories
 	item.IsDraft = data.IsDraft
 	item.PublishedAt = data.PublishedAt
-	item.PublishedUntil = data.PublishedUntil
+	item.Tags = data.Tags
+	item.Categories = data.Categories
 
 	if item, err := services.EditPost(item); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())

pkg/internal/server/api/stories_api.go

@@ -26,7 +26,6 @@ func createStory(c *fiber.Ctx) error {
 		Tags        []models.Tag      `json:"tags"`
 		Categories  []models.Category `json:"categories"`
 		PublishedAt *time.Time        `json:"published_at"`
-		PublishedUntil *time.Time        `json:"published_until"`
 		IsDraft     bool              `json:"is_draft"`
 		RealmAlias  *string           `json:"realm"`
 		ReplyTo     *uint             `json:"reply_to"`
@@ -51,12 +50,10 @@ func createStory(c *fiber.Ctx) error {
 	item := models.Post{
 		Type:        models.PostTypeStory,
 		Body:        bodyMapping,
-		Language:       services.DetectLanguage(data.Content),
 		Tags:        data.Tags,
 		Categories:  data.Categories,
-		PublishedAt:    data.PublishedAt,
-		PublishedUntil: data.PublishedUntil,
 		IsDraft:     data.IsDraft,
+		PublishedAt: data.PublishedAt,
 		AuthorID:    user.ID,
 	}
 
@@ -107,11 +104,10 @@ func editStory(c *fiber.Ctx) error {
 		Content     string            `json:"content" validate:"required,max=4096"`
 		Location    *string           `json:"location" validate:"max=2048"`
 		Attachments []uint            `json:"attachments"`
+		IsDraft     bool              `json:"is_draft"`
+		PublishedAt *time.Time        `json:"published_at"`
 		Tags        []models.Tag      `json:"tags"`
 		Categories  []models.Category `json:"categories"`
-		PublishedAt    *time.Time        `json:"published_at"`
-		PublishedUntil *time.Time        `json:"published_until"`
-		IsDraft        bool              `json:"is_draft"`
 	}
 
 	if err := exts.BindAndValidate(c, &data); err != nil {
@@ -138,12 +134,10 @@ func editStory(c *fiber.Ctx) error {
 	_ = jsoniter.Unmarshal(rawBody, &bodyMapping)
 
 	item.Body = bodyMapping
-	item.Language = services.DetectLanguage(data.Content)
+	item.IsDraft = data.IsDraft
+	item.PublishedAt = data.PublishedAt
 	item.Tags = data.Tags
 	item.Categories = data.Categories
-	item.PublishedAt = data.PublishedAt
-	item.PublishedUntil = data.PublishedUntil
-	item.IsDraft = data.IsDraft
 
 	if item, err := services.EditPost(item); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())

pkg/internal/services/languages.go

@@ -5,12 +5,14 @@ import (
 	"strings"
 )
 
-func DetectLanguage(content string) string {
+func DetectLanguage(content *string) string {
+	if content != nil {
 		detector := lingua.NewLanguageDetectorBuilder().
 			FromLanguages(lingua.AllLanguages()...).
 			Build()
-	if lang, ok := detector.DetectLanguageOf(content); ok {
+		if lang, ok := detector.DetectLanguageOf(*content); ok {
 			return strings.ToLower(lang.String())
 		}
+	}
 	return "unknown"
 }

pkg/internal/services/posts.go

@@ -44,9 +44,7 @@ func FilterPostReply(tx *gorm.DB, replyTo ...uint) *gorm.DB {
 }
 
 func FilterPostWithPublishedAt(tx *gorm.DB, date time.Time) *gorm.DB {
-	return tx.
+	return tx.Where("published_at <= ? OR published_at IS NULL", date)
-		Where("published_at <= ? OR published_at IS NULL", date).
-		Where("published_until > ? OR published_until IS NULL", date)
 }
 
 func FilterPostWithAuthorDraft(tx *gorm.DB, uid uint) *gorm.DB {
@@ -123,7 +121,7 @@ func ListPost(tx *gorm.DB, take int, offset int, noReact ...bool) ([]*models.Pos
 	var items []*models.Post
 	if err := tx.
 		Limit(take).Offset(offset).
-		Order("published_at DESC").
+		Order("created_at DESC").
 		Preload("Tags").
 		Preload("Categories").
 		Preload("Realm").
@@ -218,10 +216,6 @@ func EnsurePostCategoriesAndTags(item models.Post) (models.Post, error) {
 }
 
 func NewPost(user models.Account, item models.Post) (models.Post, error) {
-	if !item.IsDraft && item.PublishedAt == nil {
-		item.PublishedAt = lo.ToPtr(time.Now())
-	}
-
 	item, err := EnsurePostCategoriesAndTags(item)
 	if err != nil {
 		return item, err