pkg/models/messages.go

@@ -7,6 +7,7 @@ type MessageType = uint8
 const (
 	MessageTypeText = MessageType(iota)
 	MessageTypeAudio
+	MessageTypeFile
 )
 
 type Message struct {
@@ -18,8 +19,6 @@ type Message struct {
 	Attachments []Attachment      `json:"attachments"`
 	Channel     Channel           `json:"channel"`
 	Sender      ChannelMember     `json:"sender"`
-	ReplyID     *uint             `json:"reply_id"`
-	ReplyTo     *Message          `json:"reply_to" gorm:"foreignKey:ReplyID"`
 	ChannelID   uint              `json:"channel_id"`
 	SenderID    uint              `json:"sender_id"`
 }

pkg/server/messages_api.go

@@ -1,8 +1,6 @@
 package server
 
 import (
-	"fmt"
-	"git.solsynth.dev/hydrogen/messaging/pkg/database"
 	"git.solsynth.dev/hydrogen/messaging/pkg/models"
 	"git.solsynth.dev/hydrogen/messaging/pkg/services"
 	"github.com/gofiber/fiber/v2"
@@ -37,40 +35,16 @@ func newTextMessage(c *fiber.Ctx) error {
 	var data struct {
 		Content     string              `json:"content" validate:"required"`
 		Attachments []models.Attachment `json:"attachments"`
-		ReplyTo     *uint               `json:"reply_to"`
 	}
 
 	if err := BindAndValidate(c, &data); err != nil {
 		return err
 	}
 
-	channel, member, err := services.GetAvailableChannelWithAlias(alias, user)
-	if err != nil {
+	var message models.Message
+	if channel, member, err := services.GetAvailableChannelWithAlias(alias, user); err != nil {
 		return fiber.NewError(fiber.StatusNotFound, err.Error())
-	}
-
-	message := models.Message{
-		Content:     data.Content,
-		Metadata:    nil,
-		Sender:      member,
-		Channel:     channel,
-		ChannelID:   channel.ID,
-		SenderID:    member.ID,
-		Attachments: data.Attachments,
-		Type:        models.MessageTypeText,
-	}
-
-	var replyTo models.Message
-	if data.ReplyTo != nil {
-		if err := database.C.Where("id = ?", data.ReplyTo).First(&replyTo).Error; err != nil {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("message to reply was not found: %v", err))
-		} else {
-			message.ReplyTo = &replyTo
-			message.ReplyID = &replyTo.ID
-		}
-	}
-
-	if message, err = services.NewMessage(message); err != nil {
+	} else if message, err = services.NewTextMessage(data.Content, member, channel, data.Attachments...); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}
 

pkg/services/messages.go

@@ -28,7 +28,6 @@ func ListMessage(channel models.Channel, take int, offset int) ([]models.Message
 		}).Limit(take).Offset(offset).
 		Order("created_at DESC").
 		Preload("Attachments").
-		Preload("ReplyTo").
 		Preload("Sender").
 		Preload("Sender.Account").
 		Find(&messages).Error; err != nil {
@@ -45,7 +44,6 @@ func GetMessage(channel models.Channel, id uint) (models.Message, error) {
 			BaseModel: models.BaseModel{ID: id},
 			ChannelID: channel.ID,
 		}).
-		Preload("ReplyTo").
 		Preload("Attachments").
 		Preload("Sender").
 		Preload("Sender.Account").
@@ -69,15 +67,24 @@ func GetMessageWithPrincipal(channel models.Channel, member models.ChannelMember
 	}
 }
 
-func NewMessage(message models.Message) (models.Message, error) {
+func NewTextMessage(content string, sender models.ChannelMember, channel models.Channel, attachments ...models.Attachment) (models.Message, error) {
+	message := models.Message{
+		Content:     content,
+		Metadata:    nil,
+		ChannelID:   channel.ID,
+		SenderID:    sender.ID,
+		Attachments: attachments,
+		Type:        models.MessageTypeText,
+	}
+
 	var members []models.ChannelMember
 	if err := database.C.Save(&message).Error; err != nil {
 		return message, err
 	} else if err = database.C.Where(models.ChannelMember{
-		ChannelID: message.ChannelID,
+		ChannelID: channel.ID,
 	}).Find(&members).Error; err == nil {
 		for _, member := range members {
-			message, _ = GetMessage(message.Channel, message.ID)
+			message, _ = GetMessage(channel, message.ID)
 			PushCommand(member.AccountID, models.UnifiedCommand{
 				Action:  "messages.new",
 				Payload: message,
@@ -110,20 +117,19 @@ func EditMessage(message models.Message) (models.Message, error) {
 }
 
 func DeleteMessage(message models.Message) (models.Message, error) {
-	prev, _ := GetMessage(models.Channel{
-		BaseModel: models.BaseModel{ID: message.Channel.ID},
-	}, message.ID)
-
 	var members []models.ChannelMember
 	if err := database.C.Delete(&message).Error; err != nil {
 		return message, err
 	} else if err = database.C.Where(models.ChannelMember{
 		ChannelID: message.ChannelID,
 	}).Find(&members).Error; err == nil {
+		message, _ = GetMessage(models.Channel{
+			BaseModel: models.BaseModel{ID: message.Channel.ID},
+		}, message.ID)
 		for _, member := range members {
 			PushCommand(member.AccountID, models.UnifiedCommand{
 				Action:  "messages.burnt",
-				Payload: prev,
+				Payload: message,
 			})
 		}
 	}