兼容最新版微信抓取

lqqyt2423 · Mar 30, 2019 · b4fb57f · b4fb57f
1 parent 3c967c9
commit b4fb57f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/rule/index.js b/rule/index.js
@@ -7,7 +7,8 @@ const {
   getComments,
   getProfileBasicInfo,
   getPostList,
-  handleProfileHtml
+  handleProfileHtml,
+  getNextPostLink,
 } = require('./wechatRule');
 const basicAuth = require('./basicAuth');
 const config = require('../config');
@@ -80,7 +81,10 @@ const rule = {
       if (!config.rule.profile.disable) {
         nextLink = yield models.Profile.getNextProfileLink();
       }
-      if (!nextLink) nextLink = '';
+      if (!nextLink) {
+        nextLink = yield getNextPostLink();
+        debug('没有需要抓取的公众号了，自动开始文章抓取');
+      }
       debug('nextLink', nextLink);
       return {
         response: {

diff --git a/rule/wechatRule.js b/rule/wechatRule.js
@@ -381,7 +381,7 @@ const handleProfileHtml = async function (ctx) {
       const isScrollFn = time => {
         let contentText = document.querySelector('.weui-panel').innerText;
         contentText = contentText.trim();
-        const contentArr = contentText.split('\\n');
+        const contentArr = contentText.split('\\n').filter(function(el) {return el.length != 0});
 
         // 最后一行表示目前抓取的状态
         // 正在加载
@@ -582,4 +582,5 @@ module.exports = {
   getProfileBasicInfo,
   getPostList,
   handleProfileHtml,
+  getNextPostLink,
 };