mlow/lmcli
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fix reply ordering

Browse Source
This commit is contained in:
Matt Low 2024-12-11 15:56:43 +00:00
parent c261fdadf5
commit d2ce8edad8
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/conversation/repo.go
View File

@ -298,39 +298,36 @@ func (s *repo) CloneBranch(messageToClone Message) (*Message, uint, error) {
func fetchMessages(db *gorm.DB) ([]Message, error) { func fetchMessages(db *gorm.DB) ([]Message, error) {
var messages []Message var messages []Message
if err := db.Preload("Conversation").Find(&messages).Error; err != nil { if err := db.Preload("Conversation").Order("id ASC").Find(&messages).Error; err != nil {
return nil, fmt.Errorf("Could not fetch messages: %v", err) return nil, fmt.Errorf("Could not fetch messages: %v", err)
} }
messageMap := make(map[uint]Message) messageMap := make(map[uint]*Message)
for i, message := range messages { for i, message := range messages {
messageMap[messages[i].ID] = message messageMap[message.ID] = &messages[i]
} }
// Create a map to store replies by their parent ID // Create a map to store replies by their parent ID
repliesMap := make(map[uint][]Message) repliesMap := make(map[uint][]Message)
for i, message := range messages { for _, message := range messages {
if messages[i].ParentID != nil { if message.ParentID != nil {
repliesMap[*messages[i].ParentID] = append(repliesMap[*messages[i].ParentID], message) repliesMap[*message.ParentID] = append(repliesMap[*message.ParentID], message)
} }
} }
// Assign replies, parent, and selected reply to each message // Assign replies, parent, and selected reply to each message
for i := range messages { for i := range messages {
if replies, exists := repliesMap[messages[i].ID]; exists { if replies, exists := repliesMap[messages[i].ID]; exists {
messages[i].Replies = make([]Message, len(replies)) messages[i].Replies = replies
for j, m := range replies {
messages[i].Replies[j] = m
}
} }
if messages[i].ParentID != nil { if messages[i].ParentID != nil {
if parent, exists := messageMap[*messages[i].ParentID]; exists { if parent, exists := messageMap[*messages[i].ParentID]; exists {
messages[i].Parent = &parent messages[i].Parent = parent
} }
} }
if messages[i].SelectedReplyID != nil { if messages[i].SelectedReplyID != nil {
if selectedReply, exists := messageMap[*messages[i].SelectedReplyID]; exists { if selectedReply, exists := messageMap[*messages[i].SelectedReplyID]; exists {
messages[i].SelectedReply = &selectedReply messages[i].SelectedReply = selectedReply
} }
} }
} }
@ -359,27 +356,6 @@ func (s *repo) buildPath(message *Message, getNext func(*Message) *uint) ([]Mess
messageMap[messages[i].ID] = &messages[i] messageMap[messages[i].ID] = &messages[i]
} }
// Construct Replies
repliesMap := make(map[uint][]*Message, len(messages))
for _, m := range messageMap {
if m.ParentID == nil {
continue
}
if p, ok := messageMap[*m.ParentID]; ok {
repliesMap[p.ID] = append(repliesMap[p.ID], m)
}
}
// Add replies to messages
for _, m := range messageMap {
if replies, ok := repliesMap[m.ID]; ok {
m.Replies = make([]Message, len(replies))
for idx, reply := range replies {
m.Replies[idx] = *reply
}
}
}
// Build the path // Build the path
var path []Message var path []Message
nextID := &message.ID nextID := &message.ID