artalk 2.5.4 → 2.6.0

package/dist/src/api/page.d.ts

@@ -18,5 +18,5 @@ export default class PageApi extends ApiBase {
     /** PV */
     pv(): Promise<number>;
     /** 统计 */
-    stat(type: 'latest_comments' | 'latest_pages' | 'pv_most_pages' | 'comment_most_pages' | 'page_pv' | 'site_pv' | 'page_comment' | 'site_comment', pageKeys?: string | string[], limit?: number): Promise<number | object | CommentData[] | PageData[]>;
+    stat(type: 'latest_comments' | 'latest_pages' | 'pv_most_pages' | 'comment_most_pages' | 'page_pv' | 'site_pv' | 'page_comment' | 'site_comment', pageKeys?: string | string[], limit?: number): Promise<number | object | PageData[] | CommentData[]>;
 }

package/dist/src/context.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="marked" />
 import type ArtalkConfig from '../types/artalk-config';
 import type { CommentData, NotifyData } from '../types/artalk-data';
 import type ContextApi from '../types/context';

package/dist/src/i18n/jp.d.ts

@@ -0,0 +1,69 @@
+declare const _default: {
+    placeholder: string;
+    noComment: string;
+    send: string;
+    save: string;
+    nick: string;
+    email: string;
+    link: string;
+    emoticon: string;
+    preview: string;
+    image: string;
+    uploadFail: string;
+    commentFail: string;
+    restoredMsg: string;
+    onlyAdminCanReply: string;
+    uploadLoginMsg: string;
+    counter: string;
+    sortLatest: string;
+    sortOldest: string;
+    sortBest: string;
+    sortAuthor: string;
+    openComment: string;
+    closeComment: string;
+    listLoadFailMsg: string;
+    listRetry: string;
+    loadMore: string;
+    admin: string;
+    reply: string;
+    voteUp: string;
+    voteDown: string;
+    voteFail: string;
+    readMore: string;
+    actionConfirm: string;
+    collapse: string;
+    collapsed: string;
+    collapsedMsg: string;
+    expand: string;
+    approved: string;
+    pending: string;
+    pendingMsg: string;
+    edit: string;
+    editCancel: string;
+    delete: string;
+    deleteConfirm: string;
+    pin: string;
+    unpin: string;
+    seconds: string;
+    minutes: string;
+    hours: string;
+    days: string;
+    now: string;
+    adminCheck: string;
+    captchaCheck: string;
+    confirm: string;
+    cancel: string;
+    msgCenter: string;
+    ctrlCenter: string;
+    frontend: string;
+    backend: string;
+    loading: string;
+    loadFail: string;
+    editing: string;
+    editFail: string;
+    deleting: string;
+    deleteFail: string;
+    reqGot: string;
+    reqAborted: string;
+};
+export default _default;

package/dist/src/i18n/zh-TW.d.ts

@@ -0,0 +1,69 @@
+declare const _default: {
+    placeholder: string;
+    noComment: string;
+    send: string;
+    save: string;
+    nick: string;
+    email: string;
+    link: string;
+    emoticon: string;
+    preview: string;
+    image: string;
+    uploadFail: string;
+    commentFail: string;
+    restoredMsg: string;
+    onlyAdminCanReply: string;
+    uploadLoginMsg: string;
+    counter: string;
+    sortLatest: string;
+    sortOldest: string;
+    sortBest: string;
+    sortAuthor: string;
+    openComment: string;
+    closeComment: string;
+    listLoadFailMsg: string;
+    listRetry: string;
+    loadMore: string;
+    admin: string;
+    reply: string;
+    voteUp: string;
+    voteDown: string;
+    voteFail: string;
+    readMore: string;
+    actionConfirm: string;
+    collapse: string;
+    collapsed: string;
+    collapsedMsg: string;
+    expand: string;
+    approved: string;
+    pending: string;
+    pendingMsg: string;
+    edit: string;
+    editCancel: string;
+    delete: string;
+    deleteConfirm: string;
+    pin: string;
+    unpin: string;
+    seconds: string;
+    minutes: string;
+    hours: string;
+    days: string;
+    now: string;
+    adminCheck: string;
+    captchaCheck: string;
+    confirm: string;
+    cancel: string;
+    msgCenter: string;
+    ctrlCenter: string;
+    frontend: string;
+    backend: string;
+    loading: string;
+    loadFail: string;
+    editing: string;
+    editFail: string;
+    deleting: string;
+    deleteFail: string;
+    reqGot: string;
+    reqAborted: string;
+};
+export default _default;

package/dist/types/artalk-config.d.ts

@@ -34,10 +34,10 @@ export default interface ArtalkConfig {
 
   /** Gravatar 头像 */
   gravatar: {
-    /** 镜像 */
+    /** API 地址 */
     mirror: string
-    /** 默认头像（URL or Gravatar Type） */
-    default: string
+    /** API 参数 */
+    params: string
   }
 
   /** 头像链接生成器 */

package/dist/types/artalk-data.d.ts

@@ -185,6 +185,9 @@ export interface UserDataForAdmin extends UserData {
 
   /** 评论数 */
   comment_count: number
+
+  /** 密码 */
+  password: string
 }
 
 export interface NotifyData {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artalk",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "license": "LGPL-3.0",
   "description": "A Selfhosted Comment System",
   "keywords": [
@@ -23,13 +23,13 @@
   "module": "./dist/Artalk.es.js",
   "types": "./dist/src/main.d.ts",
   "devDependencies": {
-    "@types/marked": "4.0.8"
+    "@types/marked": "5.0.1"
   },
   "dependencies": {
     "abortcontroller-polyfill": "^1.7.5",
     "hanabi": "^0.4.0",
     "insane": "^2.6.2",
-    "marked": "^4.3.0"
+    "marked": "^7.0.4"
   },
   "scripts": {
     "dev": "vite",

package/src/defaults.ts

@@ -28,8 +28,8 @@ const defaults: ArtalkConfig = {
   pvEl: '#ArtalkPV',
 
   gravatar: {
-    default: 'mp',
     mirror: 'https://cravatar.cn/avatar/',
+    params: 'd=mp&s=240',
   },
 
   pagination: {

package/src/editor/plug-manager.ts

@@ -46,7 +46,7 @@ export function createPlugManager(editor: Editor): PlugManager {
   const DISABLED = getDisabledPlugNames(editor.conf)
 
   ENABLED_PLUGS
-    .filter(p => !DISABLED.includes(p.name)) // 禁用的插件
+    .filter(p => !DISABLED.includes(p.Name)) // 禁用的插件
     .forEach((Plug) => {
       initPlugItem(ctx, Plug)
     })

package/src/editor/submit.ts

@@ -48,13 +48,13 @@ async function Do(m: SubmitManager) {
     // submit error
     console.error(err)
     m.editor.showNotify(`${m.editor.$t('commentFail')}，${err.msg || String(err)}`, 'e')
+    return
+  } finally {
+    m.editor.hideLoading()
   }
 
-  // 复原编辑器
-  m.editor.reset()
-
+  m.editor.reset() // 复原编辑器
   m.editor.ctx.trigger('editor-submitted')
-  m.editor.hideLoading()
 }
 
 interface CustomSubmit {

package/src/lib/utils.ts

@@ -116,7 +116,8 @@ export function onImagesLoaded($container: HTMLElement, event: Function) {
 }
 
 export function getGravatarURL(ctx: Context, emailMD5: string) {
-  return `${(ctx.conf.gravatar.mirror).replace(/\/$/, '')}/${emailMD5}?d=${encodeURIComponent(ctx.conf.gravatar.default)}&s=80`
+  const { mirror, params } = ctx.conf.gravatar
+  return `${mirror.replace(/\/$/, '')}/${emailMD5}?${params.replace(/^\?/, '')}`
 }
 
 export function sleep(ms: number) {

package/types/artalk-config.d.ts

@@ -34,10 +34,10 @@ export default interface ArtalkConfig {
 
   /** Gravatar 头像 */
   gravatar: {
-    /** 镜像 */
+    /** API 地址 */
     mirror: string
-    /** 默认头像（URL or Gravatar Type） */
-    default: string
+    /** API 参数 */
+    params: string
   }
 
   /** 头像链接生成器 */

package/types/artalk-data.d.ts

@@ -185,6 +185,9 @@ export interface UserDataForAdmin extends UserData {
 
   /** 评论数 */
   comment_count: number
+
+  /** 密码 */
+  password: string
 }
 
 export interface NotifyData {