From 848d6a71873b12f10c03aa38be9910909fea27dd Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Mon, 22 Aug 2022 23:24:51 +0300
Subject: [PATCH] refactor mappings getter

---
 bot/bot.go      | 11 ++++++-----
 bot/mailbox.go  |  2 +-
 smtp/session.go | 17 ++++++-----------
 smtp/smtp.go    |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/bot/bot.go b/bot/bot.go
index bd09d62..c232766 100644
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -76,8 +76,8 @@ func (b *Bot) Start() error {
 
 // Send email to matrix room
 func (b *Bot) Send(ctx context.Context, from, to, subject, body string, files []*utils.File) error {
-	roomID, ok := b.rooms[utils.Mailbox(to)]
-	if !ok || roomID == "" {
+	roomID, ok := b.GetMapping(ctx, utils.Mailbox(to))
+	if !ok {
 		return errors.New("room not found")
 	}
 
@@ -117,15 +117,16 @@ func (b *Bot) Send(ctx context.Context, from, to, subject, body string, files []
 }
 
 // GetMappings returns mapping of mailbox = room
-func (b *Bot) GetMappings(ctx context.Context) (map[string]id.RoomID, error) {
+func (b *Bot) GetMapping(ctx context.Context, mailbox string) (id.RoomID, bool) {
 	if len(b.rooms) == 0 {
 		err := b.syncRooms(ctx)
 		if err != nil {
-			return nil, err
+			return "", false
 		}
 	}
 
-	return b.rooms, nil
+	roomID, ok := b.rooms[mailbox]
+	return roomID, ok
 }
 
 // Stop the bot
diff --git a/bot/mailbox.go b/bot/mailbox.go
index 7d8bc07..3ab9696 100644
--- a/bot/mailbox.go
+++ b/bot/mailbox.go
@@ -70,7 +70,7 @@ func (b *Bot) setMailbox(ctx context.Context, evt *event.Event, mailbox string)
 	defer span.Finish()
 
 	mailbox = utils.Mailbox(mailbox)
-	existingID, ok := b.rooms[mailbox]
+	existingID, ok := b.GetMapping(ctx, mailbox)
 	if ok && existingID != "" && existingID != evt.RoomID {
 		content := format.RenderMarkdown("Mailbox "+mailbox+"@"+b.domain+" already taken", true, true)
 		content.MsgType = event.MsgNotice
diff --git a/smtp/session.go b/smtp/session.go
index 1927bb1..8802d55 100644
--- a/smtp/session.go
+++ b/smtp/session.go
@@ -30,23 +30,18 @@ func (s *session) Mail(from string, opts smtp.MailOptions) error {
 
 func (s *session) Rcpt(to string) error {
 	sentry.GetHubFromContext(s.ctx).Scope().SetTag("to", to)
-	mappings, err := s.client.GetMappings(s.ctx)
-	if err != nil {
-		s.log.Error("cannot get mappings: %v", err)
-		return err
-	}
-	s.log.Debug("mappings: %v", mappings)
-	_, ok := mappings[utils.Mailbox(to)]
-	if !ok {
-		s.log.Debug("mapping for %s not found", to)
-		return smtp.ErrAuthRequired
-	}
 
 	if utils.Hostname(to) != s.domain {
 		s.log.Debug("wrong domain of %s", to)
 		return smtp.ErrAuthRequired
 	}
 
+	_, ok := s.client.GetMapping(s.ctx, utils.Mailbox(to))
+	if !ok {
+		s.log.Debug("mapping for %s not found", to)
+		return smtp.ErrAuthRequired
+	}
+
 	s.to = to
 	s.log.Debug("mail to %s", to)
 	return nil
diff --git a/smtp/smtp.go b/smtp/smtp.go
index e954406..98921a1 100644
--- a/smtp/smtp.go
+++ b/smtp/smtp.go
@@ -9,6 +9,6 @@ import (
 
 // Client interface to send emails
 type Client interface {
-	GetMappings(context.Context) (map[string]id.RoomID, error)
+	GetMapping(context.Context, string) (id.RoomID, bool)
 	Send(ctx context.Context, from, mailbox, subject, body string, files []*utils.File) error
 }