Revert "Quick fixes (#239)"

This reverts commit 5305abb.

Author: mmcdole

feed.go

@@ -38,7 +38,6 @@ type Feed struct {
 	FeedVersion     string                   `json:"feedVersion"`
 }
 
-// String returns a JSON representation of the Feed for debugging purposes.
 func (f Feed) String() string {
 	json, _ := json.MarshalIndent(f, "", "    ")
 	return string(json)
@@ -98,19 +97,9 @@ func (f Feed) Len() int {
 // Less compares PublishedParsed of Items[i], Items[k]
 // and returns true if Items[i] is less than Items[k].
 func (f Feed) Less(i, k int) bool {
-	iParsed := f.Items[i].PublishedParsed
-	kParsed := f.Items[k].PublishedParsed
-	
-	if iParsed == nil && kParsed == nil {
-		return false
-	}
-	if iParsed == nil {
-		return true
-	}
-	if kParsed == nil {
-		return false
-	}
-	return iParsed.Before(*kParsed)
+	return f.Items[i].PublishedParsed.Before(
+		*f.Items[k].PublishedParsed,
+	)
 }
 
 // Swap swaps Items[i] and Items[k].

json/parser.go

@@ -7,6 +7,9 @@ import (
 	jsoniter "github.com/json-iterator/go"
 )
 
+var (
+	j = jsoniter.ConfigCompatibleWithStandardLibrary
+)
 
 // Parser is an JSON Feed Parser
 type Parser struct{}
@@ -18,7 +21,6 @@ func (ap *Parser) Parse(feed io.Reader) (*Feed, error) {
 	buffer := new(bytes.Buffer)
 	buffer.ReadFrom(feed)
 
-	j := jsoniter.ConfigCompatibleWithStandardLibrary
 	err := j.Unmarshal(buffer.Bytes(), jsonFeed)
 	if err != nil {
 		return nil, err

parser.go

@@ -24,7 +24,6 @@ type HTTPError struct {
 	Status     string
 }
 
-// Error returns the string representation of the HTTP error.
 func (err HTTPError) Error() string {
 	return fmt.Sprintf("http error: %s", err.Status)
 }
@@ -125,7 +124,8 @@ func (f *Parser) ParseURLWithContext(feedURL string, ctx context.Context) (feed
 
 	if resp != nil {
 		defer func() {
-			if ce := resp.Body.Close(); ce != nil && err == nil {
+			ce := resp.Body.Close()
+			if ce != nil {
 				err = ce
 			}
 		}()

translator.go

@@ -257,9 +257,8 @@ func (t *DefaultRSSTranslator) translateFeedGenerator(rss *rss.Feed) (generator
 }
 
 func (t *DefaultRSSTranslator) translateFeedCategories(rss *rss.Feed) (categories []string) {
-	var cats []string
+	cats := []string{}
 	if rss.Categories != nil {
-		cats = make([]string, 0, len(rss.Categories))
 		for _, c := range rss.Categories {
 			cats = append(cats, c.Value)
 		}
@@ -291,7 +290,7 @@ func (t *DefaultRSSTranslator) translateFeedCategories(rss *rss.Feed) (categorie
 }
 
 func (t *DefaultRSSTranslator) translateFeedItems(rss *rss.Feed) (items []*Item) {
-	items = make([]*Item, 0, len(rss.Items))
+	items = []*Item{}
 	for _, i := range rss.Items {
 		items = append(items, t.translateFeedItem(i))
 	}
@@ -458,9 +457,8 @@ func firstImageFromHtmlDocument(document string) *Image {
 }
 
 func (t *DefaultRSSTranslator) translateItemCategories(rssItem *rss.Item) (categories []string) {
-	var cats []string
+	cats := []string{}
 	if rssItem.Categories != nil {
-		cats = make([]string, 0, len(rssItem.Categories))
 		for _, c := range rssItem.Categories {
 			cats = append(cats, c.Value)
 		}
@@ -641,7 +639,7 @@ func (t *DefaultAtomTranslator) translateFeedAuthor(atom *atom.Feed) (author *Pe
 
 func (t *DefaultAtomTranslator) translateFeedAuthors(atom *atom.Feed) (authors []*Person) {
 	if atom.Authors != nil {
-		authors = make([]*Person, 0, len(atom.Authors))
+		authors = []*Person{}
 
 		for _, a := range atom.Authors {
 			authors = append(authors, &Person{
@@ -693,7 +691,7 @@ func (t *DefaultAtomTranslator) translateFeedGenerator(atom *atom.Feed) (generat
 
 func (t *DefaultAtomTranslator) translateFeedCategories(atom *atom.Feed) (categories []string) {
 	if atom.Categories != nil {
-		categories = make([]string, 0, len(atom.Categories))
+		categories = []string{}
 		for _, c := range atom.Categories {
 			if c.Label != "" {
 				categories = append(categories, c.Label)
@@ -706,7 +704,7 @@ func (t *DefaultAtomTranslator) translateFeedCategories(atom *atom.Feed) (catego
 }
 
 func (t *DefaultAtomTranslator) translateFeedItems(atom *atom.Feed) (items []*Item) {
-	items = make([]*Item, 0, len(atom.Entries))
+	items = []*Item{}
 	for _, entry := range atom.Entries {
 		items = append(items, t.translateFeedItem(entry))
 	}
@@ -781,7 +779,7 @@ func (t *DefaultAtomTranslator) translateItemAuthor(entry *atom.Entry) (author *
 
 func (t *DefaultAtomTranslator) translateItemAuthors(entry *atom.Entry) (authors []*Person) {
 	if entry.Authors != nil {
-		authors = make([]*Person, 0, len(entry.Authors))
+		authors = []*Person{}
 		for _, a := range entry.Authors {
 			authors = append(authors, &Person{
 				Name:  a.Name,
@@ -802,7 +800,7 @@ func (t *DefaultAtomTranslator) translateItemImage(entry *atom.Entry) (image *Im
 
 func (t *DefaultAtomTranslator) translateItemCategories(entry *atom.Entry) (categories []string) {
 	if entry.Categories != nil {
-		categories = make([]string, 0, len(entry.Categories))
+		categories = []string{}
 		for _, c := range entry.Categories {
 			if c.Label != "" {
 				categories = append(categories, c.Label)
@@ -816,7 +814,7 @@ func (t *DefaultAtomTranslator) translateItemCategories(entry *atom.Entry) (cate
 
 func (t *DefaultAtomTranslator) translateItemEnclosures(entry *atom.Entry) (enclosures []*Enclosure) {
 	if entry.Links != nil {
-		enclosures = make([]*Enclosure, 0, len(entry.Links))
+		enclosures = []*Enclosure{}
 		for _, e := range entry.Links {
 			if e.Rel == "enclosure" {
 				enclosure := &Enclosure{}
@@ -1003,7 +1001,7 @@ func (t *DefaultJSONTranslator) translateFeedAuthor(json *json.Feed) (author *Pe
 
 func (t *DefaultJSONTranslator) translateFeedAuthors(json *json.Feed) (authors []*Person) {
 	if json.Authors != nil {
-		authors = make([]*Person, 0, len(json.Authors))
+		authors = []*Person{}
 		for _, a := range json.Authors {
 			name, address := shared.ParseNameAddress(a.Name)
 			author := &Person{}
@@ -1036,7 +1034,7 @@ func (t *DefaultJSONTranslator) translateFeedImage(json *json.Feed) (image *Imag
 }
 
 func (t *DefaultJSONTranslator) translateFeedItems(json *json.Feed) (items []*Item) {
-	items = make([]*Item, 0, len(json.Items))
+	items = []*Item{}
 	for _, i := range json.Items {
 		items = append(items, t.translateFeedItem(i))
 	}
@@ -1128,7 +1126,7 @@ func (t *DefaultJSONTranslator) translateItemAuthor(jsonItem *json.Item) (author
 
 func (t *DefaultJSONTranslator) translateItemAuthors(jsonItem *json.Item) (authors []*Person) {
 	if jsonItem.Authors != nil {
-		authors = make([]*Person, 0, len(jsonItem.Authors))
+		authors = []*Person{}
 		for _, a := range jsonItem.Authors {
 			name, address := shared.ParseNameAddress(a.Name)
 			author := &Person{}