From ca5ef645f3e63013288192e69643ebc05286501b Mon Sep 17 00:00:00 2001
From: Mechiel Lukkien <mechiel@ueber.net>
Date: Fri, 15 Sep 2023 17:51:28 +0200
Subject: [PATCH] rename Account.Deliver to Account.DeliverDestination

the name was too generic compared with the other Deliver functions
---
 ctl.go                | 2 +-
 queue/queue.go        | 2 +-
 store/account.go      | 4 ++--
 store/account_test.go | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ctl.go b/ctl.go
index 01985ef..5cd5e62 100644
--- a/ctl.go
+++ b/ctl.go
@@ -340,7 +340,7 @@ func servectlcmd(ctx context.Context, ctl *ctl, shutdown func()) {
 		}
 
 		a.WithWLock(func() {
-			err := a.Deliver(log, addr, m, msgFile, true)
+			err := a.DeliverDestination(log, addr, m, msgFile, true)
 			ctl.xcheck(err, "delivering message")
 			log.Info("message delivered through ctl", mlog.Field("to", to))
 		})
diff --git a/queue/queue.go b/queue/queue.go
index fb5fb65..89c4846 100644
--- a/queue/queue.go
+++ b/queue/queue.go
@@ -219,7 +219,7 @@ func Add(ctx context.Context, log *mlog.Log, senderAccount string, mailFrom, rcp
 		conf, _ := acc.Conf()
 		dest := conf.Destinations[mailFrom.String()]
 		acc.WithWLock(func() {
-			err = acc.Deliver(log, dest, &m, msgFile, consumeFile)
+			err = acc.DeliverDestination(log, dest, &m, msgFile, consumeFile)
 		})
 		if err != nil {
 			return 0, fmt.Errorf("delivering message: %v", err)
diff --git a/store/account.go b/store/account.go
index 0a0e327..e5eb8f8 100644
--- a/store/account.go
+++ b/store/account.go
@@ -1650,12 +1650,12 @@ func (a *Account) MessageReader(m Message) *MsgReader {
 	return &MsgReader{prefix: m.MsgPrefix, path: a.MessagePath(m.ID), size: m.Size}
 }
 
-// Deliver delivers an email to dest, based on the configured rulesets.
+// DeliverDestination delivers an email to dest, based on the configured rulesets.
 //
 // Caller must hold account wlock (mailbox may be created).
 // Message delivery, possible mailbox creation, and updated mailbox counts are
 // broadcasted.
-func (a *Account) Deliver(log *mlog.Log, dest config.Destination, m *Message, msgFile *os.File, consumeFile bool) error {
+func (a *Account) DeliverDestination(log *mlog.Log, dest config.Destination, m *Message, msgFile *os.File, consumeFile bool) error {
 	var mailbox string
 	rs := MessageRuleset(log, dest, m, m.MsgPrefix, msgFile)
 	if rs != nil {
diff --git a/store/account_test.go b/store/account_test.go
index b208f50..4deb6ba 100644
--- a/store/account_test.go
+++ b/store/account_test.go
@@ -70,7 +70,7 @@ func TestMailbox(t *testing.T) {
 	}
 	acc.WithWLock(func() {
 		conf, _ := acc.Conf()
-		err := acc.Deliver(xlog, conf.Destinations["mjl"], &m, msgFile, false)
+		err := acc.DeliverDestination(xlog, conf.Destinations["mjl"], &m, msgFile, false)
 		tcheck(t, err, "deliver without consume")
 
 		err = acc.DB.Write(ctxbg, func(tx *bstore.Tx) error {
@@ -108,7 +108,7 @@ func TestMailbox(t *testing.T) {
 		})
 		tcheck(t, err, "deliver as sent and rejects")
 
-		err = acc.Deliver(xlog, conf.Destinations["mjl"], &mconsumed, msgFile, true)
+		err = acc.DeliverDestination(xlog, conf.Destinations["mjl"], &mconsumed, msgFile, true)
 		tcheck(t, err, "deliver with consume")
 
 		err = acc.DB.Write(ctxbg, func(tx *bstore.Tx) error {