Skip to content

Commit 615f058

Browse files
ItsNotGoodNameItsNotGoodName
committedSep 12, 2023
refactor: comment out imap package & clean up
·
v0.14.2v0.13.0
1 parent 5cd3fbe commit 615f058

File tree

12 files changed

+529
-598
lines changed

12 files changed

+529
-598
lines changed
 

‎cmd/smtpbridge/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func run(flags *flag.FlagSet) lieut.Executor {
9393
}
9494

9595
// App
96-
testFileStore := app.NewTestFileStore("apple-touch-icon.png", fmt.Sprintf("http://127.0.0.1:%d", cfg.HTTPPort))
97-
app := app.New(db, fileStore, bus, cfg.Config, cfg.EndpointFactory, testFileStore)
96+
webFileStore := app.NewWebFileStore("apple-touch-icon.png", fmt.Sprintf("http://127.0.0.1:%d", cfg.HTTPPort))
97+
app := app.New(db, fileStore, bus, cfg.Config, cfg.EndpointFactory, webFileStore)
9898

9999
// Supervisor
100100
super := suture.New("root", suture.Spec{

‎config/config.go

+45-45
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ const (
3030
)
3131

3232
type Config struct {
33-
Debug bool
34-
TimeHourFormat string
35-
DatabasePath string
36-
AttachmentsDirectory string
37-
CSRFSecretPath string
38-
SessionSecretPath string
39-
SessionsDirectory string
40-
HTTPDisable bool
41-
HTTPAddress string
42-
HTTPPort uint16
43-
HTTPBodyLimit int64
44-
HTTPURL string
45-
SMTPDisable bool
46-
SMTPAddress string
47-
SMTPMaxMessageBytes int64
48-
IMAPDisable bool
49-
IMAPAddress string
33+
Debug bool
34+
TimeHourFormat string
35+
DatabasePath string
36+
AttachmentsDirectory string
37+
CSRFSecretPath string
38+
SessionSecretPath string
39+
SessionsDirectory string
40+
HTTPDisable bool
41+
HTTPAddress string
42+
HTTPPort uint16
43+
HTTPBodyLimit int64
44+
HTTPURL string
45+
SMTPDisable bool
46+
SMTPAddress string
47+
SMTPMaxMessageBytes int64
48+
// IMAPDisable bool
49+
// IMAPAddress string
5050
Config *models.Config
5151
EndpointFactory endpoint.Factory
5252
InternalEndpoints []models.Endpoint
@@ -74,11 +74,11 @@ type Raw struct {
7474
HTTPUsername string `koanf:"http.username"`
7575
HTTPPassword string `koanf:"http.password"`
7676
HTTPURL string `koanf:"http.url"`
77-
IMAPDisable bool `koanf:"imap.disable"`
78-
IMAPHost string `koanf:"imap.host"`
79-
IMAPPort uint16 `koanf:"imap.port"`
80-
Endpoints map[string]RawEndpoint
81-
Rules map[string]RawRule
77+
// IMAPDisable bool `koanf:"imap.disable"`
78+
// IMAPHost string `koanf:"imap.host"`
79+
// IMAPPort uint16 `koanf:"imap.port"`
80+
Endpoints map[string]RawEndpoint
81+
Rules map[string]RawRule
8282
}
8383

8484
type RawEndpoint struct {
@@ -104,15 +104,15 @@ var RawDefault = struct {
104104
PythonExecutable string `koanf:"python_executable"`
105105
SMTPPort uint16 `koanf:"smtp.port"`
106106
HTTPPort uint16 `koanf:"http.port"`
107-
IMAPPort uint16 `koanf:"imap.port"`
107+
// IMAPPort uint16 `koanf:"imap.port"`
108108
}{
109109
TimeFormat: TimeFormat12H,
110110
MaxPayloadSize: "25 MB",
111111
DataDirectory: "smtpbridge_data",
112112
PythonExecutable: "python3",
113113
SMTPPort: 1025,
114114
HTTPPort: 8080,
115-
IMAPPort: 10143,
115+
// IMAPPort: 10143,
116116
}
117117

118118
func WithFlagSet(flags *flag.FlagSet) *flag.FlagSet {
@@ -131,9 +131,9 @@ func WithFlagSet(flags *flag.FlagSet) *flag.FlagSet {
131131
flags.Int("http-port", 0, flagUsageInt(int(RawDefault.HTTPPort), "HTTP port to listen on."))
132132
flags.Int("http-url", 0, flagUsageString("", "HTTP public URL (e.g. http://127.0.0.1:8080)."))
133133

134-
flags.Bool("imap-disable", false, flagUsageBool(false, "Disable IMAP server."))
135-
flags.String("imap-host", "", flagUsageString("", "IMAP host address to listen on."))
136-
flags.Int("imap-port", 0, flagUsageInt(int(RawDefault.IMAPPort), "HTTP port to listen on."))
134+
// flags.Bool("imap-disable", false, flagUsageBool(false, "Disable IMAP server."))
135+
// flags.String("imap-host", "", flagUsageString("", "IMAP host address to listen on."))
136+
// flags.Int("imap-port", 0, flagUsageInt(int(RawDefault.IMAPPort), "HTTP port to listen on."))
137137

138138
return flags
139139
}
@@ -279,26 +279,26 @@ func (p Parser) Parse(raw Raw) (Config, error) {
279279

280280
smtpAddress := raw.SMTPHost + ":" + strconv.Itoa(int(raw.SMTPPort))
281281

282-
imapAddress := raw.IMAPHost + ":" + strconv.Itoa(int(raw.IMAPPort))
282+
// imapAddress := raw.IMAPHost + ":" + strconv.Itoa(int(raw.IMAPPort))
283283

284284
return Config{
285-
Debug: raw.Debug,
286-
TimeHourFormat: timeHourFormat,
287-
DatabasePath: databasePath,
288-
CSRFSecretPath: csrfSecretPath,
289-
SessionSecretPath: sessionSecretPath,
290-
SessionsDirectory: sessionsDirectory,
291-
AttachmentsDirectory: attachmentsDirectory,
292-
HTTPDisable: raw.HTTPDisable,
293-
HTTPAddress: httpAddress,
294-
HTTPPort: raw.HTTPPort,
295-
HTTPBodyLimit: maxBytesForEachPayload,
296-
HTTPURL: raw.HTTPURL,
297-
SMTPDisable: raw.SMTPDisable,
298-
SMTPAddress: smtpAddress,
299-
SMTPMaxMessageBytes: maxBytesForEachPayload,
300-
IMAPDisable: raw.IMAPDisable,
301-
IMAPAddress: imapAddress,
285+
Debug: raw.Debug,
286+
TimeHourFormat: timeHourFormat,
287+
DatabasePath: databasePath,
288+
CSRFSecretPath: csrfSecretPath,
289+
SessionSecretPath: sessionSecretPath,
290+
SessionsDirectory: sessionsDirectory,
291+
AttachmentsDirectory: attachmentsDirectory,
292+
HTTPDisable: raw.HTTPDisable,
293+
HTTPAddress: httpAddress,
294+
HTTPPort: raw.HTTPPort,
295+
HTTPBodyLimit: maxBytesForEachPayload,
296+
HTTPURL: raw.HTTPURL,
297+
SMTPDisable: raw.SMTPDisable,
298+
SMTPAddress: smtpAddress,
299+
SMTPMaxMessageBytes: maxBytesForEachPayload,
300+
// IMAPDisable: raw.IMAPDisable,
301+
// IMAPAddress: imapAddress,
302302
Config: config,
303303
EndpointFactory: endpointFactory,
304304
InternalEndpoints: endpoints,

‎go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/a-h/templ v0.2.334
88
github.com/containrrr/shoutrrr v0.8.0
99
github.com/dustin/go-humanize v1.0.1
10-
github.com/emersion/go-imap v1.2.1
1110
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
1211
github.com/emersion/go-smtp v0.18.1
1312
github.com/go-chi/chi/v5 v5.0.10
@@ -38,7 +37,6 @@ require (
3837
require (
3938
github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a // indirect
4039
github.com/davecgh/go-spew v1.1.1 // indirect
41-
github.com/emersion/go-message v0.16.0 // indirect
4240
github.com/fatih/color v1.15.0 // indirect
4341
github.com/fatih/structs v1.1.0 // indirect
4442
github.com/fsnotify/fsnotify v1.6.0 // indirect

‎go.sum

-7
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,11 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
2121
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2222
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
2323
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
24-
github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
25-
github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
26-
github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
27-
github.com/emersion/go-message v0.16.0 h1:uZLz8ClLv3V5fSFF/fFdW9jXjrZkXIpE1Fn8fKx7pO4=
28-
github.com/emersion/go-message v0.16.0/go.mod h1:pDJDgf/xeUIF+eicT6B/hPX/ZbEorKkUMPOxrPVG2eQ=
2924
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
3025
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
3126
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
3227
github.com/emersion/go-smtp v0.18.1 h1:4DFV0jxKhq0Gqt/Br3BRHyKZy5TStk6NIMHAx6GE/LA=
3328
github.com/emersion/go-smtp v0.18.1/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
34-
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
35-
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
3629
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
3730
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
3831
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=

0 commit comments

Comments
 (0)
Please sign in to comment.