v2.2.3

Signed-off-by: qwqcode <qwqcode@gmail.com>

.eslintignore

@@ -6,3 +6,6 @@ dist
 coverage
 
 vite*.config*
+
+# 不检测 js
+**/*.js

.eslintrc.js

@@ -1,34 +1,39 @@
 module.exports = {
   root: true,
-  parser: '@typescript-eslint/parser',
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: ['./packages/*/tsconfig.json'],
+    tsconfigRootDir: __dirname,
+  },
   extends: [
-    'airbnb',
-    'airbnb-typescript',
+    'airbnb-base',
+    'airbnb-typescript/base',
     'prettier',
     'plugin:import/recommended',
+    'plugin:import/typescript',
   ],
   plugins: ['@typescript-eslint', 'import'],
   rules: {
-    '@typescript-eslint/lines-between-class-members': 0,
+    'no-alert': 'off',
     'no-unused-vars': 'off',
-    '@typescript-eslint/no-unused-vars': 'off',
     'no-plusplus': 0,
     'no-param-reassign': 0,
     'no-console': 0,
-    'react/sort-comp': 0,
-    '@typescript-eslint/no-use-before-define': 0,
+    'no-constructor-return': 0,
     'class-methods-use-this': 0,
-    'import/no-cycle': 0,
     'spaced-comment': 0,
     'no-lonely-if': 0,
     'prefer-destructuring': 0,
+    'import/no-cycle': 0,
+    '@typescript-eslint/lines-between-class-members': 0,
+    '@typescript-eslint/no-unused-vars': 'off',
+    '@typescript-eslint/no-use-before-define': 0,
   },
   settings: {
     'import/resolver': {
-      typescript: {},
+      typescript: {
+        "project": [__dirname + "/packages/*/tsconfig.json"]
+      },
     },
   },
-  parserOptions: {
-    project: './tsconfig.json',
-  },
 }

.github/workflows/npm.yml

@@ -8,19 +8,38 @@ on:
 
 jobs:
   publish:
+    # prevents this action from running on forks
+    if: github.repository == 'ArtalkJS/Artalk'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    # Setup .npmrc file to publish to npm
-    - uses: actions/setup-node@v2
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Use pnpm
+      uses: pnpm/action-setup@v2.0.1
       with:
-        node-version: '12.x'
-        registry-url: 'https://registry.npmjs.org'
-    - run: npm install
-    - run: npm run build
-    - run: npm publish
+        version: 7.0.0-rc.3
+
+    - name: Set node version to 16.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16.x
+        registry-url: https://registry.npmjs.org/
+        cache: 'pnpm'
+
+    - name: Install dependencies
+      run: pnpm install
+
+    - name: Build
+      run: pnpm build
+
+    - name: Publish
+      run: cd packages/artalk && pnpm publish --no-git-checks
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+    # GitHub Packages
+    #
     # Setup .npmrc file to publish to GitHub Packages
     # - uses: actions/setup-node@v2
     #   with:
@@ -29,6 +48,7 @@ jobs:
     # - run: npm publish
     #   env:
     #     NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   # Docs Update
   docs-update:
     runs-on: ubuntu-latest
@@ -51,4 +71,3 @@ jobs:
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Update Artalk CDN link to v${{ steps.get_version.outputs.VERSION }}
-

.github/workflows/pages.yml

@@ -12,19 +12,30 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup
-      uses: actions/setup-node@v1
+
+    - name: Use pnpm
+      uses: pnpm/action-setup@v2.0.1
       with:
-        node-version: '12.x'
-    - name: Install
-      run: yarn install
+        version: 7.0.0-rc.3
+
+    - name: Set node version to 16.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16.x
+        registry-url: https://registry.npmjs.org/
+        cache: 'pnpm'
+
+    - name: Install dependencies
+      run: pnpm install
+
     - name: Build
-      run: yarn predeploy
+      run: cd packages/artalk && pnpm predeploy
+
     - name: Deploy
       uses: peaceiris/actions-gh-pages@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_branch: gh-pages
-        publish_dir: ./deploy
+        publish_dir: ./packages/artalk/deploy
         user_name: 'github-actions[bot]'
-        user_email: 'github-actions[bot]@users.noreply.github.com'
+        user_email: 'github-actions[bot]@users.noreply.github.com'

.gitignore

@@ -1,8 +1,13 @@
 .DS_Store
 node_modules/
+
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.pnpm-debug.log*
 
 # Editor directories and files
 .idea

.npmignore

@@ -1,8 +1,12 @@
 .DS_Store
 node_modules/
+
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.pnpm-debug.log*
 
 .idea
 .vscode

.travis.yml

@@ -4,10 +4,15 @@ node_js:
   - lts/*
 
 script:
-  - yarn run lint
-  - yarn run build
+  - pnpm run lint
+  - pnpm run build
 
 cache:
-  yarn: true
+  npm: false
   directories:
-    - node_modules
+    - "~/.pnpm-store"
+before_install:
+  - curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7.0.0-rc.3
+  - pnpm config set store-dir ~/.pnpm-store
+install:
+  - pnpm install

LICENSE

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

README.md

@@ -14,38 +14,48 @@
 
 > 🌌 一款简洁的自托管评论系统 | A Selfhosted Comment System.
 
-前往：[“**官方文档**”](https://artalk.js.org)
+可参考：[“官方文档”](https://artalk.js.org)
+
+最新版：[“Releases”](https://github.com/ArtalkJS/ArtalkGo/releases)
 
 ---
 
-- 轻量 (~30kB gzipped)
-- 自托管 (隐私安全)
-- 简单易上手 (防秃顶)
-- Markdown 语法 (通用性)
+- 轻量级 (~30kB gzipped)
+- 自托管 (数据安全)
+- 易上手 (防秃顶)
 - Golang 后端 (易部署 / 跨平台)
+- TypeScript & Vanilla (纯天然无添加 / 无依赖)
 
 ## 特性
 
-- 表 情 包 ：统一管理 / 链接替换
-- 通知中心：红点标记 / 已读记录
+- 侧 边 栏 ：所见即所得的管理方式
+- 通知中心：红点的标记 / 已读记录
 - 身份验证：徽标自定义 / 密码验证
-- 站点隔离：多站点管理 / 站点管理员用户分配
-- 评论审核：反垃圾检测 / 验证码 / 提交频率限制
+- 评论审核：反垃圾检测 / 验证码频率限制
+- 表情符号：插入表情包 / 快速导入表情包
 - 邮件提醒：模版自定义 / 多管理员通知
-- 树洞模式：仅自己可见 / 说说功能
+- 站点隔离：多站点管理 / 管理员分配
 - 页面管理：标题可显示 / 快速跳转
-- 无限层级：可切换为 “平铺模式”
+- 图片上传：上传到本地 / 多种图床
+- 树洞模式：仅自己可见 / 说说功能
+- 多元推送：支持钉钉飞书 TG
+- 无限层级：可切换为平铺模式
 - 评论投票：赞同还是反对评论
-- 异步处理：邮件发送无需等待
+- 评论排序：按热度或时间排序
+- 评论置顶：重要消息置顶显示
+- 只看作者：仅显示作者的评论
+- 异步处理：发送评论无需等待
 - 滚动加载：评论内容分页处置
 - 自动保存：用户输入防丢功能
 - 自动填充：用户链接自动填充
+- 实时预览：评论内容实时预览
 - 暗黑模式：防止眼部疾病伤害
 - 评论折叠：这个不打算给你康
 - 数据备份：防止评论数据丢失
 - 数据迁移：在不同评论系统之间来回切换
 - 一页多评：一页多个评论区（似乎没啥用
-- TypeScript & Vanilla：纯天然无添加 / 无需依赖
+- Markdown：语法默认支持
+- 支持 Latex：引入 Artalk 的 Katex 插件
 - [Vite](https://github.com/vitejs/vite)：开发者的极致体验
 
 ## 食用方针
@@ -53,7 +63,7 @@
 前往：[“**文档 · 部署**”](https://artalk.js.org/guide/deploy.html)
 
 ```sh
-$ yarn add artalk
+$ pnpm add artalk
 ```
 
 ```ts
@@ -61,13 +71,140 @@ import Artalk from 'artalk'
 
 new Artalk({
   el:        '#Comments',
-  pageKey:   '<页面链接>',
-  pageTitle: '<页面标题>',
-  server:    '<后端地址>',
-  site:      '<站点名称>',
+  pageKey:   'http://your_domain/post/1', // 页面链接
+  pageTitle: '关于如何引入 Artalk 这档子事', // 页面标题
+  server:    'http://localhost:8080/api', // 后端地址
+  site:      'Artalk 的博客 (你的站点名)',
 })
 ```
 
+### Docker
+
+```sh
+# 为 Artalk 创建一个目录
+mkdir Artalk
+cd Artalk
+
+# 下载配置文件模版
+curl -L https://raw.githubusercontent.com/ArtalkJS/ArtalkGo/master/artalk-go.example.yml > conf.yml
+
+docker run -d \
+  --name artalk \
+  -p 0.0.0.0:8080:23366 \
+  -v $(pwd)/conf.yml:/conf.yml \
+  -v $(pwd)/data:/data \
+  artalk/artalk-go
+```
+
+### Docker Compose
+
+```sh
+mkdir Artalk
+cd Artalk
+
+vim docker-compose.yaml
+```
+
+```yaml
+version: "3.5"
+services:
+  artalk:
+    container_name: artalk
+    image: artalk/artalk-go
+    ports:
+      - 8080:23366
+    volumes:
+      - ./conf.yml:/conf.yml
+      - ./data:/data
+```
+
+```sh
+docker-compose up -d
+```
+
+## TODOs 
+
+- [x] [Golang 后端](https://github.com/ArtalkJS/ArtalkGo)
+- [x] 多站点支持
+- [x] 多数据库支持
+- [x] 评论获取分页
+- [x] 评论点赞投票
+- [x] 浏览量统计
+- [x] 评论分页加载
+- [x] 评论置顶 / 精华
+- [x] 评论排序 (热度 / 时间)
+- [x] 通知中心
+  - [x] 提及
+  - [x] 全部
+  - [x] 我的
+  - [x] 待审
+- [x] 管理员控制台
+  - [x] 评论 (增/删/改)
+  - [x] 页面 (增/删/改)
+  - [x] 站点 (增/删/改)
+  - [x] 数据分页
+  - [ ] 配置 (GUI)
+- [x] 数据导入 ([Artransfer](https://github.com/ArtalkJS/Artransfer))
+  - [x] Artrans
+  - [x] Artalk v1 (PHP)
+  - [x] WordPress
+  - [x] Typecho
+  - [x] Valine
+  - [x] Disqus
+  - [x] Commento
+  - [x] Twikoo
+- [x] 数据导出
+- [ ] 数据备份同步
+- [x] 邮件异步队列发送
+- [ ] 邮件队列持久化
+- [x] 邮件多种发送方式
+  - [x] SMTP
+  - [x] 阿里云邮件
+  - [x] 系统调用 sendmail
+- [x] 邮件多模板自定义
+- [x] 用户已读标记
+- [x] 验证码
+  - [x] 图片验证码
+  - [x] [极验](https://www.geetest.com/)滑动验证码
+- [x] 反垃圾
+  - [x] [Akismet](https://akismet.com/)
+  - [x] [阿里云内容安全](https://help.aliyun.com/document_detail/28417.html)
+  - [x] [腾讯云内容安全](https://cloud.tencent.com/document/product/1124/64508)
+  - [x] 关键字过滤
+- [x] 评论通知管理员 ([notify](https://github.com/nikoksr/notify))
+  - [x] Telegram Bot
+  - [x] 飞书 WebHook Bot
+  - [x] 钉钉
+  - [x] Bark
+  - [x] Slack
+  - [x] LINE
+  - [ ] 自定义 HTTP 回调
+- [ ] 命令行管理
+- [ ] 博客邮件订阅
+- [x] 用户鉴权机制
+- [x] 跨域非法请求阻止
+- [x] 全局验证码操作次数限制
+- [x] JWT 登陆状态验证
+- [x] 时区自定义
+- [x] 只看作者功能
+- [ ] AT 提及 (@)
+- [ ] 评论提及 (#)
+- [ ] 表情包统一管理
+  - [ ] 导入表情包
+  - [ ] 表情包图片地址控制
+- [x] 图片上传
+- [x] 图片上传到图床 ([upgit](https://github.com/pluveto/upgit))
+- [ ] 图片管理
+- [ ] 附件上传 / 管理
+- [ ] 评论标签分类系统
+- [ ] 主题样式更换
+- [ ] 规范化 API
+- [ ] 扩展中心
+- [ ] 开放用户注册
+- [ ] 接入第三方登录
+- [ ] 国际化 (i18n)
+- [x] 一键升级
+
 ## 特别致谢
 
 感谢社区提供的帮助与反馈，若有好的建议与意见欢迎前往 [ISSUES](https://github.com/ArtalkJS/Artalk/issues) 随时告知。
@@ -77,7 +214,8 @@ new Artalk({
 [![Stargazers over time](https://starchart.cc/ArtalkJS/Artalk.svg)](https://starchart.cc/ArtalkJS/Artalk)
 
 ## License
-[GPL-3.0](./LICENSE)
+
+[LGPL-3.0](./LICENSE)
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FArtalkJS%2FArtalk.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FArtalkJS%2FArtalk?ref=badge_shield)
 

package.json

@@ -1,67 +1,32 @@
 {
-  "name": "artalk",
-  "version": "2.1.2",
-  "description": "A Selfhosted Comment System",
-  "keywords": [
-    "comment-system",
-    "comments-widget",
-    "comment",
-    "comments",
-    "blog"
-  ],
+  "name": "artalk-monorepo",
+  "private": true,
   "homepage": "https://artalk.js.org",
-  "bugs": "https://github.com/ArtalkJS/Artalk/issue",
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ArtalkJS/Artalk.git"
-  },
-  "main": "./dist/Artalk.js",
-  "unpkg": "./dist/Artalk.iife.js",
-  "jsdelivr": "./dist/Artalk.iife.js",
-  "module": "./dist/Artalk.es.js",
-  "types": "./types/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/Artalk.es.js",
-      "require": "./dist/Artalk.js"
-    }
-  },
   "scripts": {
-    "dev": "vite",
-    "build": "yarn lint && vite build",
-    "build:demo": "vite build --config vite-demo.config.ts",
-    "serve": "vite preview",
-    "deploy": "gh-pages -d deploy",
-    "predeploy": "yarn run build && yarn run build:demo && yarn run copy:deploy",
-    "copy:deploy": "cp -r dist deploy && cp CNAME deploy",
-    "lint": "eslint --ext .js,.ts src"
+    "dev": "pnpm -F artalk dev",
+    "dev:sidebar": "pnpm -F @artalkjs/artalk-sidebar dev",
+    "build": "pnpm -F artalk build",
+    "build:sidebar": "pnpm -F @artalkjs/artalk-sidebar build",
+    "build:all": "pnpm build && pnpm build:sidebar"
   },
   "devDependencies": {
     "@rollup/plugin-dynamic-import-vars": "^1.4.1",
-    "@types/marked": "^4.0.1",
     "@types/node": "^16.11.7",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
     "autoprefixer": "^10.4.0",
-    "eslint": "7.2.0",
-    "eslint-config-airbnb": "18.2.1",
-    "eslint-config-airbnb-typescript": "^14.0.0",
+    "eslint": "^8.2.0",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-config-airbnb-typescript": "^16.0.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-import-resolver-typescript": "^2.4.0",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.25.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.2",
     "less": "^4.1.2",
+    "postcss": "^8.1.0",
     "prettier": "^2.4.1",
+    "rollup": "^2.59.0",
     "typescript": "^4.5.2",
     "vite": "^2.6.14",
     "vite-tsconfig-paths": "^3.3.17"
-  },
-  "dependencies": {
-    "hanabi": "^0.4.0",
-    "insane": "^2.6.2",
-    "marked": "^4.0.3"
   }
 }

packages/artalk-sidebar/index.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Artalk Sidebar</title>
+</head>
+<body>
+  <div id="ArtalkSidebar"></div>
+
+  <script type="module">
+    import InitSidebar from './src/main'
+
+    const p        = new URLSearchParams(document.location.search)
+    const pageKey  = p.get('pageKey') || ''
+    const site     = p.get('site') || ''
+    const user     = JSON.parse(p.get('user') || '{}')
+    const darkMode = p.get('darkMode') === '1'
+
+    window.referer = p.get('referer')
+
+    InitSidebar({
+      el: '#ArtalkSidebar',
+      server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : '../api',
+      pageKey,
+      site,
+      darkMode,
+    }, user)
+  </script>
+</body>
+</html>

packages/artalk-sidebar/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@artalkjs/artalk-sidebar",
+  "version": "0.1.1",
+  "license": "LGPL-3.0",
+  "description": "The sidebar of artalk",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ArtalkJS/Artalk.git",
+    "directory": "packages/artalk-sidebar"
+  },
+  "homepage": "https://artalk.js.org",
+  "bugs": "https://github.com/ArtalkJS/Artalk/issue",
+  "scripts": {
+    "dev": "vite --port 23367",
+    "build": "pnpm -F artalk build && pnpm lint && vite build",
+    "serve": "vite preview",
+    "lint": "eslint --ext .js,.ts src"
+  },
+  "dependencies": {
+    "artalk": "workspace: *"
+  }
+}

packages/artalk-sidebar/src/admin/page-list.ts

@@ -1,13 +1,14 @@
-import '@/style/page-list.less'
+import '../style/page-list.less'
 
-import Context from '@/context'
-import Component from '@/lib/component'
-import * as Utils from '@/lib/utils'
-import * as Ui from '@/lib/ui'
-import { PageData } from '~/types/artalk-data'
-import ItemTextEditor from '../item-text-editor'
-import Api from '~/src/api'
-import ActionBtn from '../action-btn'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import * as Ui from 'artalk/src/lib/ui'
+import { PageData } from 'artalk/types/artalk-data'
+import Api from 'artalk/src/api'
+import ActionBtn from 'artalk/src/components/action-btn'
+import Component from '../sidebar-component'
+import { SidebarCtx } from '../main'
+import ItemTextEditor from '../lib/item-text-editor'
 
 export default class PageList extends Component {
   $editor?: HTMLElement
@@ -15,8 +16,8 @@ export default class PageList extends Component {
 
   pages: PageData[] = []
 
-  constructor(ctx: Context) {
-    super(ctx)
+  constructor(ctx: Context, sidebar: SidebarCtx) {
+    super(ctx, sidebar)
 
     this.$el = Utils.createElement(`<div class="atk-page-list"></div>`)
   }

packages/artalk-sidebar/src/admin/site-list-floater.ts

@@ -1,10 +1,10 @@
-import '@/style/site-list.less'
+import '../style/site-list.less'
 
-import Context from '@/context'
-import * as Utils from '@/lib/utils'
-import * as Ui from '@/lib/ui'
-import { SiteData } from '~/types/artalk-data'
-import Api from '~/src/api'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import * as Ui from 'artalk/src/lib/ui'
+import { SiteData } from 'artalk/types/artalk-data'
+import Api from 'artalk/src/api'
 
 interface SiteListFloaterConf {
   onSwitchSite: (siteName: string) => boolean|void

packages/artalk-sidebar/src/admin/site-list.ts

@@ -1,12 +1,13 @@
-import '@/style/site-list.less'
+import '../style/site-list.less'
 
-import Context from '@/context'
-import Component from '@/lib/component'
-import * as Utils from '@/lib/utils'
-import * as Ui from '@/lib/ui'
-import { SiteData } from '~/types/artalk-data'
-import ItemTextEditor from '../item-text-editor'
-import Api from '~/src/api'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import * as Ui from 'artalk/src/lib/ui'
+import { SiteData } from 'artalk/types/artalk-data'
+import Api from 'artalk/src/api'
+import Component from '../sidebar-component'
+import { SidebarCtx } from '../main'
+import ItemTextEditor from '../lib/item-text-editor'
 
 export default class SiteList extends Component {
   sites: SiteData[] = []
@@ -21,8 +22,8 @@ export default class SiteList extends Component {
 
   $add?: HTMLElement
 
-  constructor(ctx: Context) {
-    super(ctx)
+  constructor(ctx: Context, sidebar: SidebarCtx) {
+    super(ctx, sidebar)
 
     this.$el = Utils.createElement(
     `<div class="atk-site-list">

packages/artalk-sidebar/src/lib/item-text-editor.ts

@@ -1,6 +1,6 @@
 import '../style/item-text-editor.less'
 
-import * as Utils from '../lib/utils'
+import * as Utils from 'artalk/src/lib/utils'
 
 interface ItemTextEditorConf {
   initValue?: string

packages/artalk-sidebar/src/main.ts

@@ -0,0 +1,31 @@
+import Artalk from 'artalk'
+import ArtalkConfig, { LocalUser } from 'artalk/types/artalk-config'
+import 'artalk/dist/Artalk.css'
+import SidebarRoot from './sidebar-root'
+
+export default function InitSidebar(conf: ArtalkConfig, user: LocalUser) {
+  const artalk = new Artalk(conf)
+
+  artalk.$root.style.display = 'none'
+
+  user = user || {}
+  artalk.ctx.user.data = {
+    ...artalk.ctx.user.data,
+    ...user
+  }
+  artalk.ctx.user.save()
+
+  const sidebarCtx = new SidebarCtx()
+  const sidebar = new SidebarRoot(artalk.ctx, sidebarCtx)
+  document.body.appendChild(sidebar.$el)
+
+  if (conf.darkMode) sidebar.$el.classList.add('atk-dark-mode')
+
+  sidebar.init()
+
+  console.log('hello artalk-sidebar')
+}
+
+export class SidebarCtx {
+  reload!: () => void
+}

packages/artalk-sidebar/src/sidebar-component.ts

@@ -0,0 +1,13 @@
+import ArtalkComponent from 'artalk/src/lib/component'
+import Context from 'artalk/src/context'
+import { SidebarCtx } from './main'
+
+export default class Component extends ArtalkComponent {
+  sidebar: SidebarCtx
+
+  constructor(ctx: Context, sidebar: SidebarCtx) {
+    super(ctx)
+
+    this.sidebar = sidebar
+  }
+}

packages/artalk-sidebar/src/sidebar-root.ts

@@ -1,38 +1,37 @@
-import '../style/sidebar.less'
+import './style/sidebar.less'
 
-import MD5 from '../lib/md5'
-import Context from '../context'
-import Component from '../lib/component'
-import * as Utils from '../lib/utils'
-import * as Ui from '../lib/ui'
-import Comment  from './comment'
-import SidebarHTML from './html/sidebar.html?raw'
-import Layer from './layer'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import * as Ui from 'artalk/src/lib/ui'
+import Comment  from 'artalk/src/components/comment'
+import { SiteData } from 'artalk/types/artalk-data'
+import Api from 'artalk/src/api'
+
+import Component from './sidebar-component'
+import { SidebarCtx } from './main'
+import SidebarHTML from './sidebar.html?raw'
 
 import SidebarView from './sidebar-view'
 import CommentsView from './sidebar-views/comments-view'
 import PagesView from './sidebar-views/pages-view'
 import SitesView from './sidebar-views/sites-view'
 import TransferView from './sidebar-views/transfer-view'
-import { SiteData } from '~/types/artalk-data'
-import Api from '../api'
 import SiteListFloater from './admin/site-list-floater'
 import SettingView from './sidebar-views/setting-view'
 
+import MD5 from './lib/md5'
+
 const DEFAULT_VIEW = 'comments'
 const REGISTER_VIEWS: (typeof SidebarView)[] = [
   CommentsView, PagesView, SitesView, TransferView, // SettingView
 ]
 
-export default class Sidebar extends Component {
-  public layer?: Layer
-
+export default class SidebarRoot extends Component {
   public $header: HTMLElement
   public $headerMenu: HTMLElement
   public $title: HTMLElement
   public $avatar: HTMLElement
   public $siteLogo?: HTMLElement
-  public $closeBtn: HTMLElement
   public $nav: HTMLElement
   public $curtViewBtn: HTMLElement
   public $curtViewBtnIcon: HTMLElement
@@ -54,8 +53,8 @@ export default class Sidebar extends Component {
 
   private viewSwitcherShow = false
 
-  constructor(ctx: Context) {
-    super(ctx)
+  constructor(ctx: Context, sidebar: SidebarCtx) {
+    super(ctx, sidebar)
 
     // initial elements
     this.$el = Utils.createElement(SidebarHTML)
@@ -63,7 +62,6 @@ export default class Sidebar extends Component {
     this.$headerMenu = this.$header.querySelector('.atk-menu')!
     this.$title = this.$header.querySelector('.atk-sidebar-title')!
     this.$avatar = this.$header.querySelector('.atk-avatar')!
-    this.$closeBtn = this.$header.querySelector('.atk-sidebar-close')!
 
     this.$nav = this.$el.querySelector('.atk-sidebar-nav')!
     this.$curtViewBtn = this.$nav.querySelector('.akt-curt-view-btn')!
@@ -77,14 +75,10 @@ export default class Sidebar extends Component {
     // init UI
     this.initViewSwitcher()
 
-    this.$closeBtn.onclick = () => {
-      this.hide()
+    // 重载操作
+    this.sidebar.reload = () => {
+      this.init()
     }
-
-    // event
-    this.ctx.on('sidebar-show', () => (this.show()))
-    this.ctx.on('sidebar-hide', () => (this.hide()))
-    this.ctx.on('user-changed', () => { this.firstShow = true })
   }
 
   /** 初始化 view 切换器 */
@@ -131,94 +125,76 @@ export default class Sidebar extends Component {
     this.viewSwitcherShow = !this.viewSwitcherShow
   }
 
-  private firstShow = true
-
-  /** 显示 */
-  public async show() {
-    this.$el.style.transform = '' // 动画清除，防止二次打开失效
-
-    // 获取 Layer
-    this.layer = new Layer(this.ctx, 'sidebar', this.$el)
-    this.layer.show()
-
-    // viewWrap 滚动条归位
-    this.$viewWrap.scrollTo(0, 0)
-
-    // 执行动画
-    setTimeout(() => {
-      this.$el.style.transform = 'translate(0, 0)'
-    }, 20)
-
-    // 第一次加载
-    if (this.firstShow) {
-      ///////////////////
-      //// IMPORTANT ////
-      ///////////////////
-
-      // 用户权限检测
-      if (this.isAdmin) {
-        // 是管理员
-        this.$title.innerText = '控制中心'
-        this.$curtViewBtn.style.display = ''
-
-        if (!this.siteSwitcher) {
-          // 初始化站点切换器
-          this.siteSwitcher = new SiteListFloater(this.ctx, {
-            onSwitchSite: (siteName) => { this.switchSite(siteName) },
-            onClickSitesViewBtn: () => { this.switchView('sites') }
-          })
-          this.$viewWrap.before(this.siteSwitcher.$el)
-          this.$avatar.onclick = (evt) => {
-            if (!this.isAdmin) return
-            this.siteSwitcher?.show(evt.target as any)
-          }
+  /** 初始化 */
+  public async init() {
+     // 用户权限检测
+     if (this.isAdmin) {
+      // 是管理员
+      this.$title.innerText = '控制中心'
+      this.$curtViewBtn.style.display = ''
 
+      if (!this.siteSwitcher) {
+        // 初始化站点切换器
+        this.siteSwitcher = new SiteListFloater(this.ctx, {
+          onSwitchSite: (siteName) => {
+            this.switchSite(siteName)
+          },
+          onClickSitesViewBtn: () => {
+            this.switchView('sites')
+          },
+        })
+        this.$viewWrap.before(this.siteSwitcher.$el)
+        this.$avatar.onclick = (evt) => {
+          if (!this.isAdmin) return
+          this.siteSwitcher?.show(evt.target as any)
         }
-
-        this.curtSite = this.conf.site
-
-        Ui.showLoading(this.$el)
-        try {
-          await this.siteSwitcher!.load(this.curtSite)
-        } catch (err: any) {
-          const $err = Utils.createElement(`<span>加载失败：${err.msg || '网络错误'}<br/></span>`)
-          const $retryBtn = Utils.createElement('<span style="cursor:pointer;">点击重新获取</span>')
-          $err.appendChild($retryBtn)
-          $retryBtn.onclick = () => { Ui.setError(this.$el, null); this.show() }
-          Ui.setError(this.$el, $err)
-          return
-        } finally { Ui.hideLoading(this.$el) }
-
-        // 站点图像
-        this.$avatar.innerHTML = ''
-        this.$siteLogo = Utils.createElement('<div class="atk-site-logo"></div>')
-        this.$siteLogo.innerText = (this.curtSite || '').substr(0, 1)
-        this.$avatar.append(this.$siteLogo)
-      } else {
-        // 不是管理员
-        this.$title.innerText = '通知中心'
-        this.$curtViewBtn.style.display = 'none' // 隐藏 view 切换器
-        this.curtSite = this.conf.site // 第一次 show 使用当前站点数据
-
-        // 头像
-        const $avatarImg = document.createElement('img') as HTMLImageElement
-        $avatarImg.src = Utils.getGravatarURL(this.ctx, MD5(this.ctx.user.data.email.toLowerCase()))
-        this.$avatar.innerHTML = ''
-        this.$avatar.append($avatarImg)
       }
 
-      this.switchView(DEFAULT_VIEW) // 打开默认 view
-      this.firstShow = false
+      this.curtSite = this.conf.site
+
+      Ui.showLoading(this.$el)
+      try {
+        await this.siteSwitcher!.load(this.curtSite)
+      } catch (err: any) {
+        const $err = Utils.createElement(
+          `<span>加载失败：${err.msg || '网络错误'}<br/></span>`
+        )
+        const $retryBtn = Utils.createElement(
+          '<span style="cursor:pointer;">点击重新获取</span>'
+        )
+        $err.appendChild($retryBtn)
+        $retryBtn.onclick = () => {
+          Ui.setError(this.$el, null)
+          this.init()
+        }
+        Ui.setError(this.$el, $err)
+        return
+      } finally {
+        Ui.hideLoading(this.$el)
+      }
+
+      // 站点图像
+      this.$avatar.innerHTML = ''
+      this.$siteLogo = Utils.createElement('<div class="atk-site-logo"></div>')
+      this.$siteLogo.innerText = (this.curtSite || '').substr(0, 1)
+      this.$avatar.append(this.$siteLogo)
+    } else {
+      // 不是管理员
+      this.$title.innerText = '通知中心'
+      this.$curtViewBtn.style.display = 'none' // 隐藏 view 切换器
+      this.curtSite = this.conf.site // 第一次 show 使用当前站点数据
+
+      // 头像
+      const $avatarImg = document.createElement('img') as HTMLImageElement
+      $avatarImg.src = Utils.getGravatarURL(
+        this.ctx,
+        MD5(this.ctx.user.data.email.toLowerCase())
+      )
+      this.$avatar.innerHTML = ''
+      this.$avatar.append($avatarImg)
     }
-  }
 
-  /** 隐藏 */
-  public hide() {
-    // 执行动画
-    this.$el.style.transform = ''
-
-    // 用完即销毁
-    this.layer?.dispose()
+    this.switchView(DEFAULT_VIEW) // 打开默认 view
   }
 
   /** 切换 View */
@@ -227,7 +203,7 @@ export default class Sidebar extends Component {
     if (!view) {
       // 初始化 View
       const View = REGISTER_VIEWS.find(o => o.viewName === viewName)!
-      view = new View(this.ctx, this.$viewWrap)
+      view = new View(this.ctx, this.sidebar, this.$viewWrap)
       this.viewInstances[viewName] = view
     }
 

packages/artalk-sidebar/src/sidebar-view.ts

@@ -1,7 +1,8 @@
-import Context from '../context'
-import Component from '../lib/component'
-import * as Utils from '../lib/utils'
-import Comment from './comment'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import Comment from 'artalk/src/components/comment'
+import Component from './sidebar-component'
+import { SidebarCtx } from './main'
 
 export default class SidebarView extends Component {
   static viewName = ''
@@ -13,8 +14,8 @@ export default class SidebarView extends Component {
 
   protected $parent: HTMLElement
 
-  constructor(ctx: Context, $parent: HTMLElement) {
-    super(ctx)
+  constructor(ctx: Context, sidebar: SidebarCtx, $parent: HTMLElement) {
+    super(ctx, sidebar)
 
     this.$parent = $parent
     this.$el = Utils.createElement(`<div class="atk-sidebar-view"></div>`)

packages/artalk-sidebar/src/sidebar-views/comments-view.ts

@@ -1,7 +1,8 @@
-import Context from '../../context'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import ListLite from 'artalk/src/components/list-lite'
+
 import SidebarView from '../sidebar-view'
-import * as Utils from '../../lib/utils'
-import ListLite from '../list-lite'
 
 export default class MessageView extends SidebarView {
   static viewName = 'comments'
@@ -31,17 +32,24 @@ export default class MessageView extends SidebarView {
       this.viewActiveTab = 'mentions'
     }
 
-    this.list = new ListLite(this.ctx, this.$el)
+    this.list = new ListLite(this.ctx)
     this.list.flatMode = true
     this.list.unreadHighlight = true
-    this.list.autoLoadListenerAt = this.$parent
+    this.list.scrollListenerAt = this.$parent
     this.list.pageMode = 'pagination'
     this.list.noCommentText = '<div class="atk-sidebar-no-content">无内容</div>'
     this.list.renderComment = (comment) => {
-      comment.setOpenURL(`${comment.data.page_key}#atk-comment-${comment.data.id}`)
-      comment.$actions.querySelector('[data-atk-action="comment-reply"]')?.addEventListener('click', () => {
-        this.ctx.trigger('sidebar-hide')
-      })
+      let pageKey = comment.data.page_key
+      if (!Utils.isValidURL(pageKey)) pageKey = Utils.getURLBasedOn((window as any).referer || '', pageKey)
+      comment.setOpenURL(`${pageKey}#atk-comment-${comment.data.id}`)
+      comment.onReplyBtnClick = () => {
+        if (this.ctx.conf.editorTravel === true) {
+          this.ctx.trigger('editor-reply', {data: comment.data, $el: comment.$el, scroll: false})
+        } else {
+          this.ctx.trigger('sidebar-hide')
+          this.ctx.trigger('editor-reply', {data: comment.data, $el: comment.$el, scroll: true})
+        }
+      }
     }
     this.list.paramsEditor = (params) => {
       params.site_name = siteName
@@ -56,12 +64,11 @@ export default class MessageView extends SidebarView {
   switchTab(tab: string, siteName: string): boolean|void {
     //console.log(tab, siteName)
     this.viewActiveTab = tab
-    this.list.type = tab as any;
-    this.list.isFirstLoad = true
     this.list.paramsEditor = (params) => {
+      params.type = tab as any
       params.site_name = siteName
     }
-    this.list.reqComments()
+    this.list.fetchComments(0)
 
     return true
   }

packages/artalk-sidebar/src/sidebar-views/pages-view.ts

@@ -1,11 +1,11 @@
-import Api from '~/src/api'
-import Context from '../../context'
-import Component from '../../lib/component'
-import * as Utils from '../../lib/utils'
-import * as Ui from '../../lib/ui'
+import Api from 'artalk/src/api'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import * as Ui from 'artalk/src/lib/ui'
+import Comment from 'artalk/src/components/comment'
+import Pagination, { PaginationConf } from 'artalk/src/components/pagination'
+
 import PageList from '../admin/page-list'
-import Comment from '../comment'
-import Pagination, { PaginationConf } from '../pagination'
 import SidebarView from '../sidebar-view'
 
 const PAGE_SIZE = 20
@@ -23,7 +23,7 @@ export default class PagesView extends SidebarView {
 
   mount(siteName: string) {
     if (!this.pageList) {
-      this.pageList = new PageList(this.ctx)
+      this.pageList = new PageList(this.ctx, this.sidebar)
       this.$el.append(this.pageList.$el)
     }
 

packages/artalk-sidebar/src/sidebar-views/setting-view.ts

@@ -1,9 +1,9 @@
-import Api from '~/src/api'
-import Context from '../../context'
-import Component from '../../lib/component'
-import * as Utils from '../../lib/utils'
+import Api from 'artalk/src/api'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import Comment from 'artalk/src/components/comment'
+
 import SiteList from '../admin/site-list'
-import Comment from '../comment'
 import SidebarView from '../sidebar-view'
 
 export default class SettingView extends SidebarView {

packages/artalk-sidebar/src/sidebar-views/sites-view.ts

@@ -1,9 +1,9 @@
-import Api from '~/src/api'
-import Context from '../../context'
-import Component from '../../lib/component'
-import * as Utils from '../../lib/utils'
+import Api from 'artalk/src/api'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import Comment from 'artalk/src/components/comment'
+
 import SiteList from '../admin/site-list'
-import Comment from '../comment'
 import SidebarView from '../sidebar-view'
 
 export default class SitesView extends SidebarView {
@@ -18,7 +18,7 @@ export default class SitesView extends SidebarView {
 
   mount(siteName: string) {
     if (!this.siteList) {
-      this.siteList = new SiteList(this.ctx)
+      this.siteList = new SiteList(this.ctx, this.sidebar)
       this.$el.append(this.siteList.$el)
     }
 

packages/artalk-sidebar/src/sidebar-views/transfer-view.ts

@@ -1,13 +1,13 @@
-import Api from '~/src/api'
-import Context from '../../context'
-import Component from '../../lib/component'
-import * as Utils from '../../lib/utils'
-import * as Ui from '../../lib/ui'
+import Api from 'artalk/src/api'
+import Context from 'artalk/src/context'
+import * as Utils from 'artalk/src/lib/utils'
+import * as Ui from 'artalk/src/lib/ui'
+import Comment from 'artalk/src/components/comment'
+
 import SiteList from '../admin/site-list'
-import Comment from '../comment'
 import SidebarView from '../sidebar-view'
 
-export default class TransferView extends SidebarView {ß
+export default class TransferView extends SidebarView {
   static viewName = 'transfer'
   static viewTitle = '迁移'
   static viewAdminOnly = true
@@ -40,60 +40,160 @@ export default class TransferView extends SidebarView {ß
       <div class="atk-log"></div>
     </div>
     <div class="atk-form">
-    <div class="atk-label">数据类型</div>
-    <select name="AtkDataType">
-      <option value="artrans">Artrans (数据行囊)</option>
-      <option value="artalk_v1">Artalk v1 (PHP 旧版)</option>
-      <option value="typecho">Typecho</option>
-      <option value="wordpress">WordPress</option>
-      <option value="disqus">Disqus</option>
-      <option value="commento">Commento</option>
-      <option value="valine">Valine</option>
-      <option value="twikoo">Twikoo</option>
-    </select>
-    <div class="atk-label atk-data-file-label">数据文件</div>
-    <input type="file" name="AtkDataFile" accept="text/plain,.json">
+    <div class="atk-label atk-data-file-label">Artrans 数据文件</div>
+    <div class="atk-file-upload-group">
+      <div class="atk-file-input-wrap atk-fade-in">
+        <input type="file" name="AtkDataFile" accept=".artrans">
+        <span class="atk-desc">使用「<a href="https://artalk.js.org/guide/transfer.html" target="_blank">转换工具</a>」将评论数据转为 Artrans 格式</span>
+      </div>
+      <div class="atk-uploading-wrap atk-fade-in">
+        <div class="atk-progress">
+          <div class="atk-bar"></div>
+        </div>
+        <div class="atk-status">上传中 <span class="atk-curt">0%</span>... <span class="atk-abort">取消</span></div>
+      </div>
+    </div>
     <div class="atk-label">目标站点名</div>
     <input type="text" name="AtkSiteName" placeholder="输入内容..." autocomplete="off">
     <div class="atk-label">目标站点 URL</div>
     <input type="text" name="AtkSiteURL" placeholder="输入内容..." autocomplete="off">
     <div class="atk-label">启动参数（可选）</div>
     <textarea name="AtkPayload"></textarea>
-    <span class="atk-desc">启动参数查阅：“<a href="https://artalk.js.org/guide/transfer.html" target="_blank">文档 · 数据搬家</a>”</span>
+    <span class="atk-desc">参考「<a href="https://artalk.js.org/guide/transfer.html" target="_blank">文档 · 数据迁移</a>」</span>
     <button class="atk-btn" name="AtkSubmit">导入</button>
     </div>`
 
     const $form = this.$el.querySelector<HTMLSelectElement>('.atk-form')!
-    const $dataType = $form.querySelector<HTMLSelectElement>('[name="AtkDataType"]')!
-    const $dataFile = $form.querySelector<HTMLInputElement>('[name="AtkDataFile"]')!
-    const $dataFileLabel = $form.querySelector<HTMLInputElement>('.atk-data-file-label')!
+
+    const $fileWrap = $form.querySelector<HTMLElement>('.atk-file-input-wrap')!
+    const $file = $fileWrap.querySelector<HTMLInputElement>('[name="AtkDataFile"]')!
+    const $fileDesc = $fileWrap.querySelector<HTMLElement>('.atk-desc')!
+    const fileDescOrgHTML = $fileDesc.innerHTML
+    const restoreFileInput = () => {
+      $fileDesc.innerHTML = fileDescOrgHTML
+      $file.value = ''
+    }
+
+    // 文件上传
+    const $uploadingWrap = $form.querySelector<HTMLElement>('.atk-uploading-wrap')!
+    const $uploadProgress = $uploadingWrap.querySelector<HTMLElement>('.atk-progress')!
+    const $uploadProgressBar = $uploadProgress.querySelector<HTMLElement>('.atk-bar')!
+    const $uploadStatus = $uploadingWrap.querySelector<HTMLElement>('.atk-status')!
+    const $uploadStatusCurt = $uploadStatus.querySelector<HTMLElement>('.atk-curt')!
+    const $uploadAbortBtn = $uploadStatus.querySelector<HTMLElement>('.atk-abort')!
+
     const $siteName = $form.querySelector<HTMLInputElement>('[name="AtkSiteName"]')!
     const $siteURL = $form.querySelector<HTMLInputElement>('[name="AtkSiteURL"]')!
     const $payload = $form.querySelector<HTMLTextAreaElement>('[name="AtkPayload"]')!
     const $submitBtn = $form.querySelector<HTMLButtonElement>('[name="AtkSubmit"]')!
     const setError = (msg: string) => window.alert(msg)
 
-    $dataType.onchange = () => {
-      if (['typecho'].includes($dataType.value)) {
-        $dataFile.style.display = 'none'
-        $dataFileLabel.style.display = 'none'
-      } else {
-        $dataFile.style.display = ''
-        $dataFileLabel.style.display = ''
+    const showUploading = () => {
+      $fileWrap.style.display = 'none'
+      $uploadingWrap.style.display = ''
+      setUploading(0)
+    }
+
+    const hideUploading = () => {
+      $fileWrap.style.display = ''
+      $uploadingWrap.style.display = 'none'
+    }
+
+    const setUploading = (progress: number) => {
+      $uploadProgressBar.style.width = `${progress}%`
+      $uploadStatusCurt.innerText = `${progress}%`
+    }
+
+    let UploadedFilename: string = ''
+
+    hideUploading()
+
+    // 文件上传操作
+    $file.onchange = () => {
+      if (!$file.files || $file.files.length < 0) return
+
+      showUploading()
+      UploadedFilename = ''
+
+      const xhr = new XMLHttpRequest()
+
+      // 进度条
+      xhr.upload.addEventListener('progress', (evt) => {
+        if (evt.loaded === evt.total) {
+          // 上传完毕
+          setUploading(100)
+          return
+        }
+
+        const fileSize = $file.files![0].size
+        if (evt.loaded <= fileSize) {
+          // 正在上传
+          const percent = Math.round(evt.loaded / fileSize * 100)
+          setUploading(percent)
+        }
+      })
+
+      // 创建上传参数
+      const formData = new FormData()
+      formData.append('file', $file.files[0])
+      formData.append('token', this.ctx.user.data.token)
+
+      // 开始上传
+      xhr.open('post', `${this.ctx.conf.server}/admin/import-upload`)
+      xhr.timeout = 2*60*1000 // 2min
+      xhr.send(formData)
+
+      // 上传成功事件
+      xhr.onload = () => {
+        const setErr = (msg: string): void => {
+          restoreFileInput()
+          hideUploading()
+          alert(`文件上传失败，${msg}`)
+        }
+
+        if (xhr.status !== 200) {
+          setErr(`响应状态码：${xhr.status}`)
+          return
+        }
+
+        let json: any
+        try {
+          json = JSON.parse(xhr.response)
+        } catch (err) {
+          console.error(err)
+          setErr(`JSON 解析失败：${err}`)
+          return
+        }
+
+        if (!json.success || !json.data.filename) {
+          setErr(`响应：${xhr.response}`)
+          return
+        }
+
+        $fileDesc.innerHTML = '文件已成功上传，可以开始导入'
+        UploadedFilename = json.data.filename
+        hideUploading()
+      }
+
+      // 中止上传
+      $uploadAbortBtn.onclick = () => {
+        xhr.abort()
+        restoreFileInput()
+        hideUploading()
       }
     }
 
+    // 开始导入按钮
     $submitBtn.onclick = () => {
-      const dataType = $dataType.value.trim()
+      if (!UploadedFilename) {
+        setError(`请先上传 Artrans 数据文件`)
+        return
+      }
+
       const siteName = $siteName.value.trim()
       const siteURL = $siteURL.value.trim()
       const payload = $payload.value.trim()
 
-      if (dataType === '') {
-        setError('请选择数据类型')
-        return
-      }
-
       // 请求 payload 参数制备
       let rData: any = {}
       if (payload) {
@@ -105,7 +205,7 @@ export default class TransferView extends SidebarView {ß
           return
         }
 
-        if (rData !instanceof Object) {
+        if (typeof rData !== 'object' || Array.isArray(rData)) {
           setError(`Payload 需为 JSON 对象`)
           return
         }
@@ -114,7 +214,7 @@ export default class TransferView extends SidebarView {ß
       if (siteURL) rData.t_url = siteURL
 
       // 创建导入会话
-      const createSession = (dataStr?: string) => {
+      const createSession = (filename?: string) => {
         const $logWrap = this.$el.querySelector<HTMLElement>('.atk-log-wrap')!
         const $log = $logWrap.querySelector<HTMLElement>('.atk-log')!
         const $backBtn = this.$el.querySelector<HTMLElement>('.atk-log-back-btn')!
@@ -125,9 +225,12 @@ export default class TransferView extends SidebarView {ß
         $backBtn.onclick = () => {
           $logWrap.style.display = 'none'
           $form.style.display = ''
+          restoreFileInput()
+          UploadedFilename = ''
+          this.sidebar.reload()
         }
 
-        if (dataStr) rData.json_data = dataStr
+        if (filename) rData.json_file = filename
 
         // 创建 iframe
         const frameName = `f_${+new Date()}`
@@ -138,7 +241,6 @@ export default class TransferView extends SidebarView {ß
         $log.append($frame)
 
         const formParams: {[k: string]: string} = {
-          type: dataType,
           payload: JSON.stringify(rData),
           token: this.ctx.user.data.token || '',
         }
@@ -163,20 +265,8 @@ export default class TransferView extends SidebarView {ß
         $formTmp.remove()
       }
 
-      const reader = new FileReader()
-      reader.onload = () => {
-        const data = String(reader.result)
-        createSession(data)
-      }
-
-      // 是否已选择文件
-      if ($dataFile.files?.length) {
-        // 先读取文件
-        reader.readAsText($dataFile.files[0])
-      } else {
-        // 直接开始会话
-        createSession()
-      }
+      // 直接开始会话
+      createSession(UploadedFilename)
     }
   }
 
@@ -185,7 +275,7 @@ export default class TransferView extends SidebarView {ß
 
     try {
       const d = await new Api(this.ctx).export()
-      this.download(`artrans-${this.getYmdHisFilename()}.json`, d)
+      this.download(`backup-${this.getYmdHisFilename()}.artrans`, d)
     } catch (err: any) {
       console.log(err)
       window.alert(`${String(err)}`)

packages/artalk-sidebar/src/sidebar.html

@@ -1,4 +1,4 @@
-<div class="atk-sidebar">
+<div class="atk-sidebar artalk">
   <div class="atk-sidebar-inner">
     <div class="atk-sidebar-header">
       <span class="atk-avatar">
@@ -7,7 +7,7 @@
       <span class="atk-menu">
         <span class="atk-item atk-active atk-sidebar-title">控制中心</span>
       </span>
-      <div class="atk-sidebar-close"><i class="atk-icon atk-icon-close"></i></div>
+      <div class="atk-sidebar-close" style="opacity: 0;"><i class="atk-icon atk-icon-close"></i></div>
     </div>
     <div class="atk-sidebar-nav">
       <div class="akt-curt-view-btn">

packages/artalk-sidebar/src/style/_extend.less

@@ -69,7 +69,7 @@
 
   .atk-item {
     &:hover {
-      background: @color-bg-grey;
+      background: var(--at-color-bg-grey);
     }
 
     &:not(:last-child) {
@@ -91,10 +91,10 @@
   }
 
   .atk-icon {
-    background-color: @color-meta;
+    background-color: var(--at-color-meta);
   }
 
   .atk-icon-yes {
-    background-color: @color-main;
+    background-color: var(--at-color-main);
   }
 }

packages/artalk-sidebar/src/style/_variables.less

@@ -0,0 +1,4 @@
+@font-family: "Helvetica Neue", "PingFangSC-Light", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
+@font-size: 14px;
+@line-height: 1.6em;
+@block-radius: 4px;

packages/artalk-sidebar/src/style/item-text-editor.less

@@ -1,6 +1,6 @@
 .atk-item-text-editor-layer {
   z-index: 999;
-  background: @color-bg;
+  background: var(--at-color-bg);
   position: absolute;
   left: 0;
   top: 0;
@@ -19,7 +19,7 @@
       width: 100%;
       padding: 3px 5px;
       border: 0;
-      border-bottom: 1px solid @color-border;
+      border-bottom: 1px solid var(--at-color-border);
       outline: none;
       background: transparent;
 

packages/artalk-sidebar/src/style/page-list.less

@@ -7,7 +7,7 @@
     align-items: center;
 
     &:not(:last-child) {
-      border-bottom: 1px solid @color-border;
+      border-bottom: 1px solid var(--at-color-border);
     }
   }
 
@@ -18,13 +18,13 @@
     padding: 20px 30px;
 
     .atk-title {
-      color: @color-font;
+      color: var(--at-color-font);
       font-size: 21px;
       margin-bottom: 10px;
     }
 
     .atk-sub {
-      color: @color-sub;
+      color: var(--at-color-sub);
       font-size: 14px;
     }
   }
@@ -39,7 +39,7 @@
 
   .atk-page-edit-layer {
     z-index: 999;
-    background: @color-bg;
+    background: var(--at-color-bg);
     position: absolute;
     width: 100%;
     height: 100%;

packages/artalk-sidebar/src/style/sidebar.less

@@ -4,14 +4,12 @@
 .atk-sidebar {
   @width: 430px;
   position: fixed;
-  z-index: 99999;
+  z-index: 99998;
   top: 0;
   right: 0;
   width: @width;
   height: 100%;
-  background: @color-bg;
-  transition: transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
-  transform: translate(@width, 0px);
+  background: var(--at-color-bg);
 
   @media only screen and (max-width: @width) {
     & {
@@ -28,7 +26,7 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    border-bottom: 1px solid @color-border;
+    border-bottom: 1px solid var(--at-color-border);
 
     .atk-avatar {
       display: flex;
@@ -42,11 +40,11 @@
         height: @height;
         width: @header-height - 30px;
         border-radius: 2px;
-        background: @color-meta;
+        background: var(--at-color-meta);
         text-align: center;
         line-height: @height;
         font-size: 13px;
-        color: @color-bg;
+        color: var(--at-color-bg);
       }
 
       .atk-site-logo {
@@ -61,7 +59,7 @@
 
       .atk-item {
         position: relative;
-        color: @color-sub;
+        color: var(--at-color-sub);
         font-size: 20px;
         // cursor: pointer;
         user-select: none;
@@ -71,7 +69,7 @@
         }
 
         &.atk-active {
-          color: @color-font;
+          color: var(--at-color-font);
 
           &:after {
             content: ' ';
@@ -80,7 +78,7 @@
             left: 0;
             width: 100%;
             height: 6px;
-            background: @color-main;
+            background: var(--at-color-main);
             opacity: .4;
           }
         }
@@ -108,14 +106,14 @@
   .atk-sidebar-nav {
     display: flex;
     flex-direction: row;
-    border-bottom: 1px solid @color-border;
+    border-bottom: 1px solid var(--at-color-border);
     height: @nav-height + 1px;
 
     .akt-curt-view-btn {
       display: flex;
       align-items: center;
       padding: 0 20px;
-      border-right: 1px solid @color-border;
+      border-right: 1px solid var(--at-color-border);
       cursor: pointer;
       user-select: none;
       height: @nav-height;
@@ -123,7 +121,7 @@
       white-space: nowrap;
 
       &:hover {
-        background: @color-bg-grey;
+        background: var(--at-color-bg-grey);
       }
 
       .atk-icon {
@@ -135,7 +133,7 @@
           width: 14px;
           height: 1px;
           margin: 0 auto 4px;
-          background: @color-deep;
+          background: var(--at-color-deep);
           transform-origin: 20px;
 
           &:last-child {
@@ -185,18 +183,18 @@
       .atk-tab-item {
         line-height: @nav-height;
         height: @nav-height;
-        color: @color-sub;
+        color: var(--at-color-sub);
         cursor: pointer;
         user-select: none;
         padding: 0 20px;
         white-space: nowrap;
 
         &:hover {
-          background: @color-bg-grey;
+          background: var(--at-color-bg-grey);
         }
 
         &.atk-active {
-          color: @color-deep;
+          color: var(--at-color-deep);
         }
       }
     }
@@ -211,11 +209,11 @@
     top: 70px;
     transform: translateX(-50%);
     pointer-events: all;
-    background: @color-bg;
+    background: var(--at-color-bg);
     width: 80%;
     max-height: 40%;
     margin: 0 auto;
-    border: 1px solid @color-border;
+    border: 1px solid var(--at-color-border);
     border-radius: 4px;
     overflow-y: auto;
 
@@ -236,22 +234,22 @@
           width: 20px;
           height: 20px;
           line-height: 20px;
-          background: @color-meta;
+          background: var(--at-color-meta);
           margin: 10px;
           border-radius: 3px;
           text-align: center;
-          color: @color-bg;
+          color: var(--at-color-bg);
           font-size: 12px;
         }
 
         .atk-site-name {
-          color: @color-font;
+          color: var(--at-color-font);
           font-size: 17px;
           margin-left: 7px;
         }
 
         &.atk-active, &:hover {
-          background: @color-bg-grey;
+          background: var(--at-color-bg-grey);
         }
       }
     }
@@ -269,7 +267,7 @@
       right: 0;
       top: 0;
       font-size: 35px;
-      color: @color-meta;
+      color: var(--at-color-meta);
       pointer-events: none;
       height: 100%;
       display: flex;
@@ -286,16 +284,16 @@
     .atk-label {
       font-size: 16px;
       margin-bottom: 12px;
-      color: @color-font;
+      color: var(--at-color-font);
     }
 
     .atk-desc {
       font-size: 14px;
-      margin-top: 12px;
+      margin-top: 10px;
       margin-left: 15px;
-      margin-bottom: 20px;
+      margin-bottom: 25px;
       display: block;
-      color: @color-meta;
+      color: var(--at-color-meta);
 
       a {
         opacity: 0.8;
@@ -308,24 +306,46 @@
       padding: 0 10px;
       margin: 0;
       border: none;
-      border-bottom: 2px solid @color-border;
+      border-bottom: 2px solid var(--at-color-border);
       outline: none;
       width: 100%;
       margin-bottom: 25px;
-      background: @color-bg;
+      background: var(--at-color-bg);
 
       &:focus {
-        border-bottom-color: @color-bg-light;
+        border-bottom-color: var(--at-color-bg-light);
       }
 
       &[type="file"] {
-        border-radius: 2px;
         background: transparent;
-        border-bottom: 2px solid @color-border;
+        border: 2px solid var(--at-color-border);
         cursor: pointer;
         position: relative;
         padding: 0 15px;
-        margin-bottom: 30px;
+        margin-bottom: 17px;
+        border-radius: 50px;
+
+        &:hover {
+          background: var(--at-color-bg-light);
+          border-color: var(--at-color-bg-light);
+        }
+      }
+
+      &[type="file"]::-webkit-file-upload-button {
+        background: transparent;
+        color: #000;
+        border: 0;
+        border-right: 2px solid #eee;
+        border-left: 0;
+        border-top: 0;
+        border-bottom: 0;
+        padding: 0 20px 0 10px;
+        line-height: 25px;
+        margin-right: 15px;
+        cursor: pointer;
+        transition: .2s ease;
+        -webkit-appearance: none;
+        border-radius: 0;
       }
     }
 
@@ -343,36 +363,81 @@
       padding: 5px 10px;
       width: 100%;
       border: none;
-      border-bottom: 2px solid @color-border;
+      border-bottom: 2px solid var(--at-color-border);
       margin-bottom: 25px;
       -webkit-appearance: none;
       border-radius: 0;
-      background: @color-bg;
+      background: var(--at-color-bg);
     }
 
     button {
       &:hover {
-        background: @color-bg-light;
+        background: var(--at-color-bg-light);
       }
 
       text-align: center;
-      color: @color-light;
+      color: var(--at-color-light);
       background: transparent;
-      border: 2px solid @color-bg-light;
+      border: 2px solid var(--at-color-bg-light);
       line-height: @form-height;
       letter-spacing: 2em;
       text-indent: 2em; // center
       cursor: pointer;
       outline: none;
       padding: 0 20px;
-      border-radius: 4px;
+      border-radius: 50px;
       margin: 0 5px;
       width: 100%;
+      user-select: none;
     }
 
     input, select, button {
       font-size: 15px;
     }
+
+    .atk-file-upload-group {
+      height: 100px;
+      overflow: hidden;
+    }
+
+    .atk-uploading-wrap {
+      .atk-progress {
+        width: 100%;
+        height: 12px;
+        display: block;
+        overflow: hidden;
+        background: #eee;
+        border-radius: 100px;
+        margin-bottom: 7px;
+        margin-top: 20px;
+
+        .atk-bar {
+          transition: 0.5s cubic-bezier(0.075, 0.82, 0.165, 1);
+          background: var(--at-color-main);
+          height: 100%;
+          width: 0%;
+          opacity: 0.7;
+        }
+      }
+
+      .atk-status {
+        color: var(--at-color-meta);
+        font-size: 14px;
+
+        .atk-curt {
+          color: var(--at-color-main)
+        }
+
+        .atk-abort {
+          cursor: pointer;
+          float: right;
+
+          &:hover {
+            color: var(--at-color-main);
+          }
+        }
+      }
+    }
   }
 
   .atk-log-wrap {
@@ -381,7 +446,7 @@
       padding: 5px 33px;
       cursor: pointer;
       user-select: none;
-      border-right: 1px solid @color-border;
+      border-right: 1px solid var(--at-color-border);
       border-left: 1px solid transparent;
       &:hover {
         background: #f4f4f4;
@@ -409,8 +474,8 @@
     width: 100%;
     bottom: 0;
     left: 0;
-    background: @color-bg;
-    border-top: 1px solid @color-border;
+    background: var(--at-color-bg);
+    border-top: 1px solid var(--at-color-border);
   }
 
   .atk-list-read-more {

packages/artalk-sidebar/src/style/site-list.less

@@ -25,7 +25,7 @@
         border-radius: 2px;
 
         &:hover {
-          background: @color-bg-grey;
+          background: var(--at-color-bg-grey);
         }
       }
     }
@@ -58,7 +58,7 @@
         height: 65px;
         width: 65px;
         line-height: 65px;
-        background: @color-quote;
+        background: #687a86;
         color: #fff;
         border-radius: 4px;
       }
@@ -66,25 +66,25 @@
       .atk-site-name {
         text-align: center;
         font-size: 15px;
-        color: @color-sub;
+        color: var(--at-color-sub);
         padding: 0 17px;
         word-break: break-word;
       }
 
       &.atk-active {
-        background-color: @color-bg-grey;
-        border: 1px solid @color-border;
+        background-color: var(--at-color-bg-grey);
+        border: 1px solid var(--at-color-border);
         margin-top: -1px;
         border-radius: 0 0 4px 4px;
 
         .atk-site-name {
-          color: @color-deep;
+          color: var(--at-color-deep);
         }
       }
 
       &:hover {
         .atk-site-name {
-          color: @color-font;
+          color: var(--at-color-font);
         }
       }
     }
@@ -94,8 +94,8 @@
     position: relative;
     min-height: 120px;
     width: 100%;
-    border-top: 1px solid @color-border;
-    border-bottom: 1px solid @color-border;
+    border-top: 1px solid var(--at-color-border);
+    border-bottom: 1px solid var(--at-color-border);
     margin-bottom: -10px;
 
     .atk-header {
@@ -117,7 +117,7 @@
             position: absolute;
             width: 100%;
             height: 6px;
-            background: @color-main;
+            background: var(--at-color-main);
             opacity: .4;
             left: 0;
             bottom: 6px;
@@ -132,8 +132,8 @@
           min-height: 23px;
 
           .atk-url-item {
-            background: @color-bg-grey;
-            color: @color-font;
+            background: var(--at-color-bg-grey);
+            color: var(--at-color-font);
             border-radius: 2px;
             padding: 0 8px;
             font-size: 13px;
@@ -156,7 +156,7 @@
         cursor: pointer;
 
         &:hover i {
-          background-color: @color-red;
+          background-color: var(--at-color-red);
         }
       }
     }

packages/artalk-sidebar/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "dist",
+    "paths": {
+      "~/*": ["./*"],
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["./src", "./types"]
+}

packages/artalk-sidebar/types/index.d.ts

@@ -0,0 +1,3 @@
+import ArtalkSidebar from '../src/main'
+
+export default ArtalkSidebar

packages/artalk-sidebar/vite.config.ts

@@ -0,0 +1,26 @@
+import { defineConfig } from 'vite'
+import { resolve } from 'path'
+import tsconfigPaths from 'vite-tsconfig-paths'
+import { version as artalkVersion } from 'artalk/package.json'
+import { version as sidebarVersion } from './package.json'
+
+export default defineConfig({
+  base: './',
+  define: {
+    ARTALK_VERSION: JSON.stringify(artalkVersion),
+    ARTALK_SIDEBAR_VERSION: JSON.stringify(sidebarVersion)
+  },
+  build: {
+    target: 'es2015',
+    outDir: resolve(__dirname, "dist"),
+    minify: 'terser'
+  },
+  plugins: [tsconfigPaths()],
+  css: {
+    preprocessorOptions: {
+      less: {
+         additionalData: `@import "./src/style/_variables.less";@import "./src/style/_extend.less";`
+     },
+    },
+  },
+})

packages/artalk/index.html

@@ -29,11 +29,14 @@
     body.dark-mode .to-night { background: #fff;border: 1px solid #2d3235;color: #0083ff; }
     .to-top { right: 25px; }
   </style>
+  <!--<link rel="stylesheet"
+      href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.5.1/styles/arta.min.css">
+  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.5.1/highlight.min.js"></script>-->
 </head>
 <body>
-  <div class="card billboard artalk-fade-in">
+  <div class="card billboard atk-fade-in">
     <div class="title"><a href="https://github.com/ArtalkJS/Artalk" target="_blank"><span>『 </span>Artalk<span> 』</span></a></div>
-    <div class="desc">一款简洁的自托管评论系统</div>
+    <div class="desc">一款简洁的自托管评论系统 <span id="ArtalkPV"></span></div>
     <div class="social">
       <a href="https://www.npmjs.com/package/artalk" target="_blank"><img src="https://img.shields.io/npm/v/artalk.svg?style=flat-square"></a>
       <a href="https://www.npmjs.com/package/artalk" target="_blank"><img src="https://img.shields.io/npm/dt/artalk.svg?style=flat-square"></a>
@@ -42,11 +45,11 @@
       <a href="https://github.com/ArtalkJS/Artalk" target="_blank"><img src="https://img.shields.io/github/stars/ArtalkJS/Artalk?style=flat-square"></a>
     </div>
   </div>
-  <div class="card artalk-fade-in">
+  <div class="card atk-fade-in">
     <div id="comments"></div>
   </div>
-  <div class="float-btn to-night artalk-fade-in">Blink</div>
-  <div class="float-btn to-top artalk-fade-in" style="display: none;">TOP</div>
+  <div class="float-btn to-night atk-fade-in">Blink</div>
+  <div class="float-btn to-top atk-fade-in" style="display: none;">TOP</div>
 
   <script type="module">
     import Artalk from './src/main'
@@ -54,7 +57,7 @@
       el: '#comments',
       pageKey: 'https://artalk.js.org/',
       pageTitle: 'Artalk Home',
-      server: (location.hostname === 'localhost' || location.hostname === '127.0.0.1') ? 'http://localhost:23366/api' : 'https://artalk.qwqaq.com/api',
+      server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : 'https://artalk.qwqaq.com/api',
       site: 'ArtalkDemo',
     });
 

packages/artalk/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "artalk",
+  "version": "2.2.3",
+  "backendMinVersion": "2.1.1",
+  "license": "LGPL-3.0",
+  "description": "A Selfhosted Comment System",
+  "keywords": [
+    "comment-system",
+    "comments-widget",
+    "comment",
+    "comments",
+    "blog"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ArtalkJS/Artalk.git",
+    "directory": "packages/artalk"
+  },
+  "homepage": "https://artalk.js.org",
+  "bugs": "https://github.com/ArtalkJS/Artalk/issue",
+  "main": "./dist/Artalk.js",
+  "unpkg": "./dist/Artalk.iife.js",
+  "jsdelivr": "./dist/Artalk.iife.js",
+  "module": "./dist/Artalk.es.js",
+  "types": "./types/index.d.ts",
+  "scripts": {
+    "dev": "vite",
+    "build": "pnpm lint && vite build",
+    "build:demo": "vite build --config vite-demo.config.ts",
+    "serve": "vite preview",
+    "deploy": "gh-pages -d deploy",
+    "predeploy": "pnpm build && pnpm build:demo && pnpm copy:deploy",
+    "copy:deploy": "cp -r dist deploy && cp CNAME deploy",
+    "lint": "eslint --ext .js,.ts src"
+  },
+  "devDependencies": {
+    "@types/marked": "^4.0.3"
+  },
+  "dependencies": {
+    "hanabi": "^0.4.0",
+    "insane": "^2.6.2",
+    "marked": "^4.0.14"
+  }
+}

packages/artalk/src/api/index.ts

@@ -1,6 +1,7 @@
 import Context from '../context'
 import { CommentData, ListData, UserData, PageData, SiteData, NotifyData } from '~/types/artalk-data'
 import { Fetch, ToFormData, POST, GET } from './request'
+import * as Utils from '../lib/utils'
 
 export default class Api {
   private ctx: Context
@@ -16,15 +17,14 @@ export default class Api {
   // ============================
 
   /** 评论 · 获取 */
-  public get(offset: number, type?: string, flatMode?: boolean, paramsEditor?: (params: any) => void) {
+  public get(offset: number, pageSize: number, flatMode?: boolean, paramsEditor?: (params: any) => void) {
     const params: any = {
       page_key: this.ctx.conf.pageKey,
       site_name: this.ctx.conf.site || '',
-      limit: this.ctx.conf.pagination?.pageSize || 15,
+      limit: pageSize,
       offset,
     }
 
-    if (type) params.type = type
     if (flatMode) params.flat_mode = flatMode // 平铺模式
     if (this.ctx.user.checkHasBasicUserInfo()) {
       params.name = this.ctx.user.data.nick
@@ -45,6 +45,7 @@ export default class Api {
       content: comment.content,
       rid: comment.rid,
       page_key: comment.page_key,
+      ua: await Utils.getCorrectUserAgent(), // 需要后端支持，获取修正后的 UA (针对 Win11)
     }
 
     if (comment.page_title) params.page_title = comment.page_title
@@ -116,6 +117,12 @@ export default class Api {
     }
   }
 
+  /** 用户 · 登录状态 */
+  public async loginStatus() {
+    const data = await POST<any>(this.ctx, `${this.baseURL}/login-status`)
+    return (data || { is_login: false }) as { is_login: boolean }
+  }
+
   // ============================
   //  页面 Page
   // ============================
@@ -251,19 +258,60 @@ export default class Api {
     return POST(this.ctx, `${this.baseURL}/mark-read`, params)
   }
 
+  /** PV */
+  public async pv() {
+    const params: any = {
+      site_name: this.ctx.conf.site || '',
+      page_key: this.ctx.conf.pageKey || '',
+      page_title: this.ctx.conf.pageTitle || ''
+    }
+
+    const p = await POST<any>(this.ctx, `${this.baseURL}/pv`, params)
+    return p.pv as number
+  }
+
+  /** 图片上传 */
+  public async imgUpload(file: File) {
+    const params: any = {
+      name: this.ctx.user.data.nick,
+      email: this.ctx.user.data.email,
+      page_key: this.ctx.conf.pageKey,
+    }
+
+    if (this.ctx.conf.site) params.site_name = this.ctx.conf.site
+
+    const form = ToFormData(params)
+    form.set('file', file)
+
+    const init: RequestInit = {
+      method: 'POST',
+      body: form
+    }
+
+    const json = await Fetch(this.ctx, `${this.baseURL}/img-upload`, init)
+    return ((json.data || {}) as any) as { img_file: string, img_url: string }
+
+  }
+
   // ============================
   //  验证码
   // ============================
 
   /** 验证码 · 获取 */
   public async captchaGet() {
-    const data = await GET<any>(this.ctx, `${this.baseURL}/captcha/refresh`)
+    const data = await POST<any>(this.ctx, `${this.baseURL}/captcha/refresh`)
     return (data.img_data || '') as string
   }
 
   /** 验证码 · 检验 */
   public async captchaCheck(value: string) {
-    const data = await GET<any>(this.ctx, `${this.baseURL}/captcha/check`, { value })
+    const data = await POST<any>(this.ctx, `${this.baseURL}/captcha/check`, { value })
     return (data.img_data || '') as string
   }
+
+  /** 验证码 · 状态 */
+  public async captchaStatus() {
+    const data = await POST<any>(this.ctx, `${this.baseURL}/captcha/status`)
+    return (data || { is_pass: false }) as { is_pass: boolean }
+  }
 }

packages/artalk/src/api/request.ts

@@ -21,7 +21,9 @@ export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit,
       resp = await timeoutPromise(timeout || ctx.conf.reqTimeout || 15000, fetch(input, init))
     }
 
-    if (!resp.ok && resp.status !== 401) throw new Error(`请求响应 ${resp.status}`)
+    const noAccessCodes = [401, 400]
+
+    if (!resp.ok && !noAccessCodes.includes(resp.status)) throw new Error(`请求响应 ${resp.status}`)
 
     // 解析获取响应的 json
     let json: any = await resp.json()
@@ -41,6 +43,7 @@ export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit,
       json = await (new Promise<any>((resolve, reject) => {
         ctx.trigger('checker-captcha', {
           imgData: json.data.img_data,
+          iframe: json.data.iframe,
           onSuccess: () => {
             recall(resolve, reject)
           },
@@ -49,7 +52,7 @@ export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit,
           }
         })
       }))
-    } else if ((json.data && json.data.need_login) || resp.status === 401) {
+    } else if ((json.data && json.data.need_login) || noAccessCodes.includes(resp.status)) {
       // 请求需要管理员权限
       json = await (new Promise<any>((resolve, reject) => {
         ctx.trigger('checker-admin', {

packages/artalk/src/artalk.ts

@@ -7,10 +7,12 @@ import defaults from './defaults'
 import CheckerLauncher from './lib/checker'
 import Editor from './components/editor'
 import List from './components/list'
-import Sidebar from './components/sidebar'
+import SidebarLayer from './components/sidebar-layer'
 
 import { GetLayerWrap } from './components/layer'
 import { EventPayloadMap, Handler } from '~/types/event'
+import Api from './api'
+import * as Utils from './lib/utils'
 
 /**
  * Artalk
@@ -26,7 +28,7 @@ export default class Artalk {
   public checkerLauncher: CheckerLauncher
   public editor: Editor
   public list: List
-  public sidebar: Sidebar
+  public sidebarLayer: SidebarLayer
 
   constructor (customConf: ArtalkConfig) {
     // 配置
@@ -58,6 +60,7 @@ export default class Artalk {
 
     // 组件初始化
     this.checkerLauncher = new CheckerLauncher(this.ctx)
+    Utils.initMarked(this.ctx) // 初始化 marked
 
     // 编辑器
     this.editor = new Editor(this.ctx)
@@ -68,14 +71,24 @@ export default class Artalk {
     this.$root.appendChild(this.list.$el)
 
     // 侧边栏
-    this.sidebar = new Sidebar(this.ctx)
-    this.$root.appendChild(this.sidebar.$el)
+    this.sidebarLayer = new SidebarLayer(this.ctx)
+    this.$root.appendChild(this.sidebarLayer.$el)
 
     // 评论获取
-    this.list.reqComments()
+    this.list.fetchComments(0)
 
     // 事件绑定初始化
     this.initEventBind()
+
+    // 其他
+    this.initPV()
+
+    // 插件初始化
+    Artalk.Plugins.forEach(plugin => {
+      if (typeof plugin === 'function') {
+        plugin(this.ctx)
+      }
+    })
   }
 
   /** 事件绑定 · 初始化 */
@@ -93,8 +106,12 @@ export default class Artalk {
 
       // for layer
       const { $wrap: $layerWrap } = GetLayerWrap(this.ctx)
-      if ($layerWrap)
-        $layerWrap.querySelectorAll<HTMLElement>(`[atk-only-admin-show]`).forEach(item => items.push(item))
+      if ($layerWrap) $layerWrap.querySelectorAll<HTMLElement>(`[atk-only-admin-show]`).forEach(item => items.push(item))
+
+      // for sidebar
+      // TODO: 这个其实应该写在 packages/artalk-sidebar 里面的
+      const $sidebarEl = document.querySelector<HTMLElement>('.atk-sidebar')
+      if ($sidebarEl) $sidebarEl.querySelectorAll<HTMLElement>(`[atk-only-admin-show]`).forEach(item => items.push(item))
 
       items.forEach(($item: HTMLElement) => {
         if (this.ctx.user.data.isAdmin)
@@ -113,7 +130,7 @@ export default class Artalk {
 
   /** 重新加载 */
   public reload() {
-    this.list.reqComments()
+    this.list.fetchComments(0)
   }
 
   /** 暗黑模式 · 初始化 */
@@ -140,9 +157,24 @@ export default class Artalk {
   /** 暗黑模式 · 设定 */
   public setDarkMode(darkMode: boolean) {
     this.ctx.conf.darkMode = darkMode
+    this.ctx.trigger('conf-updated')
     this.initDarkMode()
   }
 
+  /** PV */
+  public async initPV() {
+    if (!this.conf.pvEl || !document.querySelector(this.conf.pvEl))
+      return
+
+    const $pv = document.querySelector<HTMLElement>(this.conf.pvEl)!
+    // $pv.innerText = '-' // 默认占位符
+    const pvNum = await new Api(this.ctx).pv()
+    if (Number.isNaN(Number(pvNum)))
+      return
+
+    $pv.innerText = String(pvNum)
+  }
+
   /** 监听事件 */
   public on<K extends keyof EventPayloadMap>(name: K, handler: Handler<EventPayloadMap[K]>) {
     this.ctx.on(name, handler, 'external')
@@ -157,4 +189,12 @@ export default class Artalk {
   public trigger<K extends keyof EventPayloadMap>(name: K, payload?: EventPayloadMap[K]) {
     this.ctx.trigger(name, payload, 'external')
   }
+
+  /** Plugins */
+  protected static Plugins: ((ctx: Context) => void)[] = []
+
+  /** Enable Plugin */
+  public static Use(plugin: ((ctx: Context) => void)) {
+    this.Plugins.push(plugin)
+  }
 }

packages/artalk/src/components/action-btn.ts

@@ -102,7 +102,7 @@ export default class ActionBtn {
   }
 
   /** 设置加载状态 */
-  public setLoading(value = true, loadingText?: string) {
+  public setLoading(value: boolean, loadingText?: string) {
     if (this.isLoading === value) return
     this.isLoading = value
     if (value) {

packages/artalk/src/components/comment.ts

@@ -37,6 +37,8 @@ export default class Comment extends Component {
   private openURL?: string
   public openEvt?: () => void
 
+  public onReplyBtnClick?: Function
+
   constructor(ctx: Context, data: CommentData) {
     super(ctx)
 
@@ -53,11 +55,11 @@ export default class Comment extends Component {
   /** 渲染 UI */
   public render() {
     this.$el = Utils.createElement(CommentHTML)
-    this.$main = this.$el.querySelector('.atk-comment-main')!
+    this.$main = this.$el.querySelector('.atk-main')!
     this.$header = this.$el.querySelector('.atk-header')!
     this.$body = this.$el.querySelector('.atk-body')!
     this.$content = this.$body.querySelector('.atk-content')!
-    this.$actions = this.$el.querySelector('.atk-comment-actions')!
+    this.$actions = this.$el.querySelector('.atk-actions')!
     this.$children = null
 
     this.$el.setAttribute('data-comment-id', `${this.data.id}`)
@@ -134,6 +136,11 @@ export default class Comment extends Component {
       $badge.remove()
     }
 
+    if (this.data.is_pinned) {
+      const $pinnedBadge = Utils.createElement(`<span class="atk-item atk-pinned-badge">置顶</span>`) // 置顶徽章
+      $nick.insertAdjacentElement('afterend', $pinnedBadge)
+    }
+
     const $date = this.$el.querySelector<HTMLElement>('.atk-date')!
     $date.innerText = this.getDateFormatted()
     $date.setAttribute('data-atk-comment-date', String(+new Date(this.data.date)))
@@ -227,11 +234,15 @@ export default class Comment extends Component {
 
     // 绑定回复按钮事件
     if (this.data.is_allow_reply) {
-      const replyBtn = Utils.createElement(`<span data-atk-action="comment-reply">回复</span>`)
+      const replyBtn = Utils.createElement(`<span>回复</span>`)
       this.$actions.append(replyBtn)
       replyBtn.addEventListener('click', (e) => {
         e.stopPropagation() // 防止穿透
-        this.ctx.trigger('editor-reply', this.data)
+        if (!this.onReplyBtnClick) {
+          this.ctx.trigger('editor-reply', {data: this.data, $el: this.$el})
+        } else {
+          this.onReplyBtnClick()
+        }
       })
     }
 
@@ -266,6 +277,16 @@ export default class Comment extends Component {
     delBtn.setClick(() => {
       this.adminDelete(delBtn)
     })
+
+    // 绑定置顶按钮事件
+    const pinnedBtn = new ActionBtn({
+      text: () => (this.data.is_pinned ? '取消置顶' : '置顶'),
+      adminOnly: true
+    })
+    pinnedBtn.appendTo(this.$actions)
+    pinnedBtn.setClick(() => {
+      this.adminEdit('pinned', pendingBtn)
+    })
   }
   //#endregion
 
@@ -296,7 +317,7 @@ export default class Comment extends Component {
   }
 
   getIsRoot() {
-    return this.parent === null
+    return this.data.rid === 0
   }
 
   getChildren() {
@@ -310,6 +331,9 @@ export default class Comment extends Component {
 
     this.getChildrenEl().appendChild(childC.getEl())
     childC.playFadeInAnim()
+
+    // 内容限高
+    childC.checkHeightLimitArea('content')
   }
 
   getChildrenEl() {
@@ -395,9 +419,9 @@ export default class Comment extends Component {
     })
   }
 
-  /** 管理员 - 评论折叠 */
-  adminEdit(type: 'collapsed'|'pending', btnElem: ActionBtn) {
-    if (btnElem.isLoading) return // 若正在折叠中
+  /** 管理员 - 评论状态修改 */
+  adminEdit(type: 'collapsed'|'pending'|'pinned', btnElem: ActionBtn) {
+    if (btnElem.isLoading) return // 若正在修改中
 
     btnElem.setLoading(true, '修改中...')
 
@@ -407,6 +431,8 @@ export default class Comment extends Component {
       modify.is_collapsed = !modify.is_collapsed
     } else if (type === 'pending') {
       modify.is_pending = !modify.is_pending
+    } else if (type === 'pinned') {
+      modify.is_pinned = !modify.is_pinned
     }
 
     new Api(this.ctx).commentEdit(modify).then((comment) => {
@@ -459,4 +485,86 @@ export default class Comment extends Component {
     this.openURL = url
     this.$el.classList.add('atk-openable')
   }
+
+  /** 内容限高检测 */
+  checkHeightLimit() {
+    this.checkHeightLimitArea('content') // 评论内容限高
+    this.checkHeightLimitArea('children') // 子评论部分限高（嵌套模式）
+  }
+
+  /** 目标内容限高检测 */
+  checkHeightLimitArea(area: 'children'|'content') {
+    // 参数准备
+    const childrenMaxH = this.ctx.conf.heightLimit?.children
+    const contentMaxH = this.ctx.conf.heightLimit?.content
+
+    if (area === 'children' && !childrenMaxH) return
+    if (area === 'content' && !contentMaxH) return
+
+    // 限高
+    let maxHeight: number
+    if (area === 'children') maxHeight = childrenMaxH!
+    if (area === 'content') maxHeight = contentMaxH!
+
+    // 检测指定元素
+    const checkEl = ($el?: HTMLElement|null) => {
+      if (!$el) return
+
+      // 是否超过高度
+      if (Utils.getHeight($el) > maxHeight) {
+        this.heightLimitAdd($el, maxHeight)
+      }
+    }
+
+    // 执行限高检测
+    if (area === 'children') {
+      checkEl(this.$children)
+    } else if (area === 'content') {
+      checkEl(this.$content)
+      checkEl(this.$replyTo)
+
+      // 若有图片 · 图片加载完后再检测一次
+      Utils.onImagesLoaded(this.$content, () => {
+        checkEl(this.$content)
+      })
+      if (this.$replyTo) {
+        Utils.onImagesLoaded(this.$replyTo, () => {
+          checkEl(this.$replyTo)
+        })
+      }
+    }
+  }
+
+  // 操作 · 取消限高
+  heightLimitRemove($el: HTMLElement) {
+    if (!$el) return
+    if (!$el.classList.contains('atk-height-limit')) return
+
+    $el.classList.remove('atk-height-limit')
+    Array.from($el.children).forEach((e) => {
+      if (e.classList.contains('atk-height-limit-btn')) e.remove()
+    })
+    $el.style.height = ''
+    $el.style.overflow = ''
+  }
+
+  // 操作 · 内容限高
+  heightLimitAdd($el: HTMLElement, maxHeight: number) {
+    if (!$el) return
+    if ($el.classList.contains('atk-height-limit')) return
+
+    $el.classList.add('atk-height-limit')
+    $el.style.height = `${maxHeight}px`
+    $el.style.overflow = 'hidden'
+    const $hideMoreOpenBtn = Utils.createElement(`<div class="atk-height-limit-btn">阅读更多</span>`)
+    $hideMoreOpenBtn.onclick = (e) => {
+      e.stopPropagation()
+      this.heightLimitRemove($el)
+
+      // 子评论数等于 1，直接取消限高
+      const children = this.getChildren()
+      if (children.length === 1) children[0].heightLimitRemove(children[0].$content)
+    }
+    $el.append($hideMoreOpenBtn)
+  }
 }

packages/artalk/src/components/editor-plugs/emoticons-plug.less

@@ -2,44 +2,55 @@
   height: 100%;
   width: 100%;
 
-  .atk-emoticons-list-wrap {
+  & > .atk-grp-wrap {
     .atk-slim-scrollbar();
     overflow-y: scroll;
     overflow-x: hidden;
     height: 100%; // calc(100% - 30px);
     width: 100%;
 
-    .atk-emoticons-list {
+    & > .atk-grp {
+      display: flex;
+      flex-wrap: wrap;
+      flex-direction: row;
       padding: 5px 10px 35px 10px;
 
-      .atk-emoticons-item {
-        display: inline-block;
+      &[data-type="image"] > .atk-item {
+        height: 63px;
+        width: 63px;
+      }
+
+      & > .atk-item {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         padding: 5px;
         cursor: pointer;
         user-select: none;
         border-radius: 2px;
         font-size: 16px;
+        min-width: 35px;
 
         & > img {
-          max-height: 60px;
+          max-height: 100%;
           width: auto;
         }
 
         &:hover {
-          background: @color-bg-grey;
+          background: var(--at-color-bg-grey);
         }
       }
     }
   }
 
-  .atk-emoticons-types {
+  & > .atk-grp-switcher {
     position: absolute;
     bottom: 0;
     left: 0;
     width: 100%;
-    background: @color-bg-transl;
+    background: var(--at-color-bg-transl);
     height: 30px;
-    border-top: 1px solid @color-border;
+    border-top: 1px solid var(--at-color-border);
 
     & > span {
       user-select: none;
@@ -52,9 +63,8 @@
 
       &:hover,
       &.active {
-        background: @color-bg-grey;
+        background: var(--at-color-bg-grey);
       }
     }
   }
-
 }

packages/artalk/src/components/editor-plugs/emoticons-plug.ts

@@ -17,8 +17,8 @@ export default class EmoticonsPlug extends EditorPlug {
   public $el!: HTMLElement
   public emoticons: EmoticonListData = []
 
-  public $listWrap!: HTMLElement
-  public $types!: HTMLElement
+  public $grpWrap!: HTMLElement
+  public $grpSwitcher!: HTMLElement
 
   constructor (public editor: Editor) {
     super(editor)
@@ -31,43 +31,69 @@ export default class EmoticonsPlug extends EditorPlug {
   async init() {
     // 数据处理
     Ui.showLoading(this.$el)
-
-    if (typeof this.ctx.conf.emoticons === 'string') {
-      this.emoticons = await this.remoteLoad(this.ctx.conf.emoticons)
-    } else {
-      this.emoticons = this.ctx.conf.emoticons
-    }
-
-    this.checkConvertOwO()
-
-    if (!Array.isArray(this.emoticons)) {
-      Ui.setError(this.$el, "表情包数据必须为 Array 类型")
-      Ui.hideLoading(this.$el)
-      return
-    }
-
-    // 加载子内容
-    await Promise.all(this.emoticons.map(async (grp, index) => {
-      if (typeof grp === "string") {
-        const grpData = await this.remoteLoad(grp)
-        if (grpData) {
-          this.emoticons[index] = grpData
-        }
-      }
-    }))
-
+    this.emoticons = await this.handleData(this.ctx.conf.emoticons)
     Ui.hideLoading(this.$el)
 
-
-
-
-    this.solveNullKey()
-    this.solveSameKey()
-
     // 初始化元素
     this.initEmoticonsList()
   }
 
+  async handleData(data: any): Promise<any[]> {
+    if (!Array.isArray(data) && ['object', 'string'].includes(typeof data)) {
+      data = [data]
+    }
+
+    if (!Array.isArray(data)) {
+      Ui.setError(this.$el, "表情包数据必须为 Array/Object/String 类型")
+      Ui.hideLoading(this.$el)
+      return []
+    }
+
+    const pushGrp = (grp: EmoticonGrpData) => {
+      if (typeof grp !== 'object') return
+      if (grp.name && data.find(o => o.name === grp.name)) return
+      data.push(grp)
+    }
+
+    // 加载子内容
+    const remoteLoad = async (d: any[]) => {
+      await Promise.all(d.map(async (grp, index) => {
+        if (typeof grp === 'object' && !Array.isArray(grp)) {
+          pushGrp(grp)
+        } else if (Array.isArray(grp)) {
+          await remoteLoad(grp)
+        } else if (typeof grp === "string") {
+          const grpData = await this.remoteLoad(grp)
+
+          if (Array.isArray(grpData)) await remoteLoad(grpData)
+          else if (typeof grpData === 'object') pushGrp(grpData)
+        }
+      }))
+    }
+    await remoteLoad(data)
+
+    // 处理数组数据
+    data.forEach((item: any) => {
+      if (this.isOwOFormat(item)) {
+        const c = this.convertOwO(item)
+        c.forEach((grp) => { pushGrp(grp) })
+      } else if (Array.isArray(item)) {
+        item.forEach((grp) => { pushGrp(grp) })
+      }
+    })
+
+    // 剔除非法数据
+    data = data.filter((item: any) => (typeof item === 'object' && !Array.isArray(item) && !!item && !!item.name))
+
+    console.log(data)
+
+    this.solveNullKey(data)
+    this.solveSameKey(data)
+
+    return data
+  }
+
+  /** 远程加载 */
   async remoteLoad(url: string): Promise<any> {
     if (!url) return []
 
@@ -82,17 +108,19 @@ export default class EmoticonsPlug extends EditorPlug {
     }
   }
 
-  solveNullKey() {
-    this.emoticons.forEach((grp) => {
+  /** 避免表情 item.key 为 null 的情况 */
+  solveNullKey(data: EmoticonGrpData[]) {
+    data.forEach((grp) => {
       grp.items.forEach((item, index) => {
         if (!item.key) item.key = `${grp.name} ${index+1}`
       })
     })
   }
 
-  solveSameKey() {
+  /** 避免相同 item.key */
+  solveSameKey(data: EmoticonGrpData[]) {
     const tmp: {[key: string]: number} = {}
-    this.emoticons.forEach((grp) => {
+    data.forEach((grp) => {
       grp.items.forEach(item => {
         if (!item.key || String(item.key).trim() === "") return
         if (!tmp[item.key]) tmp[item.key] = 1
@@ -103,12 +131,7 @@ export default class EmoticonsPlug extends EditorPlug {
     })
   }
 
-  checkConvertOwO() {
-    if (this.isOwOFormat(this.emoticons)) {
-      this.emoticons = this.convertOwO(this.emoticons as any)
-    }
-  }
-
+  /** 判断是否为 OwO 格式 */
   isOwOFormat(data: any) {
     try {
       return (typeof data === 'object') && !!Object.values(data).length
@@ -117,6 +140,7 @@ export default class EmoticonsPlug extends EditorPlug {
     } catch { return false }
   }
 
+  /** 转换 OwO 格式数据 */
   convertOwO(owoData: OwOFormatType): EmoticonListData {
     const dest: EmoticonListData = []
     Object.entries(owoData).forEach(([grpName, grp]) => {
@@ -125,7 +149,7 @@ export default class EmoticonsPlug extends EditorPlug {
         // 图片标签提取 src 属性值
         const iconStr = item.icon
         if (/<(img|IMG)/.test(iconStr)) {
-          const find = /src=["'](.*)["']/.exec(iconStr)
+          const find = /src=["'](.*?)["']/.exec(iconStr)
           if (find && find.length > 1) item.icon = find[1]
         }
         nGrp.items.push({ key: item.text || `${grpName} ${index+1}`, val: item.icon })
@@ -135,20 +159,21 @@ export default class EmoticonsPlug extends EditorPlug {
     return dest
   }
 
+  /** 初始化表情列表界面 */
   initEmoticonsList () {
     // 表情列表
-    this.$listWrap = Utils.createElement(`<div class="atk-emoticons-list-wrap"></div>`)
-    this.$el.append(this.$listWrap)
+    this.$grpWrap = Utils.createElement(`<div class="atk-grp-wrap"></div>`)
+    this.$el.append(this.$grpWrap)
 
     this.emoticons.forEach((grp, index) => {
-      const emoticonsEl = Utils.createElement(`<div class="atk-emoticons-list" style="display: none;"></div>`)
-      this.$listWrap.append(emoticonsEl)
-      emoticonsEl.setAttribute('data-index', String(index))
-      emoticonsEl.setAttribute('data-grp-name', grp.name)
-      emoticonsEl.setAttribute('data-type', grp.type)
+      const $grp = Utils.createElement(`<div class="atk-grp" style="display: none;"></div>`)
+      this.$grpWrap.append($grp)
+      $grp.setAttribute('data-index', String(index))
+      $grp.setAttribute('data-grp-name', grp.name)
+      $grp.setAttribute('data-type', grp.type)
       grp.items.forEach((item) => {
-        const $item = Utils.createElement(`<span class="atk-emoticons-item"></span>`)
-        emoticonsEl.append($item)
+        const $item = Utils.createElement(`<span class="atk-item"></span>`)
+        $grp.append($item)
 
         if (!!item.key && !(new RegExp(`^(${grp.name})?\\s?[0-9]+$`).test(item.key)))
           $item.setAttribute('title', item.key)
@@ -173,23 +198,24 @@ export default class EmoticonsPlug extends EditorPlug {
     })
 
     // 表情分类
-    this.$types = Utils.createElement(`<div class="atk-emoticons-types"></div>`)
-    this.$el.append(this.$types)
+    this.$grpSwitcher = Utils.createElement(`<div class="atk-grp-switcher"></div>`)
+    this.$el.append(this.$grpSwitcher)
     this.emoticons.forEach((grp, index) => {
       const $item = Utils.createElement('<span />')
       $item.innerText = grp.name
       $item.setAttribute('data-index', String(index))
-      $item.onclick = () => (this.openType(index))
-      this.$types.append($item)
+      $item.onclick = () => (this.openGrp(index))
+      this.$grpSwitcher.append($item)
     })
 
     // 默认打开第一个分类
     if (this.emoticons.length > 0)
-      this.openType(0)
+      this.openGrp(0)
   }
 
-  openType (index: number) {
-    Array.from(this.$listWrap.children).forEach((item) => {
+  /** 打开一个表情组 */
+  openGrp (index: number) {
+    Array.from(this.$grpWrap.children).forEach((item) => {
       const el = item as HTMLElement
       if (el.getAttribute('data-index') !== String(index)) {
         el.style.display = 'none'
@@ -198,8 +224,8 @@ export default class EmoticonsPlug extends EditorPlug {
       }
     })
 
-    this.$types.querySelectorAll('span.active').forEach(item => item.classList.remove('active'))
-    this.$types.querySelector(`span[data-index="${index}"]`)?.classList.add('active')
+    this.$grpSwitcher.querySelectorAll('span.active').forEach(item => item.classList.remove('active'))
+    this.$grpSwitcher.querySelector(`span[data-index="${index}"]`)?.classList.add('active')
 
     this.changeListHeight()
   }
@@ -212,7 +238,7 @@ export default class EmoticonsPlug extends EditorPlug {
   }
 
   changeListHeight () {
-    /* const listWrapHeight = Utils.getHeight(this.$listWrapem)
+    /* const listWrapHeight = Utils.getHeight(this.$grpWrapem)
     this.editor.plugWrapEl.style.height = `${listWrapHeight > 150 ? listWrapHeight : 150}px` */
   }
 
@@ -227,6 +253,7 @@ export default class EmoticonsPlug extends EditorPlug {
     this.$el.parentElement!.style.height = ''
   }
 
+  /** 处理评论 content 中的表情内容 */
   public transEmoticonImageText (text: string) {
     if (!this.emoticons || !Array.isArray(this.emoticons))
       return text

packages/artalk/src/components/editor-plugs/preview-plug.less

@@ -3,5 +3,5 @@
   overflow-x: hidden;
   height: 100%;
   width: 100%;
-  padding: @block-padding 10px + 5px;
+  padding: 10px (10px + 5px);
 }

packages/artalk/src/components/editor.ts

@@ -18,18 +18,18 @@ export default class Editor extends Component {
   public $header: HTMLElement
   public $textareaWrap: HTMLElement
   public $textarea: HTMLTextAreaElement
-  public $closeComment: HTMLTextAreaElement
   public $plugWrap: HTMLElement
   public $bottom: HTMLElement
-  public $bottomPartLeft: HTMLElement
-  public $plugSwitcherWrap: HTMLElement
-  public $bottomPartRight: HTMLElement
+  public $plugBtnWrap: HTMLElement
+  public $imgUploadBtn?: HTMLElement
   public $submitBtn: HTMLButtonElement
   public $notifyWrap: HTMLElement
 
   private replyComment: CommentData|null = null
   private $sendReply: HTMLElement|null = null
 
+  private isTraveling = false
+
   private get user () {
     return this.ctx.user
   }
@@ -39,17 +39,14 @@ export default class Editor extends Component {
 
     this.$el = Utils.createElement(EditorHTML)
 
-    this.$header = this.$el.querySelector('.atk-editor-header')!
-    this.$textareaWrap = this.$el.querySelector('.atk-editor-textarea-wrap')!
-    this.$textarea = this.$el.querySelector('.atk-editor-textarea')!
-    this.$closeComment = this.$el.querySelector('.atk-close-comment')!
-    this.$plugWrap = this.$el.querySelector('.atk-editor-plug-wrap')!
-    this.$bottom = this.$el.querySelector('.atk-editor-bottom')!
-    this.$bottomPartLeft = this.$el.querySelector('.atk-editor-bottom-part.atk-left')!
-    this.$plugSwitcherWrap = this.$el.querySelector('.atk-editor-plug-switcher-wrap')!
-    this.$bottomPartRight = this.$el.querySelector('.atk-editor-bottom-part.atk-right')!
+    this.$header = this.$el.querySelector('.atk-header')!
+    this.$textareaWrap = this.$el.querySelector('.atk-textarea-wrap')!
+    this.$textarea = this.$el.querySelector('.atk-textarea')!
+    this.$plugWrap = this.$el.querySelector('.atk-plug-wrap')!
+    this.$bottom = this.$el.querySelector('.atk-bottom')!
+    this.$plugBtnWrap = this.$el.querySelector('.atk-plug-btn-wrap')!
     this.$submitBtn = this.$el.querySelector('.atk-send-btn')!
-    this.$notifyWrap = this.$el.querySelector('.atk-editor-notify-wrap')!
+    this.$notifyWrap = this.$el.querySelector('.atk-notify-wrap')!
 
     this.initLocalStorage()
     this.initHeader()
@@ -60,10 +57,14 @@ export default class Editor extends Component {
     // 监听事件
     this.ctx.on('editor-open', () => (this.open()))
     this.ctx.on('editor-close', () => (this.close()))
-    this.ctx.on('editor-reply', (commentData) => (this.setReply(commentData)))
+    this.ctx.on('editor-reply', (p) => (this.setReply(p.data, p.$el, p.scroll)))
+    this.ctx.on('editor-reply-cancel', () => (this.cancelReply()))
     this.ctx.on('editor-show-loading', () => (Ui.showLoading(this.$el)))
     this.ctx.on('editor-hide-loading', () => (Ui.hideLoading(this.$el)))
     this.ctx.on('editor-notify', (f) => (this.showNotify(f.msg, f.type)))
+    this.ctx.on('editor-travel', ($el) => (this.travel($el)))
+    this.ctx.on('editor-travel-back', () => (this.travelBack()))
+    this.ctx.on('conf-updated', () => (this.refreshUploadBtn()))
   }
 
   initLocalStorage () {
@@ -196,13 +197,13 @@ export default class Editor extends Component {
     this.$plugWrap.innerHTML = ''
     this.$plugWrap.style.display = 'none'
     this.openedPlugName = null
-    this.$plugSwitcherWrap.innerHTML = ''
+    this.$plugBtnWrap.innerHTML = ''
 
     // 依次实例化 plug
     this.LOADABLE_PLUG_LIST.forEach((PlugObj) => {
       // 切换按钮
-      const btnElem = Utils.createElement(`<span class="atk-editor-action atk-editor-plug-switcher">${PlugObj.BtnHTML}</span>`)
-      this.$plugSwitcherWrap.appendChild(btnElem)
+      const btnElem = Utils.createElement(`<span class="atk-plug-btn" data-plug-name="${PlugObj.Name}">${PlugObj.BtnHTML}</span>`)
+      this.$plugBtnWrap.appendChild(btnElem)
       btnElem.addEventListener('click', () => {
         let plug = this.plugList[PlugObj.Name]
         if (!plug) {
@@ -210,7 +211,7 @@ export default class Editor extends Component {
           this.plugList[PlugObj.Name] = plug
         }
 
-        this.$plugSwitcherWrap.querySelectorAll('.active').forEach(item => item.classList.remove('active'))
+        this.$plugBtnWrap.querySelectorAll('.active').forEach(item => item.classList.remove('active'))
 
         // 若点击已打开的，则收起
         if (PlugObj.Name === this.openedPlugName) {
@@ -245,6 +246,8 @@ export default class Editor extends Component {
         btnElem.classList.add('active')
       })
     })
+
+    this.initImgUpload()
   }
 
   /** 关闭编辑器插件 */
@@ -254,6 +257,116 @@ export default class Editor extends Component {
     this.openedPlugName = null
   }
 
+  /** 允许的图片格式 */
+  allowImgExts = ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'svg', 'webp']
+
+  /** 初始化图片上传功能 */
+  initImgUpload() {
+    this.$imgUploadBtn = Utils.createElement(`<span class="atk-plug-btn">图片</span>`)
+    this.$plugBtnWrap.querySelector('[data-plug-name="preview"]')!.before(this.$imgUploadBtn) // 显示在预览图标之前
+
+    // 按钮点击
+    this.$imgUploadBtn.onclick = () => {
+      // 选择图片
+      const $input = document.createElement('input')
+      $input.type = 'file'
+      $input.accept = this.allowImgExts.map(o => `.${o}`).join(',')
+      $input.onchange = () => {
+        (async () => { // 解决阻塞 UI 问题
+          if (!$input.files || $input.files.length === 0) return
+          const file = $input.files[0]
+          this.uploadImg(file)
+        })()
+      }
+      $input.click() // 显示选择图片对话框
+    }
+
+    // 统一从 FileList 获取文件并上传图片方法
+    const uploadFromFileList = (files?: FileList) => {
+      if (!files) return
+
+      for (let i = 0; i < files.length; i++) {
+        const file = files[i]
+        this.uploadImg(file)
+      }
+    }
+
+    // 拖拽图片
+    // @link https://developer.mozilla.org/zh-CN/docs/Web/API/HTML_Drag_and_Drop_API/File_drag_and_drop
+    // 阻止浏览器的默认释放行为
+    this.$textarea.addEventListener('dragover', (evt) => {
+      evt.stopPropagation()
+      evt.preventDefault()
+    })
+
+    this.$textarea.addEventListener('drop', (evt) => {
+      const files = evt.dataTransfer?.files
+      if (files?.length) {
+        evt.preventDefault()
+        uploadFromFileList(files)
+      }
+    })
+
+    // 粘贴图片
+    this.$textarea.addEventListener('paste', (evt) => {
+      const files = evt.clipboardData?.files
+      if (files?.length) {
+        evt.preventDefault()
+        uploadFromFileList(files)
+      }
+    })
+  }
+
+  /** 刷新图片上传按钮 */
+  refreshUploadBtn() {
+    if (!this.$imgUploadBtn) return
+
+    if (!this.ctx.conf.imgUpload) {
+      this.$imgUploadBtn.setAttribute('atk-only-admin-show', '')
+      this.ctx.trigger('check-admin-show-el')
+    }
+  }
+
+  async uploadImg(file: File) {
+    const fileExt = /[^.]+$/.exec(file.name)
+    if (!fileExt || !this.allowImgExts.includes(fileExt[0])) return
+
+    // 未登录提示
+    if (!this.ctx.user.checkHasBasicUserInfo()) {
+      this.showNotify('填入你的名字邮箱才能上传哦', 'w')
+      return
+    }
+
+    // 插入图片前换一行
+    let insertPrefix = '\n'
+    if (this.$textarea.value.trim() === '') insertPrefix = ''
+
+    // 插入占位加载文字
+    const uploadPlaceholderTxt = `${insertPrefix}![](Uploading ${file.name}...)`
+    this.insertContent(uploadPlaceholderTxt)
+
+    // 上传图片
+    let resp: any
+    try {
+      resp = await new Api(this.ctx).imgUpload(file)
+    } catch (err: any) {
+      console.error(err)
+      this.showNotify(`图片上传失败，${err.msg}`, 'e')
+    }
+    if (!!resp && resp.img_url) {
+      let imgURL = resp.img_url as string
+
+      // 若为相对路径，加上 artalk server
+      if (!Utils.isValidURL(imgURL)) imgURL = Utils.getURLBasedOnApi(this.ctx, imgURL)
+
+      // 上传成功插入图片
+      this.setContent(this.$textarea.value.replace(uploadPlaceholderTxt, `${insertPrefix}![](${imgURL})`))
+    } else {
+      // 上传失败删除加载文字
+      this.setContent(this.$textarea.value.replace(uploadPlaceholderTxt, ''))
+    }
+  }
+
   insertContent (val: string) {
     if ((document as any).selection) {
       this.$textarea.focus();
@@ -288,7 +401,8 @@ export default class Editor extends Component {
     this.cancelReply()
   }
 
-  getContent () {
+  /** 获取最终用于 submit 的数据 */
+  getFinalContent () {
     let content = this.getContentOriginal()
 
     // 表情包处理
@@ -305,7 +419,7 @@ export default class Editor extends Component {
   }
 
   getContentMarked () {
-    return Utils.marked(this.ctx, this.getContent())
+    return Utils.marked(this.ctx, this.getFinalContent())
   }
 
   initBottomPart () {
@@ -318,7 +432,7 @@ export default class Editor extends Component {
     this.$sendReply = null
   }
 
-  setReply (commentData: CommentData) {
+  setReply (commentData: CommentData, $comment: HTMLElement, scroll = true) {
     if (this.replyComment !== null) {
       this.cancelReply()
     }
@@ -332,7 +446,13 @@ export default class Editor extends Component {
       this.$textareaWrap.append(this.$sendReply)
     }
     this.replyComment = commentData
-    Ui.scrollIntoView(this.$el)
+
+    if (this.ctx.conf.editorTravel === true) {
+      this.travel($comment)
+    }
+
+    if (scroll) Ui.scrollIntoView(this.$el)
+
     this.$textarea.focus()
   }
 
@@ -342,6 +462,10 @@ export default class Editor extends Component {
       this.$sendReply = null
     }
     this.replyComment = null
+
+    if (this.ctx.conf.editorTravel === true) {
+      this.travelBack()
+    }
   }
 
   initSubmit () {
@@ -354,7 +478,7 @@ export default class Editor extends Component {
   }
 
   async submit () {
-    if (this.getContent().trim() === '') {
+    if (this.getFinalContent().trim() === '') {
       this.$textarea.focus()
       return
     }
@@ -365,7 +489,7 @@ export default class Editor extends Component {
 
     try {
       const nComment = await new Api(this.ctx).add({
-        content: this.getContent(),
+        content: this.getFinalContent(),
         nick: this.user.data.nick,
         email: this.user.data.email,
         link: this.user.data.link,
@@ -398,7 +522,8 @@ export default class Editor extends Component {
 
   /** 关闭评论 */
   close () {
-    this.$closeComment.style.display = ''
+    if (!this.$textareaWrap.querySelector('.atk-comment-closed'))
+      this.$textareaWrap.prepend(Utils.createElement('<div class="atk-comment-closed">仅管理员可评论</div>'))
 
     if (!this.user.data.isAdmin) {
       this.$textarea.style.display = 'none'
@@ -413,9 +538,30 @@ export default class Editor extends Component {
 
   /** 打开评论 */
   open () {
-    this.$closeComment.style.display = 'none'
+    this.$textareaWrap.querySelector('.atk-comment-closed')?.remove()
     this.$textarea.style.display = ''
     this.$bottom.style.display = ''
   }
+
+  travel ($afterEl: HTMLElement) {
+    if (this.isTraveling) return
+    this.isTraveling = true
+    this.$el.after(Utils.createElement('<div class="atk-editor-travel-placeholder"></div>'))
+
+    const $travelPlace = Utils.createElement('<div></div>')
+    $afterEl.after($travelPlace)
+    $travelPlace.replaceWith(this.$el)
+
+    this.$el.classList.add('atk-fade-in') // 添加渐入动画
+  }
+
+  travelBack () {
+    if (!this.isTraveling) return
+    this.isTraveling = false
+    this.ctx.$root.querySelector('.atk-editor-travel-placeholder')?.replaceWith(this.$el)
+
+    // 取消回复
+    if (this.replyComment !== null) this.cancelReply()
+  }
 }
 

packages/artalk/src/components/html/comment.html

@@ -1,25 +1,18 @@
-<div class="atk-comment-wrap" data-comment-id="">
+<div class="atk-comment-wrap">
   <div class="atk-comment">
-
     <div class="atk-avatar"></div>
-
-    <div class="atk-comment-main">
-
+    <div class="atk-main">
       <div class="atk-header">
-        <span class="atk-nick"></span>
-        <span class="atk-badge"></span>
-        <span class="atk-date"></span>
+        <span class="atk-item atk-nick"></span>
+        <span class="atk-item atk-badge"></span>
+        <span class="atk-item atk-date"></span>
       </div>
-
       <div class="atk-body">
         <div class="atk-content"></div>
       </div>
-
       <div class="atk-footer">
-        <div class="atk-comment-actions"></div>
+        <div class="atk-actions"></div>
       </div>
-
     </div>
-
   </div>
 </div>

packages/artalk/src/components/html/editor.html

@@ -0,0 +1,18 @@
+<div class="atk-main-editor">
+  <div class="atk-header">
+    <input name="nick" placeholder="昵称" class="atk-nick" type="text" required="required">
+    <input name="email" placeholder="邮箱" class="atk-email" type="email" required="required">
+    <input name="link" placeholder="网址 (https://)" class="atk-link" type="url">
+  </div>
+  <div class="atk-textarea-wrap">
+    <textarea class="atk-textarea" placeholder=""></textarea>
+  </div>
+  <div class="atk-plug-wrap" style="display: none;"></div>
+  <div class="atk-bottom">
+    <div class="atk-item atk-plug-btn-wrap"></div>
+    <div class="atk-item">
+      <button type="button" class="atk-send-btn"></button>
+    </div>
+  </div>
+  <div class="atk-notify-wrap"></div>
+</div>

packages/artalk/src/components/html/list.html

@@ -1,14 +1,16 @@
 <div class="atk-list">
   <div class="atk-list-header">
     <div class="atk-comment-count">
-      <span class="atk-comment-count-num">0</span>
-      条评论
+      <div class="atk-text">
+        <span class="atk-comment-count-num">0</span>
+        条评论
+      </div>
     </div>
     <div class="atk-right-action">
       <span data-action="admin-close-comment" class="atk-hide" atk-only-admin-show>关闭评论</span>
       <span data-action="open-sidebar" class="atk-hide atk-on">
         <span class="atk-unread-badge" style="display: none;"></span>
-        通知中心
+        <div class="atk-text">通知中心</div>
       </span>
     </div>
   </div>

packages/artalk/src/components/html/sidebar-layer.html

@@ -0,0 +1,8 @@
+<div class="atk-sidebar-layer">
+  <div class="atk-sidebar-inner">
+    <div class="atk-sidebar-header">
+      <div class="atk-sidebar-close"><i class="atk-icon atk-icon-close"></i></div>
+    </div>
+    <div class="atk-sidebar-iframe-wrap"></div>
+  </div>
+</div>

packages/artalk/src/components/layer.ts

@@ -13,6 +13,8 @@ export default class Layer extends Component {
   private bodyStyleOrgOverflow = ''
   private bodyStyleOrgPaddingRight = ''
 
+  public afterHide?: Function
+
   constructor (ctx: Context, name: string, el?: HTMLElement) {
     super(ctx)
 
@@ -50,13 +52,8 @@ export default class Layer extends Component {
     return this.$el
   }
 
-  private static hideTimeoutList: number[] = []
-
   show () {
-    Layer.hideTimeoutList.forEach(item => {
-      clearTimeout(item)
-    })
-    Layer.hideTimeoutList = []
+    this.fireAllActionTimer()
 
     this.$wrap.style.display = 'block'
     this.$mask.style.display = 'block'
@@ -68,6 +65,32 @@ export default class Layer extends Component {
     }
 
     // body style 禁止滚动 + 防抖
+    this.pageBodyScrollBarHide()
+  }
+
+  hide () {
+    if (this.afterHide) this.afterHide()
+    this.$wrap.classList.add('atk-fade-out')
+    this.$el.style.display = 'none'
+
+    this.newActionTimer(() => {
+      this.$wrap.style.display = 'none'
+      // body style 禁止滚动解除
+      this.pageBodyScrollBarShow()
+      this.checkCleanLayer()
+    }, 450)
+    this.newActionTimer(() => {
+      this.$wrap.style.display = 'none'
+      this.$wrap.classList.remove('atk-fade-out')
+    }, 200)
+  }
+
+  setMaskClickHide (enable: boolean) {
+    this.maskClickHideEnable = enable
+  }
+
+  // 页面滚动条隐藏
+  pageBodyScrollBarHide() {
     this.bodyStyleOrgOverflow = document.body.style.overflow
     this.bodyStyleOrgPaddingRight = document.body.style.paddingRight
     document.body.style.overflow = 'hidden'
@@ -76,31 +99,38 @@ export default class Layer extends Component {
     document.body.style.paddingRight = `${Ui.getScrollBarWidth() + bpr || 0}px`
   }
 
-  hide () {
-    Layer.hideTimeoutList.push(window.setTimeout(() => {
-      this.$wrap.style.display = 'none'
-      // body style 禁止滚动解除
-      document.body.style.overflow = this.bodyStyleOrgOverflow
-      document.body.style.paddingRight = this.bodyStyleOrgPaddingRight
-    }, 450))
-
-    this.$wrap.classList.add('atk-fade-out')
-    Layer.hideTimeoutList.push(window.setTimeout(() => {
-      this.$wrap.style.display = 'none'
-      this.$wrap.classList.remove('atk-fade-out')
-    }, 200))
-
-    this.$el.style.display = 'none'
+  // 页面滚动条显示
+  pageBodyScrollBarShow() {
+    document.body.style.overflow = this.bodyStyleOrgOverflow
+    document.body.style.paddingRight = this.bodyStyleOrgPaddingRight
   }
 
-  setMaskClickHide (enable: boolean) {
-    this.maskClickHideEnable = enable
+  // Timers
+  private static actionTimers: {act: Function, tid: number}[] = []
+
+  private newActionTimer(func: Function, delay: number) {
+    const act = () => {
+      func() // 执行
+      Layer.actionTimers = Layer.actionTimers.filter(o => o.act !== act) // 删除
+    }
+
+    const tid = window.setTimeout(() => act(), delay)
+
+    Layer.actionTimers.push({ act, tid })
+  }
+
+  private fireAllActionTimer() {
+    Layer.actionTimers.forEach(item => {
+      clearTimeout(item.tid)
+      item.act() // 立即执行
+    })
   }
 
   /** 销毁 - 无动画 */
   disposeNow () {
     document.body.style.overflow = ''
     this.$el.remove()
+    this.pageBodyScrollBarShow()
     // this.$el dispose
     this.checkCleanLayer()
   }

packages/artalk/src/components/list-lite.ts

@@ -0,0 +1,501 @@
+import Context from '../context'
+import Component from '../lib/component'
+import * as Utils from '../lib/utils'
+import * as Ui from '../lib/ui'
+import Api from '../api'
+import Comment from './comment'
+import { ListData, CommentData, NotifyData, ApiVersionData } from '~/types/artalk-data'
+import Pagination from './pagination'
+import ReadMoreBtn from './read-more-btn'
+import { backendMinVersion } from '../../package.json'
+
+export default class ListLite extends Component {
+  protected $commentsWrap: HTMLElement
+  protected comments: Comment[] = []
+
+  protected data?: ListData
+  protected isLoading: boolean = false
+
+  public noCommentText = '无内容' // 无评论时显示
+
+  /** 平铺模式 */
+  public flatMode = false
+
+  /** 分页 */
+  public pageMode: 'pagination'|'read-more' = 'pagination'
+  public pageSize: number = 20 // 每次请求获取量
+  public scrollListenerAt?: HTMLElement // 监听指定元素上的滚动
+  public repositionAt?: HTMLElement // 翻页归位到指定元素
+
+  protected pagination?: Pagination   // 分页条
+  protected readMoreBtn?: ReadMoreBtn // 阅读更多
+  protected autoLoadScrollEvent?: any // 自动加载滚动事件
+
+  public renderComment?: (comment: Comment) => void
+  public paramsEditor?: (params: any) => void
+  public onAfterLoad?: (data: ListData) => void
+
+  // 未读标记
+  protected unread: NotifyData[] = []
+  public unreadHighlight?: boolean // 高亮未读
+
+  constructor (ctx: Context) {
+    super(ctx)
+
+    // 初始化元素
+    this.$el = Utils.createElement(
+    `<div class="atk-list-lite">
+      <div class="atk-list-comments-wrap"></div>
+    </div>`)
+    this.$commentsWrap = this.$el.querySelector('.atk-list-comments-wrap')!
+
+    // 评论时间自动更新
+    window.setInterval(() => {
+      this.$el.querySelectorAll<HTMLElement>('[data-atk-comment-date]').forEach(el => {
+        const date = el.getAttribute('data-atk-comment-date')
+        el.innerText = Utils.timeAgo(new Date(Number(date)))
+      })
+    }, 30 * 1000) // 30s 更新一次
+
+    // 事件监听
+    this.ctx.on('unread-update', (data) => (this.updateUnread(data.notifies)))
+  }
+
+  /** 评论获取 */
+  public async fetchComments(offset: number) {
+    if (this.isLoading) return
+
+    // 加载动画
+    const showLoading = () => {
+      this.isLoading = true
+      if (offset === 0) Ui.showLoading(this.$el)
+      else if (this.pageMode === 'read-more') this.readMoreBtn!.setLoading(true)
+      else if (this.pageMode === 'pagination') this.pagination!.setLoading(true)
+    }
+    const hideLoading = () => {
+      this.isLoading = false
+      if (offset === 0) Ui.hideLoading(this.$el)
+      else if (this.pageMode === 'read-more') this.readMoreBtn!.setLoading(false)
+      else if (this.pageMode === 'pagination') this.pagination!.setLoading(false)
+    }
+    showLoading()
+
+    // 事件通知（开始加载评论）
+    this.ctx.trigger('comments-load')
+
+    // 清空评论（加载按钮）
+    if (this.pageMode === 'read-more' && offset === 0) { this.clearAllComments() }
+
+    // 请求评论数据
+    let listData: ListData
+    try {
+      listData = await new Api(this.ctx).get(offset, this.pageSize, this.flatMode, this.paramsEditor)
+    } catch (e: any) {
+      this.onError(e.msg || String(e), offset)
+      throw e
+    } finally {
+      hideLoading()
+    }
+
+    // 清除原有错误
+    Ui.setError(this.$el, null)
+
+    // 装载数据
+    try {
+      this.onLoad(listData, offset)
+    } catch (e: any) {
+      this.onError(String(e), offset)
+      throw e
+    } finally {
+      hideLoading()
+    }
+  }
+
+  protected onLoad(data: ListData, offset: number) {
+    // 清空评论（分页条）
+    if (this.pageMode === 'pagination') { this.clearAllComments() }
+
+    this.data = data
+
+    // 版本检测
+    const feMinVersion = data.api_version?.fe_min_version || '0.0.0'
+    if (this.ctx.conf.versionCheck && this.versionCheck('前端', feMinVersion, ARTALK_VERSION)) return
+    if (this.ctx.conf.versionCheck && this.versionCheck('后端', backendMinVersion, data.api_version?.version)) return
+
+    // 图片上传功能
+    if (data.conf && typeof data.conf.img_upload === "boolean") {
+      this.ctx.conf.imgUpload = data.conf.img_upload
+    }
+
+    // 导入数据
+    this.importComments(data.comments)
+
+    // 分页方式
+    this.refreshPagination(offset, (this.flatMode ? data.total : data.total_roots)) // 初始化
+
+    // 加载后事件
+    this.refreshUI()
+
+    this.ctx.trigger('unread-update', { notifies: data.unread || [] })
+    this.ctx.trigger('comments-loaded')
+    this.ctx.trigger('conf-updated')
+
+    if (this.onAfterLoad) this.onAfterLoad(data)
+  }
+
+  /** 分页模式 */
+  private refreshPagination(offset: number, total: number) {
+    const modePagination = (this.pageMode === 'pagination')
+    const modeReadMoreBtn = (this.pageMode === 'read-more')
+    const initialized = (modePagination) ? !!this.pagination : !!this.readMoreBtn
+
+    // 初始化
+    if (!initialized) {
+      this.initPagination()
+    }
+
+    // 更新
+    if (modePagination) this.pagination!.update(offset, total)
+    if (modeReadMoreBtn) this.readMoreBtn!.update(offset, total)
+  }
+
+  private initPagination() {
+    // 加载更多按钮
+    if (this.pageMode === 'read-more') {
+      this.readMoreBtn = new ReadMoreBtn({
+        pageSize: this.pageSize,
+        onClick: async (o) => {
+          await this.fetchComments(o)
+        },
+      })
+      this.$el.append(this.readMoreBtn.$el)
+
+      // 滚动到底部自动加载
+      if (this.conf.pagination?.autoLoad) {
+        // 添加滚动事件监听
+        const at = this.scrollListenerAt || document
+        if (this.autoLoadScrollEvent) at.removeEventListener('scroll', this.autoLoadScrollEvent) // 解除原有
+        this.autoLoadScrollEvent = () => {
+          if (this.pageMode !== 'read-more') return
+          if (!this.readMoreBtn) return
+
+          if (!this.readMoreBtn.hasMore) return
+          if (this.isLoading) return
+
+          const $target = this.$el.querySelector<HTMLElement>('.atk-list-comments-wrap > .atk-comment-wrap:nth-last-child(3)') // 获取倒数第3个评论元素
+          if (!$target) return
+          if (Ui.isVisible($target, this.scrollListenerAt)) {
+            this.readMoreBtn.click() // 自动点击加载更多按钮
+          }
+        }
+        at.addEventListener('scroll', this.autoLoadScrollEvent)
+      }
+    }
+
+    // 分页条
+    if (this.pageMode === 'pagination') {
+      this.pagination = new Pagination((!this.flatMode ? this.data!.total_roots : this.data!.total), {
+        pageSize: this.pageSize,
+        onChange: async (o) => {
+          if (this.ctx.conf.editorTravel === true) {
+            this.ctx.trigger('editor-travel-back') // 防止评论框被吞
+          }
+
+          await this.fetchComments(o)
+
+          // 滚动到第一个评论的位置
+          if (this.repositionAt) {
+            const at = this.scrollListenerAt || window
+            at.scroll({
+              top: this.repositionAt ? Utils.getOffset(this.repositionAt).top : 0,
+              left: 0,
+            })
+          }
+        }
+      })
+
+      this.$el.append(this.pagination.$el)
+    }
+  }
+
+  /** 错误处理 */
+  protected onError(msg: any, offset: number) {
+    msg = String(msg)
+    console.error(msg)
+
+    // 加载更多按钮显示错误
+    if (offset !== 0 && this.pageMode === 'read-more') {
+      this.readMoreBtn?.showErr(`获取失败`)
+      return
+    }
+
+    // 显示错误对话框
+    const $err = Utils.createElement(`<span>${msg}，无法获取评论列表数据<br/></span>`)
+
+    const $retryBtn = Utils.createElement('<span style="cursor:pointer;">点击重新获取</span>')
+    $retryBtn.onclick = () => (this.fetchComments(0))
+    $err.appendChild($retryBtn)
+
+    const adminBtn = Utils.createElement('<span atk-only-admin-show> | <span style="cursor:pointer;">打开控制台</span></span>')
+    adminBtn.onclick = () => (this.ctx.trigger('sidebar-show'))
+    if (!this.ctx.user.data.isAdmin) adminBtn.classList.add('atk-hide')
+    $err.appendChild(adminBtn)
+
+    Ui.setError(this.$el, $err)
+  }
+
+  /** 刷新界面 */
+  public refreshUI() {
+    // 无评论
+    const isNoComment = this.comments.length <= 0
+    let $noComment = this.$commentsWrap.querySelector<HTMLElement>('.atk-list-no-comment')
+
+    if (isNoComment) {
+      if (!$noComment) {
+        $noComment = Utils.createElement('<div class="atk-list-no-comment"></div>')
+        $noComment.innerHTML = this.noCommentText
+        this.$commentsWrap.appendChild($noComment)
+      }
+    } else {
+      $noComment?.remove()
+    }
+
+    // 仅管理员显示控制
+    this.ctx.trigger('check-admin-show-el')
+  }
+
+  /** 创建新评论 */
+  protected createComment(data: CommentData) {
+    const comment = new Comment(this.ctx, data)
+    comment.afterRender = () => {
+      if (this.renderComment) this.renderComment(comment)
+    }
+    comment.onDelete = (c) => {
+      this.deleteComment(c)
+      this.refreshUI()
+    }
+
+    return comment
+  }
+
+  /** 导入评论 · 通过请求数据 */
+  public importComments(srcData: CommentData[]) {
+    if (this.flatMode) {
+      srcData.forEach((commentData: CommentData) => {
+        this.putCommentFlatMode(commentData, srcData, 'append')
+      })
+    } else {
+      this.importCommentsNesting(srcData)
+    }
+  }
+
+  // 导入评论 · 嵌套模式
+  private importCommentsNesting(srcData: CommentData[]) {
+    // 查找并导入所有子评论
+    const loadChildren = (parentC: Comment) => {
+      const children = srcData.filter(o => o.rid === parentC.data.id)
+      children.forEach((childData: CommentData) => {
+        const childC = this.createComment(childData)
+        childC.render()
+
+        // 插入到父评论中
+        parentC.putChild(childC)
+
+        // 递归加载子评论
+        loadChildren(childC)
+      })
+    }
+
+    // 遍历 root 评论
+    const rootComments = srcData.filter((o) => o.rid === 0)
+    rootComments.forEach((rootData: CommentData) => {
+      const rootC = this.createComment(rootData)
+      rootC.render()
+
+      // 显示并播放渐入动画
+      this.$commentsWrap.appendChild(rootC.getEl())
+      rootC.playFadeInAnim()
+
+      // 评论放入 comments 总表中
+      this.comments.push(rootC)
+
+      // 加载子评论
+      loadChildren(rootC)
+
+      // 限高检测
+      rootC.checkHeightLimit()
+    })
+  }
+
+  /** 导入评论 · 平铺模式 */
+  private putCommentFlatMode(cData: CommentData, srcData: CommentData[], insertMode: 'append'|'prepend') {
+    if (cData.is_collapsed) cData.is_allow_reply = false
+    const comment = this.createComment(cData)
+    if (cData.rid !== 0) {
+      const rComment = srcData.find(o => o.id === cData.rid)
+      if (rComment) comment.replyTo = rComment
+    }
+    comment.render()
+
+    // 将评论导入 comments 总表中
+    if (insertMode === 'append') this.comments.push(comment)
+    if (insertMode === 'prepend') this.comments.unshift(comment)
+
+    // 可见评论添加到界面
+    // 注：不可见评论用于显示 “引用内容”
+    if (cData.visible) {
+      if (insertMode === 'append') this.$commentsWrap.append(comment.getEl())
+      if (insertMode === 'prepend') this.$commentsWrap.prepend(comment.getEl())
+      comment.playFadeInAnim()
+    }
+
+    // 平铺评论插入后 · 内容限高检测
+    comment.checkHeightLimit()
+
+    return comment
+  }
+
+  /** 新增评论 · 首部添加 */
+  public insertComment(commentData: CommentData) {
+    if (!this.flatMode) {
+      // 嵌套模式
+      const comment = this.createComment(commentData)
+      comment.render()
+
+      if (commentData.rid === 0) {
+        // root评论 新增
+        this.$commentsWrap.prepend(comment.getEl())
+        this.comments.unshift(comment)
+      } else {
+        // 子评论 新增
+        const parent = this.findComment(commentData.rid)
+        if (parent) {
+          parent.putChild(comment)
+
+          // 若父评论存在 “子评论部分” 限高，取消限高
+          comment.getParents().forEach((p) => {
+            if (p.$children) p.heightLimitRemove(p.$children)
+          })
+        }
+      }
+
+      comment.checkHeightLimit()
+
+      Ui.scrollIntoView(comment.getEl()) // 滚动到可以见
+      comment.playFadeInAnim() // 播放评论渐出动画
+    } else {
+      // 平铺模式
+      const comment = this.putCommentFlatMode(commentData, this.comments.map(c => c.data), 'prepend')
+      Ui.scrollIntoView(comment.getEl()) // 滚动到可见
+    }
+
+    // 评论数增加 1
+    if (this.data) this.data.total += 1
+
+    // 评论新增后
+    this.refreshUI()
+    this.ctx.trigger('comments-loaded')
+  }
+
+  /** 遍历操作 Comment (包括子评论) */
+  protected eachComment(commentList: Comment[], action: (comment: Comment, levelList: Comment[]) => boolean|void) {
+    if (commentList.length === 0) return
+    commentList.every((item) => {
+      if (action(item, commentList) === false) return false
+      this.eachComment(item.getChildren(), action)
+      return true
+    })
+  }
+
+  /** 查找评论项 */
+  protected findComment(id: number, src?: Comment[]): Comment|null {
+    if (!src) src = this.comments
+    let comment: Comment|null = null
+    this.eachComment(src, (item) => {
+      if (item.data.id === id) {
+        comment = item
+        return false
+      }
+      return true
+    })
+
+    return comment
+  }
+
+  /** 删除评论 */
+  public deleteComment(comment: number|Comment) {
+    let findComment: Comment|null
+    if (typeof comment === 'number') {
+      findComment = this.findComment(comment)
+      if (!findComment) throw Error(`未找到评论 ${comment}`)
+    } else findComment = comment
+
+    findComment.getEl().remove()
+    this.eachComment(this.comments, (item, levelList) => {
+      if (item === findComment) {
+        levelList.splice(levelList.indexOf(item), 1)
+        return false
+      }
+      return true
+    })
+
+    if (this.data) this.data.total -= 1 // 评论数减 1
+
+    this.refreshUI()
+  }
+
+  /** 清空所有评论 */
+  public clearAllComments() {
+    this.$commentsWrap.innerHTML = ''
+    this.data = undefined
+    this.comments = []
+  }
+
+  /** 更新未读数据 */
+  public updateUnread(notifies: NotifyData[]) {
+    this.unread = notifies
+
+    // 高亮评论
+    if (this.unreadHighlight === true) {
+      this.eachComment(this.comments, (comment) => {
+        const notify = this.unread.find(o => o.comment_id === comment.data.id)
+        if (notify) {
+          comment.setUnread(true)
+          comment.setOpenURL(notify.read_link)
+          comment.openEvt = () => {
+            this.unread = this.unread.filter(o => o.comment_id !== comment.data.id) // remove
+            this.ctx.trigger('unread-update', {
+              notifies: this.unread
+            })
+          }
+        } else {
+          comment.setUnread(false)
+        }
+      })
+    }
+  }
+
+  /** 版本检测 */
+  public versionCheck(name: '前端'|'后端', needVersion: string, curtVersion: string): boolean {
+    const needUpdate = Utils.versionCompare(needVersion, curtVersion) === 1
+    if (needUpdate) {
+      // 需要更新
+      const errEl = Utils.createElement(`<div>Artalk ${name}版本已过时，请更新以获得完整体验<br/>`
+      + `如果你是管理员，请前往 “<a href="https://artalk.js.org/" target="_blank">官方文档</a>” 获得帮助`
+      + `<br/><br/>`
+      + `<span style="color: var(--at-color-meta);">当前${name}版本 ${curtVersion}，需求版本 >= ${needVersion}</span><br/><br/>`
+      + `</div>`)
+      const ignoreBtn = Utils.createElement('<span style="cursor:pointer;">忽略</span>')
+      ignoreBtn.onclick = () => {
+        Ui.setError(this.$el.parentElement!, null)
+        this.ctx.conf.versionCheck = false
+        this.ctx.trigger('conf-updated')
+        this.fetchComments(0)
+      }
+      errEl.append(ignoreBtn)
+      Ui.setError(this.$el.parentElement!, errEl, '<span class="atk-warn-title">Artalk Warn</span>')
+    }
+
+    return needUpdate
+  }
+}

packages/artalk/src/components/list.ts

@@ -12,11 +12,13 @@ export default class List extends ListLite {
   private $closeCommentBtn!: HTMLElement
   private $openSidebarBtn!: HTMLElement
   private $unreadBadge!: HTMLElement
+  private $commentCount!: HTMLElement
+  private $dropdownWrap?: HTMLElement
 
   constructor (ctx: Context) {
     const el = Utils.createElement(ListHTML)
 
-    super(ctx, el)
+    super(ctx)
 
     // 把 listLite $el 变为子元素
     el.querySelector('.atk-list-body')!.append(this.$el)
@@ -34,15 +36,24 @@ export default class List extends ListLite {
 
     // 分页模式
     this.pageMode = this.conf.pagination?.readMore ? 'read-more' : 'pagination'
+    this.pageSize = this.conf.pagination?.pageSize || 20
+    this.repositionAt = this.$el
 
     // 操作按钮
     this.initListActionBtn()
 
+    this.$commentCount = this.$el.querySelector('.atk-comment-count')!
+
+    // 评论列表排序 Dropdown 下拉选择层
+    if (this.ctx.conf.listSort) {
+      this.initDropdown()
+    }
+
     // copyright
     this.$el.querySelector<HTMLElement>('.atk-copyright')!.innerHTML = `Powered By <a href="https://artalk.js.org" target="_blank" title="Artalk v${ARTALK_VERSION}">Artalk</a>`
 
     // event listen
-    this.ctx.on('list-reload', () => (this.reqComments(0))) // 刷新评论
+    this.ctx.on('list-reload', () => (this.fetchComments(0))) // 刷新评论
     this.ctx.on('list-refresh-ui', () => (this.refreshUI()))
     this.ctx.on('list-import', (data) => (this.importComments(data)))
     this.ctx.on('list-insert', (data) => (this.insertComment(data)))
@@ -51,7 +62,7 @@ export default class List extends ListLite {
     this.ctx.on('unread-update', (data) => (this.showUnreadBadge(data.notifies?.length || 0)))
   }
 
-  private initListActionBtn () {
+  private initListActionBtn() {
     // 侧边栏呼出按钮
     this.$openSidebarBtn = this.$el.querySelector('[data-action="open-sidebar"]')!
     this.$closeCommentBtn = this.$el.querySelector('[data-action="admin-close-comment"]')!
@@ -71,10 +82,10 @@ export default class List extends ListLite {
   }
 
   /** 刷新界面 */
-  public refreshUI () {
+  public refreshUI() {
     super.refreshUI()
 
-    this.$el.querySelector<HTMLElement>('.atk-comment-count-num')!.innerText = String(this.commentsCount)
+    this.$el.querySelector<HTMLElement>('.atk-comment-count-num')!.innerText = String(Number(this.data?.total) || 0)
 
     // 已输入个人信息
     if (!!this.ctx.user.data.nick && !!this.ctx.user.data.email) {
@@ -85,7 +96,7 @@ export default class List extends ListLite {
 
     // 仅管理员显示控制
     this.ctx.trigger('check-admin-show-el')
-    this.$openSidebarBtn.innerText = (!this.ctx.user.data.isAdmin) ? '通知中心' : '控制中心'
+    this.$openSidebarBtn.querySelector<HTMLElement>('.atk-text')!.innerText = (!this.ctx.user.data.isAdmin) ? '通知中心' : '控制中心'
 
     // 关闭评论
     if (!!this.data && !!this.data.page && this.data.page.admin_only === true) {
@@ -97,7 +108,7 @@ export default class List extends ListLite {
     }
   }
 
-  public onLoad(data: ListData, offset: number) {
+  protected onLoad(data: ListData, offset: number) {
     super.onLoad(data, offset)
 
     // 检测锚点跳转
@@ -130,7 +141,7 @@ export default class List extends ListLite {
     // TODO 若找不到评论的情况
     // if (!comment) { // 若找不到评论
     //   if (this.hasMoreComments) { // 阅读更多，并重试
-    //     await this.reqComments()
+    //     await this.fetchComments()
     //   }
     // }
 
@@ -161,7 +172,7 @@ export default class List extends ListLite {
       })
   }
 
-  public showUnreadBadge (count: number) {
+  public showUnreadBadge(count: number) {
     if (count > 0) {
       this.$unreadBadge.innerText = `${Number(count || 0)}`
       this.$unreadBadge.style.display = 'block'
@@ -169,4 +180,58 @@ export default class List extends ListLite {
       this.$unreadBadge.style.display = 'none'
     }
   }
+
+  /** 初始化选择下拉层 */
+  protected initDropdown() {
+    this.$dropdownWrap = this.$commentCount
+    this.$commentCount.classList.add('atk-dropdown-wrap')
+
+    // 插入图标
+    this.$dropdownWrap.append(Utils.createElement(`<span class="atk-arrow-down-icon"></span>`))
+
+    const reloadUseParamsEditor = (func: (p: any) => void) => {
+      this.paramsEditor = (p) => { func(p) }
+      this.fetchComments(0)
+    }
+
+    // 下拉列表
+    const dropdownList = [
+      ['最新', () => { reloadUseParamsEditor(p => { p.sort_by = 'date_desc' }) }],
+      ['最热', () => { reloadUseParamsEditor(p => { p.sort_by = 'vote' }) }],
+      ['最早', () => { reloadUseParamsEditor(p => { p.sort_by = 'date_asc' }) }],
+      ['作者', () => { reloadUseParamsEditor(p => { p.view_only_admin = true }) }],
+    ]
+
+    // 列表项点击事件
+    let curtActive = 0 // 当前选中
+    const onItemClick = (i: number, $item: HTMLElement, name: string, action: Function) => {
+      action()
+
+      // set active
+      curtActive = i
+      $dropdown.querySelectorAll('.active').forEach((e) => { e.classList.remove('active') })
+      $item.classList.add('active')
+
+      // 关闭层 (临时消失，取消 :hover)
+      $dropdown.style.display = 'none'
+      setTimeout(() => { $dropdown.style.display = '' }, 80)
+    }
+
+    // 生成列表元素
+    const $dropdown = Utils.createElement(`<ul class="atk-dropdown atk-fade-in"></ul>`)
+    dropdownList.forEach((item, i) => {
+      const name = item[0] as string
+      const action = item[1] as Function
+
+      const $item = Utils.createElement(`<li class="atk-dropdown-item"><span></span></li>`)
+      const $link = $item.querySelector<HTMLElement>('span')!
+      $link.innerText = name
+      $link.onclick = () => { onItemClick(i, $item, name, action) }
+      $dropdown.append($item)
+
+      if (i === curtActive) $item.classList.add('active') // 默认选中项
+    })
+
+    this.$dropdownWrap.append($dropdown)
+  }
 }

packages/artalk/src/components/pagination.ts

@@ -4,7 +4,7 @@ import * as Ui from '../lib/ui'
 
 export interface PaginationConf {
   /** 每页条数 */
-  pageSize?: number
+  pageSize: number
 
   /** 回调函数 */
   onChange: (offset: number) => void
@@ -21,7 +21,7 @@ export default class Pagination {
 
   public page: number = 1
   get pageSize(): number {
-    return this.conf.pageSize || 15
+    return this.conf.pageSize
   }
   get offset(): number {
     return this.pageSize * (this.page - 1)

packages/artalk/src/components/read-more-btn.ts

@@ -1,14 +1,10 @@
 import * as Utils from '../lib/utils'
 
 export interface ReadMoreBtnConf {
-  /** 每页条数 */
-  pageSize?: number
-
-  /** 数据总数 */
-  total: number
-
   /** 回调函数 */
-  onClick: () => void
+  onClick: (offset: number) => void
+
+  pageSize: number
 }
 
 /**
@@ -19,6 +15,13 @@ export default class ReadMoreBtn {
   public $el: HTMLElement
   private $loading: HTMLElement
   private $text: HTMLElement
+  private offset: number = 0
+  private total: number = 0
+
+  /** 是否有更多内容 */
+  get hasMore() {
+    return this.total > (this.offset + this.conf.pageSize)
+  }
 
   public constructor(conf: ReadMoreBtnConf) {
     this.conf = conf
@@ -27,18 +30,19 @@ export default class ReadMoreBtn {
     `<div class="atk-list-read-more" style="display: none;">
       <div class="atk-list-read-more-inner">
         <div class="atk-loading-icon" style="display: none;"></div>
-        <span class="atk-text">查看更多</span>
+        <span class="atk-text">加载更多</span>
       </div>
     </div>`)
 
     this.$loading = this.$el.querySelector<HTMLElement>('.atk-loading-icon')!
     this.$text = this.$el.querySelector<HTMLElement>('.atk-text')!
 
-    this.$el.onclick = () => this.click()
+    this.$el.onclick = () => { this.click() }
   }
 
   click() {
-    this.conf.onClick()
+    if (this.hasMore) this.conf.onClick(this.offset + this.conf.pageSize)
+    this.checkDisabled()
   }
 
   /** 显示 */
@@ -68,4 +72,17 @@ export default class ReadMoreBtn {
       this.$el.classList.remove('atk-err')
     }, 2000) // 2s后错误提示复原
   }
+
+  /** 更新数据 */
+  public update(offset: number, total: number) {
+    this.offset = offset
+    this.total = total
+
+    this.checkDisabled()
+  }
+
+  public checkDisabled() {
+    if (this.hasMore) this.show()
+    else this.hide()
+  }
 }

packages/artalk/src/components/sidebar-layer.ts

@@ -0,0 +1,166 @@
+import '../style/sidebar-layer.less'
+
+import Context from '@/context'
+import Component from '@/lib/component'
+import * as Utils from '@/lib/utils'
+import SidebarHTML from './html/sidebar-layer.html?raw'
+import * as Ui from '@/lib/ui'
+import Layer from './layer'
+import Api from '../api'
+
+export default class SidebarLayer extends Component {
+  public layer?: Layer
+  public $header: HTMLElement
+  public $closeBtn: HTMLElement
+  public $iframeWrap: HTMLElement
+  public $iframe?: HTMLIFrameElement
+
+  constructor(ctx: Context) {
+    super(ctx)
+
+    this.$el = Utils.createElement(SidebarHTML)
+    this.$header = this.$el.querySelector('.atk-sidebar-header')!
+    this.$closeBtn = this.$header.querySelector('.atk-sidebar-close')!
+    this.$iframeWrap = this.$el.querySelector('.atk-sidebar-iframe-wrap')!
+
+    this.$closeBtn.onclick = () => {
+      this.hide()
+    }
+
+    // event
+    this.ctx.on('sidebar-show', () => (this.show()))
+    this.ctx.on('sidebar-hide', () => (this.hide()))
+    this.ctx.on('user-changed', () => { this.firstShow = true })
+  }
+
+  private firstShow = true
+
+  /** 显示 */
+  public async show() {
+    this.$el.style.transform = '' // 动画清除，防止二次打开失效
+
+    // 获取 Layer
+    if (this.layer == null) {
+      this.layer = new Layer(this.ctx, 'sidebar', this.$el)
+      this.layer.afterHide = () => {
+        // 防止评论框被吞
+        if (this.ctx.conf.editorTravel === true) {
+          this.ctx.trigger('editor-travel-back')
+        }
+      }
+    }
+    this.layer.show()
+
+    // viewWrap 滚动条归位
+    // this.$viewWrap.scrollTo(0, 0)
+
+    // 执行动画
+    setTimeout(() => {
+      this.$el.style.transform = 'translate(0, 0)'
+    }, 20)
+
+    // 第一次加载
+    if (this.firstShow) {
+      // 管理员身份验证
+      if (this.ctx.user.data.isAdmin) {
+        const resp = await new Api(this.ctx).loginStatus()
+        if (!resp.is_login) {
+          await (new Promise<any>((resolve, reject) => {
+            this.ctx.trigger('checker-admin', {
+              onSuccess: () => {
+                resolve(null)
+                setTimeout(() => {
+                  this.show()
+                }, 500)
+              },
+              onCancel: () => {
+                this.layer?.hide()
+              }
+            })
+          }))
+        }
+      }
+
+      this.$iframeWrap.innerHTML = ''
+      this.$iframe = Utils.createElement<HTMLIFrameElement>('<iframe></iframe>')
+
+      const baseURL = (import.meta.env.MODE === 'development')  ? 'http://localhost:23367/'
+        : Utils.getURLBasedOnApi(this.ctx, 'sidebar/')
+      const userData = encodeURIComponent(JSON.stringify(this.ctx.user.data))
+
+      const location = window.location
+      this.iframeLoad(`${baseURL}`
+        + `?pageKey=${encodeURIComponent(this.conf.pageKey)}`
+        + `&site=${encodeURIComponent(this.conf.site || '')}`
+        + `&user=${userData}`
+        + `&time=${+new Date()}`
+        + `&referer=${encodeURIComponent(`${location.protocol}//${location.host}${location.pathname}`)}`
+        + `${((this.conf.darkMode) ? `&darkMode=1` : ``)}`)
+
+      this.$iframeWrap.append(this.$iframe)
+      this.firstShow = false
+    } else {
+      // 暗黑模式
+      if (this.conf.darkMode && !this.$iframe!.src.match(/darkMode=1$/)) {
+        this.iframeLoad(`${this.$iframe!.src}&darkMode=1`)
+      }
+      if (!this.conf.darkMode && this.$iframe!.src.match(/darkMode=1$/)) {
+        this.iframeLoad(this.$iframe!.src.replace(/&darkMode=1$/, ''))
+      }
+    }
+  }
+
+  /** 隐藏 */
+  public hide() {
+    // 执行动画
+    this.$el.style.transform = ''
+
+    this.layer?.hide()
+  }
+
+  public iframeLoad(src: string) {
+    if (!this.$iframe) return
+
+    this.$iframe.src = src
+
+    // 加载动画
+    Ui.showLoading(this.$iframeWrap)
+    this.$iframe.onload = () => {
+      Ui.hideLoading(this.$iframeWrap)
+    }
+
+    // this.checkReqStatus(src) // 判不准，删了，没啥用
+  }
+
+  loadingTimer: number|null = null
+
+  // 测试可访问性 (由于 iframe 测不准，需要额外请求)
+  public async checkReqStatus(url: string) {
+    if (this.loadingTimer !== null) window.clearTimeout(this.loadingTimer)
+
+    this.loadingTimer = window.setTimeout(async () => {
+      try {
+        await fetch(url)
+      } catch (err) {
+        console.log(err)
+        // 请求失败，显示错误提示
+        const $errAlert = Utils.createElement(
+          `<div class="atk-err-alert">` +
+          `  <div class="atk-title">侧边栏似乎打开失败</div>` +
+          `  <div class="atk-text"><span id="AtkReload">重新加载</span> / <span id="AtkCancel">取消</span></div>` +
+          `</div>`
+        )
+        const $reloadBtn = $errAlert.querySelector<HTMLElement>('#AtkReload')!
+        const $cancelBtn = $errAlert.querySelector<HTMLElement>('#AtkCancel')!
+        $reloadBtn.onclick = () => {
+          this.iframeLoad(url)
+          $errAlert.remove()
+        }
+        $cancelBtn.onclick = () => { // 提供取消按钮，防止误判
+          $errAlert.remove()
+        }
+        this.$iframeWrap.append($errAlert)
+      }
+    }, 2000) // 2s 后开始检测
+  }
+}

packages/artalk/src/context.ts

@@ -1,3 +1,4 @@
+import { marked as libMarked } from 'marked'
 import User from './lib/user'
 import ArtalkConfig from '~/types/artalk-config'
 import { EventPayloadMap, Event, EventScopeType, Handler } from '~/types/event'
@@ -39,4 +40,6 @@ export default class Context {
       .map((evt) => evt.handler)
       .forEach((handler) => handler(payload as any))
   }
+
+  public markedInstance!: typeof libMarked
 }

packages/artalk/src/defaults.ts

@@ -10,12 +10,15 @@ const defaults: ArtalkConfig = {
   noComment: '「此时无声胜有声」',
   sendBtn: '发送评论',
   darkMode: false,
+  editorTravel: true,
 
   emoticons: "https://cdn.jsdelivr.net/gh/ArtalkJS/Emoticons/grps/default.json",
 
   vote: true,
   voteDown: false,
   uaBadge: true,
+  listSort: true,
+  pvEl: '#ArtalkPV',
   flatMode: 'auto',
   maxNesting: 3,
   gravatar: {
@@ -24,7 +27,7 @@ const defaults: ArtalkConfig = {
   },
 
   pagination: {
-    pageSize: 15,
+    pageSize: 20,
     readMore: true,
     autoLoad: true,
   },
@@ -34,6 +37,7 @@ const defaults: ArtalkConfig = {
     children: 400,
   },
 
+  imgUpload: true,
   reqTimeout: 15000,
   versionCheck: true,
 }

packages/artalk/src/lib/checker/admin-checker.ts

@@ -5,7 +5,7 @@ import { Checker } from '.'
 const AdminChecker: Checker = {
   inputType: 'password',
 
-  request(that, inputVal) {
+  request(that, ctx, inputVal) {
     const data = {
       name: that.ctx.user.data.nick,
       email: that.ctx.user.data.email,
@@ -15,11 +15,11 @@ const AdminChecker: Checker = {
     return new Api(that.ctx).login(data.name, data.email, data.password)
   },
 
-  body() {
+  body(that, ctx) {
     return Utils.createElement('<span>敲入密码来验证管理员身份：</span>')
   },
 
-  onSuccess(that, userToken, inputVal, formEl) {
+  onSuccess(that, ctx, userToken, inputVal, formEl) {
     that.ctx.user.data.isAdmin = true
     that.ctx.user.data.token = userToken
     that.ctx.user.save()
@@ -27,7 +27,7 @@ const AdminChecker: Checker = {
     that.ctx.trigger('list-reload')
   },
 
-  onError(that, err, inputVal, formEl) {}
+  onError(that, ctx, err, inputVal, formEl) {}
 }
 
 export default AdminChecker

packages/artalk/src/lib/checker/captcha-checker.ts

@@ -0,0 +1,84 @@
+import Api from '@/api'
+import * as Utils from '../utils'
+import * as Ui from '../ui'
+import { Checker } from '.'
+
+const CaptchaChecker: Checker = {
+  request(that, ctx, inputVal) {
+    return new Api(that.ctx).captchaCheck(inputVal)
+  },
+
+  body(that, ctx) {
+    // Iframe 验证方式
+    if (that.captchaConf.iframe) {
+      const $iframeWrap = Utils.createElement(`<div class="atk-checker-iframe-wrap"></div>`)
+      const $iframe = Utils.createElement<HTMLIFrameElement>(`<iframe class="atk-fade-in"></iframe>`)
+      $iframe.style.display = 'none'
+      Ui.showLoading($iframeWrap, { transparentBg: true })
+      $iframe.src = `${that.ctx.conf.server}/captcha/get`
+      $iframe.onload = () => {
+        $iframe.style.display = ''
+        Ui.hideLoading($iframeWrap)
+      }
+      $iframeWrap.append($iframe)
+
+      const $closeBtn = Utils.createElement(`<div class="atk-close-btn"><i class="atk-icon atk-icon-close"></i></div>`)
+      $iframeWrap.append($closeBtn)
+
+      ctx.hideInteractInput()
+
+      // 轮询状态
+      let stop = false // 打断
+      const sleep = (ms: number) => new Promise((resolve) => { window.setTimeout(() => { resolve(null) }, ms) })
+      ;(async function queryStatus() {
+        await sleep(1000)
+        if (stop) return
+        let isPass = false
+        try {
+          const resp = await new Api(that.ctx).captchaStatus()
+          isPass = resp.is_pass
+        } catch { isPass = false }
+        if (isPass) {
+          ctx.triggerSuccess()
+        } else {
+          queryStatus()
+        }
+      })()
+
+      $closeBtn.onclick = () => {
+        stop = true
+        ctx.cancel()
+      }
+
+      return $iframeWrap
+    }
+
+    // 图片验证方式
+    const elem = Utils.createElement(
+      `<span><img class="atk-captcha-img" src="${that.captchaConf.imgData || ''}" alt="验证码">敲入验证码继续：</span>`
+    );
+
+    // 刷新验证码
+    elem.querySelector<HTMLElement>('.atk-captcha-img')!.onclick = () => {
+      const imgEl = elem.querySelector('.atk-captcha-img')
+      new Api(that.ctx).captchaGet()
+        .then((imgData) => {
+          imgEl!.setAttribute('src', imgData)
+        })
+        .catch((err) => {
+          console.error('验证码获取失败 ', err)
+        })
+    }
+    return elem
+  },
+
+  onSuccess(that, ctx, data, inputVal, formEl) {
+    that.captchaConf.val = inputVal
+  },
+
+  onError(that, ctx, err, inputVal, formEl) {
+    formEl.querySelector<HTMLElement>('.atk-captcha-img')!.click() // 刷新验证码
+  }
+}
+
+export default CaptchaChecker

packages/artalk/src/lib/checker/index.ts

@@ -14,8 +14,7 @@ export default class CheckerLauncher {
   public ctx: Context
 
   public launched: Checker[] = []
-  public submitCaptchaVal?: string
-  public submitCaptchaImgData?: string
+  public captchaConf: { val?: string, imgData?: string, iframe?: string } = {}
 
   constructor(ctx: Context) {
     this.ctx = ctx
@@ -26,9 +25,9 @@ export default class CheckerLauncher {
   /** 初始化事件绑定 */
   public initEventBind() {
     this.ctx.on('checker-captcha', (conf) => {
-      if (conf.imgData) {
-        this.submitCaptchaImgData = conf.imgData
-      }
+      if (conf.imgData) this.captchaConf.imgData = conf.imgData
+      if (conf.iframe) this.captchaConf.iframe = conf.iframe
+
       this.fire(CaptchaChecker, conf)
     })
 
@@ -41,20 +40,42 @@ export default class CheckerLauncher {
     if (this.launched.includes(checker)) return // 阻止同时 fire 相同的 checker
     this.launched.push(checker)
 
+    // 创建层
     const layer = new Layer(this.ctx, `checker-${new Date().getTime()}`)
     layer.setMaskClickHide(false)
     layer.show()
 
-    const formEl = Utils.createElement()
-    formEl.appendChild(checker.body(this))
+    // Checker 的上下文
+    let hideInteractInput = false
+    const checkerCtx: CheckerCtx = {
+      getLayer: () => layer,
+      hideInteractInput: () => {
+        hideInteractInput = true
+      },
+      triggerSuccess: () => {
+        this.close(checker, layer)
+        if (checker.onSuccess) checker.onSuccess(this, checkerCtx, "", "", formEl)
+        if (payload.onSuccess) payload.onSuccess("", dialog.$el)
+      },
+      cancel: () => {
+        this.close(checker, layer)
+        if (payload.onCancel) payload.onCancel()
+      }
+    }
 
-    const input = Utils.createElement<HTMLInputElement>(
+    // 创建表单
+    const formEl = Utils.createElement()
+    formEl.appendChild(checker.body(this, checkerCtx))
+
+    // 输入框
+    const $input = Utils.createElement<HTMLInputElement>(
       `<input id="check" type="${checker.inputType || 'text'}" autocomplete="off" required placeholder="">`
     )
-    formEl.appendChild(input)
-    setTimeout(() => input.focus(), 80) // 延迟 Focus
+    formEl.appendChild($input)
+    setTimeout(() => $input.focus(), 80) // 延迟 Focus
 
-    input.onkeyup = (evt) => {
+    // 绑定键盘事件
+    $input.onkeyup = (evt) => {
       if (evt.key === 'Enter' || evt.keyCode === 13) {
         // 按下回车键
         evt.preventDefault()
@@ -70,7 +91,9 @@ export default class CheckerLauncher {
 
     // 确认按钮
     dialog.setYes((btnEl) => {
-      const inputVal = input.value.trim()
+      const inputVal = $input.value.trim()
+
+      // 按钮操作
       if (!btnTextOrg) btnTextOrg = btnEl.innerText
       const btnTextSet = (btnText: string) => {
         btnEl.innerText = btnText
@@ -83,21 +106,25 @@ export default class CheckerLauncher {
 
       btnEl.innerText = '加载中...'
 
+      // 发送请求
       checker
-        .request(this, inputVal)
+        .request(this, checkerCtx, inputVal)
         .then((data) => {
           // 请求成功
-          this.done(checker, layer)
-          if (checker.onSuccess) checker.onSuccess(this, data, inputVal, formEl)
+          this.close(checker, layer)
+
+          if (checker.onSuccess) checker.onSuccess(this, checkerCtx, data, inputVal, formEl)
           if (payload.onSuccess) payload.onSuccess(inputVal, dialog.$el)
         })
         .catch((err) => {
           // 请求失败
           btnTextSet(String(err.msg || String(err)))
-          if (checker.onError) checker.onError(this, err, inputVal, formEl)
 
+          if (checker.onError) checker.onError(this, checkerCtx, err, inputVal, formEl)
+
+          // 错误显示 3s 后恢复按钮
           const tf = setTimeout(() => btnTextRestore(), 3000)
-          input.onfocus = () => {
+          $input.onfocus = () => {
             btnTextRestore()
             clearTimeout(tf)
           }
@@ -108,17 +135,25 @@ export default class CheckerLauncher {
 
     // 取消按钮
     dialog.setNo(() => {
-      this.done(checker, layer)
+      this.close(checker, layer)
       if (payload.onCancel) payload.onCancel()
       return false
     })
 
+    if (hideInteractInput) {
+      $input.style.display = 'none'
+      dialog.$el.querySelector<HTMLElement>('.atk-layer-dialog-actions')!.style.display = 'none'
+    }
+
+    // 层装载 dialog 元素
     layer.getEl().append(dialog.$el)
 
-    if (payload.onMount) payload.onMount(dialog.$el) // onMount
+    // onMount 回调
+    if (payload.onMount) payload.onMount(dialog.$el)
   }
 
-  private done(checker: Checker, layer: Layer) {
+  // 关闭 checker 对话框
+  private close(checker: Checker, layer: Layer) {
     layer.disposeNow()
     this.launched = this.launched.filter(c => c !== checker)
   }
@@ -127,8 +162,15 @@ export default class CheckerLauncher {
 export interface Checker {
   el?: HTMLElement
   inputType?: 'password' | 'text'
-  body: (launcher: CheckerLauncher) => HTMLElement
-  request: (launcher: CheckerLauncher, inputVal: string) => Promise<string>
-  onSuccess?: (launcher: CheckerLauncher, data: string, inputVal: string, formEl: HTMLElement) => void
-  onError?: (launcher: CheckerLauncher, err: any, inputVal: string, formEl: HTMLElement) => void
+  body: (launcher: CheckerLauncher, ctx: CheckerCtx) => HTMLElement
+  request: (launcher: CheckerLauncher, ctx: CheckerCtx, inputVal: string) => Promise<string>
+  onSuccess?: (launcher: CheckerLauncher, ctx: CheckerCtx, data: string, inputVal: string, formEl: HTMLElement) => void
+  onError?: (launcher: CheckerLauncher, ctx: CheckerCtx, err: any, inputVal: string, formEl: HTMLElement) => void
+}
+
+export interface CheckerCtx {
+  getLayer(): Layer
+  hideInteractInput(): void
+  triggerSuccess(): void
+  cancel(): void
 }

packages/artalk/src/lib/detect.js

@@ -104,7 +104,9 @@ function Detect (userAgent) {
         '6.0': 'Vista',
         5.2: 'XP',
         5.1: 'XP',
-        '5.0': '2000'
+        '5.0': '2000',
+        '10.0': '10',
+        '11.0': '11' // 自定的，不是微软官方的判断方法
       }
       return hash[v] || v
     },

packages/artalk/src/lib/ui.ts

@@ -2,7 +2,7 @@ import * as Utils from './utils'
 import Context from '../context'
 
 /** 显示加载 */
-export function showLoading(parentElem: HTMLElement|Context) {
+export function showLoading(parentElem: HTMLElement|Context, conf?: { transparentBg?: boolean }) {
   if (parentElem instanceof Context) parentElem = parentElem.$root
 
   let $loading = parentElem.querySelector<HTMLElement>('.atk-loading')
@@ -13,6 +13,7 @@ export function showLoading(parentElem: HTMLElement|Context) {
         <svg viewBox="25 25 50 50"><circle cx="50" cy="50" r="20" fill="none" stroke-width="2" stroke-miterlimit="10"></circle></svg>
       </div>
     </div>`)
+    if (conf?.transparentBg) $loading.style.background = 'transparent'
     parentElem.appendChild($loading)
   }
   $loading.style.display = ''

packages/artalk/src/lib/utils.ts

@@ -0,0 +1,277 @@
+import { marked as libMarked } from 'marked'
+import insane from 'insane'
+import hanabi from 'hanabi'
+import Context from '../context'
+
+export function createElement<E extends HTMLElement = HTMLElement>(htmlStr: string = ''): E {
+  const div = document.createElement('div')
+  div.innerHTML = htmlStr.trim()
+  return (div.firstElementChild || div) as E
+}
+
+export function getHeight(el: HTMLElement) {
+  return parseFloat(getComputedStyle(el, null).height.replace('px', ''))
+}
+
+export function htmlEncode(str: string) {
+  const temp = document.createElement('div')
+  temp.innerText = str
+  const output = temp.innerHTML
+  return output
+}
+
+export function htmlDecode(str: string) {
+  const temp = document.createElement('div')
+  temp.innerHTML = str
+  const output = temp.innerText
+  return output
+}
+
+export function getQueryParam(name: string) {
+  const match = RegExp(`[?&]${name}=([^&]*)`).exec(window.location.search);
+  return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
+}
+
+export function getOffset(el: HTMLElement) {
+  const rect = el.getBoundingClientRect()
+  return {
+    top: rect.top + window.scrollY,
+    left: rect.left + window.scrollX
+  }
+}
+
+export function padWithZeros(vNumber: number, width: number) {
+  let numAsString = vNumber.toString()
+  while (numAsString.length < width) {
+    numAsString = `0${numAsString}`
+  }
+  return numAsString
+}
+
+export function dateFormat(date: Date) {
+  const vDay = padWithZeros(date.getDate(), 2)
+  const vMonth = padWithZeros(date.getMonth() + 1, 2)
+  const vYear = padWithZeros(date.getFullYear(), 2)
+  // var vHour = padWithZeros(date.getHours(), 2);
+  // var vMinute = padWithZeros(date.getMinutes(), 2);
+  // var vSecond = padWithZeros(date.getSeconds(), 2);
+  return `${vYear}-${vMonth}-${vDay}`
+}
+
+export function timeAgo(date: Date) {
+  try {
+    const oldTime = date.getTime()
+    const currTime = new Date().getTime()
+    const diffValue = currTime - oldTime
+
+    const days = Math.floor(diffValue / (24 * 3600 * 1000))
+    if (days === 0) {
+      // 计算相差小时数
+      const leave1 = diffValue % (24 * 3600 * 1000) // 计算天数后剩余的毫秒数
+      const hours = Math.floor(leave1 / (3600 * 1000))
+      if (hours === 0) {
+        // 计算相差分钟数
+        const leave2 = leave1 % (3600 * 1000) // 计算小时数后剩余的毫秒数
+        const minutes = Math.floor(leave2 / (60 * 1000))
+        if (minutes === 0) {
+          // 计算相差秒数
+          const leave3 = leave2 % (60 * 1000) // 计算分钟数后剩余的毫秒数
+          const seconds = Math.round(leave3 / 1000)
+          return `${seconds} 秒前`
+        }
+        return `${minutes} 分钟前`
+      }
+      return `${hours} 小时前`
+    }
+    if (days < 0) return '刚刚'
+
+    if (days < 8) {
+      return `${days} 天前`
+    }
+
+    return dateFormat(date)
+  } catch (error) {
+    console.error(error)
+    return ' - '
+  }
+}
+
+/** 所有图片加载完毕后执行 */
+export function onImagesLoaded($container: HTMLElement, event: Function) {
+  if (!$container) return
+  const images = $container.getElementsByTagName('img')
+  if (!images.length) return
+  let loaded = images.length
+  for (let i = 0; i < images.length; i++) {
+    if (images[i].complete) {
+      loaded--
+    } else {
+      // eslint-disable-next-line @typescript-eslint/no-loop-func
+      images[i].addEventListener('load', () => {
+        loaded--
+        if (loaded === 0) event()
+      })
+    }
+
+    if (loaded === 0) event()
+  }
+}
+
+export function getGravatarURL(ctx: Context, emailMD5: string) {
+  return `${(ctx.conf.gravatar?.mirror || '').replace(/\/$/, '')}/${emailMD5}?d=${encodeURIComponent(ctx.conf.gravatar?.default || '')}&s=80`
+}
+
+export function sleep(ms: number) {
+  return new Promise(resolve => { setTimeout(resolve, ms) });
+}
+
+/** 版本号比较（a < b :-1 | 0 | b < a :1） */
+export function versionCompare(a: string, b: string) {
+  const pa = a.split('.')
+  const pb = b.split('.')
+  for (let i = 0; i < 3; i++) {
+      const na = Number(pa[i])
+      const nb = Number(pb[i])
+      if (na > nb) return 1
+      if (nb > na) return -1
+      if (!Number.isNaN(na) && Number.isNaN(nb)) return 1
+      if (Number.isNaN(na) && !Number.isNaN(nb)) return -1
+  }
+  return 0
+}
+
+/** 初始化 marked */
+export function initMarked(ctx: Context) {
+  const renderer = new libMarked.Renderer()
+  const linkRenderer = renderer.link
+  renderer.link = (href, title, text) => {
+    const localLink = href?.startsWith(`${window.location.protocol}//${window.location.hostname}`);
+    const html = linkRenderer.call(renderer as any, href, title, text);
+    return html.replace(/^<a /, `<a target="_blank" ${!localLink ? `rel="noreferrer noopener nofollow"` : ''} `);
+  }
+
+  renderer.code = (block, lang) => {
+    // Colorize the block only if the language is known to highlight.js
+    const realLang = (!lang ? 'plaintext' : lang)
+    let colorized = block
+    if ((window as any).hljs) {
+      if (realLang && (window as any).hljs.getLanguage(realLang)) {
+        colorized = (window as any).hljs.highlight(realLang, block).value
+      }
+    } else {
+      colorized = hanabi(block)
+    }
+
+    return `<pre rel="${realLang}">\n`
+      + `<code class="hljs language-${realLang}">${colorized.replace(/&amp;/g, '&')}</code>\n`
+      + `</pre>`
+  }
+
+  // @see https://github.com/markedjs/marked/blob/4afb228d956a415624c4e5554bb8f25d047676fe/src/Tokenizer.js#L329
+  const nMarked = libMarked
+  libMarked.setOptions({
+    renderer,
+    pedantic: false,
+    gfm: true,
+    breaks: true,
+    smartLists: true,
+    smartypants: true,
+    xhtml: false,
+    sanitize: false,
+    silent: true,
+  })
+
+  ctx.markedInstance = nMarked
+}
+
+/** 解析 markdown */
+export function marked(ctx: Context, src: string): string {
+  // @link https://gist.github.com/lionel-rowe/bb384465ba4e4c81a9c8dada84167225
+  return insane(ctx.markedInstance.parse(src), {
+    allowedClasses: {},
+    allowedSchemes: ['http', 'https', 'mailto'],
+    allowedTags: [
+      'a', 'abbr', 'article', 'b', 'blockquote', 'br', 'caption', 'code', 'del', 'details', 'div', 'em',
+      'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'main', 'mark',
+      'ol', 'p', 'pre', 'section', 'span', 'strike', 'strong', 'sub', 'summary', 'sup', 'table',
+      'tbody', 'td', 'th', 'thead', 'tr', 'u', 'ul'
+    ],
+    allowedAttributes: {
+      '*': ['title', 'accesskey'],
+      a: ['href', 'name', 'target', 'aria-label'],
+      img: ['src', 'alt', 'title', 'atk-emoticon', 'aria-label'],
+      // for code highlight
+      code: ['class'],
+      span: ['class', 'style'],
+    },
+    filter: node => {
+      // allow hljs style
+      const allowed = [
+        [ 'code', /^hljs\W+language-(.*)$/ ],
+        [ 'span', /^(hljs-.*)$/ ]
+      ]
+      allowed.forEach(([ tag, reg ]) => {
+        if (
+          node.tag === tag
+          && !!node.attrs.class
+          && !(reg as RegExp).test(node.attrs.class)
+        ) {
+          delete node.attrs.class
+        }
+      })
+
+      // allow <span> set color sty
+      if (node.tag === 'span' && !!node.attrs.style
+          && !/^color:(\W+)?#[0-9a-f]{3,6};?$/i.test(node.attrs.style)) {
+        delete node.attrs.style
+      }
+
+      return true
+    }
+  })
+}
+
+/** 获取修正后的 UserAgent */
+export async function getCorrectUserAgent() {
+  const uaRaw = navigator.userAgent
+  const uaData = (navigator as any).userAgentData // @link https://web.dev/migrate-to-ua-ch/
+  if (!uaData || !uaData.getHighEntropyValues) {
+    return uaRaw
+  }
+
+  // microsoft f******k you!!!!!
+  // @link https://docs.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11
+  let uaGot: any = null
+  try {
+    uaGot = await uaData.getHighEntropyValues(["platformVersion"])
+  } catch (err) { console.error(err); return uaRaw }
+
+  if (uaData.platform !== "Windows") { return uaRaw }
+  const majorPlatformVersion = Number(uaGot.platformVersion.split('.')[0])
+  if (majorPlatformVersion >= 13) {
+    // Win11 样本："Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36"
+    return uaRaw.replace(/Windows\W+NT\W+10.0/, 'Windows NT 11.0')
+  }
+
+  return uaRaw
+}
+
+/** 是否为完整的 URL */
+export function isValidURL(urlRaw: string) {
+  // @link https://www.rfc-editor.org/rfc/rfc3986
+  let url: URL
+  try {
+    url = new URL(urlRaw)
+  } catch (_) { return false }
+  return url.protocol === "http:" || url.protocol === "https:"
+}
+
+/** 获取基于 conf.server 的 URL */
+export function getURLBasedOnApi(ctx: Context, path: string) {
+  return `${ctx.conf.server.replace(/\/api\/?$/, '')}/${path.replace(/^\//, '')}`
+}
+
+/** 获取基于某个 baseURL 的 URL */
+export function getURLBasedOn(baseURL: string, path: string) {
+  return `${baseURL.replace(/\/$/, '')}/${path.replace(/^\//, '')}`
+}

packages/artalk/src/style/_color.less

@@ -0,0 +1,41 @@
+.artalk, .atk-layer-wrap {
+  --at-color-font: #2a2e2e;
+  --at-color-deep: #2a2e2e;
+  --at-color-sub: #757575;
+  --at-color-grey: #999;
+  --at-color-meta: #757e91;
+  --at-color-border: #eceff2;
+  --at-color-light: #4285f4;
+  --at-color-bg: #FFF;
+  --at-color-bg-transl: rgba(255, 255, 255, 0.94);
+  --at-color-bg-grey: #F4F4F4;
+  --at-color-bg-grey-transl: rgba(244, 244, 244, 0.75);
+  --at-color-bg-light: rgba(29, 161, 242, 0.1);
+  --at-color-main: #0083ff;
+  --at-color-red: #ff5652;
+  --at-color-pink: #fa5a57;
+  --at-color-yellow: #ff7c37;
+  --at-color-green: #4caf50;
+  --at-color-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(255, 255, 255));
+
+  &.atk-dark-mode {
+    --at-color-font: #fff;
+    --at-color-deep: #e7e7e7;
+    --at-color-sub: #e7e7e7;
+    --at-color-grey: #fff;
+    --at-color-meta: #fff;
+    --at-color-border: #2d3235;
+    --at-color-light: #687a86;
+    --at-color-bg: #1e2224;
+    --at-color-bg-transl: rgba(30, 34, 36, 0.95);
+    --at-color-bg-grey: #46494e;
+    --at-color-bg-grey-transl:  rgba(8, 8, 8, 0.95);
+    --at-color-bg-light: rgba(29, 161, 242, 0.1);
+    --at-color-main: #0083ff;
+    --at-color-red: #ff5652;
+    --at-color-pink: #fa5a57;
+    --at-color-yellow: #ff7c37;
+    --at-color-green: #4caf50;
+    --at-color-gradient: linear-gradient(180deg, rgba(30, 34, 36, 0), rgba(30, 34, 36, 1));
+  }
+}

packages/artalk/src/style/_extend.less

@@ -0,0 +1,20 @@
+.atk-slim-scrollbar() {
+  &::-webkit-scrollbar {
+    width: 4px;
+    height: 4px;
+    background: transparent;
+  }
+
+  &::-webkit-scrollbar-thumb,
+  &::-webkit-scrollbar-thumb:window-inactive {
+    background: rgba(86,86,86,.3);
+  }
+
+  &::-webkit-scrollbar-thumb:vertical:hover {
+    background: rgba(65,74,82,.77);
+  }
+
+  &::-webkit-scrollbar-thumb:vertical:active {
+    background: rgba(41,47,53,.77);
+  }
+}

packages/artalk/src/style/_variables.less

@@ -0,0 +1,4 @@
+@font-family: "Helvetica Neue", "PingFangSC-Light", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
+@font-size: 14px;
+@line-height: 1.6em;
+@block-radius: 4px;

packages/artalk/src/style/comment.less

@@ -0,0 +1,304 @@
+.atk-comment-wrap {
+  overflow: hidden;
+  position: relative;
+  border-bottom: 1px solid var(--at-color-border);
+
+  &.atk-flash-once {
+    animation: atkFlashOnce 1s ease-in-out 0s;
+
+    @keyframes atkFlashOnce {
+      from { background: rgba(0, 131, 255, 0.2); }
+      to { background: transparent; }
+    }
+  }
+
+  &.atk-unread:before {
+    content: ' ';
+    position: absolute;
+    left: 0;
+    top: 10%;
+    width: 3px;
+    height: 80%;
+    background: var(--at-color-main);
+  }
+
+  &.atk-openable {
+    cursor: pointer;
+
+    &:hover {
+      background: var(--at-color-bg-grey);
+    }
+
+    .atk-height-limit:after {
+      background: transparent !important;
+    }
+  }
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.atk-comment {
+  display: block;
+  padding: 12px 10px;
+
+  & > .atk-avatar {
+    display: block;
+    padding: 2px 0;
+    float: left;
+
+    img {
+      width: 48px;
+      height: 48px;
+      border-radius: 3px;
+    }
+  }
+
+  & > .atk-main {
+    display: block;
+    margin-left: 62px;
+
+    & > .atk-header {
+      line-height: 1;
+      font-size: 13px;
+      margin-bottom: 3px;
+      overflow: hidden;
+      position: relative;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+
+      .atk-item {
+        display: flex;
+        margin-bottom: 2px;
+        color: var(--at-color-meta);
+
+        &:not(:last-child) {
+          margin-right: 6px;
+        }
+
+        &.atk-nick, &.atk-nick a {
+          font-size: 14px;
+          color: var(--at-color-main);
+          text-decoration: none;
+        }
+      }
+
+      .badge() {
+        color: var(--at-color-meta);
+        background: var(--at-color-bg-grey);
+        padding: 0 6px;
+        line-height: 18px;
+        border-radius: 3px;
+
+        &:not(:last-child) {
+          margin-right: 6px;
+        }
+      }
+
+      .atk-badge {
+        .badge();
+        color: #fff;
+      }
+
+      .atk-pinned-badge {
+        .badge();
+        color: #fff;
+        background: #f44336;
+      }
+
+      .atk-ua {
+        .badge()
+      }
+
+      .atk-ua-wrap {
+        @media only screen and (max-width: 768px) {
+          display: block;
+        }
+      }
+    }
+
+    & > .atk-body {
+      display: block;
+      overflow: hidden;
+      position: relative;
+
+      img {
+        max-width: 100%;
+      }
+
+      & > .atk-content {
+        word-break: break-all;
+
+        &.atk-type-collapsed {
+          border: 3px solid var(--at-color-bg-grey);
+          border-bottom: 0;
+          padding: 5px 10px;
+          border-radius: @block-radius @block-radius 0 0;
+          margin-bottom: -5px;
+        }
+
+        & > *:first-child {
+          margin-top: 0;
+        }
+
+        & > *:last-child {
+          margin-bottom: 0;
+        }
+
+        .atk-height-limit-btn {
+          bottom: 5px;
+        }
+      }
+
+      & > .atk-pending {
+        color: var(--at-color-meta);
+        margin: 3px 0;
+        font-size: 13px;
+        padding: 10px 18px;
+        display: block;
+        background: var(--at-color-bg-grey);
+        border-left: 4px solid #f44336;
+      }
+
+      & > .atk-reply-to {
+        padding: 5px 15px;
+        border-left: 3px solid #eee;
+        margin-bottom: 10px;
+        position: relative;
+
+        .atk-meta {
+          font-size: 15px;
+
+          .atk-nick {
+            color: var(--at-color-main)
+          }
+        }
+
+        .atk-content {
+          margin-top: 5px;
+        }
+      }
+
+      & > .atk-collapsed {
+        margin: 3px 0;
+        font-size: 13px;
+        padding: 10px 18px;
+        display: block;
+        background: var(--at-color-bg-grey);
+        border-radius: @block-radius;
+
+        .atk-text {
+          color: var(--at-color-meta);
+        }
+
+        .atk-show-btn {
+          color: var(--at-color-main);
+          cursor: pointer;
+          user-select: none;
+          margin-left: 3px;
+          &:hover {
+            color: var(--at-color-main);
+          }
+        }
+      }
+    }
+
+    & > .atk-footer {
+      margin-top: 12px;
+
+      .atk-actions {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        flex-wrap: wrap;
+        margin-bottom: -15px;
+
+        & > span {
+          color: var(--at-color-meta);
+          font-size: 13px;
+          line-height: 15px;
+          display: inline-flex;
+          cursor: pointer;
+          user-select: none;
+          margin-bottom: 15px;
+
+          &.atk-error, &.atk-error:hover {
+            color: var(--at-color-red);
+          }
+
+          &:not(:first-child):not(.atk-hide) {
+            margin-left: 8px;
+            padding-left: 8px;
+            border-left: 1px solid var(--at-color-border);
+          }
+
+          &:hover {
+            color: var(--at-color-deep);
+          }
+        }
+      }
+    }
+  }
+
+  /** 内容限高 **/
+  .atk-height-limit:after {
+    position: absolute;
+    z-index: 1;
+    display: block;
+    overflow: hidden;
+    width: 100%;
+    content: " ";
+    bottom: 0;
+    height: 80px;
+    background: var(--at-color-gradient);
+  }
+
+  .atk-height-limit-btn {
+    z-index: 10;
+    position: absolute;
+    left: 50%;
+    bottom: 10px;
+    transform: translateX(-50%);
+    cursor: pointer;
+    border: 1px solid var(--at-color-border);
+    border-radius: @block-radius;
+    background: var(--at-color-bg);
+    padding: 1px 20px;
+    font-size: 15px;
+    color: var(--at-color-meta);
+    user-select: none;
+  }
+
+  // 避免重复显示按钮
+  .atk-height-limit .atk-height-limit .atk-height-limit-btn {
+    display: none;
+  }
+}
+
+/** 子评论区域 **/
+.atk-comment-children {
+  & > .atk-comment-wrap {
+    margin-top: 10px;
+    border-left: 1px dashed var(--at-color-border);
+    border-bottom-color: transparent;
+    &:not(:last-child) {
+      margin-bottom: 5px;
+    }
+
+    & > .atk-comment {
+      padding-top: 4px;
+      padding-bottom: 4px;
+
+      & > .atk-avatar img {
+        width: 36px;
+        height: 36px;
+      }
+
+      & > .atk-main {
+        margin-left: 47px;
+      }
+    }
+  }
+}

packages/artalk/src/style/editor.less

@@ -1,35 +1,32 @@
-.artalk > .atk-editor {
-  border: 1px solid @color-border;
-  border-radius: @block-radius;
-  margin-bottom: @block-margin;
-  overflow: hidden;
+.atk-main-editor {
+  @editor-padding: 10px;
+  z-index: 5;
   position: relative;
-  background: @color-bg;
+  overflow: hidden;
+  background: var(--at-color-bg);
+  border: 1px solid var(--at-color-border);
+  border-radius: @block-radius;
+  margin-bottom: 15px;
 
   @media only screen and (max-width: 768px) {
-    & > {
-      margin-bottom: @block-margin-mobile;
-    }
+    margin-bottom: 7px;
   }
 
-  & > .atk-editor-header {
+  & > .atk-header {
     display: flex;
     flex-direction: row;
-    padding: 0 @block-padding;
-    padding-top: calc(@block-padding / 2);
-    padding-bottom: 0;
+    padding: calc(@editor-padding / 2) @editor-padding 0;
 
     input {
-      font-size: 14px;
-      border: 2px solid transparent;
-      transition: color .3s ease;
       flex: 1;
+      width: 100%;
+      font-size: 14px;
       background: transparent;
+      border: 2px solid transparent;
       border-radius: calc(@block-radius / 2);
       padding: 6px 5px;
       resize: none;
       outline: none;
-      width: 100%;
 
       &:not(:last-child) {
         margin-right: 2px;
@@ -37,59 +34,46 @@
     }
   }
 
-  & > .atk-editor-textarea-wrap {
-    .atk-editor-textarea {
-      font-size: 15px;
-      color: @color-font;
-      background-color: @color-bg;
-      margin-top: 2px;
-      padding: @block-padding calc(10px + 5px);
+  & > .atk-textarea-wrap {
+    position: relative;
+
+    & > .atk-textarea {
       display: block;
-      width: 100%;
-      min-height: 130px;
-      resize: none;
-      word-wrap: break-word;
+      overflow: hidden;
+      color: var(--at-color-font);
+      font-size: 15px;
+      background-color: var(--at-color-bg);
       border: 2px solid transparent;
       border-radius: calc(@block-radius / 2);
+      width: 100%;
+      min-height: 130px;
+      margin-top: 2px;
+      padding: @editor-padding calc(10px + 5px);
+      resize: none;
+      word-wrap: break-word;
       outline: none;
-      overflow: hidden;
     }
 
-    .atk-close-comment {
-      display: flex;
-      user-select: none;
-      // background: repeating-linear-gradient(145deg, #f2f2f2, #f2f2f2 15px, #fff 0, #fff 30px);
-      padding: 0;
-      position: relative;
-      text-align: center;
-      min-height: 30px;
-      border-top: 1px solid @color-border;
-      margin-top: 4px;
-      font-weight: 100;
+    & > .atk-comment-closed {
+      pointer-events: none;
+      color: var(--at-color-meta);
       font-size: 12px;
-      place-items: center;
-      justify-content: center;
-      place-content: flex-end;
-      flex-direction: row;
-      background: @color-bg;
-
-      & > span {
-        color: @color-meta;
-        border-radius: 2px;
-        margin-right: 14px;
-      }
+      background-color: var(--at-color-bg);
+      border-top: 1px solid var(--at-color-border);
+      padding: 5px 15px;
+      // background: repeating-linear-gradient(145deg, #f2f2f2, #f2f2f2 15px, #fff 0, #fff 30px);
     }
 
-    .atk-send-reply {
+    & > .atk-send-reply {
       z-index: 2;
       position: absolute;
       right: 10px;
-      bottom: 40px;
+      bottom: 8px;
       max-width: calc(100% - 20px);
       height: 30px;
       line-height: 30px;
       font-size: 14px;
-      background: @color-bg-grey-transl;
+      background: var(--at-color-bg-grey-transl);
       padding: 0 30px 0 10px;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -110,97 +94,89 @@
         font-weight: 700;
 
         &:hover {
-          color: @color-deep;
+          color: var(--at-color-deep);
         }
       }
     }
   }
 
-  & > .atk-editor-plug-wrap {
+  & > .atk-plug-wrap {
     position: relative;
     height: 180px;
     width: 100%;
     overflow: hidden;
-    border-top: 1px solid @color-border;
-    animation: .3s both atkFadeIn;
-    transition: .2s height ease-in-out;
+    border-top: 1px solid var(--at-color-border);
+    animation: 0.3s both atkFadeIn;
+    transition: 0.2s height ease-in-out;
   }
 
-  & > .atk-editor-bottom {
+  & > .atk-bottom {
     display: flex;
     flex-direction: row;
-    border-top: 1px solid @color-border;
-    padding: 0 0 0 calc(@block-padding - 5px);
+    justify-content: space-between;
+    border-top: 1px solid var(--at-color-border);
+    padding: 0 0 0 calc(@editor-padding - 5px);
 
-    .atk-editor-bottom-part {
+    & > .atk-item {
       display: flex;
-      flex: 1;
       flex-direction: row;
       align-items: center;
-
-      &.atk-left {
-        flex: inherit;
-      }
-
-      &.atk-right {
-        justify-content: flex-end;
-      }
     }
 
-    .atk-editor-action {
+    .atk-plug-btn {
       padding: 0 8px;
       cursor: pointer;
-      color: @color-grey;
+      color: var(--at-color-grey);
       font-size: @font-size;
       user-select: none;
 
-      & > i {
-        color: @color-grey;
+      &:not(:last-child) {
+        border-right: 1px solid var(--at-color-border);
+      }
+
+      &.active {
+        color: var(--at-color-main);
+
+        svg.markdown path {
+          fill: var(--at-color-main);
+        }
+      }
+
+      i {
+        color: var(--at-color-grey);
         display: inline-flex;
         vertical-align: sub;
         margin-left: 4px;
         svg.markdown path {
-          fill: @color-grey;
+          fill: var(--at-color-grey);
         }
       }
-
-      &.active {
-        color: @color-main;
-
-        & > i > svg.markdown path {
-          fill: @color-main;
-        }
-      }
-
-      &:not(:last-child) {
-        border-right: 1px solid @color-border;
-      }
     }
 
     .atk-send-btn {
-      background: @color-main;
-      color: #FFF;
+      background: var(--at-color-main);
+      color: #fff;
+      font-size: @font-size;
       border: none;
       padding: 0 30px;
+      margin: 0;
       height: 30px;
       cursor: pointer;
-      transition: opacity .3s ease-in-out;
+      transition: opacity 0.3s ease-in-out;
       outline: none;
-      font-size: @font-size;
-      margin: 0;
 
       &:active {
-        opacity: .9;
+        opacity: 0.9;
       }
     }
   }
 
-  & > .atk-editor-notify-wrap {
+  & > .atk-notify-wrap {
+    z-index: 9;
     position: absolute;
     right: -2px;
     bottom: 36px;
     width: 225px;
-    z-index: 9;
-    opacity: .83;
+    opacity: 0.83;
   }
 }

packages/artalk/src/style/list.less

@@ -5,7 +5,73 @@
     display: flex;
     flex-direction: row;
     padding: 10px 10px 5px 10px;
-    border-bottom: 1px solid @color-border;
+    border-bottom: 1px solid var(--at-color-border);
+
+    .atk-text {
+      display: inline-block;
+    }
+
+    /* 下拉选择层 */
+    .atk-dropdown-wrap {
+      position: relative;
+      cursor: pointer;
+
+      .atk-arrow-down-icon {
+        cursor: pointer;
+        vertical-align: middle;
+        border-top: 5px solid var(--at-color-grey);
+        border-left: 3px solid transparent;
+        border-right: 3px solid transparent;
+        margin-top: -1px;
+        margin-left: 0.4rem;
+        display: inline-block;
+      }
+
+      &:hover {
+        .atk-dropdown {
+          display: block;
+        }
+      }
+
+      .atk-dropdown {
+        z-index: 888;
+        display: none;
+        height: auto !important;
+        max-height: calc(100vh - 2.7rem);
+        overflow-y: auto;
+        position: absolute;
+        top: 100%;
+        right: 0;
+        width: 100%;
+        background-color: var(--at-color-bg);
+        padding: 0.6rem 0;
+        border: 1px solid var(--at-color-border);
+        text-align: center;
+        border-radius: 0.25rem;
+        white-space: nowrap;
+        margin: 0;
+        list-style: none;
+      }
+
+      .atk-dropdown-item {
+        span, a {
+          display: block;
+          line-height: 2rem;
+          position: relative;
+          border-bottom: none;
+          font-weight: 400;
+          padding: 0 1.5rem;
+
+          &:hover {
+            color: var(--at-color-main);
+          }
+        }
+
+        &.active span, a {
+          color: var(--at-color-main);
+        }
+      }
+    }
 
     .atk-comment-count {
       font-size: 15px;
@@ -25,19 +91,19 @@
 
       & > span {
         font-size: 14px;
-        color: @color-meta;
+        color: var(--at-color-meta);
         cursor: pointer;
         user-select: none;
         position: relative;
 
         &.atk-on, &.atk-on * {
-          color: @color-main;
+          color: var(--at-color-main);
         }
 
         &:not(:last-child):not(.atk-hide) {
           margin-right: 10px;
           padding-right: 10px;
-          border-right: 1px solid @color-border;
+          border-right: 1px solid var(--at-color-border);
         }
 
         .atk-unread-badge {
@@ -45,7 +111,7 @@
           top: -5px;
           left: -6px;
           color: #fff;
-          background: @color-pink;
+          background: var(--at-color-pink);
           text-align: center;
           min-width: 16px;
           height: 16px;
@@ -61,12 +127,15 @@
   & > .atk-list-body {
     min-height: 150px;
 
-    & > .atk-list-comments-wrap {
+    .atk-list-comments-wrap {
+      .atk-main-editor {
+        margin-top: -1px;
+      }
     }
   }
 
   & > .atk-list-footer {
-    z-index: 100;
+    z-index: 1;
     position: absolute;
     bottom: 5px;
     right: 0;
@@ -80,12 +149,12 @@
     .atk-copyright {
       display: block;
       font-size: 12px;
-      color: @color-meta;
+      color: var(--at-color-meta);
       padding-right: 15px;
       margin-top: 5px;
 
       a {
-        color: @color-main;
+        color: var(--at-color-main);
         text-decoration: none;
       }
     }
@@ -101,7 +170,7 @@
 }
 
 .atk-list-read-more {
-  border-top: 1px dashed @color-border;
+  border-top: 1px dashed var(--at-color-border);
   margin-top: 20px;
   padding-bottom: 20px;
 
@@ -124,11 +193,11 @@
     width: 120px;
     margin: 0 auto;
     margin-top: -15px;
-    background: @color-bg;
-    border-color: @color-border;
+    background: var(--at-color-bg);
+    border-color: var(--at-color-border);
 
     &.atk-err > .atk-text {
-      color: @color-red !important;
+      color: var(--at-color-red) !important;
     }
 
     & > .atk-loading-icon {
@@ -137,12 +206,12 @@
     }
 
     & > .atk-text {
-      color: @color-meta;
+      color: var(--at-color-meta);
     }
 
     &:hover {
       & > .atk-text {
-        color: @color-main;
+        color: var(--at-color-main);
       }
     }
   }

packages/artalk/src/style/main.less

@@ -7,28 +7,50 @@
 }
 
 .artalk, .atk-layer-wrap {
+  line-height: @line-height;
+  color: var(--at-color-font);
+  font-family: @font-family;
+  word-wrap: break-word;
+  word-break: break-all;
+
   * {
     box-sizing: border-box;
-    line-height: @line-height;
-    color: @color-font;
-    font-family: @font-family;
-    word-wrap: break-word;
-    word-break: break-all;
+  }
+
+  input, textarea, button, optgroup, select {
+    font-family: inherit;
+  }
+
+  @codeFont: Source Code Pro,courier new,Input Mono,PT Mono,SFMono-Regular,Consolas,Monaco,Menlo,PingFang SC,Liberation Mono,Microsoft YaHei,Courier,monospace;
+
+  code {
+    font-family: @codeFont;
+    margin: 0 .3em;
+    padding: .1em .2em;
+    background-color: var(--at-color-bg-grey);
+    color: var(--at-color-font);
+    border-radius: @block-radius;
   }
 
   pre {
-    padding: 10px;
+    margin-top: 10px;
+    margin-bottom: 0;
+    line-height: 0;
+  }
+
+  pre code {
+    * { font-family: @codeFont; }
     line-height: @line-height;
-    background-color: @color-bg-grey;
-    color: @color-font;
-    padding: 5px 10px;
-    border-radius: calc(@block-radius / 2);
+    display: block;
+    padding: 10px 15px;
+    white-space: pre-wrap;
+    background-color: var(--at-color-bg-grey);
+    color: var(--at-color-font);
     margin: 0;
-    font-family: Source Code Pro,courier new,Input Mono,PT Mono,SFMono-Regular,Consolas,Monaco,Menlo,PingFang SC,Liberation Mono,Microsoft YaHei,Courier,monospace;
   }
 
   a {
-    color: @color-main;
+    color: var(--at-color-main);
     text-decoration: none;
   }
 
@@ -36,8 +58,8 @@
     position: static;
     margin: 10px 0 10px 0;
     padding: 10px 20px 10px 20px;
-    background: @color-bg-grey;
-    border-left: 4px solid @color-quote;
+    background: var(--at-color-bg-grey);
+    border-left: 4px solid #687a86;
   }
 
   p:first-child {
@@ -48,13 +70,31 @@
     margin-bottom: 0;
   }
 
-  * {
-    box-sizing: border-box;
-  }
-
   img {
     max-width: 100%;
   }
+
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    border-spacing: 0;
+    margin-bottom: 1.5em;
+    font-size: .96em
+  }
+
+  td, th {
+    text-align: left;
+    padding: 4px 8px 4px 10px;
+    border: 1px solid var(--at-color-border)
+  }
+
+  td {
+    vertical-align: top
+  }
+
+  tr:nth-child(even) {
+    background-color: var(--at-color-bg-grey);
+  }
 }
 
 .atk-hide {
@@ -67,7 +107,7 @@
   position: absolute;
   top: 0;
   left: 0;
-  background: @color-bg;
+  background: var(--at-color-bg);
   z-index: 10;
   align-items: center;
   justify-content: center;
@@ -170,7 +210,7 @@
 i.atk-icon {
   width: 20px;
   height: 20px;
-  background-color: @color-deep;
+  background-color: var(--at-color-deep);
   background-size: contain;
   background-repeat: no-repeat;
   mask-repeat: no-repeat;
@@ -182,7 +222,7 @@ i.atk-icon {
 }
 
 .atk-icon-del {
-  background-color: @color-red !important;
+  background-color: var(--at-color-red) !important;
   mask-image: url("data:image/svg+xml,%3Csvg width='22' height='22' viewBox='0 0 22 22' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M2.29167 5.04166L4.81251 5.04166M4.81251 5.04166L4.81251 18.3333C4.81251 18.5865 5.01771 18.7917 5.27084 18.7917L16.7292 18.7917C16.9823 18.7917 17.1875 18.5865 17.1875 18.3333V5.04166M4.81251 5.04166L7.33334 5.04166M17.1875 5.04166L19.7083 5.04166M17.1875 5.04166L14.6667 5.04166M7.33334 5.04166V3.20833L14.6667 3.20833V5.04166M7.33334 5.04166L14.6667 5.04166' stroke='%23D06565' stroke-width='2'/%3E%3Cpath d='M9.16667 8.25V15.125M12.8333 8.25V15.125' stroke='%23D06565' stroke-width='2'/%3E%3C/svg%3E");
 }
 
@@ -205,14 +245,14 @@ i.atk-icon {
 /* Layer */
 .atk-error-layer {
   &:extend(.atk-full-layer);
-  background-color: @color-bg-transl;
+  background-color: var(--at-color-bg-transl);
 
   .atk-error-title {
-    color: @color-red;
+    color: var(--at-color-red);
   }
 
   .atk-warn-title {
-    color: @color-yellow;
+    color: var(--at-color-yellow);
   }
 
   .atk-error-title, .atk-warn-title {
@@ -228,11 +268,11 @@ i.atk-icon {
     padding: 0 20px;
 
     * {
-      color: @color-deep;
+      color: var(--at-color-deep);
     }
 
     a {
-      color: @color-meta;
+      color: var(--at-color-meta);
     }
   }
 }
@@ -240,7 +280,7 @@ i.atk-icon {
 .atk-layer-dialog-wrap {
   @formInputHeight: 30px;
   &:extend(.atk-full-layer);
-  background-color: @color-bg-transl;
+  background-color: var(--at-color-bg-transl);
 
   & > .atk-layer-dialog {
     width: 25%;
@@ -248,19 +288,19 @@ i.atk-icon {
     & > .atk-layer-dialog-content {
       .atk-captcha-img {
         cursor: pointer;
-        width: 100px;
+        width: 170px;
         height: auto;
         margin-right: 10px;
         padding-right: 10px;
-        border-right: 1px solid @color-border;
+        border-right: 1px solid var(--at-color-border);
         vertical-align: bottom;
       }
 
       input {
         width: 100%;
         line-height: calc(@formInputHeight + 4px);
-        background-color: @color-bg;
-        border: 1px solid @color-border;
+        background-color: var(--at-color-bg);
+        border: 1px solid var(--at-color-border);
         border-radius: calc(@block-radius / 2);
         outline: none;
         padding: 0 6px;
@@ -279,9 +319,9 @@ i.atk-icon {
         flex: 1;
         display: block;
         cursor: pointer;
-        border: 1px solid @color-main;
+        border: 1px solid var(--at-color-main);
         background: transparent;
-        color: @color-main;
+        color: var(--at-color-main);
         border-radius: calc(@block-radius / 2);
         padding: 0 15px;
         line-height: @formInputHeight;
@@ -289,7 +329,7 @@ i.atk-icon {
 
         &:active {
           color: #FFF;
-          background: @color-main;
+          background: var(--at-color-main);
         }
 
         &:not(:last-child) {
@@ -303,6 +343,41 @@ i.atk-icon {
         }
       }
     }
+
+    .atk-checker-iframe-wrap {
+      position: fixed;
+      z-index: 999998;
+      left: 0;
+      top: 0;
+      height: 100vh;
+      width: 100vw;
+
+      & > iframe {
+        width: 100%;
+        height: 100%;
+        border: 0;
+      }
+
+      .atk-close-btn {
+        z-index: 999999;
+        position: fixed;
+        top: 20px;
+        right: 20px;
+        display: flex;
+        flex-direction: column;
+        width: 50px;
+        height: 50px;
+        align-items: center;
+        place-content: center;
+        cursor: pointer;
+        user-select: none;
+        margin-left: 10px;
+
+        &:hover .atk-icon-close {
+          background-color: rgba(232, 17, 35, 0.9);
+        }
+      }
+    }
   }
 }
 
@@ -355,19 +430,19 @@ i.atk-icon {
 /* Common Action Btn */
 .atk-common-action-btn {
   &.atk-btn-confirm {
-    color: @color-yellow !important;
+    color: var(--at-color-yellow) !important;
   }
 
   &.atk-btn-warn {
-    color: @color-yellow !important;
+    color: var(--at-color-yellow) !important;
   }
 
   &.atk-btn-error {
-    color: @color-red !important;
+    color: var(--at-color-red) !important;
   }
 
   &.atk-btn-success {
-    color: @color-green !important;
+    color: var(--at-color-green) !important;
   }
 }
 

packages/artalk/src/style/pagination.less

@@ -9,11 +9,11 @@
   & > .atk-input {
     font-size: 15px;
     height: 32px;
-    border: 1px solid @color-border;
+    border: 1px solid var(--at-color-border);
     border-radius: 3px;
     padding: 0 5px;
     text-align: center;
-    background: @color-bg;
+    background: var(--at-color-bg);
   }
 
   & > .atk-btn {
@@ -25,11 +25,11 @@
     align-items: center;
 
     &:hover {
-      background: @color-bg-grey;
+      background: var(--at-color-bg-grey);
     }
 
     &.atk-disabled {
-      color: @color-sub;
+      color: var(--at-color-sub);
 
       &:hover {
         cursor: default;
@@ -40,13 +40,13 @@
 
   & > .atk-input {
     background: transparent;
-    color: @color-font;
+    color: var(--at-color-font);
     font-size: 18px;
     width: 60px;
     outline: none;
 
     &:focus {
-      border-color: @color-main;
+      border-color: var(--at-color-main);
     }
   }
 

packages/artalk/src/style/sidebar-layer.less

@@ -0,0 +1,92 @@
+@header-height: 60px;
+@nav-height: 40px;
+
+.atk-sidebar-layer {
+  @width: 430px;
+  position: fixed;
+  z-index: 99999;
+  top: 0;
+  right: 0;
+  width: @width;
+  height: 100%;
+  background: var(--at-color-bg);
+  transition: transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+  transform: translate(@width, 0px);
+
+  @media only screen and (max-width: @width) {
+    & {
+      width: 100%;
+    }
+  }
+
+  .atk-sidebar-inner {
+    position: relative;
+    height: 100%;
+  }
+
+  // Header
+  .atk-sidebar-header {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    z-index: 99999;
+
+    .atk-sidebar-close {
+      display: flex;
+      flex-direction: column;
+      width: @header-height;
+      height: @header-height;
+      align-items: center;
+      place-content: center;
+      cursor: pointer;
+      user-select: none;
+      margin-left: 10px;
+
+      &:hover .atk-icon-close {
+        background-color: rgba(232, 17, 35, 0.9);
+      }
+    }
+  }
+
+  .atk-sidebar-iframe-wrap {
+    height: 100%;
+    position: relative;
+
+    iframe {
+      border: 0;
+      width: 100%;
+      height: 100%;
+    }
+
+    .atk-err-alert {
+      z-index: 9999;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      position: absolute;
+      background: var(--at-color-bg);
+      padding: 40px 30px;
+      width: 80%;
+      text-align: center;
+      border-radius: 4px;
+
+      .atk-title {
+        font-size: 1.4em;
+        margin-bottom: 20px;
+        color: var(--at-color-font);
+      }
+
+      .atk-text {
+        color: var(--at-color-font);
+
+        span {
+          cursor: pointer;
+          color: var(--at-color-main);
+        }
+      }
+    }
+  }
+}

packages/artalk/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "dist",
+    "paths": {
+      "~/*": ["./*"],
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["./src", "./types"]
+}

packages/artalk/types/artalk-config.d.ts

@@ -2,15 +2,6 @@ export default interface ArtalkConfig {
   /** 装载元素 */
   el: string
 
-  /** 评论框占位字符 */
-  placeholder?: string
-
-  /** 评论为空时显示字符 */
-  noComment?: string
-
-  /** 发送按钮文字 */
-  sendBtn?: string
-
   /** 页面唯一标识（完整 URL） */
   pageKey: string
 
@@ -23,6 +14,18 @@ export default interface ArtalkConfig {
   /** 站点名 */
   site?: string
 
+  /** 评论框占位字符 */
+  placeholder?: string
+
+  /** 评论为空时显示字符 */
+  noComment?: string
+
+  /** 发送按钮文字 */
+  sendBtn?: string
+
+  /** 评论框旅行（显示在待回复评论后面） */
+  editorTravel?: boolean
+
   /** 表情包 */
   emoticons?: any
 
@@ -45,7 +48,7 @@ export default interface ArtalkConfig {
   }
 
   /** 内容限高 */
-  heightLimit: {
+  heightLimit?: {
     /** 评论内容限高 */
     content?: number
 
@@ -59,6 +62,9 @@ export default interface ArtalkConfig {
   /** 评论投票反对按钮 */
   voteDown?: boolean
 
+  /** PV 元素 Selector */
+  pvEl?: string
+
   /** 暗黑模式 */
   darkMode?: boolean
 
@@ -74,6 +80,12 @@ export default interface ArtalkConfig {
   /** 显示 UA 徽标 */
   uaBadge?: boolean
 
+  /** 评论列表排序功能 (显示 Dropdown) */
+  listSort?: boolean
+
+  /** 图片上传功能 */
+  imgUpload?: boolean
+
   /** 版本检测 */
   versionCheck?: boolean
 }

packages/artalk/types/artalk-data.d.ts

@@ -29,6 +29,9 @@ export interface CommentData {
   /** 是否待审 */
   is_pending?: boolean
 
+  /** 是否置顶 */
+  is_pinned?: boolean
+
   /** 是否为管理员 */
   is_admin?: boolean
 
@@ -64,8 +67,8 @@ export interface ListData {
   /** 评论数据 */
   comments: CommentData[]
 
-  /** 父级评论总数 */
-  total_parents: number
+  /** 根评论总数 */
+  total_roots: number
 
   /** 评论总数（包括所有子评论） */
   total: number
@@ -84,6 +87,9 @@ export interface ListData {
 
   /** API 版本 */
   api_version: ApiVersionData
+
+  /** 后端配置 */
+  conf: any // TODO
 }
 
 export interface PageData {

packages/artalk/types/event.d.ts

@@ -8,6 +8,7 @@ export interface EventPayloadMap {
   'editor-submit': undefined       // 编辑器提交时
   'editor-submitted': undefined    // 编辑器提交后
   'user-changed': LocalUser        // 本地用户数据变更时
+  'conf-updated': undefined        // Artalk 配置变更时
 
   // List 操作（外部：不建议 listen，仅 trigger）
   'list-reload': undefined         // 重新加载 List
@@ -27,7 +28,10 @@ export interface EventPayloadMap {
   'editor-show-loading': undefined    // 加载显示
   'editor-hide-loading': undefined    // 加载隐藏
   'editor-notify': NotifyConf         // 显示提示
-  'editor-reply': CommentData         // 设置回复
+  'editor-reply': EditorReplyPayload  // 设置回复
+  'editor-reply-cancel': undefined    // 取消回复
+  'editor-travel': HTMLElement
+  'editor-travel-back': undefined
 
   // Notify
   'unread-update': UnreadUpdatePayload // 未读数据更新
@@ -51,6 +55,7 @@ export interface NotifyConf {
 
 export interface CheckerCaptchaPayload extends CheckerPayload {
   imgData?: string
+  iframe?: string
 }
 
 export interface UnreadUpdatePayload {
@@ -59,6 +64,12 @@ export interface UnreadUpdatePayload {
 
 export type ListUpdatePayload = (data: ListData | undefined) => void
 
+export interface EditorReplyPayload {
+  data: CommentData
+  $el: HTMLElement
+  scroll?: boolean
+}
+
 // ============================================
 export interface Handler<P> {
   (payload: P): void

packages/plugin-katex/README.md

@@ -0,0 +1,41 @@
+# @artalkjs/plugin-katex
+
+食用方法
+
+```html
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+
+  <!-- 引入 katex -->
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css">
+  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js"></script>
+
+  <!-- 引入 Artalk -->
+  <link href="https://cdn.jsdelivr.net/npm/artalk/dist/Artalk.css" rel="stylesheet">
+  <script src="https://cdn.jsdelivr.net/npm/artalk/dist/Artalk.js"></script>
+
+  <!-- 引入 @artalkjs/plugin-katex -->
+  <script defer src="https://cdn.jsdelivr.net/npm/@artalkjs/plugin-katex/dist/artalk-plugin-katex.js"></script>
+</head>
+<body>
+  
+<!-- Artalk -->
+<div id="Comments"></div>
+<script>
+  new Artalk({
+    el:        '#Comments',
+    pageKey:   '<页面链接>',
+    pageTitle: '<页面标题>',
+    server:    '<后端地址>',
+    site:      '<站点名称>',
+  })
+</script>
+
+</body>
+</html>
+```

packages/plugin-katex/index.d.ts

@@ -0,0 +1 @@
+import './main'

packages/plugin-katex/index.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>plugin-katex</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css">
+  <script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js"></script>
+</head>
+<body>
+  <div id="comments"></div>
+
+  <script type="module">
+    import Artalk from 'artalk'
+    import './main.ts'
+    import 'artalk/dist/Artalk.css'
+
+    var artalk = new Artalk({
+      el: '#comments',
+      pageKey: 'https://artalk.js.org/',
+      pageTitle: 'Artalk Home',
+      server: (import.meta.env.MODE === 'development') ? 'http://localhost:23366/api' : 'https://artalk.qwqaq.com/api',
+      site: 'ArtalkDemo',
+    });
+  </script>
+</body>
+</html>

packages/plugin-katex/main.ts

@@ -0,0 +1,54 @@
+/* eslint-disable guard-for-in */
+/* eslint-disable no-restricted-syntax */
+import Artalk from 'artalk'
+import katex from 'katex'
+
+Artalk.Use((ctx) => {
+  const renderer: any = {}
+
+  function renderMathsExpression(expr) {
+    if (expr[0] === '$' && expr[expr.length - 1] === '$') {
+      let displayStyle = false
+      expr = expr.substr(1, expr.length - 2)
+      if (expr[0] === '$' && expr[expr.length - 1] === '$') {
+        displayStyle = true
+        expr = expr.substr(1, expr.length - 2)
+      }
+      let html: any = null
+      try {
+        html = katex.renderToString(expr)
+      } catch (e) {
+        console.error(e)
+      }
+      if (displayStyle && html) {
+        html = html.replace(/class="katex"/g, 'class="katex katex-block" style="display: block;"')
+      }
+      return html
+    }
+
+    return null
+  }
+
+  renderer.paragraph = (text) => {
+    const blockRegex = /\$\$[^$]*\$\$/g
+    const inlineRegex = /\$[^$]*\$/g
+    const blockExprArray = text.match(blockRegex)
+    const inlineExprArray = text.match(inlineRegex)
+
+    for (const i in blockExprArray) {
+      const expr = blockExprArray[i]
+      const result = renderMathsExpression(expr)
+      text = text.replace(expr, result)
+    }
+
+    for (const i in inlineExprArray) {
+      const expr = inlineExprArray[i]
+      const result = renderMathsExpression(expr)
+      text = text.replace(expr, result)
+    }
+
+    return text
+  }
+
+  ctx.markedInstance.use({ renderer });
+})

packages/plugin-katex/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@artalkjs/plugin-katex",
+  "version": "0.1.0",
+  "license": "LGPL-3.0",
+  "description": "The katex plugin of artalk",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ArtalkJS/Artalk.git",
+    "directory": "packages/plugin-katex"
+  },
+  "homepage": "https://artalk.js.org",
+  "bugs": "https://github.com/ArtalkJS/Artalk/issue",
+  "main": "./dist/artalk-plugin-katex.js",
+  "unpkg": "./dist/artalk-plugin-katex.iife.js",
+  "jsdelivr": "./dist/artalk-plugin-katex.iife.js",
+  "module": "./dist/artalk-plugin-katex.es.js",
+  "types": "./index.d.ts",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "serve": "vite preview",
+    "prepublish": "pnpm build",
+    "publish": "pnpm publish --access=public"
+  },
+  "dependencies": {
+    "artalk": "workspace: *",
+    "katex": "^0.15.3"
+  },
+  "devDependencies": {
+    "@types/katex": "^0.14.0"
+  }
+}

packages/plugin-katex/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "dist"
+  },
+}

packages/plugin-katex/vite.config.ts

@@ -0,0 +1,34 @@
+import { defineConfig } from 'vite'
+import { resolve } from 'path'
+import tsconfigPaths from 'vite-tsconfig-paths'
+
+export default defineConfig({
+  base: './',
+  build: {
+    target: 'es2015',
+    outDir: resolve(__dirname, "dist"),
+    minify: 'terser',
+    lib: {
+      entry: resolve(__dirname, './main.ts'),
+      name: 'artalk-plugin-katex',
+      fileName: (format) => ((format == "umd") ? 'artalk-plugin-katex.js' : `artalk-plugin-katex.${format}.js`),
+      formats: ["es", "umd", "iife"]
+    },
+    rollupOptions: {
+      // 确保外部化处理那些你不想打包进库的依赖
+      external: ['artalk', 'katex'],
+      output: {
+        assetFileNames: assetInfo => {
+          return "[name].[ext]"
+        },
+        // 在 UMD 构建模式下为这些外部化的依赖提供一个全局变量
+        globals: {
+          artalk: 'Artalk',
+          katex: 'katex',
+        },
+        extend: true
+      }
+    }
+  },
+  plugins: [tsconfigPaths()],
+})