Merge pull request #117 from curbengh/optional-updated

fix: compatibility with null post.updated

Author: curbengh

atom.xml

@@ -6,7 +6,7 @@
   <link href="{{ feed_url | uriencode }}" rel="self"/>
   {% if config.feed.hub %}<link href="{{ config.feed.hub | uriencode }}" rel="hub"/>{% endif %}
   <link href="{{ url | uriencode }}"/>
-  <updated>{{ posts.first().updated.toISOString() }}</updated>
+  <updated>{% if posts.first().updated %}{{ posts.first().updated.toISOString() }}{% else %}{{ posts.first().date.toISOString() }}{% endif %}</updated>
   <id>{{ url | uriencode }}</id>
   {% if config.author %}
   <author>
@@ -21,7 +21,7 @@
     <link href="{{ post.permalink | uriencode }}"/>
     <id>{{ post.permalink | uriencode }}</id>
     <published>{{ post.date.toISOString() }}</published>
-    <updated>{{ post.updated.toISOString() }}</updated>
+    <updated>{% if post.updated %}{{ post.updated.toISOString() }}{% else %}{{ post.date.toISOString() }}{% endif %}</updated>
     {% if config.feed.content and post.content %}
     <content type="html"><![CDATA[{{ post.content | noControlChars | safe }}]]></content>
     {% endif %}

package.json

@@ -42,7 +42,7 @@
     "cheerio": "^0.22.0",
     "eslint": "^7.0.0",
     "eslint-config-hexo": "^4.1.0",
-    "hexo": "^4.0.0",
+    "hexo": "^5.0.0",
     "mocha": "^8.0.1",
     "nyc": "^15.1.0"
   },

rss2.xml

@@ -15,7 +15,7 @@
     <atom:link href="{{ feed_url | uriencode }}" rel="self" type="application/rss+xml"/>
     {% if config.feed.hub %}<atom:link href="{{ config.feed.hub | uriencode }}" rel="hub"/>{% endif %}
     <description>{{ config.description }}</description>
-    <pubDate>{{ posts.first().updated.toDate().toUTCString() }}</pubDate>
+    <pubDate>{% if posts.first().updated %}{{ posts.first().updated.toDate().toUTCString() }}{% else %}{{ posts.first().date.toDate().toUTCString() }}{% endif %}</pubDate>
     <generator>http://hexo.io/</generator>
     {% for post in posts.toArray() %}
     <item>

test/index.js

@@ -57,7 +57,9 @@ describe('Feed generator', () => {
     await Post.insert([
       {source: 'foo', slug: 'foo', content: '<h6>TestHTML</h6>', date: 1e8},
       {source: 'bar', slug: 'bar', date: 1e8 + 1},
-      {source: 'baz', slug: 'baz', title: 'With Image', image: 'test.png', date: 1e8 - 1}
+      {source: 'baz', slug: 'baz', title: 'With Image', image: 'test.png', date: 1e8 - 1},
+      {source: 'date', slug: 'date', title: 'date', date: 1e8 - 2, updated: undefined},
+      {source: 'updated', slug: 'updated', title: 'updated', date: 1e8 - 2, updated: 1e8 + 10}
     ]);
     posts = Post.sort('-date');
     locals = hexo.locals.toObject();
@@ -396,6 +398,40 @@ describe('Feed generator', () => {
       feed_url: 'http://localhost/atom.xml'
     }));
   });
+
+  it('no updated date', async () => {
+    hexo.config.feed = {
+      type: 'atom',
+      path: 'atom.xml'
+    };
+    hexo.config = Object.assign(hexo.config, urlConfig);
+    const feedCfg = hexo.config.feed;
+    const result = generator(locals, feedCfg.type, feedCfg.path);
+
+    const { items } = await p(result.data);
+    const post = items.filter(({ title }) => title === 'date');
+    const { date, updated } = post[0];
+
+    updated.should.eql(date);
+  });
+
+  it('updated date', async () => {
+    hexo.config.feed = {
+      type: 'atom',
+      path: 'atom.xml'
+    };
+    hexo.config = Object.assign(hexo.config, urlConfig);
+    const feedCfg = hexo.config.feed;
+    const result = generator(locals, feedCfg.type, feedCfg.path);
+
+    const { items } = await p(result.data);
+    const post = items.filter(({ title }) => title === 'updated');
+    const { date, updated } = post[0];
+    const expected = new Date(1e8 + 10).toISOString();
+
+    updated.should.eql(expected);
+    date.should.not.eql(updated);
+  });
 });
 
 it('No posts', () => {

test/parse.js

@@ -43,6 +43,7 @@ const template = {
       id: 'id',
       title: 'title',
       date: 'published',
+      updated: 'updated',
       description: 'summary',
       content: 'content[@type="html"]',
       image: 'content[@type="image"]/@src',