From 49a64a656cb145130a4f2b0432fb75acc8869fc6 Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@protonmail.com>
Date: Fri, 17 Apr 2020 11:46:09 +0200
Subject: [PATCH] refactor: remove unexported fetchMessage

---
 internal/store/event_loop.go      | 2 +-
 internal/store/mailbox_message.go | 2 +-
 internal/store/user_message.go    | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/internal/store/event_loop.go b/internal/store/event_loop.go
index 5979c151..5072259e 100644
--- a/internal/store/event_loop.go
+++ b/internal/store/event_loop.go
@@ -430,7 +430,7 @@ func (loop *eventLoop) processMessages(eventLog *logrus.Entry, messages []*pmapi
 
 				msgLog.WithError(err).Warning("Message was not present in DB. Trying fetch...")
 
-				if msg, err = loop.store.fetchMessage(message.ID); err != nil {
+				if msg, err = loop.apiClient.GetMessage(message.ID); err != nil {
 					if err == pmapi.ErrNoSuchMessage {
 						msgLog.WithError(err).Warn("Skipping message update because message exists neither in local DB nor on API")
 						err = nil
diff --git a/internal/store/mailbox_message.go b/internal/store/mailbox_message.go
index aacf79be..3e2fcf7b 100644
--- a/internal/store/mailbox_message.go
+++ b/internal/store/mailbox_message.go
@@ -37,7 +37,7 @@ func (storeMailbox *Mailbox) GetMessage(apiID string) (*Message, error) {
 // FetchMessage fetches the message with the given `apiID`, stores it in the database, and returns a new store message
 // wrapping it.
 func (storeMailbox *Mailbox) FetchMessage(apiID string) (*Message, error) {
-	msg, err := storeMailbox.store.fetchMessage(apiID)
+	msg, err := storeMailbox.api().GetMessage(apiID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/store/user_message.go b/internal/store/user_message.go
index e0dc3782..9fc91c0d 100644
--- a/internal/store/user_message.go
+++ b/internal/store/user_message.go
@@ -142,14 +142,6 @@ func (store *Store) getMessageFromDB(apiID string) (msg *pmapi.Message, err erro
 	return
 }
 
-// fetchMessage returns pmapi struct of message by API ID. If the requested
-// message is not in the database, it will try to fetch it from the server.
-// NOTE: Do not update the database here to prevent issues (extreme edge case).
-// The database will be updated by the event loop anyway.
-func (store *Store) fetchMessage(apiID string) (msg *pmapi.Message, err error) {
-	return store.api.GetMessage(apiID)
-}
-
 func (store *Store) txGetMessage(tx *bolt.Tx, apiID string) (*pmapi.Message, error) {
 	b := tx.Bucket(metadataBucket)