Compare commits

..

No commits in common. "691012307b87a576d91af2cb9bbe2d66cc8e4f6f" and "877a87e21d34b514a0f70ea166e8e95e89e28125" have entirely different histories.

3 changed files with 5 additions and 5 deletions

View File

@ -341,7 +341,7 @@ func performCommands(sub microsub.Microsub, commands []string) {
u := commands[2]
_, err := sub.FollowURL(uid, u)
if err != nil {
log.Fatalf("ERROR: %s", err)
log.Fatalf("An error occurred: %s\n", err)
}
// NOTE(peter): should we show the returned feed here?
}
@ -488,7 +488,7 @@ func importJsonIntoMicrosub(sub microsub.Microsub, filename string) {
feeds, err := sub.FollowGetList(uid)
if err != nil {
log.Fatalf("An error occurred: %s\n", err)
log.Fatalf("An error occurred: %q\n", err)
}
for _, f := range feeds {
@ -500,7 +500,7 @@ func importJsonIntoMicrosub(sub microsub.Microsub, filename string) {
if _, e := feedMap[string(feed)]; !e {
_, err := sub.FollowURL(uid, string(feed))
if err != nil {
log.Printf("An error occurred: %s\n", err)
log.Printf("An error occurred: %q\n", err)
continue
}
log.Printf("Feed followed: %s\n", string(feed))

View File

@ -695,7 +695,7 @@ func Fetch2(fetchURL string) (*http.Response, error) {
client := http.Client{}
resp, err := client.Do(req)
if err != nil {
return nil, fmt.Errorf("fetch failed: %s", u, err)
return nil, fmt.Errorf("error while fetching %s: %s", u, err)
}
defer resp.Body.Close()

View File

@ -34,7 +34,7 @@ type redisStreamTimeline struct {
func (b *memoryBackend) getTimeline(channel string) TimelineBackend {
// TODO: fetch timeline type from channel
timelineType := "sorted-set"
if channel == "notifications" || channel == "tweets" {
if channel == "notifications" {
timelineType = "stream"
}
if timelineType == "sorted-set" {