From c6d1a8d4556e6e03bd09a866a810d80035a65914 Mon Sep 17 00:00:00 2001 From: Yevhen Odynets Date: Tue, 28 Oct 2025 13:36:53 +0200 Subject: [PATCH] fixed mails moving --- config/scope/stb.yaml | 6 +++--- internal/mail/mail.go | 2 ++ pkg/repository/stb.go | 9 +++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/scope/stb.yaml b/config/scope/stb.yaml index 8691d24..d014d38 100644 --- a/config/scope/stb.yaml +++ b/config/scope/stb.yaml @@ -7,10 +7,10 @@ stb: #mailboxes: ["Done"] search-criteria: ["Your Share The Brutality digest", "noreply@sharethebrutality.info"] move-processed-to-mailbox: - succeed: Processed/Succeed + succeed: Succeed #succeed: Done - failed: Processed/Failed - suspicious: Processed/Suspicious + failed: Failed + suspicious: Suspicious sender: mailbox: noreply host: sharethebrutality.info diff --git a/internal/mail/mail.go b/internal/mail/mail.go index 9d288cd..7ddafac 100644 --- a/internal/mail/mail.go +++ b/internal/mail/mail.go @@ -181,7 +181,9 @@ func (s *EmailService) MoveMessageToMailbox(msg *client.FetchMessageBuffer, stat movable.AddNum(msg.SeqNum) mailbox := viper.GetStringMapString("stb.move-processed-to-mailbox") wait, err := s.client.Move(movable, mailbox[status]).Wait() + if s.CheckErr("Moving to archive", err) { + fmt.Println("Error moving to mail:", mailbox[status], "Error:", err.Error()) return false } diff --git a/pkg/repository/stb.go b/pkg/repository/stb.go index 4078867..bc5e239 100644 --- a/pkg/repository/stb.go +++ b/pkg/repository/stb.go @@ -47,13 +47,10 @@ func (s *ShareTheBrutality) GetMail(email string) ([]model.ExternalSources, *mai //now := carbon.Now() s.EmailService.ListMessages(viper.GetStringSlice(mailboxes), searchCriteria) //box.CreateMailbox("INBOX/Processed") - //s.EmailService.CreateMailbox("Processed") //s.EmailService.CreateMailbox("Succeed") - //s.EmailService.CreateMailbox("Processed/Succeed") - //s.EmailService.DeleteMailbox("Processed") - //s.EmailService.CreateMailbox("Processed/Failed") - //s.EmailService.CreateMailbox("Processed/Suspicious") - //s.EmailService.MailboxesList() + //s.EmailService.DeleteMailbox("Succeed") + + s.EmailService.MailboxesList() entries := s.Processing(viper.GetStringMapString(fmt.Sprintf("%s.sender", s.scope)))