HyperNet/Messaging
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🗃️ Add relations between quoted event and original event

Browse Source
This commit is contained in:
LittleSheep 2024-11-18 22:56:10 +08:00
parent a79995e7c0
commit 6c60e250e1
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/internal/http/api/events_message_api.go
View File

@ -57,13 +57,14 @@ func newMessageEvent(c *fiber.Ctx) error {
_ = jsoniter.Unmarshal(raw, &parsed) _ = jsoniter.Unmarshal(raw, &parsed)
event := models.Event{ event := models.Event{
Uuid: data.Uuid, Uuid: data.Uuid,
Body: parsed, Body: parsed,
Type: data.Type, Type: data.Type,
Sender: member, Sender: member,
Channel: channel, Channel: channel,
ChannelID: channel.ID, QuoteEventID: data.Body.QuoteEventID,
SenderID: member.ID, ChannelID: channel.ID,
SenderID: member.ID,
} }
if event, err = services.NewEvent(event); err != nil { if event, err = services.NewEvent(event); err != nil {

20
pkg/internal/models/events.go
View File

@ -15,13 +15,15 @@ const (
type Event struct { type Event struct {
cruda.BaseModel cruda.BaseModel
Uuid string `json:"uuid"` Uuid string `json:"uuid"`
Body datatypes.JSONMap `json:"body"` Body datatypes.JSONMap `json:"body"`
Type string `json:"type"` Type string `json:"type"`
Channel Channel `json:"channel"` Channel Channel `json:"channel"`
Sender ChannelMember `json:"sender"` Sender ChannelMember `json:"sender"`
ChannelID uint `json:"channel_id"` QuoteEventID *uint `json:"quote_event_id,omitempty"`
SenderID uint `json:"sender_id"` QuoteEvent *Event `json:"quote_event,omitempty" gorm:"foreignKey:QuoteEventID"`
ChannelID uint `json:"channel_id"`
SenderID uint `json:"sender_id"`
} }
// Event Payloads // Event Payloads
@ -30,7 +32,7 @@ type EventMessageBody struct {
Text string `json:"text,omitempty"` Text string `json:"text,omitempty"`
Algorithm string `json:"algorithm,omitempty"` Algorithm string `json:"algorithm,omitempty"`
Attachments []string `json:"attachments,omitempty"` Attachments []string `json:"attachments,omitempty"`
QuoteEvent uint `json:"quote_event,omitempty"` QuoteEventID *uint `json:"quote_event,omitempty"`
RelatedEvent uint `json:"related_event,omitempty"` RelatedEvent *uint `json:"related_event,omitempty"`
RelatedUsers []uint `json:"related_users,omitempty"` RelatedUsers []uint `json:"related_users,omitempty"`
} }

19
pkg/internal/services/messages.go
View File

@ -19,15 +19,16 @@ func EditMessage(event models.Event, body models.EventMessageBody) (models.Event
if err != nil { if err != nil {
return event, err return event, err
} }
body.RelatedEvent = event.ID body.RelatedEvent = &event.ID
_, err = NewEvent(models.Event{ _, err = NewEvent(models.Event{
Uuid: uuid.NewString(), Uuid: uuid.NewString(),
Body: EncodeMessageBody(body), Body: EncodeMessageBody(body),
Type: models.EventMessageEdit, Type: models.EventMessageEdit,
Channel: event.Channel, Channel: event.Channel,
Sender: event.Sender, Sender: event.Sender,
ChannelID: event.ChannelID, QuoteEventID: body.QuoteEventID,
SenderID: event.SenderID, ChannelID: event.ChannelID,
SenderID: event.SenderID,
}) })
if err != nil { if err != nil {
return event, err return event, err
@ -44,7 +45,7 @@ func DeleteMessage(event models.Event) (models.Event, error) {
_, err = NewEvent(models.Event{ _, err = NewEvent(models.Event{
Uuid: uuid.NewString(), Uuid: uuid.NewString(),
Body: EncodeMessageBody(models.EventMessageBody{ Body: EncodeMessageBody(models.EventMessageBody{
RelatedEvent: event.ID, RelatedEvent: &event.ID,
}), }),
Type: models.EventMessageDelete, Type: models.EventMessageDelete,
Channel: event.Channel, Channel: event.Channel,