ChronosXYZ/yans
1
0
Fork 0
mirror of https://github.com/ChronosX88/yans.git synced 2024-11-24 04:22:19 +00:00
Code Issues Projects Releases Wiki Activity

Revert behavior of setting thread property when posting article

Browse Source
This commit is contained in:
ChronosX88 2022-04-14 19:24:37 +03:00
parent 86e4290287
commit 3bedb48945
Signed by: ChronosXYZ
GPG Key ID: 085A69A82C8C511A
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/server/handler.go
View File

@ -335,11 +335,10 @@ func (h *Handler) handlePost(s *Session, command string, arguments []string, id
a.Header = envelope.Root.Header a.Header = envelope.Root.Header
a.Envelope = envelope a.Envelope = envelope
// TODO handle multipart message
if err != nil { if err != nil {
return err return err
} }
a.Body = string(envelope.Text) a.Body = envelope.Text
// set thread property // set thread property
if envelope.GetHeader("In-Reply-To") != "" { if envelope.GetHeader("In-Reply-To") != "" {
@ -351,10 +350,14 @@ func (h *Handler) handlePost(s *Session, command string, arguments []string, id
return err return err
} }
} }
var parentHeader mail.Header if !parentMessage.Thread.Valid {
err = json.Unmarshal([]byte(parentMessage.HeaderRaw), &parentHeader) var parentHeader mail.Header
parentMessageID := parentHeader.Get("Message-ID") err = json.Unmarshal([]byte(parentMessage.HeaderRaw), &parentHeader)
a.Thread = sql.NullString{String: parentMessageID, Valid: true} parentMessageID := parentHeader.Get("Message-ID")
a.Thread = sql.NullString{String: parentMessageID, Valid: true}
} else {
a.Thread = parentMessage.Thread
}
} }
if len(envelope.Attachments) > 0 { if len(envelope.Attachments) > 0 {