artalk 2.5.0 → 2.5.2

package/dist/i18n/jp.js

@@ -1 +1 @@
-!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self).jp=o()}(this,(function(){"use strict";const e={placeholder:"Leave a comment",noComment:"No Comment",send:"Send",save:"Save",nick:"Nickname",email:"Email",link:"Website",emoticon:"Emoji",preview:"Preview",image:"Image",uploadFail:"Upload Failed",commentFail:"Failed to comment",restoredMsg:"Content has been restored",onlyAdminCanReply:"Only admin can reply",uploadLoginMsg:"Please fill in your name and email to upload",counter:"{count} Comments",sortLatest:"Latest",sortOldest:"Oldest",sortBest:"Best",sortAuthor:"Author",openComment:"Open Comment",closeComment:"Close Comment",listLoadFailMsg:"Failed to load comments",listRetry:"Click to retry",loadMore:"Load More",admin:"Admin",reply:"Reply",voteUp:"Up",voteDown:"Down",voteFail:"Vote Failed",readMore:"Read More",actionConfirm:"Confirm",collapse:"Collapse",collapsed:"Collapsed",collapsedMsg:"This comment has been collapsed",expand:"Expand",approved:"Approved",pending:"Pending",pendingMsg:"Pending, visible only to commenter.",edit:"Edit",editCancel:"Cancel Edit",delete:"Delete",deleteConfirm:"Confirm",pin:"Pin",unpin:"Unpin",seconds:"seconds ago",minutes:"minutes ago",hours:"hours ago",days:"days ago",now:"just now",adminCheck:"Enter admin password:",captchaCheck:"Enter the CAPTCHA to continue:",confirm:"Confirm",cancel:"Cancel",msgCenter:"Messages",ctrlCenter:"Admin",frontend:"Frontend",backend:"Backend",loading:"Loading",loadFail:"Load Failed",editing:"Editing",editFail:"Edit Failed",deleting:"Deleting",deleteFail:"Delete Failed",reqGot:"Request got",reqAborted:"Request timed out or terminated unexpectedly"},o={en:e,"en-US":e,"zh-CN":{placeholder:"键入内容...",noComment:"「此时无声胜有声」",send:"发送评论",save:"保存评论",nick:"昵称",email:"邮箱",link:"网址",emoticon:"表情",preview:"预览",image:"图片",uploadFail:"上传失败",commentFail:"评论失败",restoredMsg:"内容已自动恢复",onlyAdminCanReply:"仅管理员可评论",uploadLoginMsg:"填入你的名字邮箱才能上传哦",counter:"{count} 条评论",sortLatest:"最新",sortOldest:"最早",sortBest:"最热",sortAuthor:"作者",openComment:"打开评论",closeComment:"关闭评论",listLoadFailMsg:"无法获取评论列表数据",listRetry:"点击重新获取",loadMore:"加载更多",admin:"管理员",reply:"回复",voteUp:"赞同",voteDown:"反对",voteFail:"投票失败",readMore:"阅读更多",actionConfirm:"确认操作",collapse:"折叠",collapsed:"已折叠",collapsedMsg:"该评论已被系统或管理员折叠",expand:"展开",approved:"已审",pending:"待审",pendingMsg:"审核中，仅本人可见。",edit:"编辑",editCancel:"取消编辑",delete:"删除",deleteConfirm:"确认删除",pin:"置顶",unpin:"取消置顶",seconds:"秒前",minutes:"分钟前",hours:"小时前",days:"天前",now:"刚刚",adminCheck:"键入密码来验证管理员身份：",captchaCheck:"键入验证码继续：",confirm:"确认",cancel:"取消",msgCenter:"通知中心",ctrlCenter:"控制中心",frontend:"前端",backend:"后端",loading:"加载中",loadFail:"加载失败",editing:"修改中",editFail:"修改失败",deleting:"删除中",deleteFail:"删除失败",reqGot:"请求响应",reqAborted:"请求超时或意外终止"}},n="ArtalkI18n";var t;t=(t="en").replace(/^([a-zA-Z]+)(-[a-zA-Z]+)?$/,((e,o,n)=>o.toLowerCase()+(n||"").toUpperCase())),o[t]?o[t]:window[n]&&window[n][t]?window[n][t]:o.en;const i=function(e,o,t){return window[n]||(window[n]={}),window[n][e]=o,t&&t.forEach((e=>{window[n][e]=o})),o}("jp",{placeholder:"コメントを残す",noComment:"コメントなし",send:"送信",save:"保存",nick:"ニックネーム",email:"メール",link:"ウェブサイト",emoticon:"絵文字",preview:"プレビュー",image:"画像",uploadFail:"アップロードに失敗しました",commentFail:"コメントに失敗しました",restoredMsg:"コンテンツが復元されました",onlyAdminCanReply:"管理者のみが返信できます",uploadLoginMsg:"アップロードするには、名前とメールアドレスを入力してください",counter:"{count} コメント",sortLatest:"最新のもの",sortOldest:"最も古い",sortBest:"ベスト",sortAuthor:"著者",openComment:"コメントを開く",closeComment:"コメントを閉じる",listLoadFailMsg:"コメントの読み込みに失敗しました",listRetry:"クリックで再試行",loadMore:"もっと読み込む",admin:"管理者",reply:"返信",voteUp:"アップ",voteDown:"ダウン",voteFail:"投票に失敗しました",readMore:"続きを読む",actionConfirm:"確認",collapse:"折りたたむ",collapsed:"折りたたまれた",collapsedMsg:"このコメントは折りたたまれました",expand:"展開",approved:"承認されました",pending:"保留中",pendingMsg:"保留中、コメント投稿者にのみ表示されます",edit:"編集",editCancel:"編集をキャンセル",delete:"削除",deleteConfirm:"確認",pin:"ピン",unpin:"ピン外し",seconds:"秒前",minutes:"分前",hours:"時間前",days:"数日前",now:"たった今",adminCheck:"管理者パスワードを入力してください:",captchaCheck:"続けるにはCAPTCHAを入力してください:",confirm:"確認",cancel:"取消",msgCenter:"メッセージ",ctrlCenter:"コンソール",frontend:"フロントエンド",backend:"バックエンド",loading:"読み込み中",loadFail:"読み込みに失敗しました",editing:"編集中",editFail:"編集に失敗しました",deleting:"削除中",deleteFail:"削除に失敗しました",reqGot:"リクエストを取得しました",reqAborted:"リクエストがタイムアウトしたか、予期せず終了した"},["jp-JP"]);return i}));
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self).jp=o()}(this,(function(){"use strict";const e="ArtalkI18n";var o,n,t;return o="jp",n={placeholder:"コメントを残す",noComment:"コメントなし",send:"送信",save:"保存",nick:"ニックネーム",email:"メール",link:"ウェブサイト",emoticon:"絵文字",preview:"プレビュー",image:"画像",uploadFail:"アップロードに失敗しました",commentFail:"コメントに失敗しました",restoredMsg:"コンテンツが復元されました",onlyAdminCanReply:"管理者のみが返信できます",uploadLoginMsg:"アップロードするには、名前とメールアドレスを入力してください",counter:"{count} コメント",sortLatest:"最新のもの",sortOldest:"最も古い",sortBest:"ベスト",sortAuthor:"著者",openComment:"コメントを開く",closeComment:"コメントを閉じる",listLoadFailMsg:"コメントの読み込みに失敗しました",listRetry:"クリックで再試行",loadMore:"もっと読み込む",admin:"管理者",reply:"返信",voteUp:"アップ",voteDown:"ダウン",voteFail:"投票に失敗しました",readMore:"続きを読む",actionConfirm:"確認",collapse:"折りたたむ",collapsed:"折りたたまれた",collapsedMsg:"このコメントは折りたたまれました",expand:"展開",approved:"承認されました",pending:"保留中",pendingMsg:"保留中、コメント投稿者にのみ表示されます",edit:"編集",editCancel:"編集をキャンセル",delete:"削除",deleteConfirm:"確認",pin:"ピン",unpin:"ピン外し",seconds:"秒前",minutes:"分前",hours:"時間前",days:"数日前",now:"たった今",adminCheck:"管理者パスワードを入力してください:",captchaCheck:"続けるにはCAPTCHAを入力してください:",confirm:"確認",cancel:"取消",msgCenter:"メッセージ",ctrlCenter:"コンソール",frontend:"フロントエンド",backend:"バックエンド",loading:"読み込み中",loadFail:"読み込みに失敗しました",editing:"編集中",editFail:"編集に失敗しました",deleting:"削除中",deleteFail:"削除に失敗しました",reqGot:"リクエストを取得しました",reqAborted:"リクエストがタイムアウトしたか、予期せず終了した"},t=["jp-JP"],window[e]||(window[e]={}),window[e][o]=n,t&&t.forEach((o=>{window[e][o]=n})),n}));

package/dist/i18n/zh-TW.js

@@ -1 +1 @@
-!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self)["zh-TW"]=o()}(this,(function(){"use strict";const e={placeholder:"Leave a comment",noComment:"No Comment",send:"Send",save:"Save",nick:"Nickname",email:"Email",link:"Website",emoticon:"Emoji",preview:"Preview",image:"Image",uploadFail:"Upload Failed",commentFail:"Failed to comment",restoredMsg:"Content has been restored",onlyAdminCanReply:"Only admin can reply",uploadLoginMsg:"Please fill in your name and email to upload",counter:"{count} Comments",sortLatest:"Latest",sortOldest:"Oldest",sortBest:"Best",sortAuthor:"Author",openComment:"Open Comment",closeComment:"Close Comment",listLoadFailMsg:"Failed to load comments",listRetry:"Click to retry",loadMore:"Load More",admin:"Admin",reply:"Reply",voteUp:"Up",voteDown:"Down",voteFail:"Vote Failed",readMore:"Read More",actionConfirm:"Confirm",collapse:"Collapse",collapsed:"Collapsed",collapsedMsg:"This comment has been collapsed",expand:"Expand",approved:"Approved",pending:"Pending",pendingMsg:"Pending, visible only to commenter.",edit:"Edit",editCancel:"Cancel Edit",delete:"Delete",deleteConfirm:"Confirm",pin:"Pin",unpin:"Unpin",seconds:"seconds ago",minutes:"minutes ago",hours:"hours ago",days:"days ago",now:"just now",adminCheck:"Enter admin password:",captchaCheck:"Enter the CAPTCHA to continue:",confirm:"Confirm",cancel:"Cancel",msgCenter:"Messages",ctrlCenter:"Admin",frontend:"Frontend",backend:"Backend",loading:"Loading",loadFail:"Load Failed",editing:"Editing",editFail:"Edit Failed",deleting:"Deleting",deleteFail:"Delete Failed",reqGot:"Request got",reqAborted:"Request timed out or terminated unexpectedly"},o={en:e,"en-US":e,"zh-CN":{placeholder:"键入内容...",noComment:"「此时无声胜有声」",send:"发送评论",save:"保存评论",nick:"昵称",email:"邮箱",link:"网址",emoticon:"表情",preview:"预览",image:"图片",uploadFail:"上传失败",commentFail:"评论失败",restoredMsg:"内容已自动恢复",onlyAdminCanReply:"仅管理员可评论",uploadLoginMsg:"填入你的名字邮箱才能上传哦",counter:"{count} 条评论",sortLatest:"最新",sortOldest:"最早",sortBest:"最热",sortAuthor:"作者",openComment:"打开评论",closeComment:"关闭评论",listLoadFailMsg:"无法获取评论列表数据",listRetry:"点击重新获取",loadMore:"加载更多",admin:"管理员",reply:"回复",voteUp:"赞同",voteDown:"反对",voteFail:"投票失败",readMore:"阅读更多",actionConfirm:"确认操作",collapse:"折叠",collapsed:"已折叠",collapsedMsg:"该评论已被系统或管理员折叠",expand:"展开",approved:"已审",pending:"待审",pendingMsg:"审核中，仅本人可见。",edit:"编辑",editCancel:"取消编辑",delete:"删除",deleteConfirm:"确认删除",pin:"置顶",unpin:"取消置顶",seconds:"秒前",minutes:"分钟前",hours:"小时前",days:"天前",now:"刚刚",adminCheck:"键入密码来验证管理员身份：",captchaCheck:"键入验证码继续：",confirm:"确认",cancel:"取消",msgCenter:"通知中心",ctrlCenter:"控制中心",frontend:"前端",backend:"后端",loading:"加载中",loadFail:"加载失败",editing:"修改中",editFail:"修改失败",deleting:"删除中",deleteFail:"删除失败",reqGot:"请求响应",reqAborted:"请求超时或意外终止"}},n="ArtalkI18n";var t;t=(t="en").replace(/^([a-zA-Z]+)(-[a-zA-Z]+)?$/,((e,o,n)=>o.toLowerCase()+(n||"").toUpperCase())),o[t]?o[t]:window[n]&&window[n][t]?window[n][t]:o.en;const i=function(e,o,t){return window[n]||(window[n]={}),window[n][e]=o,t&&t.forEach((e=>{window[n][e]=o})),o}("zh-TW",{placeholder:"鍵入內容...",noComment:"「此時無聲勝有聲」",send:"發送評論",save:"保存評論",nick:"昵稱",email:"郵箱",link:"網址",emoticon:"表情",preview:"預覽",image:"圖片",uploadFail:"上傳失敗",commentFail:"評論失敗",restoredMsg:"內容已自動恢復",onlyAdminCanReply:"僅管理員可評論",uploadLoginMsg:"填入你的名字郵箱才能上傳哦",counter:"{count} 條評論",sortLatest:"最新",sortOldest:"最早",sortBest:"最熱",sortAuthor:"作者",openComment:"打開評論",closeComment:"關閉評論",listLoadFailMsg:"無法獲取評論列表數據",listRetry:"點擊重新獲取",loadMore:"加載更多",admin:"管理員",reply:"回覆",voteUp:"贊同",voteDown:"反對",voteFail:"投票失敗",readMore:"閱讀更多",actionConfirm:"確認操作",collapse:"摺疊",collapsed:"已摺疊",collapsedMsg:"該評論已被系統或管理員摺疊",expand:"展開",approved:"已審",pending:"待審",pendingMsg:"審核中，僅本人可見。",edit:"編輯",editCancel:"取消編輯",delete:"刪除",deleteConfirm:"確認刪除",pin:"置頂",unpin:"取消置頂",seconds:"秒前",minutes:"分鐘前",hours:"小時前",days:"天前",now:"剛剛",adminCheck:"鍵入密碼來驗證管理員身份：",captchaCheck:"鍵入驗證碼繼續：",confirm:"確認",cancel:"取消",msgCenter:"通知中心",ctrlCenter:"控制中心",frontend:"前端",backend:"後端",loading:"加載中",loadFail:"加載失敗",editing:"修改中",editFail:"修改失敗",deleting:"刪除中",deleteFail:"刪除失敗",reqGot:"請求響應",reqAborted:"請求超時或意外終止"});return i}));
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o():"function"==typeof define&&define.amd?define(o):(e="undefined"!=typeof globalThis?globalThis:e||self)["zh-TW"]=o()}(this,(function(){"use strict";const e="ArtalkI18n";var o,n,t;return o="zh-TW",n={placeholder:"鍵入內容...",noComment:"「此時無聲勝有聲」",send:"發送評論",save:"保存評論",nick:"昵稱",email:"郵箱",link:"網址",emoticon:"表情",preview:"預覽",image:"圖片",uploadFail:"上傳失敗",commentFail:"評論失敗",restoredMsg:"內容已自動恢復",onlyAdminCanReply:"僅管理員可評論",uploadLoginMsg:"填入你的名字郵箱才能上傳哦",counter:"{count} 條評論",sortLatest:"最新",sortOldest:"最早",sortBest:"最熱",sortAuthor:"作者",openComment:"打開評論",closeComment:"關閉評論",listLoadFailMsg:"無法獲取評論列表數據",listRetry:"點擊重新獲取",loadMore:"加載更多",admin:"管理員",reply:"回覆",voteUp:"贊同",voteDown:"反對",voteFail:"投票失敗",readMore:"閱讀更多",actionConfirm:"確認操作",collapse:"摺疊",collapsed:"已摺疊",collapsedMsg:"該評論已被系統或管理員摺疊",expand:"展開",approved:"已審",pending:"待審",pendingMsg:"審核中，僅本人可見。",edit:"編輯",editCancel:"取消編輯",delete:"刪除",deleteConfirm:"確認刪除",pin:"置頂",unpin:"取消置頂",seconds:"秒前",minutes:"分鐘前",hours:"小時前",days:"天前",now:"剛剛",adminCheck:"鍵入密碼來驗證管理員身份：",captchaCheck:"鍵入驗證碼繼續：",confirm:"確認",cancel:"取消",msgCenter:"通知中心",ctrlCenter:"控制中心",frontend:"前端",backend:"後端",loading:"加載中",loadFail:"加載失敗",editing:"修改中",editFail:"修改失敗",deleting:"刪除中",deleteFail:"刪除失敗",reqGot:"請求響應",reqAborted:"請求超時或意外終止"},window[e]||(window[e]={}),window[e][o]=n,t&&t.forEach((o=>{window[e][o]=n})),n}));

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

@@ -27,7 +27,7 @@ export default class UserApi extends ApiBase {
     /** 用户 · 注销 */
     logout(): Promise<unknown>;
     /** 已读标记 */
-    markRead(notifyKey: string, readAll?: boolean): Promise<unknown>;
+    markRead(commentID: number, notifyKey: string, readAll?: boolean): Promise<unknown>;
     /** 用户 · 列表 */
     userList(offset?: number, limit?: number, type?: 'all' | 'admin' | 'in_conf'): Promise<{
         users: UserDataForAdmin[];

package/dist/src/context.d.ts

@@ -20,6 +20,7 @@ declare class Context implements ContextApi {
     private eventList;
     constructor(conf: ArtalkConfig, $root?: HTMLElement);
     inject(depName: string, obj: any): void;
+    get(depName: string): any;
     getApi(): Api;
     getCommentList(): Comment[];
     getCommentDataList(): CommentData[];

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

@@ -0,0 +1,70 @@
+import type { I18n } from '.';
+export declare const GLOBAL_LOCALES_KEY = "ArtalkI18n";
+export declare function defineLocaleExternal(lang: string, locale: I18n, aliases?: string[]): {
+    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;
+};

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

@@ -207,74 +207,6 @@ export declare const internal: {
         reqAborted: string;
     };
 };
-export declare function defineLocaleExternal(lang: string, locale: I18n, aliases?: string[]): {
-    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;
-};
 /**
  * find a locale object by language name
  */

package/dist/src/lib/checker/index.d.ts

@@ -1,7 +1,6 @@
 import Context from '../../../types/context';
 import Layer from '../../layer';
 import type Api from '../../api';
-import type User from '../user';
 export interface CheckerCaptchaPayload extends CheckerPayload {
     imgData?: string;
     iframe?: string;
@@ -41,7 +40,6 @@ export interface CheckerCtx {
     set<K extends keyof CheckerStore>(key: K, val: CheckerStore[K]): void;
     getCtx(): Context;
     getApi(): Api;
-    getUser(): User;
     getLayer(): Layer;
     hideInteractInput(): void;
     triggerSuccess(): void;

package/dist/src/lib/user.d.ts

@@ -1,9 +1,10 @@
 import { LocalUser } from '../../types/artalk-config';
 import Context from '../../types/context';
-export default class User {
-    ctx: Context;
+declare class User {
+    ctx?: Context;
     data: LocalUser;
-    constructor(ctx: Context);
+    constructor();
+    setContext(ctx: Context): void;
     /** 保存用户到 localStorage 中 */
     update(obj?: Partial<LocalUser>): void;
     /** 注销，清除用户登录状态 */
@@ -11,3 +12,5 @@ export default class User {
     /** 是否已填写基本用户信息 */
     checkHasBasicUserInfo(): boolean;
 }
+declare const UserInstance: User;
+export default UserInstance;

package/dist/src/list/list-ui.d.ts

@@ -5,3 +5,12 @@ export declare function refreshUI(list: ListLite): void;
 export declare function renderErrorDialog(list: ListLite, errMsg: string, errData?: any): HTMLElement;
 /** 版本检测弹窗 */
 export declare function versionCheckDialog(list: ListLite, feVer: string, beVer: string): boolean;
+/** 评论排序方式选择下拉菜单 */
+export declare function renderDropdown(conf: {
+    $dropdownWrap: HTMLElement;
+    dropdownList: [string, () => void][];
+}): void;
+/** 删除评论排序方式选择下拉菜单 */
+export declare function removeDropdown(conf: {
+    $dropdownWrap: HTMLElement;
+}): void;

package/dist/src/list/list.d.ts

@@ -20,7 +20,6 @@ export default class List extends ListLite {
     /** 管理员设置页面信息 */
     adminPageEditSave(): void;
     showUnreadBadge(count: number): void;
-    private dropdownLoaded;
     /** 初始化选择下拉层 */
     protected initDropdown(): void;
     updateUnread(notifies: NotifyData[]): void;

package/dist/src/service.d.ts

@@ -3,7 +3,6 @@ import CheckerLauncher from './lib/checker';
 import Api from './api';
 import Editor from './editor';
 import SidebarLayer from './layer/sidebar-layer';
-import User from './lib/user';
 import ListLite from './list/list-lite';
 /**
  * Services
@@ -15,7 +14,14 @@ import ListLite from './list/list-lite';
 declare const services: {
     i18n(ctx: Context): void;
     markdown(): void;
-    user(ctx: Context): User;
+    user(ctx: Context): {
+        ctx?: Context | undefined;
+        data: import("../types/artalk-config").LocalUser;
+        setContext(ctx: Context): void;
+        update(obj?: Partial<import("../types/artalk-config").LocalUser>): void;
+        logout(): void;
+        checkHasBasicUserInfo(): boolean;
+    };
     api(ctx: Context): Api;
     checkerLauncher(ctx: Context): CheckerLauncher;
     editor(ctx: Context): Editor;

package/dist/types/context.d.ts

@@ -22,14 +22,13 @@ export default interface ContextApi {
   /** 依赖注入函数 */
   inject<K extends keyof TInjectedServices>(depName: K, obj: TInjectedServices[K]): void
 
+  /** 获取依赖对象 */
+  get<K extends keyof TInjectedServices>(depName: K): TInjectedServices[K]
+
   /** 配置对象 */
   // TODO 修改为 getConf() 和 setConf()
   conf: ArtalkConfig
 
-  /** 用户对象 */
-  // TODO 修改为 getUser()
-  user: User
-
   /** marked 依赖对象 */
   getMarkedInstance(): TMarked | undefined
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artalk",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "license": "LGPL-3.0",
   "description": "A Selfhosted Comment System",
   "keywords": [

package/src/api/comment.ts

@@ -1,6 +1,7 @@
 import { CommentData, ListData } from '~/types/artalk-data'
 import * as Utils from '../lib/utils'
 import ApiBase from './api-base'
+import User from '../lib/user'
 
 /**
  * 评论 API
@@ -16,9 +17,9 @@ export default class CommentApi extends ApiBase {
     }
 
     if (flatMode) params.flat_mode = flatMode // 平铺模式
-    if (this.ctx.user.checkHasBasicUserInfo()) {
-      params.name = this.ctx.user.data.nick
-      params.email = this.ctx.user.data.email
+    if (User.checkHasBasicUserInfo()) {
+      params.name = User.data.nick
+      params.email = User.data.email
     }
 
     if (paramsEditor) paramsEditor(params)
@@ -68,14 +69,13 @@ export default class CommentApi extends ApiBase {
   /** 投票 */
   public async vote(targetID: number, type: string) {
     const params: any = {
-      site_name: this.ctx.conf.site || '',
       target_id: targetID,
       type,
     }
 
-    if (this.ctx.user.checkHasBasicUserInfo()) {
-      params.name = this.ctx.user.data.nick
-      params.email = this.ctx.user.data.email
+    if (User.checkHasBasicUserInfo()) {
+      params.name = User.data.nick
+      params.email = User.data.email
     }
 
     const data = await this.POST<any>('/vote', params)

package/src/api/page.ts

@@ -55,7 +55,6 @@ export default class PageApi extends ApiBase {
   /** 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 || ''
     }
@@ -73,7 +72,6 @@ export default class PageApi extends ApiBase {
   ) {
     const params: any = {
       type,
-      site_name: this.ctx.conf.site || '',
     }
 
     if (pageKeys) params.page_keys = Array.isArray(pageKeys) ? pageKeys.join(',') : pageKeys

package/src/api/request.ts

@@ -1,11 +1,13 @@
 import Context from '~/types/context'
+import User from '../lib/user'
+import $t from '../i18n'
 
 /** 公共请求函数 */
 export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit, timeout?: number): Promise<any> {
   // JWT
-  if (ctx.user.data.token) {
+  if (User.data.token) {
     const headers = new Headers(init.headers) // 保留原有 headers
-    headers.set('Authorization', `Bearer ${ctx.user.data.token}`)
+    headers.set('Authorization', `Bearer ${User.data.token}`)
     init.headers = headers
   }
 
@@ -20,7 +22,7 @@ export async function Fetch(ctx: Context, input: RequestInfo, init: RequestInit,
   const isNoAccess = noAccessCodes.includes(respHttpCode)
 
   if (!resp.ok && !isNoAccess)
-    throw new Error(`${ctx.$t('reqGot')} ${respHttpCode}`)
+    throw new Error(`${$t('reqGot')} ${respHttpCode}`)
 
   // 解析获取响应的 json
   let json: any = await resp.json()
@@ -95,7 +97,7 @@ function timeoutFetch(ctx: Context, url: RequestInfo, ms: number, opts: RequestI
     promise.finally(() => { clearTimeout(timer) })
   }
   promise = promise.catch((err) => {
-    throw ((err || {}).name === 'AbortError') ? new Error(ctx.$t('reqAborted')) : err
+    throw ((err || {}).name === 'AbortError') ? new Error($t('reqAborted')) : err
   })
   return promise
 }

package/src/api/upload.ts

@@ -1,5 +1,6 @@
 import { ToFormData } from './request'
 import ApiBase from './api-base'
+import User from '../lib/user'
 
 /**
  * 上传 API
@@ -8,13 +9,11 @@ export default class UploadApi extends ApiBase {
   /** 图片上传 */
   public async imgUpload(file: File) {
     const params: any = {
-      name: this.ctx.user.data.nick,
-      email: this.ctx.user.data.email,
+      name: User.data.nick,
+      email: 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)
 

package/src/api/user.ts

@@ -1,6 +1,7 @@
 import { UserData, NotifyData, UserDataForAdmin } from '~/types/artalk-data'
 import ApiBase from './api-base'
 import { ToFormData } from './request'
+import User from '../lib/user'
 
 /**
  * 用户 API
@@ -12,8 +13,6 @@ export default class UserApi extends ApiBase {
       name, email, password
     }
 
-    if (this.ctx.conf.site) params.site_name = this.ctx.conf.site
-
     const data = await this.POST<any>('/login', params)
     return data as { token: string, user: UserData }
   }
@@ -22,7 +21,7 @@ export default class UserApi extends ApiBase {
   public userGet(name: string, email: string) {
     const ctrl = new AbortController()
     const params: any = {
-      name, email, site_name: (this.ctx.conf.site || '')
+      name, email
     }
 
     const req = this.Fetch(`/user-get`, {
@@ -45,8 +44,8 @@ export default class UserApi extends ApiBase {
   /** 用户 · 登录状态 */
   public async loginStatus() {
     const data = await this.POST<any>('/login-status', {
-      name: this.ctx.user.data.nick,
-      email: this.ctx.user.data.email
+      name: User.data.nick,
+      email: User.data.email
     })
     return (data || { is_login: false, is_admin: false }) as { is_login: boolean, is_admin: boolean }
   }
@@ -57,17 +56,18 @@ export default class UserApi extends ApiBase {
   }
 
   /** 已读标记 */
-  public markRead(notifyKey: string, readAll = false) {
+  public markRead(commentID: number, notifyKey: string, readAll = false) {
     const params: any = {
-      site_name: this.ctx.conf.site || '',
+      comment_id: commentID,
       notify_key: notifyKey,
     }
 
     if (readAll) {
+      delete params.comment_id
       delete params.notify_key
       params.read_all = true
-      params.name = this.ctx.user.data.nick
-      params.email = this.ctx.user.data.email
+      params.name = User.data.nick
+      params.email = User.data.email
     }
 
     return this.POST(`/mark-read`, params)

package/src/artalk.ts

@@ -10,6 +10,7 @@ import { handelBaseConf } from './config'
 import Services from './service'
 import * as Stat from './lib/stat'
 import ListLite from './list/list-lite'
+import Api from './api'
 
 /**
  * Artalk
@@ -31,7 +32,7 @@ export default class Artalk {
   public static DisabledComponents: string[] = []
 
   constructor(conf: Partial<ArtalkConfig>) {
-    if (Artalk.instance) return Artalk.instance.update(conf)
+    if (Artalk.instance) Artalk.destroy()
 
     // 初始化基本配置
     this.conf = handelBaseConf(conf)
@@ -56,7 +57,7 @@ export default class Artalk {
 
   /** Init Artalk */
   public static init(conf: Partial<ArtalkConfig>): Artalk {
-    if (this.instance) return this.instance.update(conf) // 单例模式
+    if (this.instance) Artalk.destroy()
     this.instance = new Artalk(conf)
     return this.instance
   }
@@ -153,7 +154,8 @@ export default class Artalk {
 
   /** Load count widget */
   public static loadCountWidget(conf: Partial<ArtalkConfig>) {
-    const ctx = new ConcreteContext(handelBaseConf(conf))
+    const ctx: Context = new ConcreteContext(handelBaseConf(conf))
+    ctx.inject('api', new Api(ctx))
     Stat.initCountWidget({ ctx, pvAdd: false })
   }
 

package/src/context.ts

@@ -39,14 +39,16 @@ class Context implements ContextApi {
     this.$root = $root || document.createElement('div')
     this.$root.classList.add('artalk')
     this.$root.innerHTML = ''
-
-    this.api = new Api(this)
   }
 
   public inject(depName: string, obj: any) {
     this[depName] = obj
   }
 
+  public get(depName: string) {
+    return this[depName]
+  }
+
   public getApi() {
     return this.api
   }

package/src/editor/edit-mode.ts

@@ -1,6 +1,7 @@
 import type { CommentData } from '~/types/artalk-data'
 import * as Utils from '../lib/utils'
 import Editor from './editor'
+import User from '../lib/user'
 
 export interface EditModeManager {
   editor: Editor
@@ -69,7 +70,7 @@ function cancelEdit(m: EditModeManager) {
   m.comment = undefined
   m.editor.travelBack()
 
-  const { nick, email, link } = m.editor.ctx.user.data
+  const { nick, email, link } = User.data
   ui.$nick.value = nick
   ui.$email.value = email
   ui.$link.value = link

package/src/editor/editor.ts

@@ -4,6 +4,7 @@ import Component from '../lib/component'
 import * as Utils from '../lib/utils'
 import * as Ui from '../lib/ui'
 import marked from '../lib/marked'
+import User from '../lib/user'
 import initEditorFuncs from './funcs'
 import { render, EditorUI } from './ui'
 import { PlugManager } from './plug-manager'
@@ -178,7 +179,7 @@ export default class Editor extends Component {
     if (!this.ui.$textareaWrap.querySelector('.atk-comment-closed'))
       this.ui.$textareaWrap.prepend(Utils.createElement(`<div class="atk-comment-closed">${this.$t('onlyAdminCanReply')}</div>`))
 
-    if (!this.ctx.user.data.isAdmin) {
+    if (!User.data.isAdmin) {
       this.ui.$textarea.style.display = 'none'
       this.closePlugPanel()
       this.ui.$bottom.style.display = 'none'

package/src/editor/funcs.ts

@@ -1,4 +1,5 @@
 import Editor from './editor'
+import User from '../lib/user'
 import { createMover } from './mover'
 import { createPlugManager } from './plug-manager'
 import { createReplyManager } from './reply'
@@ -31,7 +32,7 @@ function localStorage(editor: Editor) {
 function header(editor: Editor) {
   const $inputs = editor.getHeaderInputEls()
   Object.entries($inputs).forEach(([key, $input]) => {
-    $input.value = editor.ctx.user.data[key] || ''
+    $input.value = User.data[key] || ''
     $input.addEventListener('input', () => onHeaderInput(editor, key, $input))
 
     // 设置 Placeholder
@@ -42,7 +43,7 @@ function header(editor: Editor) {
 function onHeaderInput(editor: Editor, field: string, $input: HTMLInputElement) {
   if (editor.isEditMode) return // 评论编辑模式，不修改个人信息
 
-  editor.ctx.user.update({
+  User.update({
     [field]: $input.value.trim()
   })