From 97f2fc83239e12343260cc9d2b422f9d916cfed7 Mon Sep 17 00:00:00 2001
From: Peter Stuifzand <peter@stuifzand.eu>
Date: Mon, 9 Apr 2018 22:38:18 +0200
Subject: [PATCH] Leave "after" and "before" when all items are gotten

---
 cmd/server/memory.go | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/cmd/server/memory.go b/cmd/server/memory.go
index 2fff3c5..8d33bf5 100644
--- a/cmd/server/memory.go
+++ b/cmd/server/memory.go
@@ -374,15 +374,13 @@ func (b *memoryBackend) TimelineGet(after, before, channel string) microsub.Time
 	// 	}
 	// }
 
-	if len(after) == 0 {
-		after = "-inf"
-	} else {
-		after = "(" + after
+	afterScore := "-inf"
+	if len(after) != 0 {
+		afterScore = "(" + after
 	}
-	if len(before) == 0 {
-		before = "+inf"
-	} else {
-		before = "(" + before
+	beforeScore = "+inf"
+	if len(before) != 0 {
+		beforeScore = "(" + before
 	}
 
 	itemJSONs := [][]byte{}
@@ -391,8 +389,8 @@ func (b *memoryBackend) TimelineGet(after, before, channel string) microsub.Time
 		conn.Do(
 			"ZRANGEBYSCORE",
 			zchannelKey,
-			after,
-			before,
+			afterScore,
+			beforeScore,
 			"LIMIT",
 			0,
 			20,
@@ -411,9 +409,6 @@ func (b *memoryBackend) TimelineGet(after, before, channel string) microsub.Time
 	if len(itemScores) >= 2 {
 		before = itemScores[1]
 		after = itemScores[len(itemScores)-1]
-	} else {
-		before = ""
-		after = ""
 	}
 
 	for i := 0; i < len(itemScores); i += 2 {