From baa8813dcc1bf4dbd18763df9ee654472ae0e433 Mon Sep 17 00:00:00 2001 From: Kevin Kuehler Date: Thu, 10 Oct 2019 15:27:12 -0700 Subject: Add threading control path to msglist.Draw() Signed-off-by: Kevin Kuehler --- lib/format/format.go | 6 +++--- lib/msgstore.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/format/format.go b/lib/format/format.go index b403f2d..c71ae93 100644 --- a/lib/format/format.go +++ b/lib/format/format.go @@ -10,8 +10,8 @@ import ( ) func ParseMessageFormat(format string, timestampformat string, - accountName string, number int, msg *models.MessageInfo) (string, - []interface{}, error) { + accountName string, number int, msg *models.MessageInfo, + subjectThread string) (string, []interface{}, error) { retval := make([]byte, 0, len(format)) var args []interface{} @@ -147,7 +147,7 @@ func ParseMessageFormat(format string, timestampformat string, args = append(args, addrs) case 's': retval = append(retval, 's') - args = append(args, msg.Envelope.Subject) + args = append(args, subjectThread+msg.Envelope.Subject) case 't': if len(msg.Envelope.To) == 0 { return "", nil, diff --git a/lib/msgstore.go b/lib/msgstore.go index bfea081..e86dc56 100644 --- a/lib/msgstore.go +++ b/lib/msgstore.go @@ -179,7 +179,7 @@ func (store *MessageStore) Update(msg types.WorkerMessage) { newMap := make(map[uint32]*models.MessageInfo) for i := len(msg.Threads) - 1; i >= 0; i-- { - msg.Threads[i].FormatThread(func(t *types.Thread, x string) bool { + msg.Threads[i].FormatThread(func(t *types.Thread, x []rune) bool { uid := t.Uid uids = append([]uint32{uid}, uids...) if msg, ok := store.Messages[uid]; ok { -- cgit v1.2.3