fix: 部分动态无法获取描述

shanmiteko · Jul 15, 2021 · ebf7440 · ebf7440
1 parent a0e668b
commit ebf7440
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ cd lottery
 进入lottery上一级目录
 
 ```bash
-docker image rm shanmite/lottery_auto_docker
+docker image rm -f shanmite/lottery_auto_docker
 rm -rf lottery/
 ```
 

diff --git a/lib/Public.js b/lib/Public.js
@@ -136,9 +136,9 @@ class Public {
                 obj.ctrl = (typeof extend_json === 'undefined') ? [] : strToJson(extend_json).ctrl || [];
                 /* 是否有官方抽奖 */
                 obj.hasOfficialLottery = (typeof extension === 'undefined') ? false : typeof extension.lott === 'undefined' ? false : true;
-                const item = cardToJson.item || {};
-                /* 转发者的描述 */
-                obj.description = item.content || item.description || '';
+                const { item = {} } = cardToJson;
+                /* 转发者的描述 后两个分别是视频动态的描述和视频本身的描述*/
+                obj.description = item.content || item.description || cardToJson.dynamic || cardToJson.desc || '';
                 if (obj.type === 1) {
                     /* 被转发者的UID */
                     obj.origin_uid = desc.origin.uid;
@@ -160,11 +160,14 @@ class Public {
                         false : typeof origin_extension.lott === 'undefined' ?
                             false : true;
                     const origin = cardToJson.origin || '{}';
-                    const { user, item } = strToJson(origin);
+                    const originToJson = strToJson(origin);
+                    const { user, item } = originToJson;
                     /* 被转发者的name */
-                    obj.origin_uname = typeof user === 'undefined' ? '' : user.name || user.uname || '';
+                    obj.origin_uname = typeof user === 'undefined'
+                        ? '' : user.name || user.uname || '';
                     /* 被转发者的描述 */
-                    obj.origin_description = typeof item === 'undefined' ? '' : item.content || item.description || '';
+                    obj.origin_description = typeof item === 'undefined'
+                        ? '' : item.content || item.description || originToJson.dynamic || originToJson.desc || '';
                 }
                 array.push(obj);
             });

diff --git a/lib/lottery-in-nodejs.js b/lib/lottery-in-nodejs.js
@@ -8,8 +8,8 @@ const { sendNotify } = require('./sendNotify');
 const config = require('./config');
 
 async function createRandomDynamic(num) {
-    Base.tooltip.log(`准备创建${num}条随机动态`);
     if (config.create_dy) {
+        Base.tooltip.log(`准备创建${num}条随机动态`);
         const Dynamic = await Public.prototype.checkAllDynamic(GlobalVar.get("myUID"), 1);
         if ((Dynamic.allModifyDynamicResArray[0] || { type: 0 }).type === 1) {
             for (let index = 0; index < num; index++) {

diff --git a/my_config.example.js b/my_config.example.js
@@ -8,7 +8,6 @@ module.exports = {
          */
         UIDs: [
             31252386,
-            35719643,
             689277291
         ],
 
@@ -133,7 +132,7 @@ module.exports = {
         /**
          * 屏蔽词
          */
-        blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号"],
+        blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼"],
 
         /**
          * 取关白名单