Skip to content

add dynamodb support #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: AlexDenfordGGG posts not tracked on Reddit #72
merged 3 commits into from
Nov 26, 2018
Merged

add dynamodb support #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa407cd
add dynamodb support
ccbrown Nov 26, 2018
df56177
don't export dynamodb table creation function
ccbrown Nov 26, 2018
12d96ea
compatibility fix for older db entries
ccbrown Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
compatibility fix for older db entries
  • Loading branch information
@ccbrown
ccbrown committed Nov 26, 2018
commit 12d96ea86cdd2c3fd518638c2221da2cce7232ef
2 changes: 1 addition & 1 deletion server/bolt_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (db *BoltDatabase) Activity(locale *Locale, start string, count int) ([]Act
activity, err := unmarshalActivity(k, v)
if err != nil {
return err
} else if locale.ActivityFilter(activity) {
} else if activity != nil && locale.ActivityFilter(activity) {
ret = append(ret, activity)
next = base64.RawURLEncoding.EncodeToString(k)
}
Expand Down
3 changes: 1 addition & 2 deletions server/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package server

import (
"encoding/binary"
"fmt"

json "github.com/json-iterator/go"
)
Expand Down Expand Up @@ -67,5 +66,5 @@ func unmarshalActivity(key, value []byte) (Activity, error) {
}
return post, nil
}
return nil, fmt.Errorf("invalid activity key")
return nil, nil
}
6 changes: 3 additions & 3 deletions server/dynamodb_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ func (db *DynamoDBDatabase) Activity(locale *Locale, start string, count int) ([
return nil, "", err
}
for _, item := range result.Items {
a, err := unmarshalActivity(item["rk"].B, item["v"].B)
if err != nil {
if a, err := unmarshalActivity(item["rk"].B, item["v"].B); err != nil {
return nil, "", err
} else if a != nil {
activity = append(activity, a)
}
activity = append(activity, a)
}
if result.LastEvaluatedKey == nil {
break
Expand Down