peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Leave "after" and "before" when all items are gotten

Browse Source
This commit is contained in:
Peter Stuifzand 2018-04-09 22:38:18 +02:00
parent 072af93608
commit 97f2fc8323
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/server/memory.go
View File

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