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

Move TimelineGet to backend code

Browse Source
This commit is contained in:
Peter Stuifzand 2018-12-25 12:29:32 +01:00
parent 56d9981a4a
commit 67c8b03467
Signed by: peter
GPG Key ID: 374322D56E5209E8
2 changed files with 157 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
cmd/eksterd/memory.go
View File

@ -305,89 +305,17 @@ func (b *memoryBackend) run() {
}
func (b *memoryBackend) TimelineGet(before, after, channel string) (microsub.Timeline, error) {
conn := pool.Get()
defer conn.Close()
items := []microsub.Item{}
log.Printf("TimelineGet %s\n", channel)
feeds, err := b.FollowGetList(channel)
// Check if feed exists
_, err := b.FollowGetList(channel)
if err != nil {
return microsub.Timeline{Items: items}, err
}
log.Println(feeds)
zchannelKey := fmt.Sprintf("zchannel:%s:posts", channel)
afterScore := "-inf"
if len(after) != 0 {
afterScore = "(" + after
}
beforeScore := "+inf"
if len(before) != 0 {
beforeScore = "(" + before
return microsub.Timeline{Items: []microsub.Item{}}, err
}
var itemJSONs [][]byte
timelineBackend := GetTimeline("sorted-set", channel)
itemScores, err := redis.Strings(
conn.Do(
"ZRANGEBYSCORE",
zchannelKey,
afterScore,
beforeScore,
"LIMIT",
0,
20,
"WITHSCORES",
),
)
if err != nil {
return microsub.Timeline{
Paging: microsub.Pagination{},
Items: items,
}, err
}
if len(itemScores) >= 2 {
before = itemScores[1]
after = itemScores[len(itemScores)-1]
} else {
before = ""
after = ""
}
for i := 0; i < len(itemScores); i += 2 {
itemID := itemScores[i]
itemJSON, err := redis.Bytes(conn.Do("HGET", itemID, "Data"))
if err != nil {
log.Println(err)
continue
}
itemJSONs = append(itemJSONs, itemJSON)
}
for _, obj := range itemJSONs {
item := microsub.Item{}
err := json.Unmarshal(obj, &item)
if err != nil {
// FIXME: what should we do if one of the items doen't unmarshal?
log.Println(err)
continue
}
item.Read = false
items = append(items, item)
}
paging := microsub.Pagination{
After: after,
Before: before,
}
return microsub.Timeline{
Paging: paging,
Items: items,
}, nil
return timelineBackend.GetItems(before, after)
}
func (b *memoryBackend) FollowGetList(uid string) ([]microsub.Feed, error) {

151
cmd/eksterd/timeline.go Normal file
View File

@ -0,0 +1,151 @@
package main
import (
"encoding/json"
"fmt"
"log"
"github.com/gomodule/redigo/redis"
"p83.nl/go/ekster/pkg/microsub"
)
type TimelineBackend interface {
GetItems(before, after string) (microsub.Timeline, error)
AddItem(item microsub.Item) error
MarkRead(uid string) error
MarkUnread(uid string) error
}
type redisSortedSetTimeline struct {
channel string
}
type redisStreamTimeline struct {
channel string
}
func GetTimeline(timelineType, channel string) TimelineBackend {
if timelineType == "sorted-set" {
return &redisSortedSetTimeline{channel}
}
if timelineType == "stream" {
return &redisStreamTimeline{channel}
}
return nil
}
/*
* REDIS SORTED SETS TIMELINE
*/
func (timeline *redisSortedSetTimeline) GetItems(before, after string) (microsub.Timeline, error) {
conn := pool.Get()
defer conn.Close()
items := []microsub.Item{}
channel := timeline.channel
zchannelKey := fmt.Sprintf("zchannel:%s:posts", channel)
afterScore := "-inf"
if len(after) != 0 {
afterScore = "(" + after
}
beforeScore := "+inf"
if len(before) != 0 {
beforeScore = "(" + before
}
var itemJSONs [][]byte
itemScores, err := redis.Strings(
conn.Do(
"ZRANGEBYSCORE",
zchannelKey,
afterScore,
beforeScore,
"LIMIT",
0,
20,
"WITHSCORES",
),
)
if err != nil {
return microsub.Timeline{
Paging: microsub.Pagination{},
Items: items,
}, err
}
if len(itemScores) >= 2 {
before = itemScores[1]
after = itemScores[len(itemScores)-1]
} else {
before = ""
after = ""
}
for i := 0; i < len(itemScores); i += 2 {
itemID := itemScores[i]
itemJSON, err := redis.Bytes(conn.Do("HGET", itemID, "Data"))
if err != nil {
log.Println(err)
continue
}
itemJSONs = append(itemJSONs, itemJSON)
}
for _, obj := range itemJSONs {
item := microsub.Item{}
err := json.Unmarshal(obj, &item)
if err != nil {
// FIXME: what should we do if one of the items doen't unmarshal?
log.Println(err)
continue
}
item.Read = false
items = append(items, item)
}
paging := microsub.Pagination{
After: after,
Before: before,
}
return microsub.Timeline{
Paging: paging,
Items: items,
}, nil
}
func (*redisSortedSetTimeline) AddItem(item microsub.Item) error {
panic("implement me")
}
func (*redisSortedSetTimeline) MarkRead(uid string) error {
panic("implement me")
}
func (*redisSortedSetTimeline) MarkUnread(uid string) error {
panic("implement me")
}
/*
* REDIS STREAMS TIMELINE
*/
func (*redisStreamTimeline) GetItems(before, after string) (microsub.Timeline, error) {
panic("implement me")
}
func (*redisStreamTimeline) AddItem(item microsub.Item) error {
panic("implement me")
}
func (*redisStreamTimeline) MarkRead(uid string) error {
panic("implement me")
}
func (*redisStreamTimeline) MarkUnread(uid string) error {
panic("implement me")
}