mirror of
https://github.com/abhinavxd/libredesk.git
synced 2025-11-15 11:21:53 +00:00
Compare commits
1 Commits
v0.4.1-alp
...
v0.4.2-alp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
772152c40c |
@@ -372,7 +372,8 @@ SELECT
|
|||||||
source_id
|
source_id
|
||||||
FROM conversation_messages
|
FROM conversation_messages
|
||||||
WHERE conversation_id = $1
|
WHERE conversation_id = $1
|
||||||
AND type in ('incoming', 'outgoing')
|
AND type in ('incoming', 'outgoing') and private = false
|
||||||
|
and source_id > ''
|
||||||
ORDER BY id DESC
|
ORDER BY id DESC
|
||||||
LIMIT $2;
|
LIMIT $2;
|
||||||
|
|
||||||
|
|||||||
@@ -115,11 +115,13 @@ func (e *Email) Send(m models.Message) error {
|
|||||||
// Set In-Reply-To header
|
// Set In-Reply-To header
|
||||||
if m.InReplyTo != "" {
|
if m.InReplyTo != "" {
|
||||||
email.Headers.Set(headerInReplyTo, "<"+m.InReplyTo+">")
|
email.Headers.Set(headerInReplyTo, "<"+m.InReplyTo+">")
|
||||||
|
e.lo.Debug("In-Reply-To header set", "message_id", m.InReplyTo)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set message id header
|
// Set message id header
|
||||||
if m.SourceID.String != "" {
|
if m.SourceID.String != "" {
|
||||||
email.Headers.Set(headerMessageID, fmt.Sprintf("<%s>", m.SourceID.String))
|
email.Headers.Set(headerMessageID, fmt.Sprintf("<%s>", m.SourceID.String))
|
||||||
|
e.lo.Debug("Message-ID header set", "message_id", m.SourceID.String)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set references header
|
// Set references header
|
||||||
@@ -127,6 +129,7 @@ func (e *Email) Send(m models.Message) error {
|
|||||||
for _, ref := range m.References {
|
for _, ref := range m.References {
|
||||||
references += "<" + ref + "> "
|
references += "<" + ref + "> "
|
||||||
}
|
}
|
||||||
|
e.lo.Debug("References header set", "references", references)
|
||||||
email.Headers.Set(headerReferences, references)
|
email.Headers.Set(headerReferences, references)
|
||||||
|
|
||||||
// Set email content
|
// Set email content
|
||||||
|
|||||||
Reference in New Issue
Block a user