From b9373832eb1c9d14bf9ed10bea8b7074000ba8db Mon Sep 17 00:00:00 2001
From: Andre Medeiros <me@andremedeiros.info>
Date: Thu, 8 Jul 2021 23:29:53 -0400
Subject: [PATCH] actually remember last message id so we don't duplicate
 notifications

---
 cmd/apollo-worker-notifications/main.go | 40 ++++++++++++-------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/cmd/apollo-worker-notifications/main.go b/cmd/apollo-worker-notifications/main.go
index a8ccd26..25b0830 100644
--- a/cmd/apollo-worker-notifications/main.go
+++ b/cmd/apollo-worker-notifications/main.go
@@ -327,30 +327,28 @@ func (c *Consumer) Consume(delivery rmq.Delivery) {
 
 	// Set latest message we alerted on
 	latestMsg := msgs.MessageListing.Messages[0]
+	if err = c.pool.BeginFunc(ctx, func(tx pgx.Tx) error {
+		stmt := `
+			UPDATE accounts
+			SET last_message_id = $1
+			WHERE id = $2`
+		_, err := tx.Exec(ctx, stmt, latestMsg.FullName(), account.ID)
+		return err
+	}); err != nil {
+		c.logger.WithFields(logrus.Fields{
+			"accountID": id,
+			"err":       err,
+		}).Error("failed to update last_message_id for account")
+		delivery.Reject()
+		return
+	}
 
 	// Let's populate this with the latest message so we don't flood users with stuff
 	if account.LastMessageID == "" {
-		if err = c.pool.BeginFunc(ctx, func(tx pgx.Tx) error {
-			stmt := `
-				UPDATE accounts
-				SET last_message_id = $1
-				WHERE id = $2`
-			_, err := tx.Exec(ctx, stmt, latestMsg.FullName(), account.ID)
-			return err
-		}); err != nil {
-			c.logger.WithFields(logrus.Fields{
-				"accountID": id,
-				"err":       err,
-			}).Error("failed to update last_message_id for account")
-
-			delivery.Reject()
-		} else {
-			c.logger.WithFields(logrus.Fields{
-				"accountID": delivery.Payload(),
-			}).Debug("populating first message ID to prevent spamming")
-
-			delivery.Ack()
-		}
+		c.logger.WithFields(logrus.Fields{
+			"accountID": delivery.Payload(),
+		}).Debug("populating first message ID to prevent spamming")
+		delivery.Ack()
 		return
 	}