diff --git a/rss/feed.go b/rss/feed.go index c057b3d..f33b2b9 100644 --- a/rss/feed.go +++ b/rss/feed.go @@ -107,7 +107,7 @@ func (feed *Feed) fromGofeed(gofeed *gofeed.Feed) ([]*Item, error) { if err != nil { return nil, err } - feed.Updated = time.Now().UTC() //*updated + feed.Updated = *updated //time.Now().UTC() //*updated feed.Title = gofeed.Title return newitems, nil } diff --git a/rss/item_test.go b/rss/item_test.go index 32424a5..3066f0c 100644 --- a/rss/item_test.go +++ b/rss/item_test.go @@ -22,7 +22,7 @@ func Test_RSSItem(t *testing.T) { output: Item{ Name: "a", Link: "b", - Content: `
`, + Content: `a

`, }, }, { @@ -35,7 +35,7 @@ func Test_RSSItem(t *testing.T) { output: Item{ Name: "a", Link: "b", - Content: ``, + Content: `a
`, }, }, { @@ -48,7 +48,7 @@ func Test_RSSItem(t *testing.T) { output: Item{ Name: "a", Link: "b", - Content: "", + Content: `a
`, }, }, { @@ -61,7 +61,7 @@ func Test_RSSItem(t *testing.T) { output: Item{ Name: "a", Link: "b", - Content: ``, + Content: `a
`, }, }, { @@ -74,7 +74,7 @@ func Test_RSSItem(t *testing.T) { output: Item{ Name: "a", Link: "b", - Content: "x
y", + Content: `a
x
y`, }, }, } diff --git a/server/server.go b/server/server.go index 283cf71..4537799 100644 --- a/server/server.go +++ b/server/server.go @@ -96,8 +96,12 @@ func (s *Server) feed(w http.ResponseWriter, r *http.Request) { case "tag": s.getFeedTag(w, r) default: - r.URL.Path = v + "/" + r.URL.Path - s.getFeed(w, r) + if v == "" { + s.bad(w, r) + } else { + r.URL.Path = v + "/" + r.URL.Path + s.getFeed(w, r) + } } case "POST": s.newFeed(w, r) diff --git a/store/bolt.go b/store/bolt.go index d3a7681..3c3c464 100644 --- a/store/bolt.go +++ b/store/bolt.go @@ -48,7 +48,8 @@ func (bc *BoltClient) List(namespace, key string, asc bool, limit int) ([]string found = append(found, string(k)) } } else { - for k, _ := c.Seek([]byte(key)); k != nil && len(found) < limit; k, _ = c.Next() { + key += "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" + for k, _ := c.Seek([]byte(key)); k != nil && len(found) < limit; k, _ = c.Prev() { found = append(found, string(k)) } }