Enhance comment functionality with image support and validation.

server/api/comment.go

@@ -28,11 +28,17 @@ func createComment(c fiber.Ctx) error {
 	if err != nil {
 		return model.NewRequestError("Invalid resource ID")
 	}
-	content := c.FormValue("content")
-	if content == "" {
+
+	var req service.CommentRequest
+	if err := c.Bind().JSON(&req); err != nil {
+		return model.NewRequestError("Invalid request format")
+	}
+
+	if req.Content == "" {
 		return model.NewRequestError("Content cannot be empty")
 	}
-	comment, err := service.CreateComment(content, userID, uint(resourceID))
+
+	comment, err := service.CreateComment(req, userID, uint(resourceID))
 	if err != nil {
 		return err
 	}
@@ -102,11 +108,17 @@ func updateComment(c fiber.Ctx) error {
 	if err != nil {
 		return model.NewRequestError("Invalid comment ID")
 	}
-	content := c.FormValue("content")
-	if content == "" {
+
+	var req service.CommentRequest
+	if err := c.Bind().JSON(&req); err != nil {
+		return model.NewRequestError("Invalid request format")
+	}
+
+	if req.Content == "" {
 		return model.NewRequestError("Content cannot be empty")
 	}
-	comment, err := service.UpdateComment(uint(commentID), userID, content)
+
+	comment, err := service.UpdateComment(uint(commentID), userID, req)
 	if err != nil {
 		return err
 	}

server/api/image.go

@@ -19,7 +19,8 @@ func handleUploadImage(c fiber.Ctx) error {
 	if !strings.HasPrefix(contentType, "image/") {
 		return model.NewRequestError("Invalid image format")
 	}
-	id, err := service.CreateImage(uid, data)
+	ip := c.IP()
+	id, err := service.CreateImage(uid, ip, data)
 	if err != nil {
 		return err
 	}

server/dao/comment.go

@@ -6,7 +6,7 @@ import (
 	"gorm.io/gorm"
 )
 
-func CreateComment(content string, userID uint, resourceID uint) (model.Comment, error) {
+func CreateComment(content string, userID uint, resourceID uint, imageIDs []uint) (model.Comment, error) {
 	var comment model.Comment
 	err := db.Transaction(func(tx *gorm.DB) error {
 		comment = model.Comment{
@@ -17,6 +17,20 @@ func CreateComment(content string, userID uint, resourceID uint) (model.Comment,
 		if err := tx.Create(&comment).Error; err != nil {
 			return err
 		}
+
+		// 关联图片
+		if len(imageIDs) > 0 {
+			// 查找所有指定的图片
+			var images []model.Image
+			if err := tx.Where("id IN ?", imageIDs).Find(&images).Error; err != nil {
+				return err
+			}
+			// 建立关联关系
+			if err := tx.Model(&comment).Association("Images").Replace(images); err != nil {
+				return err
+			}
+		}
+
 		if err := tx.Model(&model.User{}).Where("id = ?", userID).Update("comments_count", gorm.Expr("comments_count + 1")).Error; err != nil {
 			return err
 		}
@@ -25,6 +39,9 @@ func CreateComment(content string, userID uint, resourceID uint) (model.Comment,
 	if err != nil {
 		return model.Comment{}, err
 	}
+
+	// 重新加载评论以获取关联的图片
+	db.Preload("Images").Where("id = ?", comment.ID).First(&comment)
 	return comment, nil
 }
 
@@ -36,7 +53,7 @@ func GetCommentByResourceID(resourceID uint, page, pageSize int) ([]model.Commen
 		return nil, 0, err
 	}
 
-	if err := db.Where("resource_id = ?", resourceID).Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Order("created_at DESC").Find(&comments).Error; err != nil {
+	if err := db.Where("resource_id = ?", resourceID).Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Images").Order("created_at DESC").Find(&comments).Error; err != nil {
 		return nil, 0, err
 	}
 
@@ -56,7 +73,7 @@ func GetCommentsWithUser(username string, page, pageSize int) ([]model.Comment,
 	if err := db.Model(&model.Comment{}).Where("user_id = ?", user.ID).Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
-	if err := db.Where("user_id = ?", user.ID).Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Resource").Order("created_at DESC").Find(&comments).Error; err != nil {
+	if err := db.Where("user_id = ?", user.ID).Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Resource").Preload("Images").Order("created_at DESC").Find(&comments).Error; err != nil {
 		return nil, 0, err
 	}
 	totalPages := (int(total) + pageSize - 1) / pageSize
@@ -65,22 +82,43 @@ func GetCommentsWithUser(username string, page, pageSize int) ([]model.Comment,
 
 func GetCommentByID(commentID uint) (*model.Comment, error) {
 	var comment model.Comment
-	if err := db.Preload("User").Preload("Resource").First(&comment, commentID).Error; err != nil {
+	if err := db.Preload("User").Preload("Resource").Preload("Images").First(&comment, commentID).Error; err != nil {
 		return nil, err
 	}
 	return &comment, nil
 }
 
-func UpdateCommentContent(commentID uint, content string) (*model.Comment, error) {
+func UpdateCommentContent(commentID uint, content string, imageIDs []uint) (*model.Comment, error) {
 	var comment model.Comment
-	if err := db.First(&comment, commentID).Error; err != nil {
+	err := db.Transaction(func(tx *gorm.DB) error {
+		if err := tx.First(&comment, commentID).Error; err != nil {
+			return err
+		}
+		comment.Content = content
+		if err := tx.Save(&comment).Error; err != nil {
+			return err
+		}
+
+		// 更新图片关联
+		if imageIDs != nil {
+			// 查找所有指定的图片
+			var images []model.Image
+			if err := tx.Where("id IN ?", imageIDs).Find(&images).Error; err != nil {
+				return err
+			}
+			// 替换关联关系
+			if err := tx.Model(&comment).Association("Images").Replace(images); err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+	if err != nil {
 		return nil, err
 	}
-	comment.Content = content
-	if err := db.Save(&comment).Error; err != nil {
-		return nil, err
-	}
-	db.Preload("User").First(&comment, commentID)
+
+	// 重新加载评论以获取关联的图片和用户信息
+	db.Preload("User").Preload("Images").First(&comment, commentID)
 	return &comment, nil
 }
 
@@ -90,6 +128,12 @@ func DeleteCommentByID(commentID uint) error {
 		if err := tx.First(&comment, commentID).Error; err != nil {
 			return err
 		}
+
+		// 清除图片关联
+		if err := tx.Model(&comment).Association("Images").Clear(); err != nil {
+			return err
+		}
+
 		if err := tx.Delete(&comment).Error; err != nil {
 			return err
 		}

server/dao/image.go

@@ -2,10 +2,8 @@ package dao
 
 import (
 	"errors"
-	"nysoure/server/model"
-	"time"
-
 	"gorm.io/gorm"
+	"nysoure/server/model"
 )
 
 func CreateImage(name string, width, height int) (model.Image, error) {
@@ -42,10 +40,11 @@ func DeleteImage(id uint) error {
 func GetUnusedImages() ([]model.Image, error) {
 	// Retrieve all images that are not used in any post
 	var images []model.Image
-	oneDayAgo := time.Now().Add(-24 * time.Hour)
+	// oneDayAgo := time.Now().Add(-24 * time.Hour)
 	if err := db.
 		Where("NOT EXISTS (SELECT 1 FROM resource_images WHERE image_id = images.id)").
-		Where("created_at < ?", oneDayAgo).
+		Where("NOT EXISTS (SELECT 1 FROM comment_images WHERE image_id = images.id)").
+		// Where("created_at < ?", oneDayAgo).
 		Find(&images).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, nil

server/model/comment.go

@@ -13,21 +13,29 @@ type Comment struct {
 	UserID     uint     `gorm:"not null"`
 	User       User     `gorm:"foreignKey:UserID"`
 	Resource   Resource `gorm:"foreignKey:ResourceID"`
+	Images     []Image  `gorm:"many2many:comment_images;"`
 }
 
 type CommentView struct {
-	ID        uint      `json:"id"`
-	Content   string    `json:"content"`
-	CreatedAt time.Time `json:"created_at"`
-	User      UserView  `json:"user"`
+	ID        uint        `json:"id"`
+	Content   string      `json:"content"`
+	CreatedAt time.Time   `json:"created_at"`
+	User      UserView    `json:"user"`
+	Images    []ImageView `json:"images"`
 }
 
 func (c *Comment) ToView() *CommentView {
+	imageViews := make([]ImageView, 0, len(c.Images))
+	for _, img := range c.Images {
+		imageViews = append(imageViews, img.ToView())
+	}
+
 	return &CommentView{
 		ID:        c.ID,
 		Content:   c.Content,
 		CreatedAt: c.CreatedAt,
 		User:      c.User.ToView(),
+		Images:    imageViews,
 	}
 }
 
@@ -37,14 +45,21 @@ type CommentWithResourceView struct {
 	CreatedAt time.Time    `json:"created_at"`
 	Resource  ResourceView `json:"resource"`
 	User      UserView     `json:"user"`
+	Images    []ImageView  `json:"images"`
 }
 
 func (c *Comment) ToViewWithResource() *CommentWithResourceView {
+	imageViews := make([]ImageView, 0, len(c.Images))
+	for _, img := range c.Images {
+		imageViews = append(imageViews, img.ToView())
+	}
+
 	return &CommentWithResourceView{
 		ID:        c.ID,
 		Content:   c.Content,
 		CreatedAt: c.CreatedAt,
 		Resource:  c.Resource.ToView(),
 		User:      c.User.ToView(),
+		Images:    imageViews,
 	}
 }

server/service/comment.go

@@ -7,7 +7,19 @@ import (
 	"github.com/gofiber/fiber/v3/log"
 )
 
-func CreateComment(content string, userID uint, resourceID uint) (*model.CommentView, error) {
+const (
+	maxImagePerComment = 9
+)
+
+type CommentRequest struct {
+	Content string `json:"content"`
+	Images  []uint `json:"images"`
+}
+
+func CreateComment(req CommentRequest, userID uint, resourceID uint) (*model.CommentView, error) {
+	if len(req.Images) > maxImagePerComment {
+		return nil, model.NewRequestError("Too many images, maximum is 9")
+	}
 	resourceExists, err := dao.ExistsResource(resourceID)
 	if err != nil {
 		log.Error("Error checking resource existence:", err)
@@ -24,7 +36,7 @@ func CreateComment(content string, userID uint, resourceID uint) (*model.Comment
 	if !userExists {
 		return nil, model.NewNotFoundError("User not found")
 	}
-	c, err := dao.CreateComment(content, userID, resourceID)
+	c, err := dao.CreateComment(req.Content, userID, resourceID, req.Images)
 	if err != nil {
 		log.Error("Error creating comment:", err)
 		return nil, model.NewInternalServerError("Error creating comment")
@@ -70,7 +82,10 @@ func ListCommentsWithUser(username string, page int) ([]model.CommentWithResourc
 	return res, totalPages, nil
 }
 
-func UpdateComment(commentID, userID uint, content string) (*model.CommentView, error) {
+func UpdateComment(commentID, userID uint, req CommentRequest) (*model.CommentView, error) {
+	if len(req.Images) > maxImagePerComment {
+		return nil, model.NewRequestError("Too many images, maximum is 9")
+	}
 	comment, err := dao.GetCommentByID(commentID)
 	if err != nil {
 		return nil, model.NewNotFoundError("Comment not found")
@@ -78,7 +93,7 @@ func UpdateComment(commentID, userID uint, content string) (*model.CommentView,
 	if comment.UserID != userID {
 		return nil, model.NewRequestError("You can only update your own comments")
 	}
-	updated, err := dao.UpdateCommentContent(commentID, content)
+	updated, err := dao.UpdateCommentContent(commentID, req.Content, req.Images)
 	if err != nil {
 		return nil, model.NewInternalServerError("Error updating comment")
 	}

server/service/image.go

@@ -11,6 +11,7 @@ import (
 	"nysoure/server/utils"
 	"os"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/gofiber/fiber/v3/log"
@@ -53,14 +54,51 @@ func init() {
 	}()
 }
 
-func CreateImage(uid uint, data []byte) (uint, error) {
+var (
+	imageUploadsByIP = make(map[string]uint)
+	imageUploadsLock = sync.RWMutex{}
+)
+
+const maxUploadsPerIP = 100
+
+func init() {
+	// Initialize the map with a cleanup function to remove old entries
+	go func() {
+		for {
+			time.Sleep(24 * time.Hour) // Cleanup every 24 hours
+			imageUploadsLock.Lock()
+			imageUploadsByIP = make(map[string]uint) // Clear the map
+			imageUploadsLock.Unlock()
+		}
+	}()
+}
+
+func addIpUploadCount(ip string) bool {
+	imageUploadsLock.Lock()
+	defer imageUploadsLock.Unlock()
+
+	count, exists := imageUploadsByIP[ip]
+	if !exists {
+		count = 0
+	}
+	if count >= maxUploadsPerIP {
+		return false // Exceeded upload limit for this IP
+	}
+	imageUploadsByIP[ip] = count + 1
+	return true // Upload count incremented successfully
+}
+
+func CreateImage(uid uint, ip string, data []byte) (uint, error) {
 	canUpload, err := checkUserCanUpload(uid)
 	if err != nil {
 		log.Error("Error checking user upload permission:", err)
 		return 0, model.NewInternalServerError("Error checking user upload permission")
 	}
 	if !canUpload {
-		return 0, model.NewUnAuthorizedError("User cannot upload images")
+		// For a normal user, check the IP upload limit
+		if !addIpUploadCount(ip) {
+			return 0, model.NewUnAuthorizedError("You have reached the maximum upload limit")
+		}
 	}
 
 	if len(data) == 0 {