pkg/internal/http/api/whats_new_api.go

@@ -1,10 +1,12 @@
 package api
 
 import (
+	"fmt"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -14,6 +16,35 @@ func getWhatsNew(c *fiber.Ctx) error {
 	}
 	user := c.Locals("user").(authm.Account)
 
+	var lookupRange []uint
+	var lookupPivots []int
+	var ignoreRange []uint
+	var channelMembers []models.ChannelMember
+	if err := database.C.Where("account_id = ?", user.ID).
+		Select("id", "channel_id", "reading_anchor").
+		Find(&channelMembers).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("unable to get channel identity of you: %v", err))
+	} else {
+		for _, member := range channelMembers {
+			if member.ReadingAnchor == nil {
+				continue
+			}
+			lookupRange = append(lookupRange, member.ChannelID)
+			lookupPivots = append(lookupPivots, *member.ReadingAnchor)
+			ignoreRange = append(ignoreRange, member.ID)
+		}
+	}
+
+	tx := database.C
+	tx = tx.Where("channel_id IN ?", lookupRange)
+	tx = tx.Where("sender_id NOT IN ?", ignoreRange)
+
+	countTx := tx
+	var count int64
+	if err := countTx.Model(&models.Event{}).Count(&count).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
 	var result []struct {
 		ChannelID          uint `json:"channel_id"`
 		UnreadMessageCount int  `json:"count"`
@@ -21,7 +52,7 @@ func getWhatsNew(c *fiber.Ctx) error {
 	if err := database.C.Table("channel_members cm").
 		Select("cm.channel_id, COUNT(m.id) AS unread_message_count").
 		Joins("JOIN messages m ON m.channel_id = cm.channel_id").
-		Where("m.id > cm.reading_anchor AND cm.account_id = ?", user.ID).
+		Where("m.id > cm.reading_anchor AND cm.account_id = ?", 1).
 		Group("cm.channel_id").
 		Scan(&result).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())

pkg/internal/services/reading_anchor.go

@@ -4,6 +4,7 @@ import (
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"github.com/rs/zerolog/log"
+	"github.com/samber/lo"
 	"gorm.io/gorm"
 )
 
@@ -21,15 +22,19 @@ func FlushReadingAnchor() {
 	if len(readingAnchorQueue) == 0 {
 		return
 	}
+	idSet := lo.Uniq(lo.Map(lo.Keys(readingAnchorQueue), func(item uint, _ int) uint {
+		return item
+	}))
+	var pairs []map[string]any
 	for k, v := range readingAnchorQueue {
-		if err := database.C.Model(&models.ChannelMember{}).
-			Where("id = ?", k).
-			Updates(map[string]any{
-				"reading_anchor": gorm.Expr("GREATEST(reading_anchor, ?)", v),
-			}).Error; err != nil {
-			log.Error().Err(err).Msg("An error occurred when flushing reading anchor...")
-			return
-		}
+		pairs = append(pairs, map[string]any{
+			"id":             k,
+			"reading_anchor": gorm.Expr("GREATEST(reading_anchor, ?)", v),
+		})
+	}
+	if err := database.C.Model(&models.ChannelMember{}).
+		Where("id IN ?", idSet).
+		Updates(pairs).Error; err != nil {
+		log.Error().Err(err).Msg("An error occurred when flushing reading anchor...")
 	}
-	clear(readingAnchorQueue)
 }