- | BCC |
+ Bcc |
,
diff --git a/storage/database.go b/storage/database.go
index dfdc722ab..e21ea43a3 100644
--- a/storage/database.go
+++ b/storage/database.go
@@ -342,7 +342,7 @@ func Search(search string, start, limit int) ([]MessageSummary, error) {
var ignore string
em := MessageSummary{}
- if err := row.Scan(&id, &summary, &tags, &read, &ignore, &ignore, &ignore, &ignore); err != nil {
+ if err := row.Scan(&id, &summary, &tags, &read, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore); err != nil {
logger.Log().Error(err)
return
}
diff --git a/storage/search.go b/storage/search.go
index dbe679df6..6eab60e90 100644
--- a/storage/search.go
+++ b/storage/search.go
@@ -14,10 +14,12 @@ func searchParser(args []string, start, limit int) *sqlf.Stmt {
}
q := sqlf.From("mailbox").
- Select(`ID, Data, Tags, Read,
- json_extract(Data, '$.To') as ToJSON,
- json_extract(Data, '$.From') as FromJSON,
- json_extract(Data, '$.Subject') as Subject,
+ Select(`ID, Data, Tags, Read,
+ json_extract(Data, '$.To') as ToJSON,
+ json_extract(Data, '$.From') as FromJSON,
+ json_extract(Data, '$.Cc') as CcJSON,
+ json_extract(Data, '$.Bcc') as BccJSON,
+ json_extract(Data, '$.Subject') as Subject,
json_extract(Data, '$.Attachments') as Attachments
`).
OrderBy("Sort DESC").
@@ -63,6 +65,24 @@ func searchParser(args []string, start, limit int) *sqlf.Stmt {
q.Where("FromJSON LIKE ?", "%"+escPercentChar(w)+"%")
}
}
+ } else if strings.HasPrefix(w, "cc:") {
+ w = cleanString(w[3:])
+ if w != "" {
+ if exclude {
+ q.Where("CcJSON NOT LIKE ?", "%"+escPercentChar(w)+"%")
+ } else {
+ q.Where("CcJSON LIKE ?", "%"+escPercentChar(w)+"%")
+ }
+ }
+ } else if strings.HasPrefix(w, "bcc:") {
+ w = cleanString(w[4:])
+ if w != "" {
+ if exclude {
+ q.Where("BccJSON NOT LIKE ?", "%"+escPercentChar(w)+"%")
+ } else {
+ q.Where("BccJSON LIKE ?", "%"+escPercentChar(w)+"%")
+ }
+ }
} else if strings.HasPrefix(w, "subject:") {
w = cleanString(w[8:])
if w != "" {
|