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

🗃️ Add relations between related event and original event

Browse Source
This commit is contained in:
LittleSheep 2024-11-18 23:28:17 +08:00
parent 6c60e250e1
commit c642f5ee44
3 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ func newMessageEvent(c *fiber.Ctx) error {
Sender: member, Sender: member,
Channel: channel, Channel: channel,
QuoteEventID: data.Body.QuoteEventID, QuoteEventID: data.Body.QuoteEventID,
RelatedEventID: data.Body.RelatedEventID,
ChannelID: channel.ID, ChannelID: channel.ID,
SenderID: member.ID, SenderID: member.ID,
} }

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

@ -22,6 +22,8 @@ type Event struct {
Sender ChannelMember `json:"sender"` Sender ChannelMember `json:"sender"`
QuoteEventID *uint `json:"quote_event_id,omitempty"` QuoteEventID *uint `json:"quote_event_id,omitempty"`
QuoteEvent *Event `json:"quote_event,omitempty" gorm:"foreignKey:QuoteEventID"` QuoteEvent *Event `json:"quote_event,omitempty" gorm:"foreignKey:QuoteEventID"`
RelatedEventID *uint `json:"related_event_id,omitempty"`
RelatedEvent *Event `json:"related_event,omitempty" gorm:"foreignKey:RelatedEventID"`
ChannelID uint `json:"channel_id"` ChannelID uint `json:"channel_id"`
SenderID uint `json:"sender_id"` SenderID uint `json:"sender_id"`
} }
@ -33,6 +35,6 @@ type EventMessageBody struct {
Algorithm string `json:"algorithm,omitempty"` Algorithm string `json:"algorithm,omitempty"`
Attachments []string `json:"attachments,omitempty"` Attachments []string `json:"attachments,omitempty"`
QuoteEventID *uint `json:"quote_event,omitempty"` QuoteEventID *uint `json:"quote_event,omitempty"`
RelatedEvent *uint `json:"related_event,omitempty"` RelatedEventID *uint `json:"related_event,omitempty"`
RelatedUsers []uint `json:"related_users,omitempty"` RelatedUsers []uint `json:"related_users,omitempty"`
} }

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

@ -19,7 +19,7 @@ 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.RelatedEventID = &event.ID
_, err = NewEvent(models.Event{ _, err = NewEvent(models.Event{
Uuid: uuid.NewString(), Uuid: uuid.NewString(),
Body: EncodeMessageBody(body), Body: EncodeMessageBody(body),
@ -27,6 +27,7 @@ func EditMessage(event models.Event, body models.EventMessageBody) (models.Event
Channel: event.Channel, Channel: event.Channel,
Sender: event.Sender, Sender: event.Sender,
QuoteEventID: body.QuoteEventID, QuoteEventID: body.QuoteEventID,
RelatedEventID: body.RelatedEventID,
ChannelID: event.ChannelID, ChannelID: event.ChannelID,
SenderID: event.SenderID, SenderID: event.SenderID,
}) })
@ -45,11 +46,12 @@ 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, RelatedEventID: &event.ID,
}), }),
Type: models.EventMessageDelete, Type: models.EventMessageDelete,
Channel: event.Channel, Channel: event.Channel,
Sender: event.Sender, Sender: event.Sender,
RelatedEventID: &event.ID,
ChannelID: event.ChannelID, ChannelID: event.ChannelID,
SenderID: event.SenderID, SenderID: event.SenderID,
}) })