update doc.

fix docs

.dockerignore

@@ -0,0 +1,5 @@
+.gitlab-ci.yml
+.dockerignore
+Dockerfile
+README.md
+LICENSE

.github/ISSUE_TEMPLATE/bug--.md

@@ -0,0 +1,20 @@
+---
+name: Bug汇报
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**环境信息**
+请根据实际使用环境修改以下信息
+go-cqhttp版本: v0.9.10
+运行环境: windows_amd64
+连接方式: 反向WS
+
+**bug内容**
+请在这里详细描述bug的内容
+
+**复现方法**
+请在这里分步骤的描述如何复现这个bug

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on: [push, pull_request]
+
+env:
+  BINARY_PREFIX: "go-cqhttp_"
+  BINARY_SUFFIX: ""
+  PR_PROMPT: "::warning:: Build artifact will not be uploaded due to the workflow is trigged by pull request."
+  LD_FLAGS: "-w -s"
+
+jobs:
+  build:
+    name: Build binary CI
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
+        goos: [linux, windows, darwin]
+        goarch: ["386", amd64, arm]
+        exclude: 
+          - goos: darwin
+            goarch: arm
+      fail-fast: true
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Go environment
+      uses: actions/setup-go@v2.1.1
+      with:
+        go-version: 1.14
+    
+    - name: Build binary file
+      env:
+        GOOS: ${{ matrix.goos }}
+        GOARCH: ${{ matrix.goarch }}
+        IS_PR: ${{ !!github.head_ref }}
+      run: |
+        if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi
+        if $IS_PR ; then echo $PR_PROMPT; fi
+        export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
+        export CGO_ENABLED=0
+        go build -o "output/$BINARY_NAME" -ldflags "$LD_FLAGS" .
+    
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      if: ${{ !github.head_ref }}
+      with:
+        name: ${{ matrix.goos }}_${{ matrix.goarch }}
+        path: output/
+    
+    

.github/workflows/release.yml

@@ -11,11 +11,20 @@ jobs:
         # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 
         goos: [linux, windows, darwin]
         goarch: ["386", amd64, arm]
+        exclude: 
+          - goos: darwin
+            goarch: arm
+            
     steps:
       - uses: actions/checkout@v2
+      - name: Set RELEASE_VERSION env
+        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
       - uses: wangyoucao577/go-release-action@master
+        env:
+          CGO_ENABLED: 0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          ldflags: "-w -s" 
+          ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
+          

.gitignore

@@ -0,0 +1,2 @@
+vendor/
+.idea

Dockerfile

@@ -0,0 +1,21 @@
+FROM golang:1.14.7-alpine AS builder
+
+RUN go env -w GO111MODULE=auto \
+  && go env -w CGO_ENABLED=0 \
+  && mkdir /build
+
+WORKDIR /build
+
+COPY ./ .
+
+RUN cd /build \
+  && go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
+
+FROM alpine:latest
+
+COPY --from=builder /build/cqhttp /usr/bin/cqhttp
+RUN chmod +x /usr/bin/cqhttp
+
+WORKDIR /data
+
+ENTRYPOINT [ "/usr/bin/cqhttp" ]

LICENSE

@@ -1,21 +1,661 @@
-MIT License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2020 Mrs4s
+ 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-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,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -23,6 +23,21 @@
 - [ ] 使用代理请求网络图片
 
 #### 实现
+<details>
+<summary>已实现CQ码</summary>
+
+- [CQ:image]
+- [CQ:record]
+- [CQ:video]
+- [CQ:face]
+- [CQ:at]
+- [CQ:share]
+- [CQ:reply]
+- [CQ:forward]
+- [CQ:node]
+
+</details>
+
 <details>
 <summary>已实现API</summary>
 
@@ -66,6 +81,8 @@
 | [私聊信息](https://cqhttp.cc/docs/4.15/#/Post?id=私聊消息)   |
 | [群消息](https://cqhttp.cc/docs/4.15/#/Post?id=群消息)       |
 | [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回)           |
+| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回)       |
+| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳)           |
 | [群管理员变动](https://cqhttp.cc/docs/4.15/#/Post?id=群管理员变动) |
 | [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) |
 | [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) |
@@ -76,6 +93,16 @@
 
 </details>
 
+# 关于ISSUE
+
+以下ISSUE会被直接关闭
+- 提交BUG不使用Template
+- 询问已知问题
+- 提问找不到重点
+- 重复提问
+
+> 请注意, 开发者并没有义务回复您的问题. 您应该具备基本的提问技巧。
+
 # 性能
 
 在关闭数据库的情况下, 加载25个好友128个群运行24小时后内存使用为10MB左右. 开启数据库后内存使用将根据消息量增加10-20MB, 如果系统内存小于128M建议关闭数据库使用. 

coolq/api.go

@@ -1,20 +1,23 @@
 package coolq
 
 import (
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/go-cqhttp/global"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 	"io/ioutil"
 	"os"
 	"path"
 	"runtime"
 	"strconv"
 	"time"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/message"
+	"github.com/Mrs4s/go-cqhttp/global"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 )
 
+var Version = "unknown"
+
 // https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
 func (bot *CQBot) CQGetLoginInfo() MSG {
 	return OK(MSG{"user_id": bot.Client.Uin, "nickname": bot.Client.Nickname})
@@ -22,7 +25,7 @@ func (bot *CQBot) CQGetLoginInfo() MSG {
 
 // https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
 func (bot *CQBot) CQGetFriendList() MSG {
-	var fs []MSG
+	fs := make([]MSG, 0)
 	for _, f := range bot.Client.FriendList {
 		fs = append(fs, MSG{
 			"nickname": f.Nickname,
@@ -34,8 +37,11 @@ func (bot *CQBot) CQGetFriendList() MSG {
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
-func (bot *CQBot) CQGetGroupList() MSG {
-	var gs []MSG
+func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
+	gs := make([]MSG, 0)
+	if noCache {
+		_ = bot.Client.ReloadGroupList()
+	}
 	for _, g := range bot.Client.GroupList {
 		gs = append(gs, MSG{
 			"group_id":         g.Code,
@@ -62,20 +68,7 @@ func (bot *CQBot) CQGetGroupInfo(groupId int64) MSG {
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
-func (bot *CQBot) CQGetGroupMemberList(groupId int64) MSG {
-	group := bot.Client.FindGroup(groupId)
-	if group == nil {
-		return Failed(100)
-	}
-	var members []MSG
-	for _, m := range group.Members {
-		members = append(members, convertGroupMemberInfo(groupId, m))
-	}
-	return OK(members)
-}
-
-// https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
-func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG {
+func (bot *CQBot) CQGetGroupMemberList(groupId int64, noCache bool) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil {
 		return Failed(100)
@@ -88,6 +81,19 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG
 		}
 		group.Members = t
 	}
+	members := make([]MSG, 0)
+	for _, m := range group.Members {
+		members = append(members, convertGroupMemberInfo(groupId, m))
+	}
+	return OK(members)
+}
+
+// https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
+func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG {
+	group := bot.Client.FindGroup(groupId)
+	if group == nil {
+		return Failed(100)
+	}
 	member := group.FindMember(userId)
 	if member == nil {
 		return Failed(102)
@@ -96,29 +102,57 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
-func (bot *CQBot) CQSendGroupMessage(groupId int64, m gjson.Result) MSG {
-	if m.Type == gjson.String {
-		str := m.Str
-		if str == "" {
-			return Failed(100)
+func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bool) MSG {
+	var str string
+	fixAt := func(elem []message.IMessageElement) {
+		for _, e := range elem {
+			if at, ok := e.(*message.AtElement); ok && at.Target != 0 {
+				at.Display = "@" + func() string {
+					mem := bot.Client.FindGroup(groupId).FindMember(at.Target)
+					if mem != nil {
+						return mem.DisplayName()
 					}
-		elem := bot.ConvertStringMessage(str, true)
-		mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
-		if mid == -1 {
-			return Failed(100)
+					return strconv.FormatInt(at.Target, 10)
+				}()
 			}
-		return OK(MSG{"message_id": mid})
 		}
+	}
+	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
 			elem := bot.ConvertObjectMessage(m, true)
+			fixAt(elem)
 			mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
 				return Failed(100)
 			}
 			return OK(MSG{"message_id": mid})
 		}
+		str = func() string {
+			if m.Str != "" {
+				return m.Str
+			}
+			return m.Raw
+		}()
+	} else if s, ok := i.(string); ok {
+		str = s
+	}
+	if str == "" {
+		log.Warnf("群消息发送失败: 信息为空. MSG: %v", i)
 		return Failed(100)
 	}
+	var elem []message.IMessageElement
+	if autoEscape {
+		elem = append(elem, message.NewText(str))
+	} else {
+		elem = bot.ConvertStringMessage(str, true)
+	}
+	fixAt(elem)
+	mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
+	if mid == -1 {
+		return Failed(100)
+	}
+	return OK(MSG{"message_id": mid})
+}
 
 func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 	if m.Type != gjson.JSON {
@@ -164,11 +198,24 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 		name := e.Get("data.name").Str
 		content := bot.ConvertObjectMessage(e.Get("data.content"), true)
 		if uin != 0 && name != "" && len(content) > 0 {
+			var newElem []message.IMessageElement
+			for _, elem := range content {
+				if img, ok := elem.(*message.ImageElement); ok {
+					gm, err := bot.Client.UploadGroupImage(groupId, img.Data)
+					if err != nil {
+						log.Warnf("警告：群 %v 图片上传失败: %v", groupId, err)
+						continue
+					}
+					newElem = append(newElem, gm)
+					continue
+				}
+				newElem = append(newElem, elem)
+			}
 			nodes = append(nodes, &message.ForwardNode{
 				SenderId:   uin,
 				SenderName: name,
 				Time:       int32(ts.Unix()),
-				Message:    content,
+				Message:    newElem,
 			})
 			return
 		}
@@ -191,16 +238,9 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
-func (bot *CQBot) CQSendPrivateMessage(userId int64, m gjson.Result) MSG {
-	if m.Type == gjson.String {
-		str := m.Str
-		elem := bot.ConvertStringMessage(str, false)
-		mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
-		if mid == -1 {
-			return Failed(100)
-		}
-		return OK(MSG{"message_id": mid})
-	}
+func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape bool) MSG {
+	var str string
+	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
 			elem := bot.ConvertObjectMessage(m, true)
 			mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
@@ -209,8 +249,30 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, m gjson.Result) MSG {
 			}
 			return OK(MSG{"message_id": mid})
 		}
+		str = func() string {
+			if m.Str != "" {
+				return m.Str
+			}
+			return m.Raw
+		}()
+	} else if s, ok := i.(string); ok {
+		str = s
+	}
+	if str == "" {
 		return Failed(100)
 	}
+	var elem []message.IMessageElement
+	if autoEscape {
+		elem = append(elem, message.NewText(str))
+	} else {
+		elem = bot.ConvertStringMessage(str, false)
+	}
+	mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
+	if mid == -1 {
+		return Failed(100)
+	}
+	return OK(MSG{"message_id": mid})
+}
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%EF%BC%88%E7%BE%A4%E5%A4%87%E6%B3%A8%EF%BC%89
 func (bot *CQBot) CQSetGroupCard(groupId, userId int64, card string) MSG {
@@ -242,6 +304,14 @@ func (bot *CQBot) CQSetGroupName(groupId int64, name string) MSG {
 	return Failed(100)
 }
 
+func (bot *CQBot) CQSetGroupMemo(groupId int64, msg string) MSG {
+	if g := bot.Client.FindGroup(groupId); g != nil {
+		g.UpdateMemo(msg)
+		return OK(nil)
+	}
+	return Failed(100)
+}
+
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
 func (bot *CQBot) CQSetGroupKick(groupId, userId int64, msg string) MSG {
 	if g := bot.Client.FindGroup(groupId); g != nil {
@@ -297,7 +367,7 @@ func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG {
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%EF%BC%8F%E9%82%80%E8%AF%B7
-func (bot *CQBot) CQProcessGroupRequest(flag, subType string, approve bool) MSG {
+func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bool) MSG {
 	if subType == "add" {
 		req, ok := bot.joinReqCache.Load(flag)
 		if !ok {
@@ -307,7 +377,7 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType string, approve bool) MSG
 		if approve {
 			req.(*client.UserJoinGroupRequest).Accept()
 		} else {
-			req.(*client.UserJoinGroupRequest).Reject()
+			req.(*client.UserJoinGroupRequest).Reject(false, reason)
 		}
 		return OK(nil)
 	}
@@ -317,7 +387,7 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType string, approve bool) MSG
 		if approve {
 			req.(*client.GroupInvitedRequest).Accept()
 		} else {
-			req.(*client.GroupInvitedRequest).Reject()
+			req.(*client.GroupInvitedRequest).Reject(false, reason)
 		}
 		return OK(nil)
 	}
@@ -334,6 +404,99 @@ func (bot *CQBot) CQDeleteMessage(messageId int32) MSG {
 	return OK(nil)
 }
 
+// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG {
+	group := bot.Client.FindGroup(groupId)
+	if group == nil || group.OwnerUin != bot.Client.Uin {
+		return Failed(100)
+	}
+	mem := group.FindMember(userId)
+	if mem == nil {
+		return Failed(100)
+	}
+	mem.SetAdmin(enable)
+	t, err := bot.Client.GetGroupMembers(group)
+	if err != nil {
+		log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err)
+		return Failed(100)
+	}
+	group.Members = t
+	return OK(nil)
+}
+
+func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
+	msg := MSG{}
+	vip, err := bot.Client.GetVipInfo(userId)
+	if err != nil {
+		return Failed(100)
+	}
+	msg = MSG{
+		"user_id":          vip.Uin,
+		"nickname":         vip.Name,
+		"level":            vip.Level,
+		"level_speed":      vip.LevelSpeed,
+		"vip_level":        vip.VipLevel,
+		"vip_growth_speed": vip.VipGrowthSpeed,
+		"vip_growth_total": vip.VipGrowthTotal,
+	}
+	return OK(msg)
+}
+
+// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
+func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) MSG {
+	msg := MSG{"group_id": groupId}
+	convertMem := func(memList []client.HonorMemberInfo) (ret []MSG) {
+		for _, mem := range memList {
+			ret = append(ret, MSG{
+				"user_id":     mem.Uin,
+				"nickname":    mem.Name,
+				"avatar":      mem.Avatar,
+				"description": mem.Desc,
+			})
+		}
+		return
+	}
+	if t == "talkative" || t == "all" {
+		if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Talkative); err == nil {
+			if honor.CurrentTalkative.Uin != 0 {
+				msg["current_talkative"] = MSG{
+					"user_id":   honor.CurrentTalkative.Uin,
+					"nickname":  honor.CurrentTalkative.Name,
+					"avatar":    honor.CurrentTalkative.Avatar,
+					"day_count": honor.CurrentTalkative.DayCount,
+				}
+			}
+			msg["talkative_list"] = convertMem(honor.TalkativeList)
+		}
+	}
+
+	if t == "performer" || t == "all" {
+		if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Performer); err == nil {
+			msg["performer_lis"] = convertMem(honor.ActorList)
+		}
+	}
+
+	if t == "legend" || t == "all" {
+		if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Legend); err == nil {
+			msg["legend_list"] = convertMem(honor.LegendList)
+		}
+	}
+
+	if t == "strong_newbie" || t == "all" {
+		if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.StrongNewbie); err == nil {
+			msg["strong_newbie_list"] = convertMem(honor.StrongNewbieList)
+		}
+	}
+
+	if t == "emotion" || t == "all" {
+		if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Emotion); err == nil {
+			msg["emotion_list"] = convertMem(honor.EmotionList)
+		}
+	}
+
+	return OK(msg)
+}
+
 // https://cqhttp.cc/docs/4.15/#/API?id=-handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
 // https://github.com/richardchien/coolq-http-api/blob/master/src/cqhttp/plugins/web/http.cpp#L376
 func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
@@ -343,16 +506,19 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 		msgType := context.Get("message_type").Str
 		reply := operation.Get("reply")
 		if reply.Exists() {
+			autoEscape := global.EnsureBool(operation.Get("auto_escape"), false)
+			/*
 				at := true
 				if operation.Get("at_sender").Exists() {
 					at = operation.Get("at_sender").Bool()
 				}
+			*/
 			// TODO: 处理at字段
-			if msgType == "group" && at {
-				bot.CQSendGroupMessage(context.Get("group_id").Int(), reply)
+			if msgType == "group" {
+				bot.CQSendGroupMessage(context.Get("group_id").Int(), reply, autoEscape)
 			}
 			if msgType == "private" {
-				bot.CQSendPrivateMessage(context.Get("user_id").Int(), reply)
+				bot.CQSendPrivateMessage(context.Get("user_id").Int(), reply, autoEscape)
 			}
 		}
 		if msgType == "group" {
@@ -377,12 +543,12 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 		}
 	case "request":
 		reqType := context.Get("request_type").Str
-		if context.Get("approve").Bool() {
+		if operation.Get("approve").Exists() {
 			if reqType == "friend" {
-				bot.CQProcessFriendRequest(context.Get("flag").Str, true)
+				bot.CQProcessFriendRequest(context.Get("flag").Str, operation.Get("approve").Bool())
 			}
 			if reqType == "group" {
-				bot.CQProcessGroupRequest(context.Get("flag").Str, context.Get("sub_type").Str, true)
+				bot.CQProcessGroupRequest(context.Get("flag").Str, context.Get("sub_type").Str, operation.Get("reason").Str, operation.Get("approve").Bool())
 			}
 		}
 	}
@@ -396,11 +562,19 @@ func (bot *CQBot) CQGetImage(file string) MSG {
 	if b, err := ioutil.ReadFile(path.Join(global.IMAGE_PATH, file)); err == nil {
 		r := binary.NewReader(b)
 		r.ReadBytes(16)
-		return OK(MSG{
+		msg := MSG{
 			"size":     r.ReadInt32(),
 			"filename": r.ReadString(),
 			"url":      r.ReadString(),
-		})
+		}
+		local := path.Join(global.CACHE_PATH, file+"."+path.Ext(msg["filename"].(string)))
+		if !global.PathExists(local) {
+			if data, err := global.GetBytes(msg["url"].(string)); err == nil {
+				_ = ioutil.WriteFile(local, data, 0644)
+			}
+		}
+		msg["file"] = local
+		return OK(msg)
 	}
 	return Failed(100)
 }
@@ -410,16 +584,16 @@ func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
 	if m == nil {
 		return Failed(100)
 	}
-	var r []MSG
+	r := make([]MSG, 0)
 	for _, n := range m.Nodes {
-		checkImage(n.Message)
+		bot.checkMedia(n.Message)
 		r = append(r, MSG{
 			"sender": MSG{
 				"user_id":  n.SenderId,
 				"nickname": n.SenderName,
 			},
 			"time":    n.Time,
-			"content": ToStringMessage(n.Message, 0, false),
+			"content": ToFormattedMessage(n.Message, 0, false),
 		})
 	}
 	return OK(MSG{
@@ -450,7 +624,12 @@ func (bot *CQBot) CQCanSendImage() MSG {
 }
 
 func (bot *CQBot) CQCanSendRecord() MSG {
-	return OK(MSG{"yes": false})
+	return OK(MSG{"yes": true})
+}
+
+func (bot *CQBot) CQReloadEventFilter() MSG {
+	global.BootFilter()
+	return OK(nil)
 }
 
 func (bot *CQBot) CQGetStatus() MSG {
@@ -475,6 +654,19 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
 		"plugin_build_configuration": "release",
 		"runtime_version":            runtime.Version(),
 		"runtime_os":                 runtime.GOOS,
+		"version":                    Version,
+		"protocol": func() int {
+			switch client.SystemDeviceInfo.Protocol {
+			case client.AndroidPad:
+				return 0
+			case client.AndroidPhone:
+				return 1
+			case client.AndroidWatch:
+				return 2
+			default:
+				return -1
+			}
+		}(),
 	})
 }
 

coolq/bot.go

@@ -5,15 +5,19 @@ import (
 	"encoding/gob"
 	"encoding/json"
 	"fmt"
+	"hash/crc32"
+	"path"
+	"sync"
+	"time"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/go-cqhttp/global"
+
 	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 	"github.com/xujiajun/nutsdb"
-	"hash/crc32"
-	"path"
-	"sync"
 )
 
 type CQBot struct {
@@ -24,10 +28,14 @@ type CQBot struct {
 	friendReqCache  sync.Map
 	invitedReqCache sync.Map
 	joinReqCache    sync.Map
+	tempMsgCache    sync.Map
+	oneWayMsgCache  sync.Map
 }
 
 type MSG map[string]interface{}
 
+var ForceFragmented = false
+
 func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 	bot := &CQBot{
 		Client: cli,
@@ -51,14 +59,38 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
 	bot.Client.OnGroupMuted(bot.groupMutedEvent)
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
+	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
+	bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
 	bot.Client.OnJoinGroup(bot.joinGroupEvent)
 	bot.Client.OnLeaveGroup(bot.leaveGroupEvent)
 	bot.Client.OnGroupMemberJoined(bot.memberJoinEvent)
 	bot.Client.OnGroupMemberLeaved(bot.memberLeaveEvent)
 	bot.Client.OnGroupMemberPermissionChanged(bot.memberPermissionChangedEvent)
 	bot.Client.OnNewFriendRequest(bot.friendRequestEvent)
+	bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
 	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
 	bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
+	go func() {
+		i := conf.HeartbeatInterval
+		if i < 0 {
+			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
+			return
+		}
+		if i == 0 {
+			i = 5
+		}
+		for {
+			time.Sleep(time.Second * i)
+			bot.dispatchEventMessage(MSG{
+				"time":            time.Now().Unix(),
+				"self_id":         bot.Client.Uin,
+				"post_type":       "meta_event",
+				"meta_event_type": "heartbeat",
+				"status":          nil,
+				"interval":        1000 * i,
+			})
+		}
+	}()
 	return bot
 }
 
@@ -81,7 +113,7 @@ func (bot *CQBot) GetGroupMessage(mid int32) MSG {
 		if err == nil {
 			return m
 		}
-		log.Warnf("获取信息时出现错误: %v", err)
+		log.Warnf("获取信息时出现错误: %v id: %v", err, mid)
 	}
 	return nil
 }
@@ -92,16 +124,37 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 		if i, ok := elem.(*message.ImageElement); ok {
 			gm, err := bot.Client.UploadGroupImage(groupId, i.Data)
 			if err != nil {
-				log.Warnf("警告: 群 %v 消息图片上传失败.", groupId)
+				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupId, err)
 				continue
 			}
 			newElem = append(newElem, gm)
 			continue
 		}
+		if i, ok := elem.(*message.VoiceElement); ok {
+			gv, err := bot.Client.UploadGroupPtt(groupId, i.Data)
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*PokeElement); ok {
+			if group := bot.Client.FindGroup(groupId); group != nil {
+				if mem := group.FindMember(i.Target); mem != nil {
+					mem.Poke()
+					return 0
+				}
+			}
+		}
 		newElem = append(newElem, elem)
 	}
 	m.Elements = newElem
-	ret := bot.Client.SendGroupMessage(groupId, m)
+	ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented)
+	if ret == nil || ret.Id == -1 {
+		log.Warnf("群消息发送失败: 账号可能被风控.")
+		return -1
+	}
 	return bot.InsertGroupMessage(ret)
 }
 
@@ -111,7 +164,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 		if i, ok := elem.(*message.ImageElement); ok {
 			fm, err := bot.Client.UploadPrivateImage(target, i.Data)
 			if err != nil {
-				log.Warnf("警告: 好友 %v 消息图片上传失败.", target)
+				log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
 				continue
 			}
 			newElem = append(newElem, fm)
@@ -120,8 +173,27 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 		newElem = append(newElem, elem)
 	}
 	m.Elements = newElem
-	ret := bot.Client.SendPrivateMessage(target, m)
-	return ToGlobalId(target, ret.Id)
+	var id int32 = -1
+	if bot.Client.FindFriend(target) != nil {
+		msg := bot.Client.SendPrivateMessage(target, m)
+		if msg != nil {
+			id = msg.Id
+		}
+	} else if code, ok := bot.tempMsgCache.Load(target); ok {
+		msg := bot.Client.SendTempMessage(code.(int64), target, m)
+		if msg != nil {
+			id = msg.Id
+		}
+	} else if _, ok := bot.oneWayMsgCache.Load(target); ok {
+		msg := bot.Client.SendPrivateMessage(target, m)
+		if msg != nil {
+			id = msg.Id
+		}
+	}
+	if id == -1 {
+		return -1
+	}
+	return ToGlobalId(target, id)
 }
 
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
@@ -135,6 +207,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 		"message":     ToStringMessage(m.Elements, m.GroupCode, true),
 	}
 	id := ToGlobalId(m.GroupCode, m.Id)
+	if bot.db != nil {
 		err := bot.db.Update(func(tx *nutsdb.Tx) error {
 			buf := new(bytes.Buffer)
 			if err := gob.NewEncoder(buf).Encode(val); err != nil {
@@ -146,6 +219,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
+	}
 	return id
 }
 
@@ -160,8 +234,22 @@ func (bot *CQBot) Release() {
 }
 
 func (bot *CQBot) dispatchEventMessage(m MSG) {
+	payload := gjson.Parse(m.ToJson())
+	filter := global.EventFilter
+	if filter != nil && (*filter).Eval(payload) == false {
+		log.Debug("Event filtered!")
+		return
+	}
 	for _, f := range bot.events {
-		f(m)
+		fn := f
+		go func() {
+			start := time.Now()
+			fn(m)
+			end := time.Now()
+			if end.Sub(start) > time.Second*5 {
+				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
+			}
+		}()
 	}
 }
 
@@ -170,6 +258,9 @@ func formatGroupName(group *client.GroupInfo) string {
 }
 
 func formatMemberName(mem *client.GroupMemberInfo) string {
+	if mem == nil {
+		return "未知"
+	}
 	return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
 }
 

coolq/cqcode.go

@@ -1,7 +1,9 @@
 package coolq
 
 import (
+	"crypto/md5"
 	"encoding/base64"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"github.com/Mrs4s/MiraiGo/binary"
@@ -10,8 +12,10 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"io/ioutil"
+	"net/url"
 	"path"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 )
@@ -20,33 +24,189 @@ var matchReg = regexp.MustCompile(`\[CQ:\w+?.*?]`)
 var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
 
+var IgnoreInvalidCQCode = false
+
+type PokeElement struct {
+	Target int64
+}
+
+func (e *PokeElement) Type() message.ElementType {
+	return message.At
+}
+
+func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []MSG) {
+	ur := false
+	if len(raw) != 0 {
+		ur = raw[0]
+	}
+	m := &message.SendingMessage{Elements: e}
+	reply := m.FirstOrNil(func(e message.IMessageElement) bool {
+		_, ok := e.(*message.ReplyElement)
+		return ok
+	})
+	if reply != nil {
+		r = append(r, MSG{
+			"type": "reply",
+			"data": map[string]string{"id": fmt.Sprint(ToGlobalId(code, reply.(*message.ReplyElement).ReplySeq))},
+		})
+	}
+	for _, elem := range e {
+		m := MSG{}
+		switch o := elem.(type) {
+		case *message.TextElement:
+			m = MSG{
+				"type": "text",
+				"data": map[string]string{"text": o.Content},
+			}
+		case *message.ReplyElement:
+			continue
+		case *message.LightAppElement:
+			//m = MSG{
+			//	"type": "text",
+			//	"data": map[string]string{"text": o.Content},
+			//}
+			m = MSG{
+				"type": "json",
+				"data": map[string]string{"data": o.Content},
+			}
+		case *message.AtElement:
+			if o.Target == 0 {
+				m = MSG{
+					"type": "at",
+					"data": map[string]string{"qq": "all"},
+				}
+			} else {
+				m = MSG{
+					"type": "at",
+					"data": map[string]string{"qq": fmt.Sprint(o.Target)},
+				}
+			}
+		case *message.RedBagElement:
+			m = MSG{
+				"type": "redbag",
+				"data": map[string]string{"title": o.Title},
+			}
+		case *message.ForwardElement:
+			m = MSG{
+				"type": "forward",
+				"data": map[string]string{"id": o.ResId},
+			}
+		case *message.FaceElement:
+			m = MSG{
+				"type": "face",
+				"data": map[string]string{"id": fmt.Sprint(o.Index)},
+			}
+		case *message.VoiceElement:
+			if ur {
+				m = MSG{
+					"type": "record",
+					"data": map[string]string{"file": o.Name},
+				}
+			} else {
+				m = MSG{
+					"type": "record",
+					"data": map[string]string{"file": o.Name, "url": o.Url},
+				}
+			}
+		case *message.ShortVideoElement:
+			if ur {
+				m = MSG{
+					"type": "video",
+					"data": map[string]string{"file": o.Name},
+				}
+			} else {
+				m = MSG{
+					"type": "video",
+					"data": map[string]string{"file": o.Name, "url": o.Url},
+				}
+			}
+		case *message.ImageElement:
+			if ur {
+				m = MSG{
+					"type": "image",
+					"data": map[string]string{"file": o.Filename},
+				}
+			} else {
+				m = MSG{
+					"type": "image",
+					"data": map[string]string{"file": o.Filename, "url": o.Url},
+				}
+			}
+		case *message.ServiceElement:
+			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
+				m = MSG{
+					"type": "xml",
+					"data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)},
+				}
+			} else {
+				m = MSG{
+					"type": "json",
+					"data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)},
+				}
+			}
+		}
+		r = append(r, m)
+	}
+	return
+}
+
 func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r string) {
 	ur := false
 	if len(raw) != 0 {
 		ur = raw[0]
 	}
+	// 方便
+	m := &message.SendingMessage{Elements: e}
+	reply := m.FirstOrNil(func(e message.IMessageElement) bool {
+		_, ok := e.(*message.ReplyElement)
+		return ok
+	})
+	if reply != nil {
+		r += fmt.Sprintf("[CQ:reply,id=%d]", ToGlobalId(code, reply.(*message.ReplyElement).ReplySeq))
+	}
 	for _, elem := range e {
 		switch o := elem.(type) {
 		case *message.TextElement:
-			r += o.Content
+			r += CQCodeEscapeText(o.Content)
 		case *message.AtElement:
 			if o.Target == 0 {
 				r += "[CQ:at,qq=all]"
 				continue
 			}
 			r += fmt.Sprintf("[CQ:at,qq=%d]", o.Target)
-		case *message.ReplyElement:
-			r += fmt.Sprintf("[CQ:reply,id=%d]", ToGlobalId(code, o.ReplySeq))
+		case *message.RedBagElement:
+			r += fmt.Sprintf("[CQ:redbag,title=%s]", o.Title)
 		case *message.ForwardElement:
 			r += fmt.Sprintf("[CQ:forward,id=%s]", o.ResId)
 		case *message.FaceElement:
 			r += fmt.Sprintf(`[CQ:face,id=%d]`, o.Index)
+		case *message.VoiceElement:
+			if ur {
+				r += fmt.Sprintf(`[CQ:record,file=%s]`, o.Name)
+			} else {
+				r += fmt.Sprintf(`[CQ:record,file=%s,url=%s]`, o.Name, CQCodeEscapeValue(o.Url))
+			}
+		case *message.ShortVideoElement:
+			if ur {
+				r += fmt.Sprintf(`[CQ:video,file=%s]`, o.Name)
+			} else {
+				r += fmt.Sprintf(`[CQ:video,file=%s,url=%s]`, o.Name, CQCodeEscapeValue(o.Url))
+			}
 		case *message.ImageElement:
 			if ur {
 				r += fmt.Sprintf(`[CQ:image,file=%s]`, o.Filename)
 			} else {
-				r += fmt.Sprintf(`[CQ:image,file=%s,url=%s]`, o.Filename, o.Url)
+				r += fmt.Sprintf(`[CQ:image,file=%s,url=%s]`, o.Filename, CQCodeEscapeValue(o.Url))
 			}
+		case *message.ServiceElement:
+			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
+				r += fmt.Sprintf(`[CQ:xml,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
+			} else {
+				r += fmt.Sprintf(`[CQ:json,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
+			}
+		case *message.LightAppElement:
+			r += fmt.Sprintf(`[CQ:json,data=%s]`, CQCodeEscapeValue(o.Content))
+			//r += CQCodeEscapeText(o.Content)
 		}
 	}
 	return
@@ -58,7 +218,7 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 	for _, idx := range i {
 		if idx[0] > si {
 			text := m[si:idx[0]]
-			r = append(r, message.NewText(text))
+			r = append(r, message.NewText(CQCodeUnescapeText(text)))
 		}
 		code := m[idx[0]:idx[1]]
 		si = idx[1]
@@ -66,7 +226,7 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 		ps := paramReg.FindAllStringSubmatch(code, -1)
 		d := make(map[string]string)
 		for _, p := range ps {
-			d[p[1]] = p[2]
+			d[p[1]] = CQCodeUnescapeValue(p[2])
 		}
 		if t == "reply" && group {
 			if len(r) > 0 {
@@ -93,13 +253,18 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 		}
 		elem, err := bot.ToElement(t, d, group)
 		if err != nil {
-			log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
+			if !IgnoreInvalidCQCode {
+				log.Warnf("转换CQ码 %v 到MiraiGo Element时出现错误: %v 将原样发送.", code, err)
+				r = append(r, message.NewText(code))
+			} else {
+				log.Warnf("转换CQ码 %v 到MiraiGo Element时出现错误: %v 将忽略.", code, err)
+			}
 			continue
 		}
 		r = append(r, elem)
 	}
 	if si != len(m) {
-		r = append(r, message.NewText(m[si:]))
+		r = append(r, message.NewText(CQCodeUnescapeText(m[si:])))
 	}
 	return
 }
@@ -161,45 +326,58 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 	case "text":
 		return message.NewText(d["text"]), nil
 	case "image":
+		return bot.makeImageElem(t, d, group)
+	case "poke":
+		if !group {
+			return nil, errors.New("todo") // TODO: private poke
+		}
+		t, _ := strconv.ParseInt(d["qq"], 10, 64)
+		return &PokeElement{Target: t}, nil
+	case "record":
+		if !group {
+			return nil, errors.New("private voice unsupported now")
+		}
 		f := d["file"]
+		var data []byte
 		if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
 			b, err := global.GetBytes(f)
 			if err != nil {
 				return nil, err
 			}
-			return message.NewImage(b), nil
+			data = b
 		}
 		if strings.HasPrefix(f, "base64") {
 			b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
 			if err != nil {
 				return nil, err
 			}
-			return message.NewImage(b), nil
+			data = b
 		}
-		if global.PathExists(path.Join(global.IMAGE_PATH, f)) {
-			b, err := ioutil.ReadFile(path.Join(global.IMAGE_PATH, f))
+		if strings.HasPrefix(f, "file") {
+			fu, err := url.Parse(f)
 			if err != nil {
 				return nil, err
 			}
-			if len(b) < 20 {
-				return nil, errors.New("invalid local file")
+			if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
+				fu.Path = fu.Path[1:]
 			}
-			r := binary.NewReader(b)
-			hash := r.ReadBytes(16)
-			if group {
-				rsp, err := bot.Client.QueryGroupImage(1, hash, r.ReadInt32())
+			b, err := ioutil.ReadFile(fu.Path)
 			if err != nil {
 				return nil, err
 			}
-				return rsp, nil
+			data = b
 		}
-			rsp, err := bot.Client.QueryFriendImage(1, hash, r.ReadInt32())
+		if global.PathExists(path.Join(global.VOICE_PATH, f)) {
+			b, err := ioutil.ReadFile(path.Join(global.VOICE_PATH, f))
 			if err != nil {
 				return nil, err
 			}
-			return rsp, nil
+			data = b
 		}
-		return nil, errors.New("invalid image")
+		if !global.IsAMRorSILK(data) {
+			return nil, errors.New("unsupported voice file format (please use AMR file for now)")
+		}
+		return &message.VoiceElement{Data: data}, nil
 	case "face":
 		id, err := strconv.Atoi(d["id"])
 		if err != nil {
@@ -215,7 +393,284 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 		return message.NewAt(t), nil
 	case "share":
 		return message.NewUrlShare(d["url"], d["title"], d["content"], d["image"]), nil
+	case "music":
+		if d["type"] == "qq" {
+			info, err := global.QQMusicSongInfo(d["id"])
+			if err != nil {
+				return nil, err
+			}
+			if !info.Get("track_info").Exists() {
+				return nil, errors.New("song not found")
+			}
+			aid := strconv.FormatInt(info.Get("track_info.album.id").Int(), 10)
+			name := info.Get("track_info.name").Str + " - " + info.Get("track_info.singer.0.name").Str
+			mid := info.Get("track_info.mid").Str
+			albumMid := info.Get("track_info.album.mid").Str
+			pinfo, _ := global.GetBytes("http://u.y.qq.com/cgi-bin/musicu.fcg?g_tk=2034008533&uin=0&format=json&data={\"comm\":{\"ct\":23,\"cv\":0},\"url_mid\":{\"module\":\"vkey.GetVkeyServer\",\"method\":\"CgiGetVkey\",\"param\":{\"guid\":\"4311206557\",\"songmid\":[\"" + mid + "\"],\"songtype\":[0],\"uin\":\"0\",\"loginflag\":1,\"platform\":\"23\"}}}&_=1599039471576")
+			jumpUrl := "https://i.y.qq.com/v8/playsong.html?platform=11&appshare=android_qq&appversion=10030010&hosteuin=oKnlNenz7i-s7c**&songmid=" + mid + "&type=0&appsongtype=1&_wv=1&source=qq&ADTAG=qfshare"
+			purl := gjson.ParseBytes(pinfo).Get("url_mid.data.midurlinfo.0.purl").Str
+			preview := "http://y.gtimg.cn/music/photo_new/T002R180x180M000" + albumMid + ".jpg"
+			if len(aid) < 2 {
+				return nil, errors.New("song error")
+			}
+			content := "来自go-cqhttp"
+			if d["content"] != "" {
+				content = d["content"]
+			}
+			json := fmt.Sprintf("{\"app\": \"com.tencent.structmsg\",\"desc\": \"音乐\",\"meta\": {\"music\": {\"desc\": \"%s\",\"jumpUrl\": \"%s\",\"musicUrl\": \"%s\",\"preview\": \"%s\",\"tag\": \"QQ音乐\",\"title\": \"%s\"}},\"prompt\": \"[分享]%s\",\"ver\": \"0.0.0.1\",\"view\": \"music\"}", content, jumpUrl, purl, preview, name, name)
+			return message.NewLightApp(json), nil
+		}
+		if d["type"] == "163" {
+			info, err := global.NeteaseMusicSongInfo(d["id"])
+			if err != nil {
+				return nil, err
+			}
+			if !info.Exists() {
+				return nil, errors.New("song not found")
+			}
+			name := info.Get("name").Str
+			jumpUrl := "https://y.music.163.com/m/song/" + d["id"]
+			musicUrl := "http://music.163.com/song/media/outer/url?id=" + d["id"]
+			picUrl := info.Get("album.picUrl").Str
+			artistName := ""
+			if info.Get("artists.0").Exists() {
+				artistName = info.Get("artists.0.name").Str
+			}
+			json := fmt.Sprintf("{\"app\": \"com.tencent.structmsg\",\"desc\":\"音乐\",\"view\":\"music\",\"prompt\":\"[分享]%s\",\"ver\":\"0.0.0.1\",\"meta\":{ \"music\": { \"desc\": \"%s\", \"jumpUrl\": \"%s\", \"musicUrl\": \"%s\", \"preview\": \"%s\", \"tag\": \"网易云音乐\", \"title\":\"%s\"}}}", name, artistName, jumpUrl, musicUrl, picUrl, name)
+			return message.NewLightApp(json), nil
+		}
+		if d["type"] == "custom" {
+			xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="%s" src="%s"/><title>%s</title><summary>%s</summary></item><source name="音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
+				d["title"], d["url"], d["image"], d["audio"], d["title"], d["content"])
+			return &message.ServiceElement{
+				Id:      60,
+				Content: xml,
+				SubType: "music",
+			}, nil
+		}
+		return nil, errors.New("unsupported music type: " + d["type"])
+	case "xml":
+		resId := d["resid"]
+		template := CQCodeEscapeValue(d["data"])
+		//println(template)
+		i, _ := strconv.ParseInt(resId, 10, 64)
+		msg := message.NewRichXml(template, i)
+		return msg, nil
+	case "json":
+		resId := d["resid"]
+		i, _ := strconv.ParseInt(resId, 10, 64)
+		log.Warnf("json msg=%s", d["data"])
+		if i == 0 {
+			//默认情况下走小程序通道
+			msg := message.NewLightApp(CQCodeUnescapeValue(d["data"]))
+			return msg, nil
+		}
+		//resid不为0的情况下走富文本通道，后续补全透传service Id，此处暂时不处理 TODO
+		msg := message.NewRichJson(CQCodeUnescapeValue(d["data"]))
+		return msg, nil
+	case "cardimage":
+		source := d["source"]
+		icon := d["icon"]
+		minwidth, _ := strconv.ParseInt(d["minwidth"], 10, 64)
+		if minwidth == 0 {
+			minwidth = 200
+		}
+		minheight, _ := strconv.ParseInt(d["minheight"], 10, 64)
+		if minheight == 0 {
+			minheight = 200
+		}
+		maxwidth, _ := strconv.ParseInt(d["maxwidth"], 10, 64)
+		if maxwidth == 0 {
+			maxwidth = 500
+		}
+		maxheight, _ := strconv.ParseInt(d["maxheight"], 10, 64)
+		if maxheight == 0 {
+			maxheight = 1000
+		}
+		img, err := bot.makeImageElem(t, d, group)
+		if err != nil {
+			return nil, errors.New("send cardimage faild")
+		}
+		return bot.SendNewPic(img, source, icon, minwidth, minheight, maxwidth, maxheight, group)
 	default:
 		return nil, errors.New("unsupported cq code: " + t)
 	}
 }
+
+func CQCodeEscapeText(raw string) string {
+	ret := raw
+	ret = strings.ReplaceAll(ret, "&", "&amp;")
+	ret = strings.ReplaceAll(ret, "[", "&#91;")
+	ret = strings.ReplaceAll(ret, "]", "&#93;")
+	return ret
+}
+
+func CQCodeEscapeValue(value string) string {
+	ret := CQCodeEscapeText(value)
+	ret = strings.ReplaceAll(ret, ",", "&#44;")
+	return ret
+}
+
+func CQCodeUnescapeText(content string) string {
+	ret := content
+	ret = strings.ReplaceAll(ret, "&#91;", "[")
+	ret = strings.ReplaceAll(ret, "&#93;", "]")
+	ret = strings.ReplaceAll(ret, "&amp;", "&")
+	return ret
+}
+
+func CQCodeUnescapeValue(content string) string {
+	ret := strings.ReplaceAll(content, "&#44;", ",")
+	ret = CQCodeUnescapeText(ret)
+	return ret
+}
+
+// 图片 elem 生成器，单独拎出来，用于公用
+func (bot *CQBot) makeImageElem(t string, d map[string]string, group bool) (message.IMessageElement, error) {
+	f := d["file"]
+	if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
+		cache := d["cache"]
+		if cache == "" {
+			cache = "1"
+		}
+		hash := md5.Sum([]byte(f))
+		cacheFile := path.Join(global.CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
+		if global.PathExists(cacheFile) && cache == "1" {
+			b, err := ioutil.ReadFile(cacheFile)
+			if err == nil {
+				return message.NewImage(b), nil
+			}
+		}
+		b, err := global.GetBytes(f)
+		if err != nil {
+			return nil, err
+		}
+		_ = ioutil.WriteFile(cacheFile, b, 0644)
+		return message.NewImage(b), nil
+	}
+	if strings.HasPrefix(f, "base64") {
+		b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
+		if err != nil {
+			return nil, err
+		}
+		return message.NewImage(b), nil
+	}
+	if strings.HasPrefix(f, "file") {
+		fu, err := url.Parse(f)
+		if err != nil {
+			return nil, err
+		}
+		if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
+			fu.Path = fu.Path[1:]
+		}
+		b, err := ioutil.ReadFile(fu.Path)
+		if err != nil {
+			return nil, err
+		}
+		return message.NewImage(b), nil
+	}
+	rawPath := path.Join(global.IMAGE_PATH, f)
+	if !global.PathExists(rawPath) && global.PathExists(rawPath+".cqimg") {
+		rawPath += ".cqimg"
+	}
+	if !global.PathExists(rawPath) && d["url"] != "" {
+		return bot.ToElement(t, map[string]string{"file": d["url"]}, group)
+	}
+	if global.PathExists(rawPath) {
+		b, err := ioutil.ReadFile(rawPath)
+		if err != nil {
+			return nil, err
+		}
+		if path.Ext(rawPath) != ".image" && path.Ext(rawPath) != ".cqimg" {
+			return message.NewImage(b), nil
+		}
+		if len(b) < 20 {
+			return nil, errors.New("invalid local file")
+		}
+		var size int32
+		var hash []byte
+		var url string
+		if path.Ext(rawPath) == ".cqimg" {
+			for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
+				kv := strings.SplitN(line, "=", 2)
+				switch kv[0] {
+				case "md5":
+					hash, _ = hex.DecodeString(strings.ReplaceAll(kv[1], "\r", ""))
+				case "size":
+					t, _ := strconv.Atoi(strings.ReplaceAll(kv[1], "\r", ""))
+					size = int32(t)
+				}
+			}
+		} else {
+			r := binary.NewReader(b)
+			hash = r.ReadBytes(16)
+			size = r.ReadInt32()
+			r.ReadString()
+			url = r.ReadString()
+		}
+		if size == 0 {
+			if url != "" {
+				return bot.ToElement(t, map[string]string{"file": url}, group)
+			}
+			return nil, errors.New("img size is 0")
+		}
+		if len(hash) != 16 {
+			return nil, errors.New("invalid hash")
+		}
+		if group {
+			rsp, err := bot.Client.QueryGroupImage(1, hash, size)
+			if err != nil {
+				if url != "" {
+					return bot.ToElement(t, map[string]string{"file": url}, group)
+				}
+				return nil, err
+			}
+			return rsp, nil
+		}
+		rsp, err := bot.Client.QueryFriendImage(1, hash, size)
+		if err != nil {
+			if url != "" {
+				return bot.ToElement(t, map[string]string{"file": url}, group)
+			}
+			return nil, err
+		}
+		return rsp, nil
+	}
+	return nil, errors.New("invalid image")
+}
+
+//SendNewPic 一种xml 方式发送的群消息图片
+func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon string, minwidth int64, minheigt int64, maxwidth int64, maxheight int64, group bool) (*message.ServiceElement, error) {
+	var xml string
+	xml = ""
+	if i, ok := elem.(*message.ImageElement); ok {
+		if group == false {
+			gm, err := bot.Client.UploadPrivateImage(1, i.Data)
+			if err != nil {
+				log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
+				return nil, err
+			}
+			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minwidth, minheigt, maxwidth, maxheight, source, icon)
+
+		} else {
+			gm, err := bot.Client.UploadGroupImage(1, i.Data)
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
+				return nil, err
+			}
+			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minwidth, minheigt, maxwidth, maxheight, source, icon)
+		}
+	}
+	if i, ok := elem.(*message.GroupImageElement); ok {
+		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minwidth, minheigt, maxwidth, maxheight, source, icon)
+	}
+	if i, ok := elem.(*message.FriendImageElement); ok {
+		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minwidth, minheigt, maxwidth, maxheight, source, icon)
+	}
+	if xml != "" {
+		log.Warn(xml)
+		XmlMsg := message.NewRichXml(xml, 5)
+		return XmlMsg, nil
+	}
+	return nil, errors.New("发送xml图片消息失败")
+}

coolq/event.go

@@ -10,20 +10,39 @@ import (
 	"io/ioutil"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 )
 
+var format = "string"
+
+func SetMessageFormat(f string) {
+	format = f
+}
+
+func ToFormattedMessage(e []message.IMessageElement, code int64, raw ...bool) (r interface{}) {
+	if format == "string" {
+		r = ToStringMessage(e, code, raw...)
+	} else if format == "array" {
+		r = ToArrayMessage(e, code, raw...)
+	}
+	return
+}
+
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
-	checkImage(m.Elements)
+	bot.checkMedia(m.Elements)
 	cqm := ToStringMessage(m.Elements, 0, true)
+	if !m.Sender.IsFriend {
+		bot.oneWayMsgCache.Store(m.Sender.Uin, "")
+	}
 	log.Infof("收到好友 %v(%v) 的消息: %v", m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	fm := MSG{
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "friend",
-		"message_id":   m.Id,
+		"message_id":   ToGlobalId(m.Sender.Uin, m.Id),
 		"user_id":      m.Sender.Uin,
-		"message":      ToStringMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, 0, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -39,7 +58,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
-	checkImage(m.Elements)
+	bot.checkMedia(m.Elements)
 	for _, elem := range m.Elements {
 		if file, ok := elem.(*message.GroupFileElement); ok {
 			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
@@ -53,6 +72,7 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 					"name":  file.Name,
 					"size":  file.Size,
 					"busid": file.Busid,
+					"url":   c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid),
 				},
 				"self_id": c.Uin,
 				"time":    time.Now().Unix(),
@@ -70,7 +90,7 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 		"anonymous":    nil,
 		"font":         0,
 		"group_id":     m.GroupCode,
-		"message":      ToStringMessage(m.Elements, m.GroupCode, false),
+		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
 		"message_id":   id,
 		"message_type": "group",
 		"post_type":    "message",
@@ -116,8 +136,9 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 }
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
-	checkImage(m.Elements)
+	bot.checkMedia(m.Elements)
 	cqm := ToStringMessage(m.Elements, 0, true)
+	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	tm := MSG{
 		"post_type":    "message",
@@ -125,7 +146,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
 		"sub_type":     "group",
 		"message_id":   m.Id,
 		"user_id":      m.Sender.Uin,
-		"message":      ToStringMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, 0, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -184,6 +205,79 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
 	})
 }
 
+func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.IGroupNotifyEvent) {
+	group := c.FindGroup(e.From())
+	switch notify := e.(type) {
+	case *client.GroupPokeNotifyEvent:
+		sender := group.FindMember(notify.Sender)
+		receiver := group.FindMember(notify.Receiver)
+		log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
+		bot.dispatchEventMessage(MSG{
+			"post_type":   "notice",
+			"group_id":    group.Code,
+			"notice_type": "notify",
+			"sub_type":    "poke",
+			"self_id":     c.Uin,
+			"user_id":     notify.Sender,
+			"sender_id":   notify.Sender,
+			"target_id":   notify.Receiver,
+			"time":        time.Now().Unix(),
+		})
+	case *client.GroupRedBagLuckyKingNotifyEvent:
+		sender := group.FindMember(notify.Sender)
+		luckyKing := group.FindMember(notify.LuckyKing)
+		log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
+		bot.dispatchEventMessage(MSG{
+			"post_type":   "notice",
+			"group_id":    group.Code,
+			"notice_type": "notify",
+			"sub_type":    "lucky_king",
+			"self_id":     c.Uin,
+			"user_id":     notify.Sender,
+			"sender_id":   notify.Sender,
+			"target_id":   notify.LuckyKing,
+			"time":        time.Now().Unix(),
+		})
+	case *client.MemberHonorChangedNotifyEvent:
+		log.Info(notify.Content())
+		bot.dispatchEventMessage(MSG{
+			"post_type":   "notice",
+			"group_id":    group.Code,
+			"notice_type": "notify",
+			"sub_type":    "honor",
+			"self_id":     c.Uin,
+			"user_id":     notify.Uin,
+			"time":        time.Now().Unix(),
+			"honor_type": func() string {
+				switch notify.Honor {
+				case client.Talkative:
+					return "talkative"
+				case client.Performer:
+					return "performer"
+				case client.Emotion:
+					return "emotion"
+				default:
+					return "ERROR"
+				}
+			}(),
+		})
+	}
+}
+
+func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
+	f := c.FindFriend(e.FriendUin)
+	gid := ToGlobalId(e.FriendUin, e.MessageId)
+	log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
+	bot.dispatchEventMessage(MSG{
+		"post_type":   "notice",
+		"notice_type": "friend_recall",
+		"self_id":     c.Uin,
+		"user_id":     f.Uin,
+		"time":        e.Time,
+		"message_id":  gid,
+	})
+}
+
 func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
 	log.Infof("Bot进入了群 %v.", formatGroupName(group))
 	bot.dispatchEventMessage(bot.groupIncrease(group.Code, 0, c.Uin))
@@ -245,6 +339,18 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 	})
 }
 
+func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) {
+	log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
+	bot.tempMsgCache.Delete(e.Friend.Uin)
+	bot.dispatchEventMessage(MSG{
+		"post_type":   "notice",
+		"notice_type": "friend_add",
+		"self_id":     c.Uin,
+		"user_id":     e.Friend.Uin,
+		"time":        time.Now().Unix(),
+	})
+}
+
 func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
@@ -263,7 +369,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 }
 
 func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
-	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupName, e.RequesterNick, e.RequesterUin)
+	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.joinReqCache.Store(flag, e)
 	bot.dispatchEventMessage(MSG{
@@ -272,7 +378,7 @@ func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupR
 		"sub_type":     "add",
 		"group_id":     e.GroupCode,
 		"user_id":      e.RequesterUin,
-		"comment":      "",
+		"comment":      e.Message,
 		"flag":         flag,
 		"time":         time.Now().Unix(),
 		"self_id":      c.Uin,
@@ -318,9 +424,10 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 	}
 }
 
-func checkImage(e []message.IMessageElement) {
+func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 	for _, elem := range e {
-		if i, ok := elem.(*message.ImageElement); ok {
+		switch i := elem.(type) {
+		case *message.ImageElement:
 			filename := hex.EncodeToString(i.Md5) + ".image"
 			if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
 				_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
@@ -328,9 +435,32 @@ func checkImage(e []message.IMessageElement) {
 					w.WriteUInt32(uint32(i.Size))
 					w.WriteString(i.Filename)
 					w.WriteString(i.Url)
-				}), 0777)
+				}), 0644)
 			}
 			i.Filename = filename
+		case *message.VoiceElement:
+			i.Name = strings.ReplaceAll(i.Name, "{", "")
+			i.Name = strings.ReplaceAll(i.Name, "}", "")
+			if !global.PathExists(path.Join(global.VOICE_PATH, i.Name)) {
+				b, err := global.GetBytes(i.Url)
+				if err != nil {
+					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
+					continue
+				}
+				_ = ioutil.WriteFile(path.Join(global.VOICE_PATH, i.Name), b, 0644)
+			}
+		case *message.ShortVideoElement:
+			filename := hex.EncodeToString(i.Md5) + ".video"
+			if !global.PathExists(path.Join(global.VIDEO_PATH, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.VIDEO_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Name)
+					w.Write(i.Uuid)
+				}), 0644)
+			}
+			i.Name = filename
+			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)
 		}
 	}
 }

docs/EventFilter.md

@@ -0,0 +1,132 @@
+# 事件过滤器
+
+在go-cqhttp同级目录下新建`filter.json`文件即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则会暂停所有上报。
+事件过滤器会处理所有事件(包括心跳事件在内的元事件),请谨慎使用！！
+
+## 示例
+
+这节首先给出一些示例，演示过滤器的基本用法，下一节将给出具体语法说明。
+
+### 只上报以「!!」开头的消息
+
+```json
+{
+    "raw_message": {
+        ".regex": "^!!"
+    }
+}
+```
+
+### 只上报群组的非匿名消息
+
+```json
+{
+    "message_type": "group",
+    "anonymous": {
+        ".eq": null
+    }
+}
+```
+
+### 只上报私聊或特定群组的非匿名消息
+
+```json
+{
+    ".or": [
+        {
+            "message_type": "private"
+        },
+        {
+            "message_type": "group",
+            "group_id": {
+                ".in": [
+                    123456
+                ]
+            },
+            "anonymous": {
+                ".eq": null
+            }
+        }
+    ]
+}
+```
+
+### 只上报群组 11111、22222、33333 中不是用户 12345 发送的消息，以及用户 66666 发送的所有消息
+
+```json
+{
+    ".or": [
+        {
+            "group_id": {
+                ".in": [11111, 22222, 33333]
+            },
+            "user_id": {
+                ".neq": 12345
+            }
+        },
+        {
+            "user_id": 66666
+        }
+    ]
+}
+```
+
+### 一个更复杂的例子
+
+```json
+{
+    ".or": [
+        {
+            "message_type": "private",
+            "user_id": {
+                ".not": {
+                    ".in": [11111, 22222, 33333]
+                },
+                ".neq": 44444
+            }
+        },
+        {
+            "message_type": {
+                ".regex": "group|discuss"
+            },
+            ".or": [
+                {
+                    "group_id": 12345
+                },
+                {
+                    "raw_message": {
+                        ".contains": "通知"
+                    }
+                }
+            ]
+        }
+    ]
+}
+```
+
+## 语法说明
+
+过滤规则最外层是一个 JSON 对象，其中的键，如果以 `.`（点号）开头，则表示运算符，其值为运算符的参数，如果不以 `.` 开头，则表示对事件数据对象中相应键的过滤。过滤规则中任何一个对象，只有在它的所有项都匹配的情况下，才会让事件通过（等价于一个 `and` 运算）；其中，不以 `.` 开头的键，若其值不是对象，则只有在这个值和事件数据相应值相等的情况下，才会通过（等价于一个 `eq` 运算符）。
+
+下面列出所有运算符（「要求的参数类型」是指运算符的键所对应的值的类型，「可作用于的类型」是指在过滤时事件对象相应值的类型）：
+
+| 运算符 | 要求的参数类型 | 可作用于的类型 |
+| ----- | ------------ | ----------- |
+| `.not` | object | 任何 |
+| `.and` | object | 若参数中全为运算符，则任何；若不全为运算符，则 object |
+| `.or` | array（数组元素为 object） | 任何 |
+| `.eq` | 任何 | 任何 |
+| `.neq` | 任何 | 任何 |
+| `.in` | string/array | 若参数为 string，则 string；若参数为 array，则任何 |
+| `.contains` | string | string |
+| `.regex` | string | string |
+
+
+## 过滤时的事件数据对象
+
+过滤器在go-cqhttp构建好事件数据后运行，各事件的数据字段见[OneBot标准]( https://github.com/howmanybots/onebot/blob/master/v11/specs/event/README.md )。
+
+这里有几点需要注意：
+
+- `message` 字段在运行过滤器时是消息段数组的形式（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
+- `raw_message` 字段为未经**CQ码**处理的原始消息字符串，这意味着其中可能会出现形如 `[CQ:face,id=123]` 的 CQ 码

docs/config.md

@@ -18,15 +18,30 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 {
 	"uin": 0,
 	"password": "",
+	"encrypt_password": false,
+	"password_encrypted": "",
 	"enable_db": true,
 	"access_token": "",
-	"relogin": false,
-	"relogin_delay": 0,
+	"relogin": {
+		"enabled": true,
+		"relogin_delay": 3,
+		"max_relogin_times": 0
+	},
+    "_rate_limit": {
+		"enabled": false,
+		"frequency": 1,
+		"bucket_size": 1
+    },
+	"post_message_format": "string",
+	"ignore_invalid_cqcode": false,
+	"force_fragmented": true,
+	"heartbeat_interval": 5,
 	"http_config": {
 		"enabled": true,
 		"host": "0.0.0.0",
 		"port": 5700,
-		"post_urls": []
+		"timeout": 5,
+		"post_urls": {"url:port": "secret"}
 	},
 	"ws_config": {
 		"enabled": true,
@@ -49,12 +64,54 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 | ------------------ | -------- | ------------------------------------------------------------------- |
 | uin                  | int64    | 登录用QQ号                                                          |
 | password             | string   | 登录用密码                                                          |
+| encrypt_password     | bool     | 是否对密码进行加密.                                                   |
+| password_encrypted   | string   | 加密后的密码(请勿修改)                                                |
 | enable_db            | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口          |
 | access_token         | string   | 同CQHTTP的 `access_token`  用于身份验证                              |
 | relogin              | bool     | 是否自动重新登录                                                     |
 | relogin_delay        | int      | 重登录延时（秒）                                                     |
+| max_relogin_times    | uint     | 最大重登录次数，若0则不设置上限                                        |
+| _rate_limit          | bool     | 是否启用API调用限速                                                  |
+| frequency            | float64  | 1s内能调用API的次数                                                  |
+| bucket_size          | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                 |
+| post_message_format  | string   | 上报信息类型                                                        |
+| ignore_invalid_cqcode| bool     | 是否忽略错误的CQ码                                                   |
+| force_fragmented     | bool     | 是否强制分片发送群长消息                                              |
+| heartbeat_interval   | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)        |
 | http_config          | object   | HTTP API配置                                                       |
 | ws_config            | object   | Websocket API 配置                                                 |
 | ws_reverse_servers   | object[] | 反向 Websocket API 配置                                             |
+| log_level            | string   | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error|
 
+> 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
+> 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
+> 解密密钥在使用完成后并不会留存在内存中, 所以可用相对简单的字符串作为密钥
 
+> 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
+
+> 注3：关闭心跳服务可能引起断线，请谨慎关闭
+
+## 设备信息
+
+默认生成的设备信息如下所示: 
+
+``` json
+{
+	"protocol": 0,
+	"display": "xxx",
+	"finger_print": "xxx",
+	"boot_id": "xxx",
+	"proc_version": "xxx",
+	"imei": "xxx"
+}
+```
+
+在大部分情况下 我们只需要关心 `protocol` 字段: 
+
+| 值   | 类型          | 限制                                                  |
+| ---- | ------------- | ----------------------------------------------------- |
+| 0    | Android Pad   | 无法接收 `group_notify` 事件、无法接收口令红包        |
+| 1    | Android Phone | 无                                                    |
+| 2    | Android Watch | 除了 `Android Pad` 有的限制外还包括: 无法接收撤回消息 |
+
+> 注意, 根据协议的不同, 各类消息有所限制

docs/cqhttp.md

@@ -18,6 +18,36 @@ Type : `reply`
 
 示例: `[CQ:reply,id=123456]`
 
+### 红包
+
+Type: `redbag`
+
+范围: **接收**
+
+参数:
+
+| 参数名 | 类型   | 说明        |
+| ------ | ------ | ----------- |
+| title  | string | 祝福语/口令 |
+
+示例: `[CQ:redbag,title=恭喜发财]`
+
+### 戳一戳
+
+> 注意：发送戳一戳消息无法撤回，返回的 `message id`  恒定为 `0`
+
+Type: `poke`
+
+范围: **发送(仅群聊)**
+
+参数:
+
+| 参数名 | 类型   | 说明        |
+| ------ | ------ | ----------- |
+| qq     | int64  | 需要戳的成员 |
+
+示例: `[CQ:poke,qq=123456]`
+
  ### 合并转发
 
 Type: `forward`
@@ -119,7 +149,111 @@ Type: `node`
 ]
 ````
 
+### xml支持
 
+Type: `xml`
+
+范围: **发送/接收**
+
+参数:
+
+| 参数名 | 类型   | 说明                                                         |
+| ------ | ------ | ------------------------------------------------------------ |
+| data     | string | xml内容，xml中的value部分，记得实体化处理|
+| resid     | int32 | 可以不填|
+
+示例: `[CQ:xml,data=xxxx]`
+
+####一些xml样例
+
+####ps:重要：xml中的value部分，记得html实体化处理后，再打加入到cq码中
+
+#### qq音乐
+
+```xml
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="&#91;分享&#93; 十年" sourceMsgId="0" url="https://i.y.qq.com/v8/playsong.html?_wv=1&amp;songid=4830342&amp;souce=qqshare&amp;source=qqshare&amp;ADTAG=qqshare" flag="0" adverSign="0" multiMsgFlag="0" ><item layout="2"><audio cover="http://imgcache.qq.com/music/photo/album_500/26/500_albumpic_89526_0.jpg" src="http://ws.stream.qqmusic.qq.com/C400003mAan70zUy5O.m4a?guid=1535153710&amp;vkey=D5315B8C0603653592AD4879A8A3742177F59D582A7A86546E24DD7F282C3ACF81526C76E293E57EA1E42CF19881C561275D919233333ADE&amp;uin=&amp;fromtag=3" /><title>十年</title><summary>陈奕迅</summary></item><source name="QQ音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app"  a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>
+```
+#### 网易音乐
+```xml
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="&#91;分享&#93; 十年" sourceMsgId="0" url="http://music.163.com/m/song/409650368" flag="0" adverSign="0" multiMsgFlag="0" ><item layout="2"><audio cover="http://p2.music.126.net/g-Qgb9ibk9Wp_0HWra0xQQ==/16636710440565853.jpg?param=90y90" src="https://music.163.com/song/media/outer/url?id=409650368.mp3" /><title>十年</title><summary>黄梦之</summary></item><source name="网易云音乐" icon="https://pic.rmb.bdstatic.com/911423bee2bef937975b29b265d737b3.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.netease.cloudmusic" i_actionData="tencent100495085://" appid="100495085" /></msg>
+```
+
+#### 卡片消息1
+```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<msg serviceID="1">
+<item><title>生死8秒！女司机高速急刹，他一个操作救下一车性命</title></item>
+<source name="官方认证消息" icon="https://qzs.qq.com/ac/qzone_v5/client/auth_icon.png" action="" appid="-1" />
+</msg>
+```
+
+#### 卡片消息2
+```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<msg serviceID="1">
+<item layout="4">
+<title>test title</title>
+<picture cover="http://url.cn/5CEwIUy"/>
+</item>
+</msg>
+```
+
+### json消息支持
+
+Type: `json`
+
+范围: **发送/接收**
+
+参数:
+
+| 参数名 | 类型   | 说明                                                         |
+| ------ | ------ | ------------------------------------------------------------ |
+| data     | string | json内容，json的所有字符串记得实体化处理|
+| resid     | int32 | 默认不填为0，走小程序通道，填了走富文本通道发送|
+
+json中的字符串需要进行转义：
+
+>","=>`&#44;`、
+
+>"&"=> `&amp;`、
+
+>"["=>`&#91;`、
+
+>"]"=>`&#93;`、
+
+否则无法正确得到解析
+
+示例json 的cq码：
+```test
+[CQ:json,data={"app":"com.tencent.miniapp"&#44;"desc":""&#44;"view":"notification"&#44;"ver":"0.0.0.1"&#44;"prompt":"&#91;应用&#93;"&#44;"appID":""&#44;"sourceName":""&#44;"actionData":""&#44;"actionData_A":""&#44;"sourceUrl":""&#44;"meta":{"notification":{"appInfo":{"appName":"全国疫情数据统计"&#44;"appType":4&#44;"appid":1109659848&#44;"iconUrl":"http:\/\/gchat.qpic.cn\/gchatpic_new\/719328335\/-2010394141-6383A777BEB79B70B31CE250142D740F\/0"}&#44;"data":&#91;{"title":"确诊"&#44;"value":"80932"}&#44;{"title":"今日确诊"&#44;"value":"28"}&#44;{"title":"疑似"&#44;"value":"72"}&#44;{"title":"今日疑似"&#44;"value":"5"}&#44;{"title":"治愈"&#44;"value":"60197"}&#44;{"title":"今日治愈"&#44;"value":"1513"}&#44;{"title":"死亡"&#44;"value":"3140"}&#44;{"title":"今**亡"&#44;"value":"17"}&#93;&#44;"title":"中国加油，武汉加油"&#44;"button":&#91;{"name":"病毒：SARS-CoV-2，其导致疾病命名 COVID-19"&#44;"action":""}&#44;{"name":"传染源：新冠肺炎的患者。无症状感染者也可能成为传染源。"&#44;"action":""}&#93;&#44;"emphasis_keyword":""}}&#44;"text":""&#44;"sourceAd":""}]
+```
+
+
+### cardimage 一种xml的图片消息（装逼大图）
+
+ps: xml 接口的消息都存在风控风险，请自行兼容发送失败后的处理（可以失败后走普通图片模式）
+
+Type: `cardimage`
+
+范围: **发送**
+
+参数:
+
+| 参数名 | 类型   | 说明                                                         |
+| ------ | ------ | ------------------------------------------------------------ |
+| file     | string | 和image的file字段对齐，支持也是一样的|
+| minwidth     | int64 | 默认不填为400，最小width|
+| minheight     | int64 | 默认不填为400，最小height|
+| maxwidth     | int64 | 默认不填为500，最大width|
+| maxheight     | int64 | 默认不填为1000，最大height|
+| source     | string | 分享来源的名称，可以留空|
+| icon     | string | 分享来源的icon图标url，可以留空|
+
+
+示例cardimage 的cq码：
+```test
+[CQ:cardimage,file=https://i.pixiv.cat/img-master/img/2020/03/25/00/00/08/80334602_p0_master1200.jpg]
+```
 
 ## API
 
@@ -132,7 +266,7 @@ Type: `node`
 | 字段     | 类型   | 说明 |
 | -------- | ------ | ---- |
 | group_id | int64  | 群号 |
-| name     | string | 新名 |
+| group_name     | string | 新名 |
 
 ### 获取图片信息
 
@@ -247,3 +381,58 @@ Type: `node`
 | `operator_id` | int64  |                | 操作者id       |
 | `message_id`  | int64  |                | 被撤回的消息id |
 
+#### 好友消息撤回
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `friend_recall`| 消息类型       |
+| `user_id`     | int64  |                | 好友id        |
+| `message_id`  | int64  |                | 被撤回的消息id |
+
+#### 群内戳一戳
+
+> 注意：此事件无法在平板和手表协议上触发
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `notify` | 消息类型       |
+| `group_id` | int64 |  | 群号 |
+| `sub_type` | string | `poke` | 提示类型 |
+| `user_id`     | int64  |                | 发送者id    |
+| `target_id` | int64 | | 被戳者id |
+
+#### 群红包运气王提示
+
+> 注意：此事件无法在平板和手表协议上触发
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `notify` | 消息类型       |
+| `group_id` | int64 |  | 群号 |
+| `sub_type` | string | `lucky_king` | 提示类型 |
+| `user_id`     | int64  |                | 红包发送者id |
+| `target_id` | int64 | | 运气王id |
+
+#### 群成员荣誉变更提示
+
+> 注意：此事件无法在平板和手表协议上触发
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `notify` | 消息类型       |
+| `group_id` | int64 |  | 群号 |
+| `sub_type` | string | `honor` | 提示类型 |
+| `user_id`     | int64  |                | 成员id |
+| `honor_type` | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |

docs/file.md

@@ -7,6 +7,7 @@ go-cqhttp 默认生成的文件树如下所示:
 ├── go-cqhttp
 ├── config.json
 ├── device.json
+├── servers.bin
 ├── logs
 │   └── xx-xx-xx.log
 └── data
@@ -20,6 +21,7 @@ go-cqhttp 默认生成的文件树如下所示:
 | go-cqhttp   | go-cqhttp可执行文件 |
 | config.json | 运行配置文件        |
 | device.json | 虚拟设备配置文件    |
+| servers.bin | 储存QQ服务器地址    |
 | logs        | 日志存放目录        |
 | data        | 数据目录            |
 | data/images | 图片缓存目录        |

global/art.go

@@ -1,101 +0,0 @@
-package global
-
-import (
-	"bytes"
-	"fmt"
-	"golang.org/x/image/font"
-	"golang.org/x/image/font/basicfont"
-	"golang.org/x/image/math/fixed"
-	"image"
-	"image/color"
-	_ "image/jpeg"
-	_ "image/png"
-	"io"
-)
-
-// https://github.com/xrlin/AsciiArt
-
-func Convert(f io.Reader, chars []string, subWidth, subHeight int, imageSwitch bool, bgColor, penColor color.RGBA) (string, *image.NRGBA, error) {
-	var charsLength = len(chars)
-	if charsLength == 0 {
-		return "", nil, fmt.Errorf("no chars provided")
-	}
-	if subWidth == 0 || subHeight == 0 {
-		return "", nil, fmt.Errorf("subWidth and subHeight params is required")
-	}
-	m, _, err := image.Decode(f)
-	if err != nil {
-		return "", nil, err
-	}
-	imageWidth, imageHeight := m.Bounds().Max.X, m.Bounds().Max.Y
-	var img *image.NRGBA
-	if imageSwitch {
-		img = initImage(imageWidth, imageHeight, bgColor)
-	}
-	piecesX, piecesY := imageWidth/subWidth, imageHeight/subHeight
-	var buff bytes.Buffer
-	for y := 0; y < piecesY; y++ {
-		offsetY := y * subHeight
-		for x := 0; x < piecesX; x++ {
-			offsetX := x * subWidth
-			averageBrightness := calculateAverageBrightness(m, image.Rect(offsetX, offsetY, offsetX+subWidth, offsetY+subHeight))
-			char := getCharByBrightness(chars, averageBrightness)
-			buff.WriteString(char)
-			if img != nil {
-				addCharToImage(img, char, x*subWidth, y*subHeight, penColor)
-			}
-		}
-		buff.WriteString("\n")
-	}
-	return buff.String(), img, nil
-}
-
-func initImage(width, height int, bgColor color.RGBA) *image.NRGBA {
-	img := image.NewNRGBA(image.Rect(0, 0, width, height))
-	for x := 0; x < width; x++ {
-		for y := 0; y < height; y++ {
-			img.Set(x, y, bgColor)
-		}
-	}
-	return img
-}
-func calculateAverageBrightness(img image.Image, rect image.Rectangle) float64 {
-	var averageBrightness float64
-	width, height := rect.Max.X-rect.Min.X, rect.Max.Y-rect.Min.Y
-	var brightness float64
-	for x := rect.Min.X; x < rect.Max.X; x++ {
-		for y := rect.Min.Y; y < rect.Max.Y; y++ {
-			r, g, b, _ := img.At(x, y).RGBA()
-			brightness = float64(r>>8+g>>8+b>>8) / 3
-			averageBrightness += brightness
-		}
-	}
-	averageBrightness /= float64(width * height)
-	return averageBrightness
-}
-
-func getCharByBrightness(chars []string, brightness float64) string {
-	index := int(brightness*float64(len(chars))) >> 8
-	if index == len(chars) {
-		index--
-	}
-	return chars[len(chars)-index-1]
-}
-
-func addCharToImage(img *image.NRGBA, char string, x, y int, penColor color.RGBA) {
-	face := basicfont.Face7x13
-	point := fixed.Point26_6{X: fixed.Int26_6(x * 64), Y: fixed.Int26_6(y * 64)}
-	d := &font.Drawer{
-		Dst:  img,
-		Src:  image.NewUniform(penColor),
-		Face: face,
-		Dot:  point,
-	}
-	d.DrawString(char)
-}
-
-var Colors = map[string]color.RGBA{"black": {0, 0, 0, 255},
-	"gray":  {140, 140, 140, 255},
-	"red":   {255, 0, 0, 255},
-	"green": {0, 128, 0, 255},
-	"blue":  {0, 0, 255, 255}}

global/config.go

@@ -2,21 +2,39 @@ package global
 
 import (
 	"encoding/json"
+	"os"
+	"strconv"
+	"time"
+
 	log "github.com/sirupsen/logrus"
 )
 
 type JsonConfig struct {
 	Uin               int64  `json:"uin"`
 	Password          string `json:"password"`
+	EncryptPassword   bool   `json:"encrypt_password"`
+	PasswordEncrypted string `json:"password_encrypted"`
 	EnableDB          bool   `json:"enable_db"`
 	AccessToken       string `json:"access_token"`
-	ReLogin        bool                          `json:"relogin"`
+	ReLogin           struct {
+		Enabled         bool `json:"enabled"`
 		ReLoginDelay    int  `json:"relogin_delay"`
+		MaxReloginTimes uint `json:"max_relogin_times"`
+	} `json:"relogin"`
+	RateLimit struct {
+		Enabled    bool    `json:"enabled"`
+		Frequency  float64 `json:"frequency"`
+		BucketSize int     `json:"bucket_size"`
+	} `json:"_rate_limit"`
+	IgnoreInvalidCQCode bool                          `json:"ignore_invalid_cqcode"`
+	ForceFragmented     bool                          `json:"force_fragmented"`
+	HeartbeatInterval   time.Duration                 `json:"heartbeat_interval"`
 	HttpConfig          *GoCQHttpConfig               `json:"http_config"`
 	WSConfig            *GoCQWebsocketConfig          `json:"ws_config"`
 	ReverseServers      []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"`
-	Proxy          string                        `json:"proxy"`
+	PostMessageFormat   string                        `json:"post_message_format"`
 	Debug               bool                          `json:"debug"`
+	LogLevel            string                        `json:"log_level"`
 }
 
 type CQHttpApiConfig struct {
@@ -42,6 +60,7 @@ type GoCQHttpConfig struct {
 	Enabled  bool              `json:"enabled"`
 	Host     string            `json:"host"`
 	Port     uint16            `json:"port"`
+	Timeout  int32             `json:"timeout"`
 	PostUrls map[string]string `json:"post_urls"`
 }
 
@@ -62,6 +81,26 @@ type GoCQReverseWebsocketConfig struct {
 func DefaultConfig() *JsonConfig {
 	return &JsonConfig{
 		EnableDB: true,
+		ReLogin: struct {
+			Enabled         bool `json:"enabled"`
+			ReLoginDelay    int  `json:"relogin_delay"`
+			MaxReloginTimes uint `json:"max_relogin_times"`
+		}{
+			Enabled:         true,
+			ReLoginDelay:    3,
+			MaxReloginTimes: 0,
+		},
+		RateLimit: struct {
+			Enabled    bool    `json:"enabled"`
+			Frequency  float64 `json:"frequency"`
+			BucketSize int     `json:"bucket_size"`
+		}{
+			Enabled:    false,
+			Frequency:  1,
+			BucketSize: 1,
+		},
+		PostMessageFormat: "string",
+		ForceFragmented:   true,
 		HttpConfig: &GoCQHttpConfig{
 			Enabled:  true,
 			Host:     "0.0.0.0",
@@ -94,13 +133,15 @@ func Load(p string) *JsonConfig {
 	err := json.Unmarshal([]byte(ReadAllText(p)), &c)
 	if err != nil {
 		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err)
+		log.Infoln("原文件已备份")
+		os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
 		return nil
 	}
 	return &c
 }
 
 func (c *JsonConfig) Save(p string) error {
-	data, err := json.Marshal(c)
+	data, err := json.MarshalIndent(c, "", "\t")
 	if err != nil {
 		return err
 	}

global/filter.go

@@ -0,0 +1,251 @@
+package global
+
+import (
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	"io/ioutil"
+	"regexp"
+	"strings"
+)
+
+type Filter interface {
+	Eval(payload gjson.Result) bool
+}
+
+type OperationNode struct {
+	key    string
+	filter Filter
+}
+
+type NotOperator struct {
+	operand_ Filter
+}
+
+func notOperatorConstruct(argument gjson.Result) *NotOperator {
+	if !argument.IsObject() {
+		panic("the argument of 'not' operator must be an object")
+	}
+	op := new(NotOperator)
+	op.operand_ = Generate("and", argument)
+	return op
+}
+
+func (notOperator NotOperator) Eval(payload gjson.Result) bool {
+	return !(notOperator.operand_).Eval(payload)
+}
+
+type AndOperator struct {
+	operands []OperationNode
+}
+
+func andOperatorConstruct(argument gjson.Result) *AndOperator {
+	if !argument.IsObject() {
+		panic("the argument of 'and' operator must be an object")
+	}
+	op := new(AndOperator)
+	argument.ForEach(func(key, value gjson.Result) bool {
+		if key.Str[0] == '.' {
+			// is an operator
+			//   ".foo": {
+			//       "bar": "baz"
+			//   }
+			opKey := key.Str[1:]
+			op.operands = append(op.operands, OperationNode{"", Generate(opKey, value)})
+		} else if value.IsObject() {
+			// is an normal key with an object as the value
+			//   "foo": {
+			//       ".bar": "baz"
+			//   }
+			opKey := key.String()
+			op.operands = append(op.operands, OperationNode{opKey, Generate("and", value)})
+		} else {
+			// is an normal key with a non-object as the value
+			//   "foo": "bar"
+			opKey := key.String()
+			op.operands = append(op.operands, OperationNode{opKey, Generate("eq", value)})
+		}
+		return true
+	})
+	return op
+}
+
+func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
+	res := true
+	for _, operand := range andOperator.operands {
+
+		if len(operand.key) == 0 {
+			// is an operator
+			res = res && operand.filter.Eval(payload)
+		} else {
+			// is an normal key
+			val := payload.Get(operand.key)
+			res = res && operand.filter.Eval(val)
+		}
+
+		if res == false {
+			break
+		}
+	}
+	return res
+}
+
+type OrOperator struct {
+	operands []Filter
+}
+
+func orOperatorConstruct(argument gjson.Result) *OrOperator {
+	if !argument.IsArray() {
+		panic("the argument of 'or' operator must be an array")
+	}
+	op := new(OrOperator)
+	argument.ForEach(func(_, value gjson.Result) bool {
+		op.operands = append(op.operands, Generate("and", value))
+		return true
+	})
+	return op
+}
+
+func (orOperator OrOperator) Eval(payload gjson.Result) bool {
+	res := false
+	for _, operand := range orOperator.operands {
+		res = res || operand.Eval(payload)
+
+		if res == true {
+			break
+		}
+	}
+	return res
+}
+
+type EqualOperator struct {
+	value gjson.Result
+}
+
+func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
+	op := new(EqualOperator)
+	op.value = argument
+	return op
+}
+
+func (equalOperator EqualOperator) Eval(payload gjson.Result) bool {
+	return payload.String() == equalOperator.value.String()
+}
+
+type NotEqualOperator struct {
+	value gjson.Result
+}
+
+func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
+	op := new(NotEqualOperator)
+	op.value = argument
+	return op
+}
+
+func (notEqualOperator NotEqualOperator) Eval(payload gjson.Result) bool {
+	return !(payload.String() == notEqualOperator.value.String())
+}
+
+type InOperator struct {
+	operand gjson.Result
+}
+
+func inOperatorConstruct(argument gjson.Result) *InOperator {
+	if argument.IsObject() {
+		panic("the argument of 'in' operator must be an array or a string")
+	}
+	op := new(InOperator)
+	op.operand = argument
+	return op
+}
+
+func (inOperator InOperator) Eval(payload gjson.Result) bool {
+	if inOperator.operand.IsArray() {
+		res := false
+		inOperator.operand.ForEach(func(key, value gjson.Result) bool {
+			res = res || value.String() == payload.String()
+			return true
+		})
+		return res
+	}
+	return strings.Contains(inOperator.operand.String(), payload.String())
+}
+
+type ContainsOperator struct {
+	operand string
+}
+
+func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
+	if argument.IsArray() || argument.IsObject() {
+		panic("the argument of 'contains' operator must be a string")
+	}
+	op := new(ContainsOperator)
+	op.operand = argument.String()
+	return op
+}
+
+func (containsOperator ContainsOperator) Eval(payload gjson.Result) bool {
+	if payload.IsObject() || payload.IsArray() {
+		return false
+	}
+	return strings.Contains(payload.String(), containsOperator.operand)
+}
+
+type RegexOperator struct {
+	regex string
+}
+
+func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
+	if argument.IsArray() || argument.IsObject() {
+		panic("the argument of 'regex' operator must be a string")
+	}
+	op := new(RegexOperator)
+	op.regex = argument.String()
+	return op
+}
+
+func (containsOperator RegexOperator) Eval(payload gjson.Result) bool {
+	matched, _ := regexp.MatchString(containsOperator.regex, payload.String())
+	return matched
+}
+
+func Generate(opName string, argument gjson.Result) Filter {
+	switch opName {
+	case "not":
+		return notOperatorConstruct(argument)
+	case "and":
+		return andOperatorConstruct(argument)
+	case "or":
+		return orOperatorConstruct(argument)
+	case "neq":
+		return notEqualOperatorConstruct(argument)
+	case "eq":
+		return equalOperatorConstruct(argument)
+	case "in":
+		return inOperatorConstruct(argument)
+	case "contains":
+		return containsOperatorConstruct(argument)
+	case "regex":
+		return regexOperatorConstruct(argument)
+	default:
+		panic("the operator " + opName + " is not supported")
+	}
+}
+
+var EventFilter = new(Filter)
+
+func BootFilter() {
+	defer func() {
+		if e := recover(); e != nil {
+			log.Warnf("事件过滤器启动失败: %v", e)
+			EventFilter = nil
+		} else {
+			log.Info("事件过滤器启动成功.")
+		}
+	}()
+	f, err := ioutil.ReadFile("filter.json")
+	if err != nil {
+		panic(err)
+	} else {
+		*EventFilter = Generate("and", gjson.ParseBytes(f))
+	}
+}

global/fs.go

@@ -1,13 +1,23 @@
 package global
 
 import (
-	log "github.com/sirupsen/logrus"
+	"bytes"
 	"io/ioutil"
 	"os"
 	"path"
+
+	log "github.com/sirupsen/logrus"
 )
 
-var IMAGE_PATH = path.Join("data", "images")
+var (
+	IMAGE_PATH = path.Join("data", "images")
+	VOICE_PATH = path.Join("data", "voices")
+	VIDEO_PATH = path.Join("data", "videos")
+	CACHE_PATH = path.Join("data", "cache")
+
+	HEADER_AMR  = []byte("#!AMR")
+	HEADER_SILK = []byte("\x02#!SILK_V3")
+)
 
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
@@ -23,7 +33,7 @@ func ReadAllText(path string) string {
 }
 
 func WriteAllText(path, text string) {
-	_ = ioutil.WriteFile(path, []byte(text), 0777)
+	_ = ioutil.WriteFile(path, []byte(text), 0644)
 }
 
 func Check(err error) {
@@ -31,3 +41,7 @@ func Check(err error) {
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
+
+func IsAMRorSILK(b []byte) bool {
+	return bytes.HasPrefix(b, HEADER_AMR) || bytes.HasPrefix(b, HEADER_SILK)
+}

global/net.go

@@ -3,6 +3,8 @@ package global
 import (
 	"bytes"
 	"compress/gzip"
+	"fmt"
+	"github.com/tidwall/gjson"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -32,3 +34,20 @@ func GetBytes(url string) ([]byte, error) {
 	}
 	return body, nil
 }
+
+func QQMusicSongInfo(id string) (gjson.Result, error) {
+	d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`)
+	if err != nil {
+		return gjson.Result{}, err
+	}
+	return gjson.ParseBytes(d).Get("songinfo.data"), nil
+}
+
+func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
+	d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id))
+	if err != nil {
+		return gjson.Result{}, err
+	}
+	return gjson.ParseBytes(d).Get("songs.0"), nil
+}
+

global/param.go

@@ -0,0 +1,50 @@
+package global
+
+import (
+	"github.com/tidwall/gjson"
+	"strings"
+)
+
+var trueSet = map[string]struct{}{
+	"true": {},
+	"yes":  {},
+	"1":    {},
+}
+
+var falseSet = map[string]struct{}{
+	"false": {},
+	"no":    {},
+	"0":     {},
+}
+
+func EnsureBool(p interface{}, defaultVal bool) bool {
+	var str string
+	if b, ok := p.(bool); ok {
+		return b
+	}
+	if j, ok := p.(gjson.Result); ok {
+		if !j.Exists() {
+			return defaultVal
+		}
+		if j.Type == gjson.True {
+			return true
+		}
+		if j.Type == gjson.False {
+			return false
+		}
+		if j.Type != gjson.String {
+			return defaultVal
+		}
+		str = j.Str
+	} else if s, ok := p.(string); ok {
+		str = s
+	}
+	str = strings.ToLower(str)
+	if _, ok := trueSet[str]; ok {
+		return true
+	}
+	if _, ok := falseSet[str]; ok {
+		return false
+	}
+	return defaultVal
+}

global/ratelimit.go

@@ -0,0 +1,20 @@
+package global
+
+import (
+	"context"
+	"golang.org/x/time/rate"
+)
+
+var limiter *rate.Limiter
+var limitEnable = false
+
+func RateLimit(ctx context.Context) {
+	if limitEnable {
+		_ = limiter.Wait(ctx)
+	}
+}
+
+func InitLimiter(r float64, b int) {
+	limitEnable = true
+	limiter = rate.NewLimiter(rate.Limit(r), b)
+}

go.mod

@@ -3,18 +3,29 @@ module github.com/Mrs4s/go-cqhttp
 go 1.14
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20200731043935-dbb4073480bb
+	github.com/Mrs4s/MiraiGo v0.0.0-20200913133024-ad43b3f471e2
+	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/gin-gonic/gin v1.6.3
+	github.com/go-playground/validator/v10 v10.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2
-	github.com/guonaihong/gout v0.1.1
-	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.1 // indirect
+	github.com/guonaihong/gout v0.1.2
+	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
+	github.com/jonboulle/clockwork v0.2.0 // indirect
+	github.com/json-iterator/go v1.1.10 // indirect
+	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
+	github.com/lestrrat-go/strftime v1.0.3 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
 	github.com/sirupsen/logrus v1.6.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
-	github.com/tidwall/gjson v1.6.0
+	github.com/tebeka/strftime v0.1.5 // indirect
+	github.com/tidwall/gjson v1.6.1
 	github.com/xujiajun/nutsdb v0.5.0
-	golang.org/x/image v0.0.0-20200618115811-c13761719519
-	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
-	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
+	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
+	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
+	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

go.sum

@@ -1,11 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200730113850-298c1bb9119f h1:+MW9qbGu9uWJc9vs6m8+8oQLh9nK6RCW2wk3BX7Z14c=
-github.com/Mrs4s/MiraiGo v0.0.0-20200730113850-298c1bb9119f/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200730171208-f076f2a45730 h1:ZQoh1RyCacWyyJV9+MO9S+kJ5HOQOaA9PLBEGBbL3oA=
-github.com/Mrs4s/MiraiGo v0.0.0-20200730171208-f076f2a45730/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200731043935-dbb4073480bb h1:L40i56EyeItfy5SN/TRtZL/aLtMDoFIjTTefJBhgU6E=
-github.com/Mrs4s/MiraiGo v0.0.0-20200731043935-dbb4073480bb/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
+github.com/Mrs4s/MiraiGo v0.0.0-20200913112343-ad5531c3db09 h1:zTe9IBmO+z6icSwjT2PgI9aMIIwlfWc00cFEz2+j9rc=
+github.com/Mrs4s/MiraiGo v0.0.0-20200913112343-ad5531c3db09/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
+github.com/Mrs4s/MiraiGo v0.0.0-20200913133024-ad43b3f471e2 h1:otRnJmFOuRfK2ts5x6eOqc/vTIhUN4IYKcldjhN/IQY=
+github.com/Mrs4s/MiraiGo v0.0.0-20200913133024-ad43b3f471e2/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
 github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
 github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -14,6 +12,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
@@ -26,8 +25,9 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-playground/validator/v10 v10.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
+github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -38,8 +38,9 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -49,10 +50,13 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/guonaihong/gout v0.1.1 h1:2i3eqQ1KUhTlj7AFeIHqVUFku5QwUhwE2wNgYTVpbxQ=
-github.com/guonaihong/gout v0.1.1/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
+github.com/guonaihong/gout v0.1.2 h1:TR2XCRopGgJdj231IayEoeavgbznFXzzzcZVdT/hG10=
+github.com/guonaihong/gout v0.1.2/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
+github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
+github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -60,20 +64,26 @@ github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdA
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
-github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
-github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.0.1 h1:o7qz5pmLzPDLyGW4lG6JvTKPUfTFXwe+vOamIYWtnVU=
-github.com/lestrrat-go/strftime v1.0.1/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
+github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
+github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
+github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
+github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -84,12 +94,13 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
-github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
+github.com/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
+github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
+github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
 github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
+github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
@@ -101,10 +112,11 @@ github.com/xujiajun/nutsdb v0.5.0 h1:j/jM3Zw7Chg8WK7bAcKR0Xr7Mal47U1oJAMgySfDn9E
 github.com/xujiajun/nutsdb v0.5.0/go.mod h1:owdwN0tW084RxEodABLbO7h4Z2s9WiAjZGZFhRh0/1Q=
 github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b h1:jKG9OiL4T4xQN3IUrhUpc1tG+HfDXppkgVcrAiiaI/0=
 github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b/go.mod h1:AZd87GYJlUzl82Yab2kTjx1EyXSQCAfZDhpTo1SQC4k=
+github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
+github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.0.0-20200618115811-c13761719519 h1:1e2ufUJNM3lCHEY5jIgac/7UTjd6cgJNdatjPdFWf34=
-golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -112,8 +124,10 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -121,13 +135,17 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -148,6 +166,7 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
@@ -155,7 +174,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

main.go

@@ -3,23 +3,32 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"crypto/md5"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"image"
+	"io"
+	"io/ioutil"
+	"net"
+	"os"
+	"os/signal"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/server"
+
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	"github.com/rifflock/lfshook"
 	log "github.com/sirupsen/logrus"
 	easy "github.com/t-tomalak/logrus-easy-formatter"
-	"image/color"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/signal"
-	"path"
-	"strings"
-	"time"
+	asciiart "github.com/yinghau76/go-ascii-art"
 )
 
 func init() {
@@ -31,14 +40,26 @@ func init() {
 	if err == nil {
 		log.SetOutput(io.MultiWriter(os.Stderr, w))
 	}
-	if !global.PathExists("data") {
-		if err := os.Mkdir("data", 0777); err != nil {
-			log.Fatalf("创建数据文件夹失败: %v", err)
-		}
-		if err := os.Mkdir(path.Join("data", "images"), 0777); err != nil {
+	if !global.PathExists(global.IMAGE_PATH) {
+		if err := os.MkdirAll(global.IMAGE_PATH, 0755); err != nil {
 			log.Fatalf("创建图片缓存文件夹失败: %v", err)
 		}
 	}
+	if !global.PathExists(global.VOICE_PATH) {
+		if err := os.MkdirAll(global.VOICE_PATH, 0755); err != nil {
+			log.Fatalf("创建语音缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.VIDEO_PATH) {
+		if err := os.MkdirAll(global.VIDEO_PATH, 0755); err != nil {
+			log.Fatalf("创建视频缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.CACHE_PATH) {
+		if err := os.MkdirAll(global.CACHE_PATH, 0755); err != nil {
+			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
+		}
+	}
 	if global.PathExists("cqhttp.json") {
 		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
 		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.json 文件.")
@@ -72,7 +93,35 @@ func init() {
 
 func main() {
 	console := bufio.NewReader(os.Stdin)
-	conf := global.Load("config.json")
+	var conf *global.JsonConfig
+	if global.PathExists("config.json") || os.Getenv("UIN") == "" {
+		conf = global.Load("config.json")
+	} else if os.Getenv("UIN") != "" {
+		log.Infof("将从环境变量加载配置.")
+		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
+		pwd := os.Getenv("PASS")
+		post := os.Getenv("HTTP_POST")
+		conf = &global.JsonConfig{
+			Uin:      uin,
+			Password: pwd,
+			HttpConfig: &global.GoCQHttpConfig{
+				Enabled:  true,
+				Host:     "0.0.0.0",
+				Port:     5700,
+				PostUrls: map[string]string{},
+			},
+			WSConfig: &global.GoCQWebsocketConfig{
+				Enabled: true,
+				Host:    "0.0.0.0",
+				Port:    6700,
+			},
+			PostMessageFormat: "string",
+			Debug:             os.Getenv("DEBUG") == "true",
+		}
+		if post != "" {
+			conf.HttpConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
+		}
+	}
 	if conf == nil {
 		err := global.DefaultConfig().Save("config.json")
 		if err != nil {
@@ -80,20 +129,63 @@ func main() {
 			return
 		}
 		log.Infof("默认配置文件已生成, 请编辑 config.json 后重启程序.")
+		time.Sleep(time.Second * 5)
 		return
 	}
-	if conf.Uin == 0 || conf.Password == "" {
-		log.Fatal("请修改 config.json 以添加账号密码.")
+	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
+		log.Warnf("请修改 config.json 以添加账号密码.")
+		time.Sleep(time.Second * 5)
+		return
 	}
+
+	// log classified by level
+	// Collect all records up to the specified level (default level: warn)
+	logLevel := conf.LogLevel
+	if logLevel != "" {
+		date := time.Now().Format("2006-01-02")
+		var logPathMap lfshook.PathMap
+		switch conf.LogLevel {
+		case "warn":
+			logPathMap = lfshook.PathMap{
+				log.WarnLevel:  path.Join("logs", date+"-warn.log"),
+				log.ErrorLevel: path.Join("logs", date+"-warn.log"),
+				log.FatalLevel: path.Join("logs", date+"-warn.log"),
+				log.PanicLevel: path.Join("logs", date+"-warn.log"),
+			}
+		case "error":
+			logPathMap = lfshook.PathMap{
+				log.ErrorLevel: path.Join("logs", date+"-error.log"),
+				log.FatalLevel: path.Join("logs", date+"-error.log"),
+				log.PanicLevel: path.Join("logs", date+"-error.log"),
+			}
+		default:
+			logPathMap = lfshook.PathMap{
+				log.WarnLevel:  path.Join("logs", date+"-warn.log"),
+				log.ErrorLevel: path.Join("logs", date+"-warn.log"),
+				log.FatalLevel: path.Join("logs", date+"-warn.log"),
+				log.PanicLevel: path.Join("logs", date+"-warn.log"),
+			}
+		}
+
+		log.AddHook(lfshook.NewHook(
+			logPathMap,
+			&easy.Formatter{
+				TimestampFormat: "2006-01-02 15:04:05",
+				LogFormat:       "[%time%] [%lvl%]: %msg% \n",
+			},
+		))
+	}
+
+	log.Info("当前版本:", coolq.Version)
 	if conf.Debug {
 		log.SetLevel(log.DebugLevel)
 		log.Warnf("已开启Debug模式.")
+		log.Debugf("开发交流群: 192548878")
 	}
 	if !global.PathExists("device.json") {
-		log.Warn("虚拟设备信息不存在, 将自动生成随机设备，按 Enter 继续.")
-		_, _ = console.ReadString('\n')
+		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
 		client.GenRandomDevice()
-		_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0777)
+		_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0644)
 		log.Info("已生成设备信息并保存到 device.json 文件.")
 	} else {
 		log.Info("将使用 device.json 内的设备信息运行Bot.")
@@ -101,25 +193,88 @@ func main() {
 			log.Fatalf("加载设备信息失败: %v", err)
 		}
 	}
+	if conf.EncryptPassword && conf.PasswordEncrypted == "" {
+		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+		strKey, _ := console.ReadString('\n')
+		key := md5.Sum([]byte(strKey))
+		if encrypted := EncryptPwd(conf.Password, key[:]); encrypted != "" {
+			conf.Password = ""
+			conf.PasswordEncrypted = encrypted
+			_ = conf.Save("config.json")
+		} else {
+			log.Warnf("加密时出现问题.")
+		}
+	}
+	if conf.PasswordEncrypted != "" {
+		log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+		strKey, _ := console.ReadString('\n')
+		key := md5.Sum([]byte(strKey))
+		conf.Password = DecryptPwd(conf.PasswordEncrypted, key[:])
+	}
 	log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
 	time.Sleep(time.Second * 5)
 	log.Info("开始尝试登录并同步消息...")
+	log.Infof("使用协议: %v", func() string {
+		switch client.SystemDeviceInfo.Protocol {
+		case client.AndroidPad:
+			return "Android Pad"
+		case client.AndroidPhone:
+			return "Android Phone"
+		case client.AndroidWatch:
+			return "Android Watch"
+		}
+		return "未知"
+	}())
 	cli := client.NewClient(conf.Uin, conf.Password)
+	cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
+		switch e.Type {
+		case "INFO":
+			log.Info("Protocol -> " + e.Message)
+		case "ERROR":
+			log.Error("Protocol -> " + e.Message)
+		case "DEBUG":
+			log.Debug("Protocol -> " + e.Message)
+		}
+	})
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. 服务器地址: %v:%v 服务器位置: %v", e.Servers[0].Server, e.Servers[0].Port, e.Servers[0].Location)
+		_ = ioutil.WriteFile("servers.bin", binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt16(uint16(len(e.Servers)))
+			for _, s := range e.Servers {
+				if !strings.Contains(s.Server, "com") {
+					w.WriteString(s.Server)
+					w.WriteUInt16(uint16(s.Port))
+				}
+			}
+		}), 0644)
+	})
+	if global.PathExists("servers.bin") {
+		if data, err := ioutil.ReadFile("servers.bin"); err == nil {
+			r := binary.NewReader(data)
+			r.ReadUInt16()
+			cli.CustomServer = &net.TCPAddr{
+				IP:   net.ParseIP(r.ReadString()),
+				Port: int(r.ReadUInt16()),
+			}
+		}
+	}
 	rsp, err := cli.Login()
 	for {
 		global.Check(err)
 		if !rsp.Success {
 			switch rsp.Error {
 			case client.NeedCaptcha:
-				art, _, err := global.Convert(bytes.NewReader(rsp.CaptchaImage), []string{" ", "1", "i", ":", "*", "|", "."}, 1, 1, false, global.Colors["gray"], color.RGBA{})
-				global.Check(err)
-				fmt.Println(art)
-				log.Warn("请输入验证码.")
+				_ = ioutil.WriteFile("captcha.jpg", rsp.CaptchaImage, 0644)
+				img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage))
+				fmt.Println(asciiart.New("image", img).Art)
+				log.Warn("请输入验证码 (captcha.jpg)： (Enter 提交)")
 				text, _ := console.ReadString('\n')
 				rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign)
 				continue
 			case client.UnsafeDeviceError:
 				log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl)
+				log.Infof(" 按 Enter 继续....")
+				_, _ = console.ReadString('\n')
 				return
 			case client.OtherLoginError, client.UnknownLoginError:
 				log.Fatalf("登录失败: %v", rsp.ErrorMessage)
@@ -136,10 +291,23 @@ func main() {
 	global.Check(cli.ReloadGroupList())
 	log.Infof("共加载 %v 个群.", len(cli.GroupList))
 	b := coolq.NewQQBot(cli, conf)
+	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
+		log.Warnf("post_message_format 配置错误, 将自动使用 string")
+		coolq.SetMessageFormat("string")
+	} else {
+		coolq.SetMessageFormat(conf.PostMessageFormat)
+	}
+	if conf.RateLimit.Enabled {
+		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
+	}
+	log.Info("正在加载事件过滤器.")
+	global.BootFilter()
+	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
+	coolq.ForceFragmented = conf.ForceFragmented
 	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
 		server.HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, b)
 		for k, v := range conf.HttpConfig.PostUrls {
-			server.NewHttpClient().Run(k, v, b)
+			server.NewHttpClient().Run(k, v, conf.HttpConfig.Timeout, b)
 		}
 	}
 	if conf.WSConfig != nil && conf.WSConfig.Enabled {
@@ -151,12 +319,22 @@ func main() {
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
 	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
-		if conf.ReLogin {
-			log.Warnf("Bot已离线，将在 %v 秒后尝试重连.", conf.ReLoginDelay)
-			time.Sleep(time.Second * time.Duration(conf.ReLoginDelay))
+		if conf.ReLogin.Enabled {
+			var times uint = 1
+			for {
+
+				if conf.ReLogin.MaxReloginTimes == 0 {
+				} else if times > conf.ReLogin.MaxReloginTimes {
+					break
+				}
+				log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
+					e.Message, conf.ReLogin.ReLoginDelay, times)
+				times++
+				time.Sleep(time.Second * time.Duration(conf.ReLogin.ReLoginDelay))
 				rsp, err := cli.Login()
 				if err != nil {
-				log.Fatalf("重连失败: %v", err)
+					log.Errorf("重连失败: %v", err)
+					continue
 				}
 				if !rsp.Success {
 					switch rsp.Error {
@@ -165,10 +343,15 @@ func main() {
 					case client.UnsafeDeviceError:
 						log.Fatalf("重连失败: 设备锁")
 					default:
-					log.Fatalf("重连失败: %v", rsp.ErrorMessage)
+						log.Errorf("重连失败: %v", rsp.ErrorMessage)
+						continue
 					}
 				}
+				log.Info("重连成功")
 				return
+
+			}
+			log.Fatal("重连失败: 重连次数达到设置的上限值")
 		}
 		b.Release()
 		log.Fatalf("Bot已离线：%v", e.Message)
@@ -178,3 +361,28 @@ func main() {
 	<-c
 	b.Release()
 }
+
+func EncryptPwd(pwd string, key []byte) string {
+	tea := binary.NewTeaCipher(key)
+	if tea == nil {
+		return ""
+	}
+	return base64.StdEncoding.EncodeToString(tea.Encrypt([]byte(pwd)))
+}
+
+func DecryptPwd(ePwd string, key []byte) string {
+	defer func() {
+		if pan := recover(); pan != nil {
+			log.Fatalf("密码解密失败: %v", pan)
+		}
+	}()
+	encrypted, err := base64.StdEncoding.DecodeString(ePwd)
+	if err != nil {
+		panic(err)
+	}
+	tea := binary.NewTeaCipher(key)
+	if tea == nil {
+		panic("密钥错误")
+	}
+	return string(tea.Decrypt(encrypted))
+}

server/http.go

@@ -1,17 +1,21 @@
 package server
 
 import (
+	"context"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/gin-gonic/gin"
 	"github.com/guonaihong/gout"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type httpServer struct {
@@ -23,6 +27,7 @@ type httpClient struct {
 	bot     *coolq.CQBot
 	secret  string
 	addr    string
+	timeout int32
 }
 
 var HttpServer = &httpServer{}
@@ -37,7 +42,7 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 			c.Status(404)
 			return
 		}
-		if c.Request.Method == "POST" && c.Request.Header.Get("Content-Type") == "application/json" {
+		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
 			d, err := c.GetRawData()
 			if err != nil {
 				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
@@ -61,100 +66,26 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 					c.AbortWithStatus(401)
 					return
 				}
-			}
-			if c.Query("access_token") != authToken {
+			} else if c.Query("access_token") != authToken {
 				c.AbortWithStatus(401)
 				return
-			}
+			} else {
 				c.Next()
+			}
 		})
 	}
 
-	s.engine.Any("/get_login_info", s.GetLoginInfo)
-	s.engine.Any("/get_login_info_async", s.GetLoginInfo)
-
-	s.engine.Any("/get_friend_list", s.GetFriendList)
-	s.engine.Any("/get_friend_list_async", s.GetFriendList)
-
-	s.engine.Any("/get_group_list", s.GetGroupList)
-	s.engine.Any("/get_group_list_async", s.GetGroupList)
-
-	s.engine.Any("/get_group_info", s.GetGroupInfo)
-	s.engine.Any("/get_group_info_async", s.GetGroupInfo)
-
-	s.engine.Any("/get_group_member_list", s.GetGroupMemberList)
-	s.engine.Any("/get_group_member_list_async", s.GetGroupMemberList)
-
-	s.engine.Any("/get_group_member_info", s.GetGroupMemberInfo)
-	s.engine.Any("/get_group_member_info_async", s.GetGroupMemberInfo)
-
-	s.engine.Any("/send_msg", s.SendMessage)
-	s.engine.Any("/send_msg_async", s.SendMessage)
-
-	s.engine.Any("/send_private_msg", s.SendPrivateMessage)
-	s.engine.Any("/send_private_msg_async", s.SendPrivateMessage)
-
-	s.engine.Any("/send_group_msg", s.SendGroupMessage)
-	s.engine.Any("/send_group_msg_async", s.SendGroupMessage)
-
-	s.engine.Any("/send_group_forward_msg", s.SendGroupForwardMessage)
-	s.engine.Any("/send_group_forward_msg_async", s.SendGroupForwardMessage)
-
-	s.engine.Any("/delete_msg", s.DeleteMessage)
-	s.engine.Any("/delete_msg_async", s.DeleteMessage)
-
-	s.engine.Any("/set_friend_add_request", s.ProcessFriendRequest)
-	s.engine.Any("/set_friend_add_request_async", s.ProcessFriendRequest)
-
-	s.engine.Any("/set_group_add_request", s.ProcessGroupRequest)
-	s.engine.Any("/set_group_add_request_async", s.ProcessGroupRequest)
-
-	s.engine.Any("/set_group_card", s.SetGroupCard)
-	s.engine.Any("/set_group_card_async", s.SetGroupCard)
-
-	s.engine.Any("/set_group_special_title", s.SetSpecialTitle)
-	s.engine.Any("/set_group_special_title_async", s.SetSpecialTitle)
-
-	s.engine.Any("/set_group_kick", s.SetGroupKick)
-	s.engine.Any("/set_group_kick_async", s.SetGroupKick)
-
-	s.engine.Any("/set_group_ban", s.SetGroupBan)
-	s.engine.Any("/set_group_ban_async", s.SetGroupBan)
-
-	s.engine.Any("/set_group_whole_ban", s.SetWholeBan)
-	s.engine.Any("/set_group_whole_ban_async", s.SetWholeBan)
-
-	s.engine.Any("/set_group_name", s.SetGroupName)
-	s.engine.Any("/set_group_name_async", s.SetGroupName)
-
-	s.engine.Any("/set_group_leave", s.SetGroupLeave)
-	s.engine.Any("/set_group_leave_async", s.SetGroupLeave)
-
-	s.engine.Any("/get_image", s.GetImage)
-	s.engine.Any("/get_image_async", s.GetImage)
-
-	s.engine.Any("/get_forward_msg", s.GetForwardMessage)
-
-	s.engine.Any("/get_group_msg", s.GetGroupMessage)
-	s.engine.Any("/get_group_msg_async", s.GetGroupMessage)
-
-	s.engine.Any("/can_send_image", s.CanSendImage)
-	s.engine.Any("/can_send_image_async", s.CanSendImage)
-
-	s.engine.Any("/can_send_record", s.CanSendRecord)
-	s.engine.Any("/can_send_record_async", s.CanSendRecord)
-
-	s.engine.Any("/get_status", s.GetStatus)
-	s.engine.Any("/get_status_async", s.GetStatus)
-
-	s.engine.Any("/get_version_info", s.GetVersionInfo)
-	s.engine.Any("/get_version_info_async", s.GetVersionInfo)
-
-	s.engine.Any("/.handle_quick_operation", s.HandleQuickOperation)
+	s.engine.Any("/:action", s.HandleActions)
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
-		log.Fatal(s.engine.Run(addr))
+		err := s.engine.Run(addr)
+		if err != nil {
+			log.Error(err)
+			log.Infof("请检查端口是否被占用.")
+			time.Sleep(time.Second * 5)
+			os.Exit(1)
+		}
 	}()
 }
 
@@ -162,10 +93,14 @@ func NewHttpClient() *httpClient {
 	return &httpClient{}
 }
 
-func (c *httpClient) Run(addr, secret string, bot *coolq.CQBot) {
+func (c *httpClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
 	c.bot = bot
 	c.secret = secret
 	c.addr = addr
+	c.timeout = timeout
+	if c.timeout < 5 {
+		c.timeout = 5
+	}
 	bot.OnEventPush(c.onBotPushEvent)
 	log.Infof("HTTP POST上报器已启动: %v", addr)
 }
@@ -183,9 +118,9 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
 		}
 		return h
-	}()).SetTimeout(time.Second * 5).Do()
+	}()).SetTimeout(time.Second * time.Duration(c.timeout)).Do()
 	if err != nil {
-		log.Warnf("上报Event数据到 %v 失败: %v", c.addr, err)
+		log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err)
 		return
 	}
 	if gjson.Valid(res) {
@@ -193,6 +128,17 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 	}
 }
 
+func (s *httpServer) HandleActions(c *gin.Context) {
+	global.RateLimit(context.Background())
+	action := strings.ReplaceAll(c.Param("action"), "_async", "")
+	log.Debugf("HTTPServer接收到API调用: %v", action)
+	if f, ok := httpApi[action]; ok {
+		f(s, c)
+	} else {
+		c.JSON(200, coolq.Failed(404))
+	}
+}
+
 func (s *httpServer) GetLoginInfo(c *gin.Context) {
 	c.JSON(200, s.bot.CQGetLoginInfo())
 }
@@ -202,7 +148,8 @@ func (s *httpServer) GetFriendList(c *gin.Context) {
 }
 
 func (s *httpServer) GetGroupList(c *gin.Context) {
-	c.JSON(200, s.bot.CQGetGroupList())
+	nc := getParamOrDefault(c, "no_cache", "false")
+	c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
 }
 
 func (s *httpServer) GetGroupInfo(c *gin.Context) {
@@ -212,17 +159,25 @@ func (s *httpServer) GetGroupInfo(c *gin.Context) {
 
 func (s *httpServer) GetGroupMemberList(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMemberList(gid))
+	nc := getParamOrDefault(c, "no_cache", "false")
+	c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
 }
 
 func (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid, nc == "true"))
+	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
 }
 
 func (s *httpServer) SendMessage(c *gin.Context) {
+	if getParam(c, "message_type") == "private" {
+		s.SendPrivateMessage(c)
+		return
+	}
+	if getParam(c, "message_type") == "group" {
+		s.SendGroupMessage(c)
+		return
+	}
 	if getParam(c, "group_id") != "" {
 		s.SendGroupMessage(c)
 		return
@@ -234,22 +189,24 @@ func (s *httpServer) SendMessage(c *gin.Context) {
 
 func (s *httpServer) SendPrivateMessage(c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg := getParam(c, "message")
-	if gjson.Valid(msg) {
-		c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg)))
+	msg, t := getParamWithType(c, "message")
+	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
+	if t == gjson.JSON {
+		c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg), autoEscape))
 		return
 	}
-	c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Result{Type: gjson.String, Str: msg}))
+	c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
 }
 
 func (s *httpServer) SendGroupMessage(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg := getParam(c, "message")
-	if gjson.Valid(msg) {
-		c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg)))
+	msg, t := getParamWithType(c, "message")
+	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
+	if t == gjson.JSON {
+		c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg), autoEscape))
 		return
 	}
-	c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Result{Type: gjson.String, Str: msg}))
+	c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
 }
 
 func (s *httpServer) SendGroupForwardMessage(c *gin.Context) {
@@ -268,6 +225,11 @@ func (s *httpServer) GetGroupMessage(c *gin.Context) {
 	c.JSON(200, s.bot.CQGetGroupMessage(int32(mid)))
 }
 
+func (s *httpServer) GetGroupHonorInfo(c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
+}
+
 func (s *httpServer) ProcessFriendRequest(c *gin.Context) {
 	flag := getParam(c, "flag")
 	approve := getParamOrDefault(c, "approve", "true")
@@ -281,7 +243,7 @@ func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
 		subType = getParam(c, "type")
 	}
 	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, approve == "true"))
+	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
 }
 
 func (s *httpServer) SetGroupCard(c *gin.Context) {
@@ -317,7 +279,18 @@ func (s *httpServer) SetWholeBan(c *gin.Context) {
 
 func (s *httpServer) SetGroupName(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "name")))
+	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
+}
+
+func (s *httpServer) SetGroupAdmin(c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
+	c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
+}
+
+func (s *httpServer) SendGroupNotice(c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
 }
 
 func (s *httpServer) SetGroupLeave(c *gin.Context) {
@@ -351,6 +324,15 @@ func (s *httpServer) GetVersionInfo(c *gin.Context) {
 	c.JSON(200, s.bot.CQGetVersionInfo())
 }
 
+func (s *httpServer) ReloadEventFilter(c *gin.Context) {
+	c.JSON(200, s.bot.CQReloadEventFilter())
+}
+
+func (s *httpServer) GetVipInfo(c *gin.Context) {
+	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
+	c.JSON(200, s.bot.CQGetVipInfo(uid))
+}
+
 func (s *httpServer) HandleQuickOperation(c *gin.Context) {
 	if c.Request.Method != "POST" {
 		c.AbortWithStatus(404)
@@ -371,36 +353,143 @@ func getParamOrDefault(c *gin.Context, k, def string) string {
 }
 
 func getParam(c *gin.Context, k string) string {
+	p, _ := getParamWithType(c, k)
+	return p
+}
+
+func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
 	if q := c.Query(k); q != "" {
-		return q
+		return q, gjson.Null
 	}
 	if c.Request.Method == "POST" {
 		if h := c.Request.Header.Get("Content-Type"); h != "" {
-			if h == "application/x-www-form-urlencoded" {
+			if strings.Contains(h, "application/x-www-form-urlencoded") {
 				if p, ok := c.GetPostForm(k); ok {
-					return p
+					return p, gjson.Null
 				}
 			}
-			if h == "application/json" {
+			if strings.Contains(h, "application/json") {
 				if obj, ok := c.Get("json_body"); ok {
 					res := obj.(gjson.Result).Get(k)
 					if res.Exists() {
 						switch res.Type {
 						case gjson.JSON:
-							return res.Raw
+							return res.Raw, gjson.JSON
 						case gjson.String:
-							return res.Str
+							return res.Str, gjson.String
 						case gjson.Number:
-							return strconv.FormatInt(res.Int(), 10) // 似乎没有需要接受 float 类型的api
+							return strconv.FormatInt(res.Int(), 10), gjson.Number // 似乎没有需要接受 float 类型的api
 						case gjson.True:
-							return "true"
+							return "true", gjson.True
 						case gjson.False:
-							return "false"
+							return "false", gjson.False
 						}
 					}
 				}
 			}
 		}
 	}
-	return ""
+	return "", gjson.Null
+}
+
+var httpApi = map[string]func(s *httpServer, c *gin.Context){
+	"get_login_info": func(s *httpServer, c *gin.Context) {
+		s.GetLoginInfo(c)
+	},
+	"get_friend_list": func(s *httpServer, c *gin.Context) {
+		s.GetFriendList(c)
+	},
+	"get_group_list": func(s *httpServer, c *gin.Context) {
+		s.GetGroupList(c)
+	},
+	"get_group_info": func(s *httpServer, c *gin.Context) {
+		s.GetGroupInfo(c)
+	},
+	"get_group_member_list": func(s *httpServer, c *gin.Context) {
+		s.GetGroupMemberList(c)
+	},
+	"get_group_member_info": func(s *httpServer, c *gin.Context) {
+		s.GetGroupMemberInfo(c)
+	},
+	"send_msg": func(s *httpServer, c *gin.Context) {
+		s.SendMessage(c)
+	},
+	"send_group_msg": func(s *httpServer, c *gin.Context) {
+		s.SendGroupMessage(c)
+	},
+	"send_group_forward_msg": func(s *httpServer, c *gin.Context) {
+		s.SendGroupForwardMessage(c)
+	},
+	"send_private_msg": func(s *httpServer, c *gin.Context) {
+		s.SendPrivateMessage(c)
+	},
+	"delete_msg": func(s *httpServer, c *gin.Context) {
+		s.DeleteMessage(c)
+	},
+	"set_friend_add_request": func(s *httpServer, c *gin.Context) {
+		s.ProcessFriendRequest(c)
+	},
+	"set_group_add_request": func(s *httpServer, c *gin.Context) {
+		s.ProcessGroupRequest(c)
+	},
+	"set_group_card": func(s *httpServer, c *gin.Context) {
+		s.SetGroupCard(c)
+	},
+	"set_group_special_title": func(s *httpServer, c *gin.Context) {
+		s.SetSpecialTitle(c)
+	},
+	"set_group_kick": func(s *httpServer, c *gin.Context) {
+		s.SetGroupKick(c)
+	},
+	"set_group_ban": func(s *httpServer, c *gin.Context) {
+		s.SetGroupBan(c)
+	},
+	"set_group_whole_ban": func(s *httpServer, c *gin.Context) {
+		s.SetWholeBan(c)
+	},
+	"set_group_name": func(s *httpServer, c *gin.Context) {
+		s.SetGroupName(c)
+	},
+	"set_group_admin": func(s *httpServer, c *gin.Context) {
+		s.SetGroupAdmin(c)
+	},
+	"_send_group_notice": func(s *httpServer, c *gin.Context) {
+		s.SendGroupNotice(c)
+	},
+	"set_group_leave": func(s *httpServer, c *gin.Context) {
+		s.SetGroupLeave(c)
+	},
+	"get_image": func(s *httpServer, c *gin.Context) {
+		s.GetImage(c)
+	},
+	"get_forward_msg": func(s *httpServer, c *gin.Context) {
+		s.GetForwardMessage(c)
+	},
+	"get_group_msg": func(s *httpServer, c *gin.Context) {
+		s.GetGroupMessage(c)
+	},
+	"get_group_honor_info": func(s *httpServer, c *gin.Context) {
+		s.GetGroupHonorInfo(c)
+	},
+	"can_send_image": func(s *httpServer, c *gin.Context) {
+		s.CanSendImage(c)
+	},
+	"can_send_record": func(s *httpServer, c *gin.Context) {
+		s.CanSendRecord(c)
+	},
+	"get_status": func(s *httpServer, c *gin.Context) {
+		s.GetStatus(c)
+	},
+	"get_version_info": func(s *httpServer, c *gin.Context) {
+		s.GetVersionInfo(c)
+	},
+	"_get_vip_info": func(s *httpServer, c *gin.Context) {
+		s.GetVipInfo(c)
+	},
+	"reload_event_filter": func(s *httpServer, c *gin.Context) {
+		s.ReloadEventFilter(c)
+	},
+	".handle_quick_operation": func(s *httpServer, c *gin.Context) {
+		s.HandleQuickOperation(c)
+	},
 }

server/websocket.go

@@ -1,25 +1,26 @@
 package server
 
 import (
+	"context"
 	"fmt"
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/gorilla/websocket"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	wsc "golang.org/x/net/websocket"
 	"net/http"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/gorilla/websocket"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 )
 
 type websocketServer struct {
 	bot            *coolq.CQBot
 	token          string
-	eventConn []*websocket.Conn
-	pushLock  *sync.Mutex
+	eventConn      []*websocketConn
+	eventConnMutex sync.Mutex
 	handshake      string
 }
 
@@ -28,9 +29,13 @@ type websocketClient struct {
 	token string
 	bot   *coolq.CQBot
 
-	pushLock      *sync.Mutex
-	universalConn *wsc.Conn
-	eventConn     *wsc.Conn
+	universalConn *websocketConn
+	eventConn     *websocketConn
+}
+
+type websocketConn struct {
+	*websocket.Conn
+	sync.Mutex
 }
 
 var WebsocketServer = &websocketServer{}
@@ -42,7 +47,6 @@ var upgrader = websocket.Upgrader{
 
 func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) {
 	s.token = authToken
-	s.pushLock = new(sync.Mutex)
 	s.bot = b
 	s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
 		s.bot.Client.Uin, time.Now().Unix())
@@ -57,39 +61,37 @@ func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) {
 }
 
 func NewWebsocketClient(conf *global.GoCQReverseWebsocketConfig, authToken string, b *coolq.CQBot) *websocketClient {
-	return &websocketClient{conf: conf, token: authToken, bot: b, pushLock: new(sync.Mutex)}
+	return &websocketClient{conf: conf, token: authToken, bot: b}
 }
 
 func (c *websocketClient) Run() {
 	if !c.conf.Enabled {
 		return
 	}
+	if c.conf.ReverseUrl != "" {
+		c.connectUniversal()
+	} else {
 		if c.conf.ReverseApiUrl != "" {
 			c.connectApi()
 		}
 		if c.conf.ReverseEventUrl != "" {
 			c.connectEvent()
 		}
-	if c.conf.ReverseUrl != "" {
-		c.connectUniversal()
 	}
 	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
 func (c *websocketClient) connectApi() {
 	log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseApiUrl)
-	wsConf, err := wsc.NewConfig(c.conf.ReverseApiUrl, c.conf.ReverseApiUrl)
-	if err != nil {
-		log.Warnf("连接到反向Websocket API服务器 %v 时出现致命错误: %v", c.conf.ReverseApiUrl, err)
-		return
+	header := http.Header{
+		"X-Client-Role": []string{"API"},
+		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
+		"User-Agent":    []string{"CQHttp/4.15.0"},
 	}
-	wsConf.Header["X-Client-Role"] = []string{"API"}
-	wsConf.Header["X-Self-ID"] = []string{strconv.FormatInt(c.bot.Client.Uin, 10)}
-	wsConf.Header["User-Agent"] = []string{"CQHttp/4.15.0"}
 	if c.token != "" {
-		wsConf.Header["Authorization"] = []string{"Token " + c.token}
+		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, err := wsc.DialConfig(wsConf)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseApiUrl, header)
 	if err != nil {
 		log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseApiUrl, err)
 		if c.conf.ReverseReconnectInterval != 0 {
@@ -99,49 +101,52 @@ func (c *websocketClient) connectApi() {
 		return
 	}
 	log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseApiUrl)
-	go c.listenApi(conn, false)
+	wrappedConn := &websocketConn{Conn: conn}
+	go c.listenApi(wrappedConn, false)
 }
 
 func (c *websocketClient) connectEvent() {
 	log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventUrl)
-	wsConf, err := wsc.NewConfig(c.conf.ReverseEventUrl, c.conf.ReverseEventUrl)
-	if err != nil {
-		log.Warnf("连接到反向Websocket Event服务器 %v 时出现致命错误: %v", c.conf.ReverseApiUrl, err)
-		return
+	header := http.Header{
+		"X-Client-Role": []string{"Event"},
+		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
+		"User-Agent":    []string{"CQHttp/4.15.0"},
 	}
-	wsConf.Header["X-Client-Role"] = []string{"Event"}
-	wsConf.Header["X-Self-ID"] = []string{strconv.FormatInt(c.bot.Client.Uin, 10)}
-	wsConf.Header["User-Agent"] = []string{"CQHttp/4.15.0"}
 	if c.token != "" {
-		wsConf.Header["Authorization"] = []string{"Token " + c.token}
+		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, err := wsc.DialConfig(wsConf)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventUrl, header)
 	if err != nil {
-		log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseApiUrl, err)
+		log.Warnf("连接到反向Websocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventUrl, err)
 		if c.conf.ReverseReconnectInterval != 0 {
 			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-			c.connectApi()
+			c.connectEvent()
 		}
 		return
 	}
+
+	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
+		c.bot.Client.Uin, time.Now().Unix())
+	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
+	if err != nil {
+		log.Warnf("反向Websocket 握手时出现错误: %v", err)
+	}
+
 	log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventUrl)
-	c.eventConn = conn
+	c.eventConn = &websocketConn{Conn: conn}
 }
 
 func (c *websocketClient) connectUniversal() {
 	log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseUrl)
-	wsConf, err := wsc.NewConfig(c.conf.ReverseUrl, c.conf.ReverseUrl)
-	if err != nil {
-		log.Warnf("连接到反向Websocket Universal服务器 %v 时出现致命错误: %v", c.conf.ReverseUrl, err)
-		return
+	header := http.Header{
+		"X-Client-Role": []string{"Universal"},
+		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
+		"User-Agent":    []string{"CQHttp/4.15.0"},
 	}
-	wsConf.Header["X-Client-Role"] = []string{"Universal"}
-	wsConf.Header["X-Self-ID"] = []string{strconv.FormatInt(c.bot.Client.Uin, 10)}
-	wsConf.Header["User-Agent"] = []string{"CQHttp/4.15.0"}
 	if c.token != "" {
-		wsConf.Header["Authorization"] = []string{"Token " + c.token}
+		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, err := wsc.DialConfig(wsConf)
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseUrl, header)
 	if err != nil {
 		log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseUrl, err)
 		if c.conf.ReverseReconnectInterval != 0 {
@@ -150,47 +155,48 @@ func (c *websocketClient) connectUniversal() {
 		}
 		return
 	}
-	go c.listenApi(conn, true)
-	c.universalConn = conn
+
+	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
+		c.bot.Client.Uin, time.Now().Unix())
+	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
+	if err != nil {
+		log.Warnf("反向Websocket 握手时出现错误: %v", err)
 	}
 
-func (c *websocketClient) listenApi(conn *wsc.Conn, u bool) {
+	wrappedConn := &websocketConn{Conn: conn}
+	go c.listenApi(wrappedConn, true)
+	c.universalConn = wrappedConn
+}
+
+func (c *websocketClient) listenApi(conn *websocketConn, u bool) {
 	defer conn.Close()
 	for {
-		buf := make([]byte, 10240)
-		l, err := conn.Read(buf)
+		_, buf, err := conn.ReadMessage()
 		if err != nil {
+			log.Warnf("监听反向WS API时出现错误: %v", err)
 			break
 		}
-		j := gjson.ParseBytes(buf[:l])
-		t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
-		log.Debugf("反向WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-		if f, ok := wsApi[t]; ok {
-			ret := f(c.bot, j.Get("params"))
-			if j.Get("echo").Exists() {
-				ret["echo"] = j.Get("echo").Value()
-			}
-			c.pushLock.Lock()
-			_, _ = conn.Write([]byte(ret.ToJson()))
-			c.pushLock.Unlock()
-		}
+
+		go conn.handleRequest(c.bot, buf)
+
 	}
 	if c.conf.ReverseReconnectInterval != 0 {
 		time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
-		if u {
-			c.connectUniversal()
-			return
+		if !u {
+			go c.connectApi()
 		}
-		c.connectApi()
 	}
 }
 
 func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
-	c.pushLock.Lock()
-	defer c.pushLock.Unlock()
 	if c.eventConn != nil {
 		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson())
-		if _, err := c.eventConn.Write([]byte(m.ToJson())); err != nil {
+		conn := c.eventConn
+		conn.Lock()
+		defer conn.Unlock()
+		_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+		if err := c.eventConn.WriteJSON(m); err != nil {
+			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
 			_ = c.eventConn.Close()
 			if c.conf.ReverseReconnectInterval != 0 {
 				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
@@ -200,107 +206,156 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
 	}
 	if c.universalConn != nil {
 		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJson())
-		_, _ = c.universalConn.Write([]byte(m.ToJson()))
+		conn := c.universalConn
+		conn.Lock()
+		defer conn.Unlock()
+		_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+		if err := c.universalConn.WriteJSON(m); err != nil {
+			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
+			_ = c.universalConn.Close()
+			if c.conf.ReverseReconnectInterval != 0 {
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+				c.connectUniversal()
+			}
+		}
 	}
 }
 
 func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
-		if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
 		}
+	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
 		return
 	}
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
-	if err == nil {
-		log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr)
-		s.eventConn = append(s.eventConn, c)
+	if err != nil {
+		log.Warnf("Websocket 握手时出现错误: %v", err)
+		c.Close()
+		return
 	}
+
+	log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr)
+
+	conn := &websocketConn{Conn: c}
+
+	s.eventConnMutex.Lock()
+	s.eventConn = append(s.eventConn, conn)
+	s.eventConnMutex.Unlock()
 }
 
 func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
-		if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
 		}
+	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
 		return
 	}
 	log.Infof("接受 Websocket 连接: %v (/api)", r.RemoteAddr)
-	go s.listenApi(c)
+	conn := &websocketConn{Conn: c}
+	go s.listenApi(conn)
 }
 
 func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
-		if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
 		}
+	}
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 Websocket 请求时出现错误: %v", err)
 		return
 	}
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
-	if err == nil {
-		log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
-		s.eventConn = append(s.eventConn, c)
-		s.listenApi(c)
+	if err != nil {
+		log.Warnf("Websocket 握手时出现错误: %v", err)
+		c.Close()
+		return
 	}
+	log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
+	conn := &websocketConn{Conn: c}
+	s.eventConn = append(s.eventConn, conn)
+	s.listenApi(conn)
 }
 
-func (s *websocketServer) listenApi(c *websocket.Conn) {
+func (s *websocketServer) listenApi(c *websocketConn) {
 	defer c.Close()
 	for {
 		t, payload, err := c.ReadMessage()
 		if err != nil {
 			break
 		}
+
 		if t == websocket.TextMessage {
-			j := gjson.ParseBytes(payload)
-			t := strings.ReplaceAll(j.Get("action").Str, "_async", "") //TODO: async support
-			log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-			if f, ok := wsApi[t]; ok {
-				ret := f(s.bot, j.Get("params"))
-				if j.Get("echo").Exists() {
-					ret["echo"] = j.Get("echo").Value()
-				}
-				s.pushLock.Lock()
-				_ = c.WriteJSON(ret)
-				s.pushLock.Unlock()
-			}
+			go c.handleRequest(s.bot, payload)
 		}
 	}
 }
 
+func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
+	defer func() {
+		if err := recover(); err != nil {
+			log.Printf("处置WS命令时发生无法恢复的异常：%v", err)
+			c.Close()
+		}
+	}()
+	global.RateLimit(context.Background())
+	j := gjson.ParseBytes(payload)
+	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
+	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
+	if f, ok := wsApi[t]; ok {
+		ret := f(bot, j.Get("params"))
+		if j.Get("echo").Exists() {
+			ret["echo"] = j.Get("echo").Value()
+		}
+		c.Lock()
+		defer c.Unlock()
+		_ = c.WriteJSON(ret)
+	}
+}
+
 func (s *websocketServer) onBotPushEvent(m coolq.MSG) {
-	s.pushLock.Lock()
-	defer s.pushLock.Unlock()
-	pos := 0
-	for _, conn := range s.eventConn {
+	s.eventConnMutex.Lock()
+	defer s.eventConnMutex.Unlock()
+	for i, l := 0, len(s.eventConn); i < l; i++ {
+		conn := s.eventConn[i]
 		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJson())
-		err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson()))
-		if err != nil {
+		conn.Lock()
+		if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson())); err != nil {
 			_ = conn.Close()
-			s.eventConn = append(s.eventConn[:pos], s.eventConn[pos+1:]...)
-			if pos > 0 {
-				pos++
+			next := i + 1
+			if next >= l {
+				next = l - 1
 			}
+			s.eventConn[i], s.eventConn[next] = s.eventConn[next], s.eventConn[i]
+			s.eventConn = append(s.eventConn[:next], s.eventConn[next+1:]...)
+			i--
+			l--
+			conn = nil
+			continue
 		}
-		pos++
+		conn.Unlock()
 	}
 }
 
@@ -312,37 +367,43 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 		return bot.CQGetFriendList()
 	},
 	"get_group_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupList()
+		return bot.CQGetGroupList(p.Get("no_cache").Bool())
 	},
 	"get_group_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupInfo(p.Get("group_id").Int())
 	},
 	"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMemberList(p.Get("group_id").Int())
+		return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
 	},
 	"get_group_member_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupMemberInfo(
 			p.Get("group_id").Int(), p.Get("user_id").Int(),
-			p.Get("no_cache").Bool(),
 		)
 	},
 	"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
+		if p.Get("message_type").Str == "private" {
+			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
+		}
+		if p.Get("message_type").Str == "group" {
+			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
+		}
 		if p.Get("group_id").Int() != 0 {
-			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"))
+			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
 		}
 		if p.Get("user_id").Int() != 0 {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"))
+			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
 		}
 		return coolq.MSG{}
 	},
 	"send_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"))
+		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
 	},
 	"send_group_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
 	},
 	"send_private_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"))
+		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
 	},
 	"delete_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
@@ -363,7 +424,7 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 		if p.Get("approve").Exists() {
 			apr = p.Get("approve").Bool()
 		}
-		return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, apr)
+		return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
 	},
 	"set_group_card": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
@@ -391,7 +452,18 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 		}())
 	},
 	"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("name").Str)
+		return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
+	},
+	"set_group_admin": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
+			if p.Get("enable").Exists() {
+				return p.Get("enable").Bool()
+			}
+			return true
+		}())
+	},
+	"_send_group_notice": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
 	},
 	"set_group_leave": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQSetGroupLeave(p.Get("group_id").Int())
@@ -405,6 +477,9 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"get_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupMessage(int32(p.Get("message_id").Int()))
 	},
+	"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
+	},
 	"can_send_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQCanSendImage()
 	},
@@ -417,6 +492,12 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"get_version_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetVersionInfo()
 	},
+	"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQGetVipInfo(p.Get("user_id").Int())
+	},
+	"reload_event_filter": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQReloadEventFilter()
+	},
 	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
 	},