env.js

Fixed #293

.github/workflows/docker.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx

.github/workflows/mirror.yml

@@ -10,7 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Mirror + trigger CI
         uses: SvanBoxel/gitlab-mirror-and-ci-action@master
         with:

.github/workflows/npmp.yml

@@ -12,7 +12,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - uses: JS-DevTools/npm-publish@v1
         with:
           token: ${{ secrets.NPM_TOKEN }}

.github/workflows/pkg.yml

@@ -30,16 +30,16 @@ jobs:
             nodev: 12
     steps:
       - name: "Checkout codes"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: "Use Node.js"
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: "*"
       - name: "Pkg this"
         run: |
           npm run pkg "node${{ matrix.nodev }}-${{ matrix.platform }}-x64"
       - name: "Upload to artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: node${{ matrix.nodev }}-${{ matrix.platform }}-x64
           path: "dist/*.zip"
@@ -49,7 +49,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           file: "dist/*.zip"
-          delete_file: "dist/*.zip"
           tag_name: "v2"
           overwrite: true
   arm64:
@@ -63,12 +62,12 @@ jobs:
           - platform: alpine
     steps:
       - name: "Checkout codes"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: "Pkg this"
         run: |
           npm run pkg "${{ matrix.platform }}-arm64"
       - name: "Upload to artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: arm64
           path: "dist/*.zip"
@@ -78,6 +77,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           file: "dist/*.zip"
-          delete_file: "dist/*.zip"
           tag_name: "v2"
           overwrite: true

CHANGELOG.md

@@ -1,5 +1,96 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.7.11)
+* 5a3c16d fix: 专栏获取内容不正确，需要排除推荐内容 (#293)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.10)
+* 29645bc fixed: 话题搜索功能已失效 #285
+* d950a59 fix: is_imitator导致错误评论
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.9)
+* 3828a0f fix: Cannot read properties of null (#284)
+* 67313f4 feat: 专栏里的动态链接识别优化 (#283)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.8)
+* ad6af97 feat: 专栏短链接识别 (#263)
+* b6c56c5 feat:  取关分区支持设置多分区 (#281)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.7)
+* 2426fe2 fix: 动态详情获取接口412频繁 (#279)
+* d370fef fix: 获取动态详情出现undefined (#271)
+* 00174b0 fix(monitor): L615
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.6)
+* 881923b fix: 开奖时间和粉丝数判断逻辑 (#253)
+* 097e2d6 fix: 筛选掉置顶的评论，与该动态UP的评论 (#252)
+* 82d285e fix:  充电专属动态 (#251)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.5)
+* 9c9bc18 fix:  查询评论报错 (#250)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.4)
+* 0630c89 feat: 新增设置抄热评屏蔽词 (#239)
+* 7b9d251 feat: 热评包含发送热评的人的昵称换成自己的昵称 (#239)
+* 5ae7801 fix: 带话题正则修改
+* 0ab5ec0 feat: 未知错误不重试
+* 50c22a4 fix: 账号异常点赞失败 (#247)
+* 8ac7466 fix: 未知错误 已赞过 (#249)
+* 7f6188d feat: UID保护列表输出调整为debug级
+* 2ad128c docs: change LICENSE
+* e945be4 feat: 检测docker是否已安装，未安装则预先安装docker
+* bfdbc7a fix: /bin/env path error
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.3)
+* d13c0a5 docs: 添加设置修改说明
+* 9615d25 fix: 预约抽奖转发 (#240)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.2)
+* af8c4a6 feat: 新增推送pushdeer (#236)
+* c1ca2b6 fix: 关键词筛选重复且影响官抽
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.1)
+* 92f1ad2 fix: 自动评论没有正确评论所有抽奖 (#235)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.0)
+* c84cb3f feat:  评论内容从评论区随机获取 (#134)
+* 4fa6d9a feat: 可关闭预约抽奖转发 (#196)
+* 0814154 feat:  关注分区移动可关闭 (#228)
+* 5097f2a feat: 清理动态时显示UID保护列表 (#229)
+* cb08e7a feat: 过滤掉充电包月抽奖 (#224)
+* 7b5a177 refactor: 调整推送格式 (#223)
+* 63b550e ci(mirror): shallow update not allowed
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.6.9)
+* 28fc79e fix: 通知内不显示抽奖信息
+* 9e6fe66 fix: free `log._cache`
+* 5b50611 ci: update actions
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
 ## 主要变化(2.6.8)
 * 847e680 feat: 丰富推送内容(#135)(#194)(#211)
 * 8bf5070 fix: `flatMap` is not a function (#218)

LICENSE

@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2020 shanmite
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -171,32 +171,34 @@ Chrome浏览器:
 
 以下是支持的推送方式
 
-|       Name        |                                        归属                                        | 说明                                                                                                                                                                                                                                                                                         |
-| :---------------: | :--------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-|      `SCKEY`      |                          微信server酱推送(于2021/4月下线)                          | server酱的微信通知[官方文档](http://sc.ftqq.com/3.version)                                                                                                                                                                                                                                   |
-|     `SENDKEY`     |                             微信server酱(Turbo版)推送                              | [获取SENDKEY](https://sct.ftqq.com/sendkey) [选择消息通道](https://sct.ftqq.com/forward)                                                                                                                                                                                                     |
-|    `BARK_PUSH`    | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | IOS用户下载BARK这个APP,填写内容是app提供的`设备码`，例如：<https://api.day.app/123> ，那么此处的设备码就是`123`，再不懂看 [这个图](https://raw.githubusercontents.com/shanmiteko/LotteryAutoScript/main/doc/pic/bark.jpg)（注：支持自建填完整链接即可）                                      |
-|   `BARK_SOUND`    | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | bark推送声音设置，例如`choo`,具体值请在`bark`-`推送铃声`-`查看所有铃声`                                                                                                                                                                                                                      |
-|  `TG_BOT_TOKEN`   |                                    telegram推送                                    | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写自己申请[@BotFather](https://t.me/BotFather)的Token,如`10xxx4:AAFcqxxxxgER5uw` , [具体教程](doc/TG_PUSH.md)                                                                                                                |
-|   `TG_USER_ID`    |                                    telegram推送                                    | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写[@getuseridbot](https://t.me/getuseridbot)中获取到的纯数字ID, [具体教程](doc/TG_PUSH.md)                                                                                                                                   |
-|  `TG_PROXY_HOST`  |                                 Telegram 代理的 IP                                 | 代理类型为 http。例子：http代理 <http://127.0.0.1:1080> 则填写 127.0.0.1                                                                                                                                                                                                                     |
-|  `TG_PROXY_PORT`  |                                Telegram 代理的端口                                 | 例子：http代理 <http://127.0.0.1:1080> 则填写 1080                                                                                                                                                                                                                                           |
-|  `DD_BOT_TOKEN`   |                                      钉钉推送                                      | 钉钉推送(`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需)[官方文档](https://ding-doc.dingtalk.com/doc#/serverapi2/qf2nxq) ,只需`https://oapi.dingtalk.com/robot/send?access_token=XXX` 等于`=`符号后面的XXX即可                                                                                      |
-|  `DD_BOT_SECRET`  |                                      钉钉推送                                      | (`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需) ,密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的`SECXXXXXXXXXX`等字符 , 注:钉钉机器人安全设置只需勾选`加签`即可，其他选项不要勾选,再不懂看 [这个图](https://raw.githubusercontents.com/shanmiteko/LotteryAutoScript/main/doc/pic/DD_bot.png) |
-|  `IGOT_PUSH_KEY`  |                                      iGot推送                                      | iGot聚合推送，支持多方式推送，确保消息可达。 [参考文档](https://wahao.github.io/Bark-MP-helper )                                                                                                                                                                                             |
-|     `QQ_SKEY`     |                                酷推(Cool Push)推送                                 | 推送所需的Skey,登录后获取Skey [参考文档](https://cp.xuthus.cc/)                                                                                                                                                                                                                              |
-|     `QQ_MODE`     |                                酷推(Cool Push)推送                                 | 推送方式(send或group或者wx，默认send) [参考文档](https://cp.xuthus.cc/)                                                                                                                                                                                                                      |
-|     `QYWX_AM`     |                                    企业微信应用                                    | 第一个值是企业id，第二个值是secret，第三个值@all(或者成员id)，第四个值是AgentID (逗号分割) 可查看此[教程](http://note.youdao.com/s/HMiudGkb) [官方文档](https://developer.work.weixin.qq.com/document/path/90236)                                                                            |
-|    `QYWX_KEY`     |                                  企业微信Bot推送                                   | 密钥，企业微信推送 webhook 后面的 key [详见官方说明文档](https://work.weixin.qq.com/api/doc/90000/90136/91770)                                                                                                                                                                               |
-| `PUSH_PLUS_TOKEN` |                                    pushplus推送                                    | 微信扫码登录后一对一推送或一对多推送下面的token(您的Token) [官方网站](http://pushplus.hxtrip.com/)                                                                                                                                                                                           |
-| `PUSH_PLUS_USER`  |                                    pushplus推送                                    | 一对多推送的“群组编码”（一对多推送下面->您的群组(如无则新建)->群组编码）注:(1、需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送)，只填`PUSH_PLUS_TOKEN`默认为一对一推送                                                                  |
-|    `QMSG_KEY`     |                      [Qmsg酱](https://qmsg.zendee.cn)私聊推送                      | [Qmsg注册](https://qmsg.zendee.cn/login.html)                                                                                                                                                                                                                                                |
-|     `QMSG_QQ`     |                       私聊消息推送接口，指定需要接收消息的QQ                       | 指定的QQ号必须在你的[管理台](https://qmsg.zendee.cn/me.html)已添加                                                                                                                                                                                                                           |
-|    `SMTP_HOST`    |                                      电子邮件                                      | smtp服务器的主机名 如: `smtp.qq.com`                                                                                                                                                                                                                                                         |
-|    `SMTP_PORT`    |                                      电子邮件                                      | smtp服务器的端口 如: `465`                                                                                                                                                                                                                                                                   |
-|    `SMTP_USER`    |                                      电子邮件                                      | 发送方的电子邮件   如: `xxxxxxxxx@qq.com`                                                                                                                                                                                                                                                    |
-|    `SMTP_PASS`    |                                      电子邮件                                      | smtp服务对应的授权码                                                                                                                                                                                                                                                                         |
-|  `SMTP_TO_USER`   |                                      电子邮件                                      | 接收方电子邮件                                                                                                                                                                                                                                                                               |
+|        Name        |                                        归属                                        | 说明                                                                                                                                                                                                                                                                                         |
+| :----------------: | :--------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|      `SCKEY`       |                          微信server酱推送(于2021/4月下线)                          | server酱的微信通知[官方文档](http://sc.ftqq.com/3.version)                                                                                                                                                                                                                                   |
+|     `SENDKEY`      |                             微信server酱(Turbo版)推送                              | [获取SENDKEY](https://sct.ftqq.com/sendkey) [选择消息通道](https://sct.ftqq.com/forward)                                                                                                                                                                                                     |
+|    `BARK_PUSH`     | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | IOS用户下载BARK这个APP,填写内容是app提供的`设备码`，例如：<https://api.day.app/123> ，那么此处的设备码就是`123`，再不懂看 [这个图](https://raw.githubusercontents.com/shanmiteko/LotteryAutoScript/main/doc/pic/bark.jpg)（注：支持自建填完整链接即可）                                      |
+|    `BARK_SOUND`    | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | bark推送声音设置，例如`choo`,具体值请在`bark`-`推送铃声`-`查看所有铃声`                                                                                                                                                                                                                      |
+|   `PUSHDEER_URL`   |                  [Pushdeer](https://github.com/easychen/pushdeer)                  | 推送api 默认: <https://api2.pushdeer.com/message/push>                                                                                                                                                                                                                                       |
+| `PUSHDEER_PUSHKEY` |                  [Pushdeer](https://github.com/easychen/pushdeer)                  | PushKey                                                                                                                                                                                                                                                                                      |
+|   `TG_BOT_TOKEN`   |                                    telegram推送                                    | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写自己申请[@BotFather](https://t.me/BotFather)的Token,如`10xxx4:AAFcqxxxxgER5uw` , [具体教程](doc/TG_PUSH.md)                                                                                                                |
+|    `TG_USER_ID`    |                                    telegram推送                                    | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写[@getuseridbot](https://t.me/getuseridbot)中获取到的纯数字ID, [具体教程](doc/TG_PUSH.md)                                                                                                                                   |
+|  `TG_PROXY_HOST`   |                                 Telegram 代理的 IP                                 | 代理类型为 http。例子：http代理 <http://127.0.0.1:1080> 则填写 127.0.0.1                                                                                                                                                                                                                     |
+|  `TG_PROXY_PORT`   |                                Telegram 代理的端口                                 | 例子：http代理 <http://127.0.0.1:1080> 则填写 1080                                                                                                                                                                                                                                           |
+|   `DD_BOT_TOKEN`   |                                      钉钉推送                                      | 钉钉推送(`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需)[官方文档](https://ding-doc.dingtalk.com/doc#/serverapi2/qf2nxq) ,只需`https://oapi.dingtalk.com/robot/send?access_token=XXX` 等于`=`符号后面的XXX即可                                                                                      |
+|  `DD_BOT_SECRET`   |                                      钉钉推送                                      | (`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需) ,密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的`SECXXXXXXXXXX`等字符 , 注:钉钉机器人安全设置只需勾选`加签`即可，其他选项不要勾选,再不懂看 [这个图](https://raw.githubusercontents.com/shanmiteko/LotteryAutoScript/main/doc/pic/DD_bot.png) |
+|  `IGOT_PUSH_KEY`   |                                      iGot推送                                      | iGot聚合推送，支持多方式推送，确保消息可达。 [参考文档](https://wahao.github.io/Bark-MP-helper )                                                                                                                                                                                             |
+|     `QQ_SKEY`      |                                酷推(Cool Push)推送                                 | 推送所需的Skey,登录后获取Skey [参考文档](https://cp.xuthus.cc/)                                                                                                                                                                                                                              |
+|     `QQ_MODE`      |                                酷推(Cool Push)推送                                 | 推送方式(send或group或者wx，默认send) [参考文档](https://cp.xuthus.cc/)                                                                                                                                                                                                                      |
+|     `QYWX_AM`      |                                    企业微信应用                                    | 第一个值是企业id，第二个值是secret，第三个值@all(或者成员id)，第四个值是AgentID (逗号分割) 可查看此[教程](http://note.youdao.com/s/HMiudGkb) [官方文档](https://developer.work.weixin.qq.com/document/path/90236)                                                                            |
+|     `QYWX_KEY`     |                                  企业微信Bot推送                                   | 密钥，企业微信推送 webhook 后面的 key [详见官方说明文档](https://work.weixin.qq.com/api/doc/90000/90136/91770)                                                                                                                                                                               |
+| `PUSH_PLUS_TOKEN`  |                                    pushplus推送                                    | 微信扫码登录后一对一推送或一对多推送下面的token(您的Token) [官方网站](http://pushplus.hxtrip.com/)                                                                                                                                                                                           |
+|  `PUSH_PLUS_USER`  |                                    pushplus推送                                    | 一对多推送的“群组编码”（一对多推送下面->您的群组(如无则新建)->群组编码）注:(1、需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送)，只填`PUSH_PLUS_TOKEN`默认为一对一推送                                                                  |
+|     `QMSG_KEY`     |                      [Qmsg酱](https://qmsg.zendee.cn)私聊推送                      | [Qmsg注册](https://qmsg.zendee.cn/login.html)                                                                                                                                                                                                                                                |
+|     `QMSG_QQ`      |                       私聊消息推送接口，指定需要接收消息的QQ                       | 指定的QQ号必须在你的[管理台](https://qmsg.zendee.cn/me.html)已添加                                                                                                                                                                                                                           |
+|    `SMTP_HOST`     |                                      电子邮件                                      | smtp服务器的主机名 如: `smtp.qq.com`                                                                                                                                                                                                                                                         |
+|    `SMTP_PORT`     |                                      电子邮件                                      | smtp服务器的端口 如: `465`                                                                                                                                                                                                                                                                   |
+|    `SMTP_USER`     |                                      电子邮件                                      | 发送方的电子邮件   如: `xxxxxxxxx@qq.com`                                                                                                                                                                                                                                                    |
+|    `SMTP_PASS`     |                                      电子邮件                                      | smtp服务对应的授权码                                                                                                                                                                                                                                                                         |
+|   `SMTP_TO_USER`   |                                      电子邮件                                      | 接收方电子邮件                                                                                                                                                                                                                                                                               |
 
 ----------------------------------------
 

env.example.js

@@ -7,6 +7,10 @@ module.exports = Object.freeze({
      * - `CLEAR` 是否启用清理功能
      * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
      * - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式)
+     * ## 代理相关
+     * - `ENABLE_PROXY` 启用代理
+     * - `XMDL_ORDERNNO` 熊猫动态代理订单号
+     * - `XMDL_SECRET` 熊猫动态代理密钥
      * ## 调试相关
      * - `LOTTERY_LOG_LEVEL` 输出日志等级 Error<Warn<Info<Debug 1<2<3<4
      * - `NOT_GO_LOTTERY` 关闭抽奖行为
@@ -25,6 +29,10 @@ module.exports = Object.freeze({
 
         ENABLE_MULTIPLE_ACCOUNT: false,
 
+        ENABLE_PROXY: "",
+        XMDL_ORDERNNO: "",
+        XMDL_SECRET: "",
+
         MULTIPLE_ACCOUNT_PARM: "",
         LOTTERY_LOG_LEVEL: 3,
         NOT_GO_LOTTERY: ""
@@ -69,6 +77,8 @@ module.exports = Object.freeze({
         QQ_MODE: "",
         BARK_PUSH: "",
         BARK_SOUND: "",
+        PUSHDEER_URL: "",
+        PUSHDEER_PUSHKEY: "",
         TG_BOT_TOKEN: "",
         TG_USER_ID: "",
         TG_PROXY_HOST: "",

lib/check.js

@@ -25,7 +25,7 @@ async function isMe(num) {
                 desp += '- - - -\n\n'
                 desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}\n\n`
                 desp += `用户: ${up_uname}\n\n`
-                desp += `在${business}中@了你(https://space.bilibili.com/${global_var.get("myUID")})\n\n`
+                desp += `在${business}中@了[你](https://space.bilibili.com/${global_var.get("myUID")})\n\n`
                 desp += `原内容为: ${source_content}\n\n`
                 desp += `[直达链接](${url})\n\n`
                 desp += '- - - -\n\n'
@@ -43,7 +43,7 @@ async function isMe(num) {
                     desp += '- - - -\n\n'
                     desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}\n\n`
                     desp += `用户: ${nickname}\n\n`
-                    desp += `回复你(https://space.bilibili.com/${global_var.get("myUID")})说:\n${source}\n\n`
+                    desp += `回复[你](https://space.bilibili.com/${global_var.get("myUID")})说:\n${source}\n\n`
                     desp += `[直达链接](${uri})\n\n`
                     desp += '- - - -\n\n'
                 }
@@ -66,7 +66,7 @@ async function isMe(num) {
                             desp += '- - - -\n\n'
                             desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}\n\n`
                             desp += `用户: ${sender_uid}\n\n`
-                            desp += `私信你(https://space.bilibili.com/${global_var.get("myUID")})说:\n${content}\n\n`
+                            desp += `私信[你](https://space.bilibili.com/${global_var.get("myUID")})说:\n${content}\n\n`
                             desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})\n\n`
                             desp += '- - - -\n\n'
                         }

lib/clear.js

@@ -6,12 +6,13 @@ const config = require("./data/config");
 
 /**
  * 获取关注分区里的uid
+ * @param {string} partition
  * @returns { Promise<number[]> }
  */
-async function getFollowList() {
+async function getFollowList(partition) {
     const
-        { clear_partition, clear_white_list, get_partition_wait } = config,
-        tagid = await bili.checkMyPartition(clear_partition);
+        { clear_white_list, get_partition_wait } = config,
+        tagid = await bili.checkMyPartition(partition);
     let rmup = [];
     if (typeof tagid === 'undefined') {
         log.info('获取关注列表', '未能成功获取关注分区id');
@@ -32,9 +33,9 @@ async function getFollowList() {
  * 清理动态和关注
  */
 async function clear() {
-    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
+    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type, clear_partition } = config;
     let success = true;
-    const uid_list = await getFollowList();
+    const uid_list = (await Promise.all(clear_partition.split(',').map(getFollowList))).flat();
     if (!uid_list.length) {
         log.info('清理关注', `关注为空`)
     } else {
@@ -82,6 +83,7 @@ async function clear() {
                     const days_ago = (Now - create_time) / 86400;
 
                     if (days_ago > clear_max_day) {
+                        log.debug('清理动态', `当前UID保护列表:\n${before_separate.join(',')}\n`)
                         /* 移除动态 */
                         if (dynamic_id
                             && clear_remove_dynamic

lib/core/monitor.js

@@ -37,7 +37,8 @@ class Monitor extends Searcher {
             event_bus.emit('Turn_off_the_Monitor', '已关闭所有转发行为')
             return
         }
-        if (!this.tagid) {
+        if (!this.tagid
+            && config.is_not_create_partition !== true) {
             this.tagid = await bili.checkMyPartition() /* 检查关注分区 */
             if (!this.tagid) {
                 event_bus.emit('Turn_off_the_Monitor', '分区获取失败')
@@ -64,9 +65,13 @@ class Monitor extends Searcher {
                 event_bus.emit('Turn_off_the_Monitor', '分区移动出错')
                 break;
             case 2004:
-                log.warn('账号异常', `UID(${global_var.get('myUID')})异常号只会对部分UP出现关注异常`)
+            case 4005:
+                log.warn(`账号异常${status}`, `UID(${global_var.get('myUID')})异常号只会对部分UP出现异常`)
                 if (!config.is_exception) {
-                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n异常号只会对部分UP出现关注异常\n可在设置中令is_exception为true关闭此推送\n${log._cache.filter(it => /Error|\[抽奖信息\]/.test(it)).join('\n')}`)
+                    await sendNotify(
+                        `[动态抽奖]账号异常${status}通知`,
+                        `UID: ${global_var.get('myUID')}\n异常号只会对部分UP出现异常\n可在设置中令is_exception为true关闭此推送\n${log._cache.filter(it => /Error|\s抽奖信息\]/.test(it)).join('\n')}`
+                    )
                 }
                 config.is_exception = true;
                 event_bus.emit('Turn_on_the_Monitor')
@@ -74,7 +79,10 @@ class Monitor extends Searcher {
             case 2005:
                 log.warn('关注已达上限', `UID(${global_var.get('myUID')})关注已达上限,已临时进入只转已关注模式`)
                 if (!config.is_outof_maxfollow) {
-                    await sendNotify('[动态抽奖]关注已达上限', `UID: ${global_var.get('myUID')}\n关注已达上限,已临时进入只转已关注模式\n可在设置中令is_outof_maxfollow为true关闭此推送\n${log._cache.filter(it => /Error|\[抽奖信息\]/.test(it)).join('\n')}`)
+                    await sendNotify(
+                        '[动态抽奖]关注已达上限',
+                        `UID: ${global_var.get('myUID')}\n关注已达上限,已临时进入只转已关注模式\n可在设置中令is_outof_maxfollow为true关闭此推送\n${log._cache.filter(it => /Error|\s抽奖信息\]/.test(it)).join('\n')}`
+                    )
                 }
                 config.is_outof_maxfollow = true;
                 config.only_followed = true;
@@ -83,12 +91,6 @@ class Monitor extends Searcher {
             case 5001:
                 event_bus.emit('Turn_off_the_Monitor', '转发失败')
                 break
-            case 6001:
-                event_bus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
-                break
-            case 7001:
-                event_bus.emit('Turn_off_the_Monitor', '获取关注数失败')
-                break
             default:
                 event_bus.emit('Turn_off_the_Monitor', `??? 未知错误: ${status}`)
                 break;
@@ -127,9 +129,16 @@ class Monitor extends Searcher {
                 if (lottery.isOfficialLottery) {
                     let { ts } = await bili.getLotteryNotice(lottery.dyid);
                     const ts_10 = Date.now() / 1000;
-                    if (ts < 0) {
-                        status = 6001
-                        break;
+                    if (ts === -1) {
+                        log.warn('过滤', '无法判断开奖时间')
+                        await delay(filter_wait)
+                        continue
+                    }
+                    if (ts === -9999) {
+                        log.info('过滤', '已撤销抽奖')
+                        d_storage.updateDyid(lottery.dyid)
+                        await delay(filter_wait)
+                        continue
                     }
                     if (ts < ts_10) {
                         log.info('过滤', '已过开奖时间')
@@ -147,9 +156,10 @@ class Monitor extends Searcher {
                     const { minfollower } = config
                     if (minfollower > 0) {
                         const followerNum = await bili.getUserInfo(lottery.uid[0]);
-                        if (followerNum < 0) {
-                            status = 7001
-                            break;
+                        if (followerNum === -1) {
+                            log.warn('过滤', `粉丝数(${followerNum})获取失败`)
+                            await delay(filter_wait)
+                            continue
                         }
                         if (followerNum < minfollower) {
                             log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
@@ -190,6 +200,7 @@ class Monitor extends Searcher {
                     case 4001:
                     case 4002:
                     case 4003:
+                    case 4004:
                     case 5002:
                     case 5003:
                     case 5004:
@@ -198,6 +209,9 @@ class Monitor extends Searcher {
                     case 2004:
                         is_exception = 2004
                         break;
+                    case 4005:
+                        is_exception = 4005
+                        break;
                     case 2005:
                         is_outof_maxfollow = 2005
                         break;
@@ -208,6 +222,8 @@ class Monitor extends Searcher {
                     case 5001:
                         is_shutdown = true
                         break;
+                    default:
+                        break;
                 }
 
                 if (is_shutdown) break
@@ -256,7 +272,16 @@ class Monitor extends Searcher {
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
         const
-            { check_if_duplicated, save_lottery_info_to_file, set_lottery_info_url, disable_reserve_lottery, reserve_lottery_wait, sneaktower, key_words, model, chatmodel, chat: chats, relay: relays, block_dynamic_type, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
+            {
+                check_if_duplicated, save_lottery_info_to_file,
+                set_lottery_info_url, disable_reserve_lottery,
+                is_not_relay_reserve_lottery,
+                reserve_lottery_wait, sneaktower, key_words,
+                model, chatmodel, chat: chats, relay: relays,
+                block_dynamic_type, max_create_time, is_imitator,
+                only_followed, at_users, blockword, blacklist,
+                use_public_blacklist
+            } = config,
             now_ts = Date.now() / 1000;
 
         /**
@@ -318,7 +343,10 @@ class Monitor extends Searcher {
         await try_for_each(protoLotteryInfo, async function (lottery_info) {
             const {
                 lottery_info_type, is_liked,
-                uids, uname, dyid, reserve_id, reserve_lottery_text, create_time,
+                uids, uname, dyid, reserve_id,
+                reserve_lottery_text,
+                is_charge_lottery,
+                create_time, chat_type,
                 ctrl, rid, des, type,
                 hasOfficialLottery
             } = lottery_info;
@@ -344,6 +372,11 @@ class Monitor extends Searcher {
                 return false
             }
 
+            if (is_charge_lottery) {
+                log.info("筛选动态", `充电抽奖(https://t.bilibili.com/${dyid})`)
+                return false
+            }
+
             const
                 [m_uid, ori_uid] = uids,
                 mIsFollowed = !m_uid || (new RegExp(m_uid)).test(attentionList),
@@ -354,7 +387,7 @@ class Monitor extends Searcher {
                     : [m_uid, mIsFollowed],
                 description = des.split(/\/\/@.*?:/)[0],
                 needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description),
-                needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
+                needTopic = [...new Set(description.match(/(?<=[带加]上?(?:话题|tag).*)#.+?#|(?<=[带加])上?#.+?#(?=话题|tag)/ig) || [])].join(' '),
                 isRelayDynamic = type === 1,
                 has_key_words = key_words.every(it => new RegExp(it).test(description)),
                 isBlock = blockword.length && new RegExp(blockword.join('|')).test(description + reserve_lottery_text),
@@ -363,8 +396,7 @@ class Monitor extends Searcher {
                     || (hasOfficialLottery && model[0] === '1')
                     || (!hasOfficialLottery && model[1] === '1' && has_key_words),
                 isSendChat =
-                    (is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
-                    || (hasOfficialLottery && chatmodel[0] === '1')
+                    (hasOfficialLottery && chatmodel[0] === '1')
                     || (!hasOfficialLottery && chatmodel[1] === '1'),
                 { blacklist: remote_blacklist } = use_public_blacklist === false
                     ? { blacklist: "" }
@@ -420,11 +452,14 @@ class Monitor extends Searcher {
                         await bili.reserve_lottery(reserve_id)
                     }
                 }
+                if (is_not_relay_reserve_lottery === true) {
+                    log.info("预约抽奖", "已关闭预约抽奖转关功能");
+                    return false
+                }
             }
 
-            if (!has_key_words && description) {
+            if (!hasOfficialLottery && model[1] === '1' && !has_key_words && description) {
                 log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n且满足: ')}`)
-                return false
             }
 
             /**若勾选只转已关注 */
@@ -452,7 +487,7 @@ class Monitor extends Searcher {
 
                 let
                     /**转发评语 */
-                    RandomStr = getRandomOne(relays)
+                    RandomStr = (getRandomOne(relays) || "!!!")
                         .replace(/\$\{uname\}/g, uname_map[real_uid] || uname),
                     /**控制字段 */
                     new_ctrl = [];
@@ -500,19 +535,12 @@ class Monitor extends Searcher {
                 onelotteryinfo.ctrl = JSON.stringify(new_ctrl);
 
                 /* 根据动态的类型决定评论的类型 */
-                onelotteryinfo.chat_type =
-                    type === 2
-                        ? 11
-                        : type === 4 || type === 1
-                            ? 17
-                            : type === 8
-                                ? 1
-                                : 0;
+                onelotteryinfo.chat_type = chat_type;
 
                 /* 是否评论 */
                 if (isSendChat) {
                     onelotteryinfo.rid = rid
-                    onelotteryinfo.chat = getRandomOne(chats)
+                    onelotteryinfo.chat = (getRandomOne(chats) || "!!!")
                         .replace(/\$\{uname\}/g, uname_map[real_uid] || uname)
                 }
 
@@ -549,6 +577,8 @@ class Monitor extends Searcher {
      * - 点赞 未知错误 4001
      * - 点赞 点赞异常 4002
      * - 点赞 点赞频繁 4003
+     * - 点赞 已赞过 4004
+     * - 点赞 账号异常，点赞失败 4005
      * - 转发 未知错误 5001
      * - 转发 该动态不能转发分享 5002
      * - 转发 请求数据发生错误，请刷新或稍后重试 5003
@@ -561,17 +591,27 @@ class Monitor extends Searcher {
             return 0
         }
 
-        let status = 0
-        const
+        let
+            status = 0,
             { uid, dyid, chat_type, rid, relay_chat, ctrl, chat } = option,
-            { check_if_duplicated, is_repost_then_chat } = config;
+            { check_if_duplicated, is_copy_chat, copy_blockword, is_repost_then_chat, is_not_create_partition } = config;
 
         /* 评论 */
         if (rid && chat_type) {
+            if (is_copy_chat) {
+                const copy_chat = getRandomOne(
+                    (await bili.getChat(rid, chat_type))
+                        .filter(it => !(new RegExp(copy_blockword.join('|')).test(it[1])))
+                ) || [";;;;;;;;;", chat || "!!!"];
+                chat = copy_chat[1]
+                    .replace(
+                        new RegExp(copy_chat[0], 'g'),
+                        global_var.get("myUNAME") || '')
+            }
 
             status = await retryfn(
                 6,
-                [1, 4],
+                [4],
                 () => bili.sendChat(
                     rid,
                     is_repost_then_chat ? relay_chat.split('//')[0] : chat,
@@ -601,13 +641,19 @@ class Monitor extends Searcher {
                 if (status) {
                     log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u}`)
                     return true
-                } else if (await bili.movePartition(u, this.tagid)) {
-                    log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u} tagid: ${this.tagid}`)
-                    /* 3000系错误 */
-                    status = 1001
-                    return true
                 } else {
-                    return false
+                    if (is_not_create_partition !== true) {
+                        if (await bili.movePartition(u, this.tagid)) {
+                            log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u} tagid: ${this.tagid}`)
+                            /* 3000系错误 */
+                            status = 1001
+                            return true
+                        } else {
+                            return false
+                        }
+                    } else {
+                        return false
+                    }
                 }
             })
             if (status) return 2000 + status
@@ -617,7 +663,7 @@ class Monitor extends Searcher {
         if (!check_if_duplicated || check_if_duplicated === 3) {
             status = await retryfn(
                 5,
-                [1, 2, 3],
+                [3],
                 () => bili.autolike(dyid)
             )
 
@@ -628,15 +674,17 @@ class Monitor extends Searcher {
         }
 
         /* 转发 */
-        status = await retryfn(
-            5,
-            [1, 3, 4],
-            () => bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)
-        )
+        if (dyid) {
+            status = await retryfn(
+                5,
+                [3, 4],
+                () => bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)
+            )
 
-        if (status) {
-            log.warn("抽奖信息", `dyid: ${dyid}`)
-            return 5000 + status
+            if (status) {
+                log.warn("抽奖信息", `dyid: ${dyid}`)
+                return 5000 + status
+            }
         }
 
         return status

lib/core/searcher.js

@@ -15,22 +15,26 @@ const { log } = utils
  * @property {boolean} is_liked
  * @property {number} create_time 10
  * @property {string} rid_str
+ * @property {number} chat_type
  * @property {string} dynamic_id
  * @property {number} type
  * @property {string} description
  * @property {string} reserve_id
  * @property {string} reserve_lottery_text
+ * @property {boolean} is_charge_lottery
  * @property {boolean} hasOfficialLottery
  * @property {Array<Object.<string,string|number>>} ctrl
  * @property {number} origin_create_time 10
  * @property {number} origin_uid
  * @property {string} origin_uname
  * @property {string} origin_rid_str
+ * @property {number} origin_chat_type
  * @property {string} origin_dynamic_id
- * @property {number} orig_type
+ * @property {number} origin_type
  * @property {string} origin_description
  * @property {string} origin_reserve_id
  * @property {string} origin_reserve_lottery_text
+ * @property {boolean} origin_is_charge_lottery
  * @property {boolean} origin_hasOfficialLottery
  * 
  * 整理后的抽奖信息
@@ -44,7 +48,9 @@ const { log } = utils
  * @property {string} dyid
  * @property {string} reserve_id
  * @property {string} reserve_lottery_text
+ * @property {boolean} is_charge_lottery
  * @property {string} rid
+ * @property {number} chat_type
  * @property {string} des
  * @property {number} type
  * @property {boolean} hasOfficialLottery 是否官方
@@ -63,6 +69,7 @@ function parseDynamicCard(dynamic_detail_card) {
         , extendjsonToJson = strToJson(extend_json)
         , { add_on_card_info = [] } = display
         , { item } = cardToJson;
+    const dy_type2chat_type = new Map([[1, 17], [2, 11], [4, 17], [8, 1], [64, 12]]);
     /* 转发者的UID */
     obj.uid = desc.uid
     /* 转发者的name */
@@ -75,8 +82,8 @@ function parseDynamicCard(dynamic_detail_card) {
     obj.type = desc.type
     /* 用于发送评论 */
     obj.rid_str = desc.rid_str.length > 12 ? desc.dynamic_id_str : desc.rid_str;
-    /* 源动态类型 */
-    obj.orig_type = desc.orig_type
+    /* 用于发送评论 */
+    obj.chat_type = dy_type2chat_type.get(obj.type) || 0;
     /* 转发者的动态ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
     obj.dynamic_id = desc.dynamic_id_str;
     /* 定位@信息 */
@@ -96,13 +103,21 @@ function parseDynamicCard(dynamic_detail_card) {
             obj.reserve_lottery_text = text;
         }
     }
+    if (JSON.stringify(add_on_card_info).match(/充电专属抽奖/)) {
+        obj.is_charge_lottery = true
+    }
     /* 是否有官方抽奖 */
     obj.hasOfficialLottery = extension && extension.lott && true;
     /* 转发者的描述 纯文字内容 图片动态描述 后两个分别是视频动态的描述和视频本身的描述*/
     obj.description =
-        (item && (item.content || '' + item.description || ''))
-        || (cardToJson.dynamic || '' + cardToJson.desc || '')
+        (item && ((item.content || '') + (item.description || '')))
+        || (
+            (cardToJson.dynamic || '')
+            + (cardToJson.desc || '')
+            + (cardToJson.vest && cardToJson.vest.content || '')
+        )
         || '';
+    /* 转发 */
     if (obj.type === 1) {
         const { origin_extension, origin } = cardToJson
             , originToJson = strToJson(origin)
@@ -112,8 +127,12 @@ function parseDynamicCard(dynamic_detail_card) {
         obj.origin_create_time = desc.origin.timestamp;
         /* 被转发者的UID */
         obj.origin_uid = desc.origin.uid;
+        /* 源动态类型 */
+        obj.origin_type = desc.orig_type
         /* 被转发者的rid(用于发评论) */
         obj.origin_rid_str = desc.origin.rid_str.length > 12 ? desc.origin.dynamic_id_str : desc.origin.rid_str;
+        /* 用于发送评论 */
+        obj.origin_chat_type = dy_type2chat_type.get(obj.origin_type) || 0
         /* 被转发者的动态的ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
         obj.origin_dynamic_id = desc.orig_dy_id_str;
         /* 预约抽奖信息 */
@@ -131,6 +150,9 @@ function parseDynamicCard(dynamic_detail_card) {
                 obj.origin_reserve_lottery_text = text;
             }
         }
+        if (JSON.stringify(add_on_card_info).match(/充电专属抽奖/)) {
+            obj.origin_is_charge_lottery = true
+        }
         /* 是否有官方抽奖 */
         obj.origin_hasOfficialLottery = origin_extension && origin_extension.lott;
         /* 被转发者的name */
@@ -164,6 +186,12 @@ function modifyDynamicRes(res) {
         log.warn('处理动态数据', '未找到任何动态信息')
     }
 
+    if (typeof has_more === "undefined"
+        && typeof offset === "undefined") {
+        log.error('处理动态数据', '该功能已失效');
+        return null;
+    }
+
     const
         /**
          * 字符串offset防止损失精度
@@ -256,6 +284,7 @@ class Searcher {
 
         return ({ allModifyDynamicResArray, offset });
     }
+
     /**
      * 获取最新动态信息(转发子动态)
      * 并初步整理
@@ -307,9 +336,11 @@ class Searcher {
                     dyid: cur.origin_dynamic_id,
                     reserve_id: cur.origin_reserve_id,
                     reserve_lottery_text: cur.origin_reserve_lottery_text,
+                    is_charge_lottery: cur.origin_is_charge_lottery,
                     rid: cur.origin_rid_str,
+                    chat_type: cur.origin_chat_type,
                     des: cur.origin_description,
-                    type: cur.orig_type,
+                    type: cur.origin_type,
                     hasOfficialLottery: cur.origin_hasOfficialLottery
                 })
 
@@ -320,6 +351,7 @@ class Searcher {
 
         return fomatdata;
     }
+
     /**
      * 获取tag下的抽奖信息(转发母动态)  
      * 并初步整理
@@ -327,6 +359,8 @@ class Searcher {
      * @returns {Promise<LotteryInfo[] | null>}
      */
     async getLotteryInfoByTag(tag_name) {
+        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
+
         const
             tag_id = await bili.getTagIDByTagName(tag_name),
             hotdy = await bili.getHotDynamicInfoByTagID(tag_id),
@@ -334,7 +368,6 @@ class Searcher {
 
         if (modDR === null) return null;
 
-        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
         log.info('获取动态', '成功获取热门动态');
 
         /**
@@ -367,7 +400,9 @@ class Searcher {
                 dyid: o.dynamic_id,
                 reserve_id: o.reserve_id,
                 reserve_lottery_text: o.reserve_lottery_text,
+                is_charge_lottery: o.is_charge_lottery,
                 rid: o.rid_str,
+                chat_type: o.chat_type,
                 des: o.description,
                 type: o.type,
                 hasOfficialLottery: o.hasOfficialLottery
@@ -377,6 +412,7 @@ class Searcher {
 
         return fomatdata
     }
+
     /**
      * 从专栏中获取抽奖信息
      * @param {string} key_words
@@ -396,13 +432,16 @@ class Searcher {
                 continue
             }
             const
-                content = await bili.getOneArticleByCv(id),
-                dyids = content.match(/(?<=t.bilibili.com\/)[0-9]+/g) || [],
-                dyids_set = [...new Set(dyids)],
+                content = (await bili.getOneArticleByCv(id) || "").split("推荐文章")[0],
+                dyids = content.match(/[0-9]{18}/g) || [],
+                short_ids = content.match(/(?<=b23.tv\/)[a-zA-Z0-9]{7}/g) || [],
+                short_id_set = [...new Set(short_ids)],
+                short_ids_to_dyids = await Promise.all(short_id_set.map(bili.shortDynamicIdToDyid)),
+                dyid_set = [...new Set([...dyids, ...short_ids_to_dyids])],
                 /**判断此专栏是否查看过的权重 */
-                weight = dyids_set.length / 2;
+                weight = dyid_set.length / 2;
 
-            let { length } = dyids_set,
+            let { length } = dyid_set,
                 /**初始权重 */
                 _weight = 0,
                 /**单个专栏中的dyid */
@@ -410,8 +449,9 @@ class Searcher {
             log.info('获取动态', `提取专栏(${id})中提及的dyid(${length})`)
 
             /**遍历某专栏中的dyids */
-            for (const dyid of dyids_set) {
-                if (dyid.length === utils.dyid_length) {
+            for (const dyid of dyid_set) {
+                if (typeof dyid === "string"
+                    && dyid.length === utils.dyid_length) {
 
                     log.info('获取动态', `查看专栏中所提及动态(${dyid}) (${length--})`)
                     const card = await bili.getOneDynamicByDyid(dyid)
@@ -457,7 +497,9 @@ class Searcher {
                 dyid: o.dynamic_id,
                 reserve_id: o.reserve_id,
                 reserve_lottery_text: o.reserve_lottery_text,
+                is_charge_lottery: o.is_charge_lottery,
                 rid: o.rid_str,
+                chat_type: o.chat_type,
                 des: o.description,
                 type: o.type,
                 hasOfficialLottery: o.hasOfficialLottery
@@ -548,5 +590,4 @@ class Searcher {
     }
 }
 
-
-module.exports = { Searcher };
+module.exports = { Searcher, parseDynamicCard };

lib/data/config.js

@@ -100,6 +100,11 @@ const config = {
      */
     disable_reserve_lottery: false,
 
+    /**
+     * 不转发预约抽奖
+     * - 预约抽奖可能与转发抽奖并存
+     */
+    is_not_relay_reserve_lottery: false,
 
     /**
      * 检查是否重复转发
@@ -326,6 +331,16 @@ const config = {
         '坚持不懈，迎难而上，开拓创新！', '[OK][OK]', '我来抽个奖', '中中中中中中', '[doge][doge][doge]', '我我我',
     ],
 
+    /**
+     * 是否抄热评
+     */
+    is_copy_chat: false,
+
+    /**
+     * 热评屏蔽词
+     */
+    copy_blockword: [],
+
     /**
      * - 抽奖UP用户分组id(网页端点击分区后地址栏中的tagid)
      * - 自动获取
@@ -333,7 +348,12 @@ const config = {
     partition_id: 0,
 
     /**
-     * 是否关注异常
+     * - 是否不为抽奖UP单独设置关注分区
+     */
+    is_not_create_partition: false,
+
+    /**
+     * 是否异常
      */
     is_exception: false,
 

lib/helper/notify.js

@@ -24,6 +24,9 @@ let BARK_PUSH = '';
 //注：此处设置github action用户填写到Settings-Secrets里面（Name输入BARK_SOUND , Value输入app提供的铃声名称，例如:birdsong）
 let BARK_SOUND = '';
 
+// =======================================pushdeer通知设置区域===========================================
+let PUSHDEER_URL = '';
+let PUSHDEER_PUSHKEY = '';
 
 // =======================================telegram机器人通知设置区域===========================================
 //此处填你telegram bot 的Token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw
@@ -94,7 +97,6 @@ if (process.env.QQ_MODE) {
     QQ_MODE = process.env.QQ_MODE;
 }
 
-
 if (process.env.BARK_PUSH) {
     if (process.env.BARK_PUSH.indexOf('https') > -1 || process.env.BARK_PUSH.indexOf('http') > -1) {
         //兼容BARK自建用户
@@ -111,15 +113,29 @@ if (process.env.BARK_PUSH) {
         BARK_PUSH = `https://api.day.app/${BARK_PUSH}`
     }
 }
+
+if (process.env.PUSHDEER_URL) {
+    PUSHDEER_URL = process.env.PUSHDEER_URL
+} else {
+    PUSHDEER_URL = "https://api2.pushdeer.com/message/push";
+}
+
+if (process.env.PUSHDEER_PUSHKEY) {
+    PUSHDEER_PUSHKEY = process.env.PUSHDEER_PUSHKEY;
+}
+
 if (process.env.TG_BOT_TOKEN) {
     TG_BOT_TOKEN = process.env.TG_BOT_TOKEN;
 }
+
 if (process.env.TG_USER_ID) {
     TG_USER_ID = process.env.TG_USER_ID;
 }
+
 if (process.env.TG_PROXY_HOST) {
     TG_PROXY_HOST = process.env.TG_PROXY_HOST;
 }
+
 if (process.env.TG_PROXY_PORT) {
     TG_PROXY_PORT = process.env.TG_PROXY_PORT;
 }
@@ -178,7 +194,7 @@ if (process.env.SMTP_TO_USER) {
 
 async function sendNotify(text, desp, params = {}) {
     if (process.env.NOTE) {
-        desp += `\n帐号备注: ${process.env.NOTE}`
+        desp = `帐号备注: ${process.env.NOTE}\n${desp}`
     }
     //提供多种通知方式
     await Promise.all([
@@ -190,6 +206,8 @@ async function sendNotify(text, desp, params = {}) {
         pushPlusNotify(text, desp),
         //iOS Bark APP
         barkNotify(text, desp, params),
+        // Pushdeer
+        pushdeerNotify(text, desp),
         //telegram 机器人
         tgBotNotify(text, desp),
         //钉钉机器人
@@ -394,6 +412,47 @@ function barkNotify(text, desp, params = {}) {
     })
 }
 
+function pushdeerNotify(text, desp) {
+    return new Promise(resolve => {
+        if (PUSHDEER_URL && PUSHDEER_PUSHKEY) {
+            send({
+                method: 'POST',
+                url: PUSHDEER_URL,
+                contents: {
+                    pushkey: PUSHDEER_PUSHKEY,
+                    text,
+                    desp,
+                    type: "markdown"
+                },
+                config: {
+                    retry: false
+                },
+                success: res => {
+                    try {
+                        const data = JSON.parse(res.body);
+                        if (data.code === 0) {
+                            log.info('发送通知', 'Pushdeer推送发送通知消息成功')
+                        } else {
+                            log.error('发送通知', `Pushdeer推送发送通知消息异常\n${JSON.stringify(data)}`)
+                        }
+                    } catch (error) {
+                        log.error('发送通知', error);
+                    } finally {
+                        resolve()
+                    }
+                },
+                failure: err => {
+                    log.error('发送通知', 'Pushdeer推送发送通知调用API失败！！' + err)
+                    resolve()
+                }
+            })
+        } else {
+            log.debug('发送通知', '您未提供Pushdeer推送所需的PUSHDEER_URL 和 PUSHDEER_PUSHKEY, 取消Pushdeer推送消息通知');
+            resolve()
+        }
+    })
+}
+
 function tgBotNotify(text, desp) {
     return new Promise(resolve => {
         if (TG_BOT_TOKEN && TG_USER_ID) {

lib/helper/proxies.js

@@ -0,0 +1,26 @@
+const { log } = require('../utils');
+const crypto = require('crypto');
+
+/**
+ * [熊猫代理](http://www.xiongmaodaili.com)
+ * @returns {import("../net/http").ProxyConfig}
+ */
+function xiongmaodaili() {
+    log.info("熊猫代理", "开始")
+    let timestamp = parseInt(new Date().getTime() / 1000);
+    let orderno = process.env["XMDL_ORDERNNO"];
+    let secret = process.env["XMDL_SECRET"];
+
+    let txt = 'orderno=' + orderno + ',secret=' + secret + ',timestamp=' + timestamp;
+    let md5 = crypto.createHash('md5');
+    let sign = md5.update(txt).digest('hex').toUpperCase();
+
+    return {
+        url: "http://dtan.xiongmaodaili.com:8088",
+        auth_headers: [
+            ["Proxy-Authorization", 'sign=' + sign + '&orderno=' + orderno + "&timestamp=" + timestamp]
+        ]
+    }
+}
+
+module.exports = { xiongmaodaili }

lib/lottery.js

@@ -17,8 +17,8 @@ async function createRandomDynamic(num) {
                 [null],
                 () => Searcher.checkAllDynamic(global_var.get("myUID"), 1)
             )) || { allModifyDynamicResArray: [] },
-            { type, orig_type } = allModifyDynamicResArray[0] || {};
-        if (type === 1 && orig_type !== 8) {
+            { type, origin_type } = allModifyDynamicResArray[0] || {};
+        if (type === 1 && origin_type !== 8) {
             await randomDynamic(num)
         } else {
             log.info('随机动态', '已有非抽奖动态故无需创建');
@@ -55,9 +55,11 @@ function start(num) {
         event_bus.on('Turn_off_the_Monitor', async (msg) => {
             log.info('结束抽奖', '原因: ' + msg);
             if (config.notice_running_state) {
-                sendNotify(`动态抽奖-帐号${num}结束抽奖`, `${log._cache.filter(it => /抽奖\]|Error|\[抽奖信息\]/.test(it)).join('\n')}`);
+                sendNotify(
+                    `动态抽奖-帐号${num}结束抽奖`,
+                    `${log._cache.filter(it => /抽奖\]|Error|\s抽奖信息\]/.test(it)).join('\n')}`
+                );
             }
-            log._cache.length = 0;
             await createRandomDynamic(config.create_dy_num);
             event_bus.flush();
             resolve();

lib/net/api.bili.js

@@ -5,7 +5,12 @@ module.exports = Object.freeze({
     DYNAMIC_REPOST_SHARE: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/share',
     DYNAMIC_SVR_CREATE_DRAW: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create_draw',
     DYNAMIC_SVR_CREATE: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create',
-    DYNAMIC_SVR_GET_DYNAMIC_DETAIL: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V2: 'https://api.vc.bilibili.com/dynamic_svr/v2/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V3: 'https://api.vc.bilibili.com/dynamic_svr/v3/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V4: 'https://api.vc.bilibili.com/dynamic_svr/v4/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V5: 'https://api.vc.bilibili.com/dynamic_svr/v5/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V6: 'https://api.vc.bilibili.com/dynamic_svr/v6/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V7: 'https://api.vc.bilibili.com/dynamic_svr/v7/dynamic_svr/get_dynamic_detail',
     DYNAMIC_SVR_RM_DYNAMIC: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/rm_dynamic',
     DYNAMIC_SVR_SPACE_HISTORY: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history',
     FEED_GET_ATTENTION_LIST: 'https://api.vc.bilibili.com/feed/v1/feed/get_attention_list',
@@ -27,12 +32,14 @@ module.exports = Object.freeze({
     SESSION_SVR_GET_SESSIONS: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions',
     SESSION_SVR_SINGLE_UNREAD: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/single_unread',
     SESSION_SVR_UPDATE_ACK: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack',
+    SHORTLINK: 'https://b23.tv/{{short_id}}',
     SPACE_MYINFO: 'https://api.bilibili.com/x/space/myinfo',
     TAG_INFO: 'https://api.bilibili.com/x/tag/info',
-    TOP_RCMD: "https://api.bilibili.com/x/web-interface/index/top/rcmd",
     TOP_FEED_RCMD: "https://api.bilibili.com/x/web-interface/index/top/feed/rcmd",
+    TOP_RCMD: "https://api.bilibili.com/x/web-interface/index/top/rcmd",
     TOPIC_SVR_TOPIC_HISTORY: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_history',
     TOPIC_SVR_TOPIC_NEW: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_new',
+    V2_REPLAY: "https://api.bilibili.com/x/v2/reply",
     WEB_INTERFACE_CARD: 'https://api.bilibili.com/x/web-interface/card',
     WEB_INTERFACE_SEARCH_TYPE: 'https://api.bilibili.com/x/web-interface/search/type',
 })

lib/net/bili.js

@@ -1,7 +1,8 @@
 const GlobalVar = require('../data/global_var');
-const { strToJson, log } = require('../utils');
+const { strToJson, log, hasEnv } = require('../utils');
 const { send } = require('./http');
 const API = require('./api.bili');
+const proxies = require("../helper/proxies");
 
 class Line {
     /**
@@ -88,7 +89,7 @@ class Line {
  */
 function get({ url, config, contents, query }) {
     return new Promise((resolve) => {
-        send({
+        let ro = {
             url,
             method: 'GET',
             config,
@@ -100,7 +101,11 @@ function get({ url, config, contents, query }) {
             contents,
             success: res => resolve(res.body),
             failure: err => resolve(err)
-        })
+        }
+        if (hasEnv("ENABLE_PROXY")) {
+            ro.proxy = proxies.xiongmaodaili();
+        }
+        send(ro)
     })
 }
 
@@ -111,7 +116,7 @@ function get({ url, config, contents, query }) {
  */
 function post({ url, config, contents, query }) {
     return new Promise((resolve) => {
-        send({
+        let ro = {
             url,
             method: 'POST',
             config,
@@ -124,7 +129,11 @@ function post({ url, config, contents, query }) {
             contents,
             success: res => resolve(res.body),
             failure: err => resolve(err)
-        })
+        };
+        if (hasEnv("ENABLE_PROXY")) {
+            ro.proxy = proxies.xiongmaodaili();
+        }
+        send(ro)
     })
 }
 
@@ -143,6 +152,7 @@ const bili_client = {
             }),
             res = strToJson(responseText);
         if (res.code === 0) {
+            GlobalVar.set("myUNAME", res.data.name)
             return true;
         } else {
             return false;
@@ -377,31 +387,90 @@ const bili_client = {
             return null;
         }
     },
+    /**
+     * @param {string} short_id 
+     * @returns {Promise<string>}
+     */
+    async shortDynamicIdToDyid(short_id) {
+        return get({
+            url: API.SHORTLINK.replace('{{short_id}}', short_id),
+            config: {
+                redirect: false,
+            }
+        }).then(a => {
+            const dyid = (a.match(/[0-9]{18}/) || [])[0];
+            log.info("短连接转换", `${short_id} -> ${dyid}`)
+            return dyid
+        })
+    },
+    _getOneDynamicByDyid: new Line('获取一个动态的细节', [
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V2,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V3,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V4,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V5,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V6,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V7,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+    ], responseText => {
+        const
+            res = strToJson(responseText),
+            { code, data } = res,
+            { card } = data || {};
+        switch (code) {
+            case 0:
+                if (card) {
+                    return [false, card, `ok`];
+                } else {
+                    return [false, undefined, `动态不存在`];
+                }
+            case 500207:
+                return [false, undefined, `该动态为包月充电专属可以给UP主充电后观看`];
+            default:
+                return [true, undefined, `获取动态数据出错:\n${responseText}`]
+        }
+    }),
     /**
      * 获取一个动态的细节
      * @param {string} dynamic_id
      * @return {Promise<JSON>} 失败返回undefined
      */
     async getOneDynamicByDyid(dynamic_id) {
-        const
-            responseText = await get({
-                url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL,
-                query: {
-                    dynamic_id
-                }
-            }),
-            { code, data } = strToJson(responseText),
-            { card } = data || {};
-        if (code !== 0) {
-            log.error('获取一个动态的细节', `获取动态(${dynamic_id})数据出错:\n${responseText}`);
-            return;
-        }
-        if (!card) {
-            log.warn('获取一个动态的细节', `动态(${dynamic_id})不存在`);
-            return;
-        }
-        log.info('获取一个动态的细节', `动态id(${dynamic_id})`);
-        return card;
+        return this._getOneDynamicByDyid.run(dynamic_id)
     },
     /**
      * 获取一组动态的信息
@@ -571,7 +640,7 @@ const bili_client = {
         if (res.code === 0) {
             return [false, res.data.follower, 'ok'];
         } else {
-            return [true, 1, `出错 可能是访问过频繁\n${responseText}`]
+            return [true, -1, `出错 可能是访问过频繁\n${responseText}`]
         }
     }),
     /**
@@ -587,7 +656,7 @@ const bili_client = {
      * @param {string} dyid
      * 动态id
      * @typedef LotteryNotice
-     * @property {number | -1} ts
+     * @property {number} ts
      * @returns {Promise<LotteryNotice>} 开奖时间
      */
     async getLotteryNotice(dyid) {
@@ -599,15 +668,21 @@ const bili_client = {
                 }
             }),
             res = strToJson(responseText);
-        if (res.code === 0) {
-            return {
-                ts: res.data.lottery_time
-            };
-        } else {
-            log.error('获取开奖信息', `失败\n${responseText}`);
-            return {
-                ts: -1
-            };
+        switch (res.code) {
+            case 0:
+                return {
+                    ts: res.data.lottery_time
+                };
+            case -9999:
+                log.warn('获取开奖信息', `${dyid}已撤销抽奖`);
+                return {
+                    ts: -9999
+                };
+            default:
+                log.error('获取开奖信息', `${dyid}失败\n${responseText}`);
+                return {
+                    ts: -1
+                };
         }
     },
     _autoAttention: new Line('自动关注', [
@@ -733,9 +808,11 @@ const bili_client = {
      * @param {string} dyid
      * @returns {Promise<number>}
      * - 成功 0  
-     * - 未知错误 1  
-     * - 点赞异常 2  
-     * - 点赞频繁 3  
+     * - 未知错误 1
+     * - 点赞异常 2
+     * - 点赞频繁 3
+     * - 已赞过 4
+     * - 账号异常，点赞失败 5
      */
     async autolike(dyid) {
         const
@@ -759,6 +836,12 @@ const bili_client = {
             case 1000001:
                 log.warn('自动点赞', '点赞频繁');
                 return 3;
+            case 65006:
+                log.warn('自动点赞', '已赞过');
+                return 4;
+            case 4128014:
+                log.warn('自动点赞', '账号异常，点赞失败');
+                return 5;
             default:
                 log.error('自动点赞', `未知错误\n${responseText}`);
                 return 1;
@@ -1044,6 +1127,38 @@ const bili_client = {
                 return 1;
         }
     },
+    /**
+     * 查询评论
+     * @param {*} rid
+     * @param {*} type
+     * @returns {Promise<Array<[string,string]>>} [[uname,chat],]
+     */
+    async getChat(rid, type) {
+        const
+            responseText = await get({
+                url: API.V2_REPLAY,
+                query: {
+                    oid: rid,
+                    type: type,
+                }
+            }),
+            res = strToJson(responseText);
+        switch (res.code) {
+            case 0:
+                log.info('查询评论', `成功`);
+                try {
+                    const upmid = res.data.upper.mid;
+                    return res.data.replies
+                        .filter(it => it.mid !== upmid)
+                        .map(it => [it.member.uname, it.content.message]);
+                } catch (_) {
+                    return []
+                }
+            default:
+                log.error('查询评论', `未知错误\n${responseText}`);
+                return [];
+        }
+    },
     /**
      * 检查分区  
      * 不存在指定分区时创建  
@@ -1062,7 +1177,7 @@ const bili_client = {
         if (res.code === 0) {
             const data = res.data.filter((it) => it.name === name);
             if (data.length) {
-                log.info('获取分区id', '成功');
+                log.info('获取分区id', `成功 ${name}`);
                 tagid = data[0].tagid;
             } else {
                 log.warn('获取分区id', `失败 无指定分区名${name}`);
@@ -1129,10 +1244,10 @@ const bili_client = {
             res.data.forEach(d => {
                 uids.push(d.mid);
             });
-            log.info(`获取分组${tagid}`, `成功获取取关分区列表${n}`);
+            log.info(`获取分组id${tagid}`, `成功获取取关分区列表${n}`);
             return uids;
         } else {
-            log.error(`获取分组${tagid}`, `获取取关分区列表失败\n${responseText}`);
+            log.error(`获取分组id${tagid}`, `获取取关分区列表失败\n${responseText}`);
             return uids;
         }
     }

lib/net/http.js

@@ -1,4 +1,3 @@
-//@ts-check
 /**
  * @typedef {import("http").IncomingHttpHeaders} HttpHeaders 头部信息
  * 
@@ -21,12 +20,16 @@
  * @property {boolean} [redirect] 是否重定向
  * @property {number} [retry_times] 重试次数
  * 
+ * @typedef ProxyConfig
+ * @property {string} url https?://{IP}:{PORT}
+ * @property {[[string, string]]} auth_headers [[k,v],[k,v]]
+ * 
  * @typedef {object} RequestOptions Http请求选项
  * @property {string} [method] 请求方法
  * @property {string} url 完整链接
  * @property {boolean} [stream] 是否流式数据
  * @property {RequestConfig} [config] 设置
- * @property {string} [proxy] HTTP代理 IP:PORT
+ * @property {ProxyConfig} [proxy] HTTP代理 IP:PORT
  * @property {Object.<string, string|number>} [query] 查询选项
  * @property {Object.<string, string|number> | string} [contents] 内容
  * @property {HttpHeaders} [headers] 请求头
@@ -35,7 +38,9 @@
  */
 
 const { request: http_request } = require('http');
+const { HttpProxyAgent } = require('http-proxy-agent');
 const { request: https_request } = require('https');
+const { HttpsProxyAgent } = require('https-proxy-agent');
 const { stringify } = require('querystring');
 
 /**默认编码 */
@@ -65,7 +70,10 @@ function send(detail) {
     const { timeout, wait, retry, redirect, retry_times } = config;
     const thisURL = new URL(url)
         , content = formatContents(headers["content-type"], contents)
-        , request = (thisURL.protocol === 'https:') && !proxy ? https_request : http_request;
+        , request = (thisURL.protocol === 'https:') ? https_request : http_request;
+    /**
+     * @type {import("https").RequestOptions}
+     */
     let options = {
         timeout,
         method: method.toUpperCase(),
@@ -81,9 +89,13 @@ function send(detail) {
         options.headers['content-length'] = Buffer.byteLength(content, 'utf-8').toString();
     }
     if (proxy) {
-        options.headers.host = thisURL.host;
-        options.path = thisURL.href;
-        [options.host, options.port] = proxy.split(':');
+        options.agent = (thisURL.protocol === 'https:')
+            ? new HttpsProxyAgent(proxy.url)
+            : new HttpProxyAgent(proxy.url);
+        for (const ah of proxy.auth_headers) {
+            options.headers[ah[0]] = ah[1]
+        }
+        options.rejectUnauthorized = false
     }
     const req = request(options, res => {
         let protodata = '';

main.js

@@ -52,6 +52,7 @@ async function main() {
         const { start, isMe, clear, checkCookie } = require("./lib/index");
 
         log.info('main', '当前为第' + NUMBER + '个账号');
+        log._cache.length = 0
 
         if (await checkCookie(NUMBER)) {
             const mode = process.env.lottery_mode;

my_config.example.js

@@ -1,6 +1,8 @@
 module.exports = Object.freeze({
     /** 
      * 默认设置(公用)
+     * 修改公用设置可填写到最下方
+     * 单独设置区将会覆盖公共设置
      */
     default_config: {
         /**
@@ -102,6 +104,12 @@ module.exports = Object.freeze({
          */
         disable_reserve_lottery: false,
 
+        /**
+         * 不转关预约抽奖
+         * - 预约抽奖可能与转发抽奖并存
+         */
+        is_not_relay_reserve_lottery: false,
+
         /**
          * 检查是否重复转发
          * - 不检查 -1
@@ -332,6 +340,16 @@ module.exports = Object.freeze({
             '坚持不懈，迎难而上，开拓创新！', '[OK][OK]', '我来抽个奖', '中中中中中中', '[doge][doge][doge]', '我我我',
         ],
 
+        /**
+         * 是否抄热评
+         */
+        is_copy_chat: false,
+
+        /**
+         * 热评屏蔽词
+         */
+        copy_blockword: ["三不原则"],
+
         /**
          * - 抽奖UP用户分组id(网页端点击分区后地址栏中的tagid)
          * - 自动获取
@@ -339,7 +357,12 @@ module.exports = Object.freeze({
         partition_id: 0,
 
         /**
-         * 是否关注异常
+         * - 是否不为抽奖UP单独设置关注分区
+         */
+        is_not_create_partition: false,
+
+        /**
+         * 是否异常
          */
         is_exception: false,
 
@@ -380,6 +403,7 @@ module.exports = Object.freeze({
         /**
          * - 取关分区
          * - 默认为: 此处存放因抽奖临时关注的up
+         * - 可用逗号分割以取关多分区
          */
         clear_partition: '',
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.6.8",
+  "version": "2.7.11",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {
@@ -42,6 +42,8 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
+    "http-proxy-agent": "^7.0.0",
+    "https-proxy-agent": "^7.0.0",
     "nodemailer": "^6.7.0"
   }
 }

script/docker/init.sh

@@ -1,6 +1,33 @@
 #!/bin/bash
 set -e
 
+# docker环境预安装
+REGEX=("debian" "ubuntu" "centos|red hat|kernel|oracle linux|alma|rocky" "'amazon linux'" "fedora" "arch")
+RELEASE=("Debian" "Ubuntu" "CentOS" "CentOS" "Fedora" "Arch")
+PACKAGE_UPDATE=("! apt-get update && apt-get --fix-broken install -y && apt-get update" "apt-get update" "yum -y update" "yum -y update" "yum -y update" "pacman -Sy")
+PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed")
+PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm")
+PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "")
+CMD=("$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(hostnamectl 2>/dev/null | grep -i system | cut -d : -f2)" "$(lsb_release -sd 2>/dev/null)" "$(grep -i description /etc/lsb-release 2>/dev/null | cut -d \" -f2)" "$(grep . /etc/redhat-release 2>/dev/null)" "$(grep . /etc/issue 2>/dev/null | cut -d \\ -f1 | sed '/^[ ]*$/d')" "$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)") 
+SYS="${CMD[0]}"
+[[ -n $SYS ]] || exit 1
+for ((int = 0; int < ${#REGEX[@]}; int++)); do
+    if [[ $(echo "$SYS" | tr '[:upper:]' '[:lower:]') =~ ${REGEX[int]} ]]; then
+        SYSTEM="${RELEASE[int]}"
+        [[ -n $SYSTEM ]] && break
+    fi
+done
+if ! systemctl is-active docker >/dev/null 2>&1; then
+    if [ $SYSTEM = "CentOS" ]; then
+      ${PACKAGE_INSTALL[int]} yum-utils
+      yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo &&
+      ${PACKAGE_INSTALL[int]} docker-ce docker-ce-cli containerd.io
+      systemctl enable --now docker
+    else
+      ${PACKAGE_INSTALL[int]} docker.io
+    fi
+fi
+
 # 脚本根目录
 SCRIPT_FOLDER=lottery
 # 设置环境变量文件
@@ -49,7 +76,7 @@ docker -v && docker pull $DOCKER_REPO
 
 echo "create start.sh"
 cat >start.sh <<EOF
-#!/bin/env bash
+#!$(which env) bash
 NAME=shanmite-lottery-start
 if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
     docker run \\
@@ -70,7 +97,7 @@ chmod +x start.sh
 
 echo "create check.sh"
 cat >check.sh <<EOF
-#!/bin/env bash
+#!$(which env) bash
 NAME=shanmite-lottery-check
 if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
     docker run \\
@@ -91,7 +118,7 @@ chmod +x check.sh
 
 echo "create clear.sh"
 cat >clear.sh <<EOF
-#!/bin/env bash
+#!$(which env) bash
 NAME=shanmite-lottery-clear
 if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
     docker run \\
@@ -112,7 +139,7 @@ chmod +x clear.sh
 
 echo "create debug.sh"
 cat >debug.sh <<EOF
-#!/bin/env bash
+#!$(which env) bash
 NAME=shanmite-lottery-debug
 echo "create temporary debug container"
 docker run \\
@@ -127,7 +154,7 @@ chmod +x debug.sh
 
 echo "create remove_all.sh"
 cat >remove_all.sh <<EOF
-#!/bin/env bash
+#!$(which env) bash
 echo "remove all containers about $DOCKER_REPO"
 docker rm -v \$(docker ps -a | awk '/shanmite\/lottery_auto_docker/ {print \$1}')
 echo "remove image $DOCKER_REPO"

test/api.test.js

@@ -1,39 +1,50 @@
 const assert = require('assert');
 const bili_client = require("../lib/net/bili");
 const util = require('./util');
+const { parseDynamicCard } = require('../lib/core/searcher');
 
 (async () => {
     assert(await bili_client.getMyinfo());
 
-    await util.par_run([
+    await util.par_run([0, 1, 2, 3, 4, 5], [
+        // 0
         async () => {
             assert.equal((await bili_client.getTopRcmd()).length, 10)
         },
+        // 1
         async () => {
             assert.equal(await bili_client.sendChat(
-                (await bili_client.getOneDynamicByDyid("692193323569381399")).desc.rid,
+                parseDynamicCard(await bili_client.getOneDynamicByDyid("692193323569381399")).rid_str,
                 "test",
                 11),
                 7
             )
         },
+        // 2
         async () => {
             assert.equal(await bili_client.sendChat(
-                (await bili_client.getOneDynamicByDyid("11229466874154064")).desc.rid,
+                parseDynamicCard(await bili_client.getOneDynamicByDyid("11229466874154064")).rid_str,
                 "test",
                 1),
                 3
             )
         },
+        // 3
         async () => {
             assert.notEqual((await bili_client.searchArticlesByKeyword("专栏")).length, 0)
         },
+        // 4
         async () => {
             assert.notEqual(await bili_client.sendChat("703886913053917267", "t", 17), 1)
         },
+        // 5
         async () => {
-            // assert(!await bili_client.createDynamic("123"))
-        }
+            assert(!await bili_client.createDynamic("1"))
+        },
+        // 6
+        async () => {
+            assert.equal(await bili_client.autolike("761391835139538967"), 4)
+        },
     ])
 
     console.log("api.test ... ok!");

test/article.test.js

@@ -0,0 +1,15 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const util = require('./util');
+
+(async () => {
+    await util.par_run([0], [
+        // 0
+        async () => {
+            let info = await bili_client.getOneArticleByCv(22112353);
+            let short_ids = [...new Set(info.match(/(?<=b23.tv\/)[a-zA-Z0-9]{7}/g) || [])];
+            assert.equal((await Promise.all(short_ids.map(bili_client.shortDynamicIdToDyid)))[0], "767357823884460033");
+        },
+    ])
+    console.log("article.test ... ok!");
+})()

test/dynamic_card.test.js

@@ -0,0 +1,56 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const searcher = require("../lib/core/searcher");
+const util = require('./util');
+
+(async () => {
+    await util.par_run([0, 1, 2, 3, 4, 5, 6], [
+        // 0
+        async () => {
+            let info = await bili_client.getOneDynamicByDyid("728424890210713624");
+            assert(searcher.parseDynamicCard(info).is_charge_lottery);
+        },
+        // 1
+        async () => {
+            let info = await bili_client.getOneDynamicByDyid("728455586333589522");
+            assert(searcher.parseDynamicCard(info).origin_is_charge_lottery);
+        },
+        // 2
+        async () => {
+            let card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("746824225190314008"));
+            let chats = await bili_client.getChat(card.rid_str, card.chat_type)
+            assert(chats.length > 0 && typeof chats[0][0] == "string")
+        },
+        // 3
+        async () => {
+            let card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("747169355882561625"));
+            assert(card.chat_type == 11)
+            card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("747441158580338693"));
+            assert(card.chat_type == 17)
+            assert(card.origin_chat_type == 11)
+        },
+        // 4
+        async () => {
+            assert.equal(await bili_client.getOneDynamicByDyid("111111111111111111"), undefined);
+            assert.notEqual(await bili_client.getOneDynamicByDyid("746824225190314008"), undefined);
+            assert.equal(await bili_client.getOneDynamicByDyid("761475750233636886"), undefined);
+        },
+        // 5
+        async () => {
+            let card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("762591475338838053"));
+            let chats = await bili_client.getChat(card.rid_str, card.chat_type)
+            assert.equal(chats.length, 19)
+            card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("762502724122050647"));
+            chats = await bili_client.getChat(card.rid_str, card.chat_type)
+            assert.equal(chats.filter(it => it[0] === '六的月').length, 0)
+        },
+        // 6
+        async () => {
+            const dy = await bili_client.getOneDynamicByDyid("774973685666676768");
+            const card = searcher.parseDynamicCard(dy)
+            assert.notEqual(card.description + "", undefined + "");
+        },
+    ])
+
+    console.log("dynamic_card.test ... ok!");
+})()

test/index.js

@@ -3,10 +3,11 @@ const global_var = require("../lib/data/global_var");
 const { log } = require('../lib/utils');
 const fs = require('fs');
 
-log._level = 1
+log._level = 2
 env.init()
 global_var.init(process.env["COOKIE"], 1)
 
+
 fs.readdirSync(module.path)
     .filter(file => file.endsWith(".test.js"))
     .forEach(file => require(`${module.path}/${file}`))

test/proxy.test.js

@@ -0,0 +1,38 @@
+const util = require('./util');
+const crypto = require('crypto');
+const { send } = require('../lib/net/http');
+
+(async () => {
+    await util.par_run([], [
+        // 0
+        async () => {
+            let timestamp = parseInt(new Date().getTime() / 1000);
+            let orderno = process.env["XMDL_ORDERNNO"];
+            let secret = process.env["XMDL_SECRET"];
+
+            if (orderno && secret) {
+                let txt = 'orderno=' + orderno + ',secret=' + secret + ',timestamp=' + timestamp;
+                let md5 = crypto.createHash('md5');
+                let sign = md5.update(txt).digest('hex').toUpperCase();
+
+                console.log(await new Promise((resolve) => {
+                    send({
+                        url: "https://api.bilibili.com/client_info",
+                        proxy: {
+                            url: "http://dtan.xiongmaodaili.com:8088",
+                            auth_headers: [
+                                ["Proxy-Authorization", 'sign=' + sign + '&orderno=' + orderno + "&timestamp=" + timestamp]
+                            ]
+                        },
+                        config: {
+                            retry: false
+                        },
+                        success: (res) => { resolve(JSON.parse(res.body)) },
+                        failure: resolve
+                    })
+                }));
+                console.log("proxy.test ... ok!");
+            }
+        },
+    ])
+})()

test/util.js

@@ -1,8 +1,11 @@
 /**
+ * @param {Array<number>} nums
  * @param {Array<()=>any>} fns
  */
-function par_run(fns) {
-    return Promise.all((fns.map(fn => fn())))
+function par_run(nums, fns) {
+    return Promise.all(
+        nums.map(num => fns[num]())
+    )
 }
 
 module.exports = {