Merge pull request #612 from DIYgod/master

[pull] master from diygod:master

.github/dependabot.yml

@@ -9,10 +9,14 @@ updates:
     labels:
       - dependencies
     ignore:
+      - dependency-name: fanfou-sdk
+        versions: ['>=5.0.0']
       - dependency-name: got
         versions: ['>=12.0.0']
       - dependency-name: ip-regex
         versions: ['>=5.0.0']
+      - dependency-name: parse-torrent
+        versions: ['>=10.0.0']
       - dependency-name: remark
         versions: ['>=14.0.0']
       - dependency-name: remark-frontmatter

lib/v2/bangumi/tv/group/reply.js

@@ -21,6 +21,18 @@ module.exports = async (ctx) => {
                 date: $el.children().first().find('small').children().remove().end().text().slice(3),
             };
         });
+    const latestSubReplies = $('.sub_reply_bg')
+        .toArray()
+        .map((el) => {
+            const $el = $(el);
+            return {
+                id: $el.attr('id'),
+                author: $el.find('.userName .l').text(),
+                content: $el.find('.cmt_sub_content').html(),
+                date: $el.children().first().find('small').children().remove().end().text().slice(3),
+            };
+        });
+    const finalLatestReplies = latestReplies.concat(latestSubReplies).sort((a, b) => (a.id < b.id ? 1 : -1));
 
     const postTopic = {
         title,
@@ -34,7 +46,7 @@ module.exports = async (ctx) => {
         title: `${title}的最新回复`,
         link,
         item: [
-            ...latestReplies.map((c) => ({
+            ...finalLatestReplies.map((c) => ({
                 title: `${c.author} 回复了小组话题《${title}》`,
                 description: c.content,
                 pubDate: timezone(parseDate(c.date), +8),

package.json

@@ -80,7 +80,7 @@
     "request-promise-native": "1.0.9",
     "staged-git-files": "1.3.0",
     "string-width": "4.2.3",
-    "supertest": "6.3.1",
+    "supertest": "6.3.2",
     "tosource": "2.0.0-alpha.3",
     "unified": "9.2.2",
     "vuepress": "1.9.7",

yarn.lock

@@ -13059,10 +13059,10 @@ superagent@^8.0.3:
     qs "^6.11.0"
     semver "^7.3.8"
 
-supertest@6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.3.1.tgz#a8ad362fc6f323c88730ac191ce30427dc869088"
-  integrity sha512-hRohNeIfk/cA48Cxpa/w48hktP6ZaRqXb0QV5rLvW0C7paRsBU3Q5zydzYrslOJtj/gd48qx540jKtcs6vG1fQ==
+supertest@6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.3.2.tgz#7780b4b85bb2ea675c05b5cb80fa52f4dbe5a52b"
+  integrity sha512-mSmbW/sPpBU6K8w8189ZiHdc62zMe7dCHpC2ktS9tc0/d2DN0FaxNbDJJNFknZD4jCrGJpxkiFoVyemvKgOdwA==
   dependencies:
     methods "^1.1.2"
     superagent "^8.0.3"