Merge pull request danmactough#246 from Alex7Kom/master

danmactough · web-flow · commit d0c612c93681 · 2017-12-10T13:34:28.000-05:00
Prioritize alternate links for item.link
diff --git a/lib/feedparser/index.js b/lib/feedparser/index.js
@@ -790,7 +790,7 @@ FeedParser.prototype.handleItem = function handleItem (node, type, options){
             if (link['@']['href']) { // Atom
               if (_.get(link['@'], 'rel')) {
                 if (link['@']['rel'] == 'canonical') item.origlink = link['@']['href'];
-                if (link['@']['rel'] == 'alternate' && !item.link) item.link = link['@']['href'];
+                if (link['@']['rel'] == 'alternate') item.link = link['@']['href'];
                 if (link['@']['rel'] == 'self' && !item.link) item.link = link['@']['href'];
                 if (link['@']['rel'] == 'replies') item.comments = link['@']['href'];
                 if (link['@']['rel'] == 'enclosure') {
@@ -813,7 +813,7 @@ FeedParser.prototype.handleItem = function handleItem (node, type, options){
           if (el['@']['href']) { // Atom
             if (_.get(el['@'], 'rel')) {
               if (el['@']['rel'] == 'canonical') item.origlink = el['@']['href'];
-              if (el['@']['rel'] == 'alternate' && !item.link) item.link = el['@']['href'];
+              if (el['@']['rel'] == 'alternate') item.link = el['@']['href'];
               if (el['@']['rel'] == 'self' && !item.link) item.link = el['@']['href'];
               if (el['@']['rel'] == 'replies') item.comments = el['@']['href'];
               if (el['@']['rel'] == 'enclosure') {
diff --git a/test/feeds/non-text-alternate-links.xml b/test/feeds/non-text-alternate-links.xml
@@ -8,6 +8,7 @@
   <generator uri="http://golem.ph.utexas.edu/instiki/show/HomePage" version="0.19.7(MML+)">Instiki</generator>
   <entry>
     <title type="html">(0,1)-category</title>
+    <link rel="self" type="application/xhtml+xml" href="https://ncatlab.org/nlab/show/self_link/"/>
     <link rel="alternate" type="application/xhtml+xml" href="https://ncatlab.org/nlab/show/%280%2C1%29-category"/>
     <updated>2017-09-21T16:03:01Z</updated>
     <published>2009-09-08T23:20:59Z</published>
