From ebe1fc2391af8085e36970707a1bd8ff1badb68b Mon Sep 17 00:00:00 2001
From: ajmckee <aj.mckee@ramjam.io>
Date: Fri, 7 May 2021 00:00:21 +0200
Subject: [PATCH] =?UTF-8?q?Update=20PR=20to=20remove=20redundant=20if?=
 =?UTF-8?q?=E2=80=99s=20and=20comments.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish.go | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/publish.go b/publish.go
index e321e5e..65f15b1 100644
--- a/publish.go
+++ b/publish.go
@@ -40,9 +40,10 @@ type PublishOptions struct {
 	ContentType string
 	// Transient or Persistent
 	DeliveryMode uint8
-	// Expiration time in ms a message will expire from a queue.
-	Expiration		string
-	Headers      Table
+	// Expiration time in ms that a message will expire from a queue.
+	// See https://www.rabbitmq.com/ttl.html#per-message-ttl-in-publishers
+	Expiration string
+	Headers Table
 }
 
 // WithPublishOptionsExchange returns a function that sets the exchange to publish to
@@ -197,18 +198,9 @@ func (publisher *Publisher) Publish(
 		var message = amqp.Publishing{}
 		message.ContentType = options.ContentType
 		message.DeliveryMode = options.DeliveryMode
-		// Message Body
 		message.Body = data
-
-		// If no header options, don't add.
-		if len(options.Headers) > 0 {
-			message.Headers = tableToAMQPTable(options.Headers)
-		}
-
-		// If we have a TTL use it.
-		if options.Expiration != "" {
-			message.Expiration = options.Expiration
-		}
+		message.Headers = tableToAMQPTable(options.Headers)
+		message.Expiration = options.Expiration
 
 		// Actual publish.
 		err := publisher.chManager.channel.Publish(