respecting content:true correctly;

hexojs · Feb 12, 2017 · 57c2dd0 · 57c2dd0
1 parent b973425
commit 57c2dd0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/atom.xml b/atom.xml
@@ -30,7 +30,11 @@
     {% elif post.excerpt %}
       {{ post.excerpt }}
     {% elif post.content %}
-       {{ post.feedShortContent }}
+       {% if not config.feed.content and config.feed.content_limit %}
+         {{ post.feedShortContent }}
+       {% else %}
+         {{ post.content }}
+       {% endif %}
     {% endif %}
     </summary>
     {% for category in post.categories.toArray() %}

diff --git a/lib/generator.js b/lib/generator.js
@@ -23,22 +23,24 @@ module.exports = function(locals) {
   var posts = locals.posts.sort('-date');
   if (feedConfig.limit) posts = posts.limit(feedConfig.limit);
 
-  posts.forEach(function(post) {
-	  var safe_content = hexoutil.stripHTML(post.content);
-	  post.feedShortContent = safe_content.substring(0, feedConfig.content_limit);
-
-          if (typeof feedConfig.content_limit_delim != 'undefined') {
-		var delim_pos = -1;
-		for (var ind in feedConfig.content_limit_delim) {
-			var delim = feedConfig.content_limit_delim[ind];
-			delim_pos = post.feedShortContent.lastIndexOf(delim);
-			if (delim_pos > -1) {
-				post.feedShortContent = post.feedShortContent.substring(0, delim_pos+1);
-				break;
+  if (typeof feedConfig.content_limit != 'undefined') {
+	  posts.forEach(function(post) {
+		  var safe_content = hexoutil.stripHTML(post.content);
+		  post.feedShortContent = safe_content.substring(0, feedConfig.content_limit);
+
+		  if (typeof feedConfig.content_limit_delim != 'undefined') {
+			var delim_pos = -1;
+			for (var ind in feedConfig.content_limit_delim) {
+				var delim = feedConfig.content_limit_delim[ind];
+				delim_pos = post.feedShortContent.lastIndexOf(delim);
+				if (delim_pos > -1) {
+					post.feedShortContent = post.feedShortContent.substring(0, delim_pos+1);
+					break;
+				}
 			}
-		}
-	  }
-  });
+		  }
+	  });
+  }
 
   var url = config.url;
   if (url[url.length - 1] !== '/') url += '/';

diff --git a/rss2.xml b/rss2.xml
@@ -22,7 +22,11 @@
       {% elif post.excerpt %}
         {{ post.excerpt }}
       {% elif post.content %}
-       {{ post.feedShortContent }}
+       {% if not config.feed.content and config.feed.content_limit %}
+         {{ post.feedShortContent }}
+       {% else %}
+         {{ post.content }}
+       {% endif %}
       {% endif %}
       </description>
       {% if config.feed.content and post.content %}