Skip to content

Commit 8ce5a35

Browse files
committed
Merge branch 'release/v1.24.1'
2 parents 85a2c15 + dd0ba8b commit 8ce5a35

File tree

15 files changed

+509
-327
lines changed

15 files changed

+509
-327
lines changed

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# build the assets
2727
- uses: actions/setup-node@v4
2828
with:
29-
node-version: 18
29+
node-version: 22
3030
cache: 'npm'
3131
- run: echo "Building assets for ${{ github.ref_name }}"
3232
- run: npm install

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: startsWith(matrix.os, 'ubuntu') == true
3535
uses: actions/setup-node@v4
3636
with:
37-
node-version: 18
37+
node-version: 22
3838
cache: 'npm'
3939
- if: startsWith(matrix.os, 'ubuntu') == true
4040
run: npm install

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
Notable changes to Mailpit will be documented in this file.
44

5+
## [v1.24.1]
6+
7+
### Feature
8+
- Add ability to mark all search results as read ([#476](https://github.com/axllent/mailpit/issues/476))
9+
10+
### Chore
11+
- Update node dependencies
12+
- Update Go dependencies
13+
- Improve error message for From header parsing failure ([#477](https://github.com/axllent/mailpit/issues/477))
14+
- Bump node version to 22 for binary releases
15+
16+
517
## [v1.24.0]
618

719
### Feature

go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
toolchain go1.23.2
66

77
require (
8-
github.com/PuerkitoBio/goquery v1.10.2
8+
github.com/PuerkitoBio/goquery v1.10.3
99
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
1010
github.com/axllent/semver v0.0.1
1111
github.com/gomarkdown/markdown v0.0.0-20250311123330-531bef5e742b
@@ -23,11 +23,11 @@ require (
2323
github.com/spf13/pflag v1.0.6
2424
github.com/tg123/go-htpasswd v1.2.3
2525
github.com/vanng822/go-premailer v1.24.0
26-
golang.org/x/net v0.38.0
27-
golang.org/x/text v0.23.0
26+
golang.org/x/net v0.39.0
27+
golang.org/x/text v0.24.0
2828
golang.org/x/time v0.11.0
2929
gopkg.in/yaml.v3 v3.0.1
30-
modernc.org/sqlite v1.36.3
30+
modernc.org/sqlite v1.37.0
3131
)
3232

3333
require (
@@ -52,12 +52,12 @@ require (
5252
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
5353
github.com/valyala/bytebufferpool v1.0.0 // indirect
5454
github.com/vanng822/css v1.0.1 // indirect
55-
golang.org/x/crypto v0.36.0 // indirect
56-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
57-
golang.org/x/image v0.25.0 // indirect
58-
golang.org/x/sys v0.31.0 // indirect
55+
golang.org/x/crypto v0.37.0 // indirect
56+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
57+
golang.org/x/image v0.26.0 // indirect
58+
golang.org/x/sys v0.32.0 // indirect
5959
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
60-
modernc.org/libc v1.62.0 // indirect
60+
modernc.org/libc v1.62.1 // indirect
6161
modernc.org/mathutil v1.7.1 // indirect
6262
modernc.org/memory v1.9.1 // indirect
6363
)

go.sum

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 h1:IEjq88XO4PuBDcvmjQJcQGg+w+UaafSy8G5Kcb5tBhI=
22
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5/go.mod h1:exZ0C/1emQJAw5tHOaUDyY1ycttqBAPcxuzf7QbY6ec=
3-
github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
4-
github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
3+
github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
4+
github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
55
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
66
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
77
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
@@ -119,12 +119,12 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
119119
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
120120
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
121121
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
122-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
123-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
124-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
125-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
126-
golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
127-
golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
122+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
123+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
124+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
125+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
126+
golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
127+
golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
128128
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
129129
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
130130
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -141,17 +141,17 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
141141
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
142142
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
143143
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
144-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
145-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
144+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
145+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
146146
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
147147
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
148148
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
149149
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
150150
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
151151
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
152152
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
153-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
154-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
153+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
154+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
155155
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
156156
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
157157
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -165,8 +165,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
165165
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
166166
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
167167
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
168-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
169-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
168+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
169+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
170170
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
171171
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
172172
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -185,8 +185,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
185185
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
186186
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
187187
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
188-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
189-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
188+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
189+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
190190
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
191191
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
192192
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -195,8 +195,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
195195
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
196196
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
197197
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
198-
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
199-
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
198+
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
199+
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
200200
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
201201
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
202202
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -214,8 +214,8 @@ modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
214214
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
215215
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
216216
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
217-
modernc.org/libc v1.62.0 h1:hmkg9BmYSGYnTmDwn2uDqJl5SOV4PLZCUALoZpPsmn4=
218-
modernc.org/libc v1.62.0/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo=
217+
modernc.org/libc v1.62.1 h1:s0+fv5E3FymN8eJVmnk0llBe6rOxCu/DEU+XygRbS8s=
218+
modernc.org/libc v1.62.1/go.mod h1:iXhATfJQLjG3NWy56a6WVU73lWOcdYVxsvwCgoPljuo=
219219
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
220220
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
221221
modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g=
@@ -224,8 +224,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
224224
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
225225
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
226226
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
227-
modernc.org/sqlite v1.36.3 h1:qYMYlFR+rtLDUzuXoST1SDIdEPbX8xzuhdF90WsX1ss=
228-
modernc.org/sqlite v1.36.3/go.mod h1:ADySlx7K4FdY5MaJcEv86hTJ0PjedAloTUuif0YS3ws=
227+
modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
228+
modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
229229
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
230230
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
231231
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

internal/storage/database.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -258,19 +258,6 @@ func DbSize() float64 {
258258
return total.Float64
259259
}
260260

261-
// IsUnread returns whether a message is unread or not.
262-
func IsUnread(id string) bool {
263-
var unread int
264-
265-
_ = sqlf.From(tenant("mailbox")).
266-
Select("COUNT(*)").To(&unread).
267-
Where("Read = ?", 0).
268-
Where("ID = ?", id).
269-
QueryRowAndClose(context.TODO(), db)
270-
271-
return unread == 1
272-
}
273-
274261
// MessageIDExists checks whether a Message-ID exists in the DB
275262
func MessageIDExists(id string) bool {
276263
var total int

internal/storage/messages.go

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func GetMessage(id string) (*Message, error) {
362362
}
363363

364364
// mark message as read
365-
if err := MarkRead(id); err != nil {
365+
if err := MarkRead([]string{id}); err != nil {
366366
return &obj, err
367367
}
368368

@@ -495,30 +495,28 @@ func LatestID(r *http.Request) (string, error) {
495495
}
496496

497497
// MarkRead will mark a message as read
498-
func MarkRead(id string) error {
499-
if !IsUnread(id) {
500-
return nil
501-
}
498+
func MarkRead(ids []string) error {
499+
for _, id := range ids {
500+
_, err := sqlf.Update(tenant("mailbox")).
501+
Set("Read", 1).
502+
Where("ID = ?", id).
503+
ExecAndClose(context.Background(), db)
504+
505+
if err == nil {
506+
logger.Log().Debugf("[db] marked message %s as read", id)
507+
}
502508

503-
_, err := sqlf.Update(tenant("mailbox")).
504-
Set("Read", 1).
505-
Where("ID = ?", id).
506-
ExecAndClose(context.Background(), db)
509+
d := struct {
510+
ID string
511+
Read bool
512+
}{ID: id, Read: true}
507513

508-
if err == nil {
509-
logger.Log().Debugf("[db] marked message %s as read", id)
514+
websockets.Broadcast("update", d)
510515
}
511516

512517
BroadcastMailboxStats()
513518

514-
d := struct {
515-
ID string
516-
Read bool
517-
}{ID: id, Read: true}
518-
519-
websockets.Broadcast("update", d)
520-
521-
return err
519+
return nil
522520
}
523521

524522
// MarkAllRead will mark all messages as read
@@ -572,32 +570,30 @@ func MarkAllUnread() error {
572570
}
573571

574572
// MarkUnread will mark a message as unread
575-
func MarkUnread(id string) error {
576-
if IsUnread(id) {
577-
return nil
578-
}
573+
func MarkUnread(ids []string) error {
574+
for _, id := range ids {
575+
_, err := sqlf.Update(tenant("mailbox")).
576+
Set("Read", 0).
577+
Where("ID = ?", id).
578+
ExecAndClose(context.Background(), db)
579+
580+
if err == nil {
581+
logger.Log().Debugf("[db] marked message %s as unread", id)
582+
}
579583

580-
_, err := sqlf.Update(tenant("mailbox")).
581-
Set("Read", 0).
582-
Where("ID = ?", id).
583-
ExecAndClose(context.Background(), db)
584+
dbLastAction = time.Now()
584585

585-
if err == nil {
586-
logger.Log().Debugf("[db] marked message %s as unread", id)
587-
}
586+
d := struct {
587+
ID string
588+
Read bool
589+
}{ID: id, Read: false}
588590

589-
dbLastAction = time.Now()
591+
websockets.Broadcast("update", d)
592+
}
590593

591594
BroadcastMailboxStats()
592595

593-
d := struct {
594-
ID string
595-
Read bool
596-
}{ID: id, Read: false}
597-
598-
websockets.Broadcast("update", d)
599-
600-
return err
596+
return nil
601597
}
602598

603599
// DeleteMessages deletes one or more messages in bulk

internal/storage/search.go

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,39 @@ func Search(search, timezone string, start int, beforeTS int64, limit int) ([]Me
100100
return results, nrResults, err
101101
}
102102

103+
// SearchUnreadCount returns the number of unread messages matching a search.
104+
// This is run one at a time to allow connected browsers to be updated.
105+
func SearchUnreadCount(search, timezone string, beforeTS int64) (int64, error) {
106+
tsStart := time.Now()
107+
108+
q := searchQueryBuilder(search, timezone)
109+
110+
if beforeTS > 0 {
111+
q = q.Where(`Created < ?`, beforeTS)
112+
}
113+
114+
var unread int64
115+
116+
q = q.Where("Read = 0").Select(`COUNT(*)`)
117+
118+
err := q.QueryAndClose(context.TODO(), db, func(row *sql.Rows) {
119+
var ignore sql.NullString
120+
if err := row.Scan(&ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore, &unread); err != nil {
121+
logger.Log().Errorf("[db] %s", err.Error())
122+
return
123+
}
124+
125+
})
126+
127+
dbLastAction = time.Now()
128+
129+
elapsed := time.Since(tsStart)
130+
131+
logger.Log().Debugf("[db] counted %d unread for \"%s\" in %s", unread, search, elapsed)
132+
133+
return unread, err
134+
}
135+
103136
// DeleteSearch will delete all messages for search terms.
104137
// The search is broken up by segments (exact phrases can be quoted), and interprets specific terms such as:
105138
// is:read, is:unread, has:attachment, to:<term>, from:<term> & subject:<term>
@@ -224,6 +257,47 @@ func DeleteSearch(search, timezone string) error {
224257
return nil
225258
}
226259

260+
// SetSearchReadStatus marks all messages matching the search as read or unread
261+
func SetSearchReadStatus(search, timezone string, read bool) error {
262+
q := searchQueryBuilder(search, timezone).Where("Read = ?", !read)
263+
264+
ids := []string{}
265+
266+
if err := q.QueryAndClose(context.TODO(), db, func(row *sql.Rows) {
267+
var created float64
268+
var id string
269+
var messageID string
270+
var subject string
271+
var metadata string
272+
var size float64
273+
var attachments int
274+
var read int
275+
var snippet string
276+
var ignore string
277+
278+
if err := row.Scan(&created, &id, &messageID, &subject, &metadata, &size, &attachments, &read, &snippet, &ignore, &ignore, &ignore, &ignore, &ignore); err != nil {
279+
logger.Log().Errorf("[db] %s", err.Error())
280+
return
281+
}
282+
283+
ids = append(ids, id)
284+
}); err != nil {
285+
return err
286+
}
287+
288+
if read {
289+
if err := MarkRead(ids); err != nil {
290+
return err
291+
}
292+
} else {
293+
if err := MarkUnread(ids); err != nil {
294+
return err
295+
}
296+
}
297+
298+
return nil
299+
}
300+
227301
// SearchParser returns the SQL syntax for the database search based on the search arguments
228302
func searchQueryBuilder(searchString, timezone string) *sqlf.Stmt {
229303
// group strings with quotes as a single argument and remove quotes

0 commit comments

Comments
 (0)