server

8d16dbb

Author: b (git@mail.blmayer.dev)

Date: Sat Jul 15 21:38:56 2023 -0300

Parent: daa51d7

Fixed some errors

Diff

cmd/dovel/main.go

commit 8d16dbbabfd53cfc7e12b6942347eee94cca22fd
Author: b <git@mail.blmayer.dev>
Date:   Sat Jul 15 21:38:56 2023 -0300

    Fixed some errors

diff --git a/cmd/dovel/main.go b/cmd/dovel/main.go
index 20e2350..38b1a29 100644
--- a/cmd/dovel/main.go
+++ b/cmd/dovel/main.go
@@ -42,7 +42,7 @@ var (
 )
 
 func main() {
-	configPath := ".dovel-config.json"
+	configPath := path.Join(os.UserConfigDir(), "config.json")
 	configFile, err := os.Open(configPath)
 	if err != nil {
 		println("open config", err.Error(), ". Using defaults")

interfaces/file/file.go

commit 8d16dbbabfd53cfc7e12b6942347eee94cca22fd
Author: b <git@mail.blmayer.dev>
Date:   Sat Jul 15 21:38:56 2023 -0300

    Fixed some errors

diff --git a/interfaces/file/file.go b/interfaces/file/file.go
index 8ff1ad1..bd959e0 100644
--- a/interfaces/file/file.go
+++ b/interfaces/file/file.go
@@ -42,6 +42,7 @@ type FileHandler struct {
 	root       string
 	domain     string
 	privateKey crypto.Signer
+	keyText string
 	vault      vault.Vault[interfaces.WebUser]
 }
 
@@ -60,6 +61,7 @@ func NewFileHandler(c config.InboxConfig, v vault.Vault[interfaces.WebUser], fs
 		if err != nil {
 			return f, err
 		}
+		f.keyText = string(key)
 
 		block, _ := pem.Decode(key)
 		if block == nil {
@@ -303,11 +305,12 @@ func (f FileHandler) Mail(file string) (interfaces.Email, error) {
 	}
 
 	// try to decrypt
-	if f.PrivateKey != nil && pgp.IsPGPMessage(email.Body) {
-		txt, err := helper.DecryptMessageArmored(f.PrivateKey, "", email.Body)
+	if f.privateKey != nil && pgp.IsPGPMessage(mail.TextBody) {
+		txt, err := helper.DecryptMessageArmored(f.keyText, nil, mail.TextBody)
 		if err != nil {
 			println(err)
 		}
+		mail.TextBody = txt
 	}
 	return interfaces.ToEmail(mail), nil
 }

interfaces/gwi/gwi.go

commit 8d16dbbabfd53cfc7e12b6942347eee94cca22fd
Author: b <git@mail.blmayer.dev>
Date:   Sat Jul 15 21:38:56 2023 -0300

    Fixed some errors

diff --git a/interfaces/gwi/gwi.go b/interfaces/gwi/gwi.go
index 417a45e..f92fcc1 100644
--- a/interfaces/gwi/gwi.go
+++ b/interfaces/gwi/gwi.go
@@ -140,7 +140,7 @@ The GWI team.`,
 	)
 	email.Subject = "New mail on project " + repo
 	email.From = fmt.Sprintf("%s/%s@%s", user, repo, g.domain)
-	return g.Send(email)
+	return g.Send(email, interfaces.Opt{})
 }
 
 func (g GWIHandler) Send(mail interfaces.Email, opts interfaces.Opt) error {