filter: allow workers to combine filter terms

Allow the backend workers to combine the filter terms. Currently, the
consecutive filters are joined in the message store with a space (" ").
This works well for most backends, but makes the filter combination for
notmuch confusing.

Example:

Issuing two consecutive filter commands in notmuch

	:filter not tag:list
	:filter tag:list

would create the following filter query

	'not tag:list tag:list'

This is not what users would expect; they expect:

	'(not tag:list) and (tag:list)'

Note that the notmuch backend works correctly for the given query, but
produced a query that does not match the user's expectation. This patch
fixes this.

The combination of filter terms in other backends remains the same.

Reported-by: Ángel Castañeda <angel@acsq.me>
Signed-off-by: Koni Marti <koni.marti@gmail.com>
Tested-by: Inwit <inwit@sindominio.net>
Acked-by: Robin Jarry <robin@jarry.cc>

1 files changed, 6 insertions, 3 deletions

diff --git a/worker/jmap/search.go b/worker/jmap/search.go
index 0101ce9b..024cc181 100644
--- a/worker/jmap/search.go
+++ b/worker/jmap/search.go
@@ -1,6 +1,8 @@
 package jmap
 
 import (
+	"strings"
+
 	"git.sr.ht/~rjarry/aerc/worker/types"
 	"git.sr.ht/~rockorager/go-jmap"
 	"git.sr.ht/~rockorager/go-jmap/mail/email"
@@ -38,13 +40,14 @@ func (w *JMAPWorker) translateSearch(
 	}
 
 	// general search terms
+	terms := strings.Join(criteria.Terms, " ")
 	switch {
 	case criteria.SearchAll:
-		cond.Text = criteria.Terms
+		cond.Text = terms
 	case criteria.SearchBody:
-		cond.Body = criteria.Terms
+		cond.Body = terms
 	default:
-		cond.Subject = criteria.Terms
+		cond.Subject = terms
 	}
 
 	filter := &email.FilterOperator{Operator: jmap.OperatorAND}