server: reduce message output, only show channel ID instead of full channel object
This commit is contained in:
+3
-3
@@ -241,7 +241,7 @@ func DBAddFile(file *File) error { return dbAddFile(file) }
|
|||||||
|
|
||||||
func DBAddMessage(msg *Message) error {
|
func DBAddMessage(msg *Message) error {
|
||||||
query := `INSERT INTO messages (id, channel, created, content, audio) VALUES ($1, $2, $3, $4, $5)`
|
query := `INSERT INTO messages (id, channel, created, content, audio) VALUES ($1, $2, $3, $4, $5)`
|
||||||
_, err := db.Pool.Exec(context.Background(), query, msg.ID, msg.Channel.ID, msg.Created, msg.Content, msg.Audio.ID)
|
_, err := db.Pool.Exec(context.Background(), query, msg.ID, msg.ChannelID, msg.Created, msg.Content, msg.Audio.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("db: failed to add message", "error", err, "messageid", msg.ID)
|
slog.Error("db: failed to add message", "error", err, "messageid", msg.ID)
|
||||||
return fmt.Errorf("failed to add message")
|
return fmt.Errorf("failed to add message")
|
||||||
@@ -274,7 +274,7 @@ func dbGetMessage(id string) (*Message, error) {
|
|||||||
return nil, fmt.Errorf("failed to fetch audio for message")
|
return nil, fmt.Errorf("failed to fetch audio for message")
|
||||||
}
|
}
|
||||||
|
|
||||||
msg.Channel = *channel
|
msg.ChannelID = channel.ID
|
||||||
msg.Audio = *audio
|
msg.Audio = *audio
|
||||||
slog.Debug("db: message found", "messageid", msg.ID)
|
slog.Debug("db: message found", "messageid", msg.ID)
|
||||||
return &msg, nil
|
return &msg, nil
|
||||||
@@ -336,7 +336,7 @@ func dbGetMessagesByChannel(channelID string, from, to *time.Time) ([]*Message,
|
|||||||
slog.Error("db: failed to fetch audio for message", "messageid", mr.msg.ID, "audioid", mr.audioID, "error", err)
|
slog.Error("db: failed to fetch audio for message", "messageid", mr.msg.ID, "audioid", mr.audioID, "error", err)
|
||||||
return nil, fmt.Errorf("failed to fetch audio for message")
|
return nil, fmt.Errorf("failed to fetch audio for message")
|
||||||
}
|
}
|
||||||
mr.msg.Channel = *channel
|
mr.msg.ChannelID = channel.ID
|
||||||
mr.msg.Audio = *audio
|
mr.msg.Audio = *audio
|
||||||
messages = append(messages, &mr.msg)
|
messages = append(messages, &mr.msg)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Message struct {
|
type Message struct {
|
||||||
ID uuid.UUID
|
ID uuid.UUID
|
||||||
Channel Channel
|
ChannelID uuid.UUID
|
||||||
Created time.Time
|
Created time.Time
|
||||||
Content string
|
Content string
|
||||||
Audio File
|
Audio File
|
||||||
}
|
}
|
||||||
|
|
||||||
type MessagePayload struct {
|
type MessagePayload struct {
|
||||||
|
|||||||
@@ -49,11 +49,11 @@ func (s *MessageServer) SendMessage(ctx context.Context, req *pb.SendMessageRequ
|
|||||||
}
|
}
|
||||||
|
|
||||||
msg := &api.Message{
|
msg := &api.Message{
|
||||||
ID: uuid.New(),
|
ID: uuid.New(),
|
||||||
Channel: *channel,
|
ChannelID: channel.ID,
|
||||||
Created: time.Now(),
|
Created: time.Now(),
|
||||||
Content: req.Content,
|
Content: req.Content,
|
||||||
Audio: *audio,
|
Audio: *audio,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := api.DBAddMessage(msg); err != nil {
|
if err := api.DBAddMessage(msg); err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user