Skip to content

Commit 7a00a48

Browse files
andrinoffandrinoff
authored
Merge branch 'master' into fix/issue-1255
2 parents 50d7914 + df18854 commit 7a00a48

17 files changed

Lines changed: 196 additions & 1153 deletions

File tree

‎.github/workflows/nixpkgs-bump.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ name: Nixpkgs Bump PR
99
# - Initial matcha package already merged into nixpkgs (this workflow updates, not inits)
1010

1111
on:
12-
release:
13-
types: [published]
1412
workflow_dispatch:
1513
inputs:
1614
version:

‎config/folder_cache.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/floatpane/matcha/internal/threading"
12+
threading "github.com/floatpane/jwz-go"
1313
)
1414

1515
// CachedFolders stores folder names for a single account.

‎docs/docs/assets/features/settings.png‎

-2.61 KB
Loading

‎docs/docs/assets/features/theme_settings.png‎

1.35 KB
Loading

‎go.mod‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ require (
66
charm.land/bubbles/v2 v2.1.0
77
charm.land/bubbletea/v2 v2.0.6
88
charm.land/lipgloss/v2 v2.0.3
9-
cunicu.li/go-iso7816 v0.8.8
10-
cunicu.li/go-openpgp-card v0.3.11
119
git.sr.ht/~rockorager/go-jmap v0.5.3
1210
github.com/ProtonMail/go-crypto v1.4.1
1311
github.com/PuerkitoBio/goquery v1.12.0
1412
github.com/arran4/golang-ical v0.3.5
1513
github.com/charmbracelet/x/ansi v0.11.7
16-
github.com/ebfe/scard v0.0.0-20241214075232-7af069cabc25
1714
github.com/emersion/go-imap/v2 v2.0.0-beta.8
1815
github.com/emersion/go-maildir v0.6.0
1916
github.com/emersion/go-message v0.18.2
2017
github.com/emersion/go-pgpmail v0.2.2
2118
github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6
19+
github.com/floatpane/bubble-overlay v0.0.1
20+
github.com/floatpane/go-openpgp-card-hl v0.0.1
2221
github.com/floatpane/go-uds-jsonrpc v0.0.1
23-
github.com/floatpane/termimage v0.2.0
22+
github.com/floatpane/jwz-go v0.0.1
23+
github.com/floatpane/termimage v0.2.1
2424
github.com/google/uuid v1.6.0
2525
github.com/hashicorp/golang-lru/v2 v2.0.7
2626
github.com/knadh/go-pop3 v1.0.2
@@ -36,6 +36,8 @@ require (
3636
)
3737

3838
require (
39+
cunicu.li/go-iso7816 v0.8.8 // indirect
40+
cunicu.li/go-openpgp-card v0.3.11 // indirect
3941
github.com/andybalholm/cascadia v1.3.3 // indirect
4042
github.com/atotto/clipboard v0.1.4 // indirect
4143
github.com/aymerick/douceur v0.2.0 // indirect
@@ -48,6 +50,7 @@ require (
4850
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
4951
github.com/cloudflare/circl v1.6.3 // indirect
5052
github.com/danieljoos/wincred v1.2.3 // indirect
53+
github.com/ebfe/scard v0.0.0-20241214075232-7af069cabc25 // indirect
5154
github.com/godbus/dbus/v5 v5.2.2 // indirect
5255
github.com/gorilla/css v1.0.1 // indirect
5356
github.com/landlock-lsm/go-landlock v0.8.1 // indirect
@@ -57,7 +60,7 @@ require (
5760
github.com/rivo/uniseg v0.4.7 // indirect
5861
github.com/sahilm/fuzzy v0.1.1 // indirect
5962
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
60-
golang.org/x/image v0.28.0 // indirect
63+
golang.org/x/image v0.41.0 // indirect
6164
golang.org/x/net v0.55.0 // indirect
6265
golang.org/x/oauth2 v0.27.0 // indirect
6366
golang.org/x/sync v0.20.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,16 @@ github.com/emersion/go-pgpmail v0.2.2/go.mod h1:mRB5P7QKiAuOvcT36tdRZvm7nSt7V+f6
6868
github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 h1:oP4q0fw+fOSWn3DfFi4EXdT+B+gTtzx8GC9xsc26Znk=
6969
github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
7070
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
71+
github.com/floatpane/bubble-overlay v0.0.1 h1:5xU8cNigDPYegvgGMfOG23fIDXhrqXPvLTaEB7uHGK4=
72+
github.com/floatpane/bubble-overlay v0.0.1/go.mod h1:Csi1byxb9L8EAb8X13XdWF5aX5YiBD5C9WEWACyGa8A=
73+
github.com/floatpane/go-openpgp-card-hl v0.0.1 h1:1DYmzwGDb8eneZxbc/xtwjXeFY8DFL3eYnUooMT0L0w=
74+
github.com/floatpane/go-openpgp-card-hl v0.0.1/go.mod h1:Mrx+ukCnpEpMAxyB0p8Ch2gu78Q3Ir40BxBybb2jirw=
7175
github.com/floatpane/go-uds-jsonrpc v0.0.1 h1:/sBlCXVAP9SyLWLj0wlFI07dX/SfXeUM67B4tRwK2QA=
7276
github.com/floatpane/go-uds-jsonrpc v0.0.1/go.mod h1:G/YeDIocGkPIU+uyhJ/e8ynn9wIEMIkJ74d3VUuC4rM=
73-
github.com/floatpane/termimage v0.2.0 h1:NGjG7VUFAqpuYiPn/Vqcq2eHYqLZNmD3HkAdQTV0Lc0=
74-
github.com/floatpane/termimage v0.2.0/go.mod h1:5Mcw99w/AI4pmYVVyZKM4DkldHClH6uYO0eCQQGmaes=
77+
github.com/floatpane/jwz-go v0.0.1 h1:OAl/vaUYn+/8zFR47WaCybBGoQItb1ZkFplNrmeO3ps=
78+
github.com/floatpane/jwz-go v0.0.1/go.mod h1:1b/JE4K+LBIBGtWbFdM1BXpN6ZbGWIv7IXPRbXD4oRE=
79+
github.com/floatpane/termimage v0.2.1 h1:jYPBg+SSl5PHFpN96tccBYXG4ZERoJ61ALyRDJMqonU=
80+
github.com/floatpane/termimage v0.2.1/go.mod h1:j8AaqyNtVAsPgbGblXprh33G0/5/CopWWgkXi3QB09I=
7581
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
7682
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
7783
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -132,8 +138,8 @@ golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
132138
golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
133139
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
134140
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
135-
golang.org/x/image v0.28.0 h1:gdem5JW1OLS4FbkWgLO+7ZeFzYtL3xClb97GaUzYMFE=
136-
golang.org/x/image v0.28.0/go.mod h1:GUJYXtnGKEUgggyzh+Vxt+AviiCcyiwpsl8iQ8MvwGY=
141+
golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo=
142+
golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=
137143
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
138144
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
139145
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=

‎gomod2nix.toml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,25 @@ schema = 3
113113
version = 'v0.0.0-20241020182733-b788ff22d5a6'
114114
hash = 'sha256-eil7taerUmXI7lGOrcw56I0ilBzayRhhf1Sjixyc4oA='
115115

116+
[mod.'github.com/floatpane/bubble-overlay']
117+
version = 'v0.0.1'
118+
hash = 'sha256-YQ+g7GhiufcasMU8f0zt6ar46ykXZMHFBPFROt2n17I='
119+
120+
[mod.'github.com/floatpane/go-openpgp-card-hl']
121+
version = 'v0.0.1'
122+
hash = 'sha256-qssT4qCMoe9dgFISyCLhthlPe36dBJNnGU1bHjbCpK4='
123+
124+
[mod.'github.com/floatpane/go-uds-jsonrpc']
125+
version = 'v0.0.1'
126+
hash = 'sha256-A7M71cI5f640oxbSsBk1WxFFoqJtsPQQ+DsTfgOAm60='
127+
128+
[mod.'github.com/floatpane/jwz-go']
129+
version = 'v0.0.1'
130+
hash = 'sha256-aO+FXEQHAO4jviLFvfO4qhiyZA2jxfREUwBu6px2b6M='
131+
116132
[mod.'github.com/floatpane/termimage']
117-
version = 'v0.2.0'
118-
hash = 'sha256-Ycx9E1//VpJ35WnU1FWnp1cXIgkRmRnpXF/YqjGlyDw='
133+
version = 'v0.2.1'
134+
hash = 'sha256-neUcMsh3A+koHxIcW/TFUAlNgyAdkuEKlZ19PQ5uAhs='
119135

120136
[mod.'github.com/godbus/dbus/v5']
121137
version = 'v5.2.2'
@@ -194,8 +210,8 @@ schema = 3
194210
hash = 'sha256-/6Ajm6bIPt5xXNL5mmeNfJh4EZjgFgVlHEwp1TiC5cM='
195211

196212
[mod.'golang.org/x/image']
197-
version = 'v0.28.0'
198-
hash = 'sha256-TkfNKPRea7gWtH8mQCNHQc0ce6LIO7XDgOoH5U6P51Q='
213+
version = 'v0.41.0'
214+
hash = 'sha256-kAqfrX6aS2f+j7fyEsk8YZt2b/VG/m3zGWRNbXnlUzA='
199215

200216
[mod.'golang.org/x/net']
201217
version = 'v0.55.0'

0 commit comments

Comments
 (0)