v2.2.4

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

README.md

@@ -14,7 +14,9 @@
 
 > 🌌 一款简洁的自托管评论系统 | A Selfhosted Comment System.
 
-前往：[“**官方文档**”](https://artalk.js.org)
+可参考：[“官方文档”](https://artalk.js.org)
+
+最新版：[“Releases”](https://github.com/ArtalkJS/ArtalkGo/releases)
 
 ---
 
@@ -69,13 +71,57 @@ 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)

packages/artalk-sidebar/index.html

@@ -16,17 +16,16 @@
     const pageKey  = p.get('pageKey') || ''
     const site     = p.get('site') || ''
     const user     = JSON.parse(p.get('user') || '{}')
+    const view     = p.get('view') || ''
     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)
+    }, user, view)
   </script>
 </body>
 </html>

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

@@ -22,10 +22,73 @@ export default class PageList extends Component {
     this.$el = Utils.createElement(`<div class="atk-page-list"></div>`)
   }
 
-  /** 清空所有 Pages */
-  clearAll() {
+  /** 初始化 PageList (清空列表) */
+  initPageList() {
     this.pages = []
-    this.$el.innerHTML = ''
+
+    // 更新全部页面标题按钮
+    ;(async () => {
+      this.$el.innerHTML = `<div class="atk-header-action-bar">
+      <span class="atk-update-all-title-btn">
+        <i class="atk-icon atk-icon-sync"></i> <span class="atk-text">更新标题</span>
+      </span>
+      </div>`
+
+      const $updateAllTitleBtn = this.$el.querySelector<HTMLElement>('.atk-update-all-title-btn')!
+      const $updateAllTitleIcon = $updateAllTitleBtn.querySelector<HTMLElement>('i')!
+      const $updateAllTitleText = $updateAllTitleBtn.querySelector<HTMLElement>('.atk-text')!
+      const btnTextOrg = $updateAllTitleText.innerText
+
+      const done = () => {
+        $updateAllTitleText.innerText = '更新完毕'
+        $updateAllTitleIcon.classList.remove('atk-rotate')
+        window.setTimeout(() => {
+          $updateAllTitleText.innerText = btnTextOrg
+        }, 1500)
+      }
+      const checkStatus = async () => {
+        const status = await new Api(this.ctx).pageFetch(undefined, undefined, true)
+        return status
+      }
+      const startWatchdog = () => {
+        $updateAllTitleIcon.classList.add('atk-rotate')
+
+        // 不完美的轮询更新状态
+        const timerID = window.setInterval(async () => {
+          const d = await new Api(this.ctx).pageFetch(undefined, undefined, true)
+
+          if (d.is_progress === false) {
+            clearInterval(timerID)
+            done()
+            return
+          }
+
+          $updateAllTitleText.innerText = d.msg
+        }, 1000)
+      }
+
+      // 图标恢复
+      const status = await checkStatus()
+      if (status.is_progress === true) {
+        startWatchdog()
+        $updateAllTitleText.innerText = status.msg
+      }
+
+      // 点击发起任务
+      $updateAllTitleBtn.onclick = async () => {
+        if ($updateAllTitleIcon.classList.contains('atk-rotate')) return
+        startWatchdog()
+        $updateAllTitleText.innerText = '开始更新...'
+
+        // 发起任务
+        try {
+          await new Api(this.ctx).pageFetch(undefined, this.sidebar.curtSite)
+        } catch (err: any) {
+          alert(err.msg)
+          done()
+        }
+      }
+    })()
   }
 
   /** 导入 Page 数据 */
@@ -62,6 +125,9 @@ export default class PageList extends Component {
     $sub.innerText = page.url || page.key
     $editBtn.onclick = () => this.showEditor(page, $page)
 
+    $title.onclick = () => { if (page.url) window.open(page.url) }
+    $sub.onclick = () => { if (page.url) window.open(page.url) }
+
     return $page
   }
 
@@ -158,7 +224,7 @@ export default class PageList extends Component {
       showLoading()
       let p: PageData
       try {
-        p = await new Api(this.ctx).pageFetch(page.id)
+        p = (await new Api(this.ctx).pageFetch(page.id)).page
       } catch (err: any) {
         showError(`同步失败：${err.msg || '未知错误'}`)
         console.log(err)

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

@@ -50,6 +50,11 @@ export default class SiteList extends Component {
       this.closeEditor()
       this.showAdd()
     }
+
+    // TODO 这个太 magic 了
+    this.ctx.on('sidebar-sites-create-form', (p: any) => {
+      this.showAdd(p.create_name, p.create_urls)
+    })
   }
 
   public loadSites(sites: SiteData[]) {
@@ -231,7 +236,8 @@ export default class SiteList extends Component {
     this.activeSite = ''
   }
 
-  public showAdd() {
+  public showAdd(defaultName?: string, defaultUrls?: string) {
+    console.log(defaultName, defaultUrls)
     this.closeAdd()
 
     this.$add = Utils.createElement(`
@@ -257,6 +263,9 @@ export default class SiteList extends Component {
     const $siteUrls = this.$add.querySelector<HTMLInputElement>('[name="AtkSiteUrls"]')!
     const $submitBtn = this.$add.querySelector<HTMLButtonElement>('[name="AtkSubmit"]')!
 
+    if (defaultName) $siteName.value = defaultName
+    if (defaultUrls) $siteUrls.value = defaultUrls
+
     $submitBtn.onclick = async () => {
       const siteName = $siteName.value.trim()
       const siteUrls = $siteUrls.value.trim()

packages/artalk-sidebar/src/main.ts

@@ -3,11 +3,12 @@ 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) {
+export default async function InitSidebar(conf: ArtalkConfig, user: LocalUser, view?: string) {
+  // 初始化 Artalk 主程序
   const artalk = new Artalk(conf)
-
   artalk.$root.style.display = 'none'
 
+  // 初始化用户数据
   user = user || {}
   artalk.ctx.user.data = {
     ...artalk.ctx.user.data,
@@ -15,17 +16,41 @@ export default function InitSidebar(conf: ArtalkConfig, user: LocalUser) {
   }
   artalk.ctx.user.save()
 
+  // 初始化 Sidebar
   const sidebarCtx = new SidebarCtx()
+  sidebarCtx.curtSite = conf.site!
+
   const sidebar = new SidebarRoot(artalk.ctx, sidebarCtx)
+
+  // 装载元素
   document.body.appendChild(sidebar.$el)
 
+  // 暗黑模式
   if (conf.darkMode) sidebar.$el.classList.add('atk-dark-mode')
 
-  sidebar.init()
+  // 初始化侧边栏
+  await sidebar.init()
+
+  // 打开 View
+  let viewName = SidebarRoot.DEFAULT_VIEW
+  let viewParams = {}
+  if (view) {
+    const splitted = view.split('|')
+    if (splitted[0]) viewName = splitted[0]
+    if (splitted[1]) viewParams = JSON.parse(splitted[1])
+  }
+
+  sidebar.switchView(viewName)
+
+  if (viewName === 'sites') {
+    // TODO 炮打翻山...
+    artalk.ctx.trigger('sidebar-sites-create-form', viewParams)
+  }
 
   console.log('hello artalk-sidebar')
 }
 
 export class SidebarCtx {
   reload!: () => void
+  curtSite!: string
 }

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

@@ -21,12 +21,13 @@ 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 SidebarRoot extends Component {
+  public static DEFAULT_VIEW = 'comments'
+
   public $header: HTMLElement
   public $headerMenu: HTMLElement
   public $title: HTMLElement
@@ -42,8 +43,7 @@ export default class SidebarRoot extends Component {
   public siteSwitcher?: SiteListFloater
 
   private get isAdmin() { return this.ctx.user.data.isAdmin }
-  public curtSite?: string
-  public curtView: string = DEFAULT_VIEW
+  public curtView?: string
   public get curtViewInstance() {
     return this.curtView ? this.viewInstances[this.curtView] : undefined
   }
@@ -150,11 +150,9 @@ export default class SidebarRoot extends Component {
         }
       }
 
-      this.curtSite = this.conf.site
-
       Ui.showLoading(this.$el)
       try {
-        await this.siteSwitcher!.load(this.curtSite)
+        await this.siteSwitcher!.load(this.sidebar.curtSite)
       } catch (err: any) {
         const $err = Utils.createElement(
           `<span>加载失败：${err.msg || '网络错误'}<br/></span>`
@@ -176,13 +174,13 @@ export default class SidebarRoot extends Component {
       // 站点图像
       this.$avatar.innerHTML = ''
       this.$siteLogo = Utils.createElement('<div class="atk-site-logo"></div>')
-      this.$siteLogo.innerText = (this.curtSite || '').substr(0, 1)
+      this.$siteLogo.innerText = (this.sidebar.curtSite || '').substring(0, 1)
       this.$avatar.append(this.$siteLogo)
     } else {
       // 不是管理员
       this.$title.innerText = '通知中心'
       this.$curtViewBtn.style.display = 'none' // 隐藏 view 切换器
-      this.curtSite = this.conf.site // 第一次 show 使用当前站点数据
+      this.sidebar.curtSite = this.conf.site // 第一次 show 使用当前站点数据
 
       // 头像
       const $avatarImg = document.createElement('img') as HTMLImageElement
@@ -193,12 +191,13 @@ export default class SidebarRoot extends Component {
       this.$avatar.innerHTML = ''
       this.$avatar.append($avatarImg)
     }
-
-    this.switchView(DEFAULT_VIEW) // 打开默认 view
   }
 
   /** 切换 View */
   public switchView(viewName: string) {
+    if (!REGISTER_VIEWS.find(o => o.viewName === viewName))
+      throw new Error(`Sidebar View "${viewName}" not found`)
+
     let view = this.viewInstances[viewName]
     if (!view) {
       // 初始化 View
@@ -208,7 +207,7 @@ export default class SidebarRoot extends Component {
     }
 
     // init view
-    view.mount(this.curtSite!)
+    view.mount()
 
     this.curtView = viewName
     this.curtTab = view.viewActiveTab
@@ -246,7 +245,7 @@ export default class SidebarRoot extends Component {
 
       // 切换 tab
       $tab.onclick = () => {
-        if (view.switchTab(tabName, this.curtSite!) === false) { return }
+        if (view.switchTab(tabName) === false) { return }
         this.$navTabs.querySelectorAll('.atk-active').forEach(e => e.classList.remove('atk-active'))
         $tab.classList.add('atk-active')
         this.curtTab = tabName
@@ -256,9 +255,9 @@ export default class SidebarRoot extends Component {
 
   /** 切换站点 */
   private switchSite(siteName: string) {
-    this.curtSite = siteName
+    this.sidebar.curtSite = siteName
     const curtView = this.curtViewInstance
-    curtView?.switchTab(this.curtTab!, siteName)
-    if (this.$siteLogo) this.$siteLogo.innerText = this.curtSite.substr(0, 1)
+    curtView?.switchTab(this.curtTab!)
+    if (this.$siteLogo) this.$siteLogo.innerText = this.sidebar.curtSite.substring(0, 1)
   }
 }

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

@@ -21,7 +21,7 @@ export default class SidebarView extends Component {
     this.$el = Utils.createElement(`<div class="atk-sidebar-view"></div>`)
   }
 
-  mount(siteName: string) {}
+  mount() {}
 
-  switchTab(tab: string, siteName: string): boolean|void {}
+  switchTab(tab: string): boolean|void {}
 }

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

@@ -13,7 +13,7 @@ export default class MessageView extends SidebarView {
 
   list!: ListLite
 
-  mount(siteName: string) {
+  mount() {
     // tabs
     if (this.ctx.user.data.isAdmin) {
       this.viewTabs = {
@@ -39,9 +39,8 @@ export default class MessageView extends SidebarView {
     this.list.pageMode = 'pagination'
     this.list.noCommentText = '<div class="atk-sidebar-no-content">无内容</div>'
     this.list.renderComment = (comment) => {
-      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}`)
+      const pageURL = comment.data.page_url
+      comment.setOpenURL(`${pageURL}#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})
@@ -52,21 +51,21 @@ export default class MessageView extends SidebarView {
       }
     }
     this.list.paramsEditor = (params) => {
-      params.site_name = siteName
+      params.site_name = this.sidebar.curtSite
     }
 
     this.$el.innerHTML = ''
     this.$el.append(this.list.$el)
 
-    this.switchTab(this.viewActiveTab, siteName)
+    this.switchTab(this.viewActiveTab)
   }
 
-  switchTab(tab: string, siteName: string): boolean|void {
+  switchTab(tab: string): boolean|void {
     //console.log(tab, siteName)
     this.viewActiveTab = tab
     this.list.paramsEditor = (params) => {
       params.type = tab as any
-      params.site_name = siteName
+      params.site_name = this.sidebar.curtSite
     }
     this.list.fetchComments(0)
 

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

@@ -5,8 +5,8 @@ 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 SidebarView from '../sidebar-view'
+import PageList from '../admin/page-list'
 
 const PAGE_SIZE = 20
 
@@ -21,26 +21,26 @@ export default class PagesView extends SidebarView {
   pageList!: PageList
   pagination!: Pagination
 
-  mount(siteName: string) {
+  mount() {
     if (!this.pageList) {
       this.pageList = new PageList(this.ctx, this.sidebar)
       this.$el.append(this.pageList.$el)
     }
 
-    this.switchTab(this.viewActiveTab, siteName)
+    this.switchTab(this.viewActiveTab)
   }
 
-  switchTab(tab: string, siteName: string): boolean|void {
-    this.reqPages(siteName, 0)
+  switchTab(tab: string): boolean|void {
+    this.reqPages(0)
   }
 
-  async reqPages(siteName: string, offset: number) {
-    this.pageList.clearAll()
+  async reqPages(offset: number) {
+    this.pageList.initPageList()
     ;(this.$el.parentNode as any)?.scrollTo(0, 0)
 
     Ui.showLoading(this.$el)
 
-    const data = await new Api(this.ctx).pageGet(siteName, offset, PAGE_SIZE)
+    const data = await new Api(this.ctx).pageGet(this.sidebar.curtSite, offset, PAGE_SIZE)
     this.pageList.importPages(data.pages || [])
 
     Ui.hideLoading(this.$el)
@@ -49,7 +49,7 @@ export default class PagesView extends SidebarView {
       this.pagination = new Pagination(data.total, {
         pageSize: PAGE_SIZE,
         onChange: (o: number) => {
-          this.reqPages(siteName, o)
+          this.reqPages(o)
         }
       })
 

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

@@ -14,8 +14,8 @@ export default class SettingView extends SidebarView {
   viewTabs = {}
   viewActiveTab = ''
 
-  mount(siteName: string) {
+  mount() {
   }
 
-  switchTab(tab: string, siteName: string) {}
+  switchTab(tab: string) {}
 }

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

@@ -16,7 +16,7 @@ export default class SitesView extends SidebarView {
 
   siteList!: SiteList
 
-  mount(siteName: string) {
+  mount() {
     if (!this.siteList) {
       this.siteList = new SiteList(this.ctx, this.sidebar)
       this.$el.append(this.siteList.$el)
@@ -25,7 +25,7 @@ export default class SitesView extends SidebarView {
     this.reqSites()
   }
 
-  switchTab(tab: string, siteName: string) {
+  switchTab(tab: string) {
     this.reqSites()
   }
 

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

@@ -18,11 +18,11 @@ export default class TransferView extends SidebarView {
   }
   viewActiveTab = 'import'
 
-  mount(siteName: string) {
-    this.switchTab('import', siteName)
+  mount() {
+    this.switchTab('import')
   }
 
-  switchTab(tab: string, siteName: string) {
+  switchTab(tab: string) {
     if (tab === 'import') {
       this.initImport()
     } else if (tab === 'export') {
@@ -108,11 +108,7 @@ export default class TransferView extends SidebarView {
 
     hideUploading()
 
-    // 文件上传操作
-    $file.onchange = () => {
-      if (!$file.files || $file.files.length < 0) return
-
-      showUploading()
+    const startUploadFile = async () => {
       UploadedFilename = ''
 
       const xhr = new XMLHttpRequest()
@@ -135,7 +131,7 @@ export default class TransferView extends SidebarView {
 
       // 创建上传参数
       const formData = new FormData()
-      formData.append('file', $file.files[0])
+      formData.append('file', $file.files![0])
       formData.append('token', this.ctx.user.data.token)
 
       // 开始上传
@@ -183,6 +179,17 @@ export default class TransferView extends SidebarView {
       }
     }
 
+    // 文件上传操作
+    $file.onchange = () => {
+      if (!$file.files || $file.files.length === 0) return
+
+      showUploading()
+      setTimeout(async () => {
+        await startUploadFile()
+        hideUploading()
+      }, 80)
+    }
+
     // 开始导入按钮
     $submitBtn.onclick = () => {
       if (!UploadedFilename) {

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

@@ -21,11 +21,13 @@
       color: var(--at-color-font);
       font-size: 21px;
       margin-bottom: 10px;
+      cursor: pointer;
     }
 
     .atk-sub {
       color: var(--at-color-sub);
       font-size: 14px;
+      cursor: pointer;
     }
   }
 
@@ -33,6 +35,32 @@
     .atk-list-text-actions();
   }
 
+  .atk-header-action-bar {
+    display: block;
+    overflow: hidden;
+    padding: 10px 15px 0 15px;
+
+    & > span {
+      display: inline-block;
+      padding: 2px 10px;
+      cursor: pointer;
+      font-size: 13px;
+
+      i {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        vertical-align: middle;
+        background-color: var(--at-color-meta);
+        margin-right: 4px;
+      }
+
+      &:hover {
+        background: var(--at-color-bg-grey);
+      }
+    }
+  }
+
   .atk-page-actions {
     .atk-list-btn-actions();
   }

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

@@ -321,7 +321,8 @@
         border: 2px solid var(--at-color-border);
         cursor: pointer;
         position: relative;
-        padding: 0 15px;
+        padding: 6px 15px;
+        line-height: 0;
         margin-bottom: 17px;
         border-radius: 50px;
 

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

@@ -111,6 +111,7 @@
           display: inline-block;
           font-size: 23px;
           position: relative;
+          line-height: 1.6em;
 
           &:after {
             content: ' ';
@@ -130,6 +131,7 @@
           margin-top: 6px;
           flex-wrap: wrap;
           min-height: 23px;
+          margin-bottom: 15px;
 
           .atk-url-item {
             background: var(--at-color-bg-grey);
@@ -165,7 +167,7 @@
       position: relative;
       display: flex;
       flex-direction: row;
-      padding: 20px 30px 6px 35px;
+      padding: 0 30px 6px 35px;
       padding-bottom: 10px;
 
       .atk-site-text-actions {

packages/artalk/index.html

@@ -29,6 +29,16 @@
     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>-->
+
+  <!-- For mobile testing -->
+  <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+  <script>
+    // VConsole will be exported to `window.VConsole` by default.
+    var vConsole = new window.VConsole();
+  </script>
 </head>
 <body>
   <div class="card billboard atk-fade-in">

packages/artalk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "artalk",
-  "version": "2.2.2",
-  "backendMinVersion": "2.1.1",
+  "version": "2.2.4",
+  "backendMinVersion": "2.1.2",
   "license": "LGPL-3.0",
   "description": "A Selfhosted Comment System",
   "keywords": [

packages/artalk/src/api/index.ts

@@ -119,8 +119,11 @@ 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 }
+    const data = await POST<any>(this.ctx, `${this.baseURL}/login-status`, {
+      name: this.ctx.user.data.nick,
+      email: this.ctx.user.data.email
+    })
+    return (data || { is_login: false, is_admin: false }) as { is_login: boolean, is_admin: boolean }
   }
 
   // ============================
@@ -164,13 +167,14 @@ export default class Api {
   }
 
   /** 页面 · 数据更新 */
-  public async pageFetch(id: number) {
-    const params: any = {
-      id,
-    }
+  public async pageFetch(id?: number, siteName?: string, getStatus?: boolean) {
+    const params: any = {}
+    if (id) params.id = id
+    if (siteName) params.site_name = siteName
+    if (getStatus) params.get_status = getStatus
 
     const d = await POST<any>(this.ctx, `${this.baseURL}/admin/page-fetch`, params)
-    return (d.page as PageData)
+    return (d as any)
   }
 
   // ============================

packages/artalk/src/artalk.ts

@@ -9,7 +9,7 @@ import Editor from './components/editor'
 import List from './components/list'
 import SidebarLayer from './components/sidebar-layer'
 
-import { GetLayerWrap } from './components/layer'
+import Layer, { GetLayerWrap } from './components/layer'
 import { EventPayloadMap, Handler } from '~/types/event'
 import Api from './api'
 import * as Utils from './lib/utils'
@@ -37,6 +37,7 @@ export default class Artalk {
 
     // 默认 pageKey
     if (!this.conf.pageKey) {
+      // @link http://bl.ocks.org/abernier/3070589
       this.conf.pageKey = `${window.location.protocol}//${window.location.host}${window.location.pathname}`
     }
 
@@ -56,6 +57,7 @@ export default class Artalk {
     // 界面初始化
     this.$root.classList.add('artalk')
     this.$root.innerHTML = ''
+    this.initLayer()
     this.initDarkMode()
 
     // 组件初始化
@@ -133,6 +135,13 @@ export default class Artalk {
     this.list.fetchComments(0)
   }
 
+  /** Layer 初始化 */
+  initLayer() {
+    // 记录页面原始 Styles
+    Layer.BodyOrgOverflow = document.body.style.overflow
+    Layer.BodyOrgPaddingRight = document.body.style.paddingRight
+  }
+
   /** 暗黑模式 · 初始化 */
   public initDarkMode() {
     const darkModeClassName = 'atk-dark-mode'
@@ -163,14 +172,15 @@ export default class Artalk {
 
   /** PV */
   public async initPV() {
+    const pvNum = await new Api(this.ctx).pv()
+    if (Number.isNaN(Number(pvNum)))
+      return
+
     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)
   }

packages/artalk/src/components/editor.ts

@@ -22,6 +22,7 @@ export default class Editor extends Component {
   public $bottom: HTMLElement
   public $plugBtnWrap: HTMLElement
   public $imgUploadBtn?: HTMLElement
+  public $imgUploadInput?: HTMLInputElement
   public $submitBtn: HTMLButtonElement
   public $notifyWrap: HTMLElement
 
@@ -265,12 +266,16 @@ export default class Editor extends Component {
     this.$imgUploadBtn = Utils.createElement(`<span class="atk-plug-btn">图片</span>`)
     this.$plugBtnWrap.querySelector('[data-plug-name="preview"]')!.before(this.$imgUploadBtn) // 显示在预览图标之前
 
+    this.$imgUploadInput = document.createElement('input')
+    this.$imgUploadInput.type = 'file'
+    this.$imgUploadInput.style.display = 'none'
+    this.$imgUploadInput.accept = this.allowImgExts.map(o => `.${o}`).join(',')
+    this.$imgUploadBtn.after(this.$imgUploadInput)
+
     // 按钮点击
     this.$imgUploadBtn.onclick = () => {
       // 选择图片
-      const $input = document.createElement('input')
-      $input.type = 'file'
-      $input.accept = this.allowImgExts.map(o => `.${o}`).join(',')
+      const $input = this.$imgUploadInput!
       $input.onchange = () => {
         (async () => { // 解决阻塞 UI 问题
           if (!$input.files || $input.files.length === 0) return
@@ -501,7 +506,7 @@ export default class Editor extends Component {
 
       // 回复不同页面的评论
       if (this.replyComment !== null && this.replyComment.page_key !== this.ctx.conf.pageKey) {
-        window.open(`${this.replyComment.page_key}#atk-comment-${nComment.id}`)
+        window.open(`${this.replyComment.page_url}#atk-comment-${nComment.id}`)
       }
 
       this.ctx.trigger('list-insert', nComment)

packages/artalk/src/components/layer.ts

@@ -10,8 +10,8 @@ export default class Layer extends Component {
 
   private maskClickHideEnable: boolean = true
 
-  private bodyStyleOrgOverflow = ''
-  private bodyStyleOrgPaddingRight = ''
+  public static BodyOrgOverflow: string
+  public static BodyOrgPaddingRight: string
 
   public afterHide?: Function
 
@@ -73,10 +73,11 @@ export default class Layer extends Component {
     this.$wrap.classList.add('atk-fade-out')
     this.$el.style.display = 'none'
 
+    // body style 禁止滚动解除
+    this.pageBodyScrollBarShow()
+
     this.newActionTimer(() => {
       this.$wrap.style.display = 'none'
-      // body style 禁止滚动解除
-      this.pageBodyScrollBarShow()
       this.checkCleanLayer()
     }, 450)
     this.newActionTimer(() => {
@@ -91,8 +92,6 @@ export default class Layer extends Component {
 
   // 页面滚动条隐藏
   pageBodyScrollBarHide() {
-    this.bodyStyleOrgOverflow = document.body.style.overflow
-    this.bodyStyleOrgPaddingRight = document.body.style.paddingRight
     document.body.style.overflow = 'hidden'
 
     const bpr = parseInt(window.getComputedStyle(document.body, null).getPropertyValue('padding-right'), 10)
@@ -101,8 +100,8 @@ export default class Layer extends Component {
 
   // 页面滚动条显示
   pageBodyScrollBarShow() {
-    document.body.style.overflow = this.bodyStyleOrgOverflow
-    document.body.style.paddingRight = this.bodyStyleOrgPaddingRight
+    document.body.style.overflow = Layer.BodyOrgOverflow
+    document.body.style.paddingRight = Layer.BodyOrgPaddingRight
   }
 
   // Timers
@@ -128,7 +127,6 @@ export default class Layer extends Component {
 
   /** 销毁 - 无动画 */
   disposeNow () {
-    document.body.style.overflow = ''
     this.$el.remove()
     this.pageBodyScrollBarShow()
     // this.$el dispose

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

@@ -91,7 +91,7 @@ export default class ListLite extends Component {
     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)
+      this.onError(e.msg || String(e), offset, e.data)
       throw e
     } finally {
       hideLoading()
@@ -219,7 +219,7 @@ export default class ListLite extends Component {
   }
 
   /** 错误处理 */
-  protected onError(msg: any, offset: number) {
+  protected onError(msg: any, offset: number, errData?: any) {
     msg = String(msg)
     console.error(msg)
 
@@ -237,9 +237,24 @@ export default class ListLite extends Component {
     $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)
+    if (!this.ctx.user.data.isAdmin) adminBtn.classList.add('atk-hide')
+
+    let sidebarView = ''
+
+    // 找不到站点错误，打开侧边栏并填入创建站点表单
+    if (errData?.err_no_site) {
+      const viewLoadParam = {
+        create_name: this.ctx.conf.site,
+        create_urls: `${window.location.protocol}//${window.location.host}`
+      }
+      // TODO 真的是飞鸽传书啊
+      sidebarView = `sites|${JSON.stringify(viewLoadParam)}`
+    }
+
+    adminBtn.onclick = () => (this.ctx.trigger('sidebar-show', {
+      view: sidebarView
+    }))
 
     Ui.setError(this.$el, $err)
   }

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

@@ -7,6 +7,7 @@ import SidebarHTML from './html/sidebar-layer.html?raw'
 import * as Ui from '@/lib/ui'
 import Layer from './layer'
 import Api from '../api'
+import { SidebarShowPayload } from '~/types/event'
 
 export default class SidebarLayer extends Component {
   public layer?: Layer
@@ -28,7 +29,7 @@ export default class SidebarLayer extends Component {
     }
 
     // event
-    this.ctx.on('sidebar-show', () => (this.show()))
+    this.ctx.on('sidebar-show', (conf) => (this.show(conf || {})))
     this.ctx.on('sidebar-hide', () => (this.hide()))
     this.ctx.on('user-changed', () => { this.firstShow = true })
   }
@@ -36,7 +37,7 @@ export default class SidebarLayer extends Component {
   private firstShow = true
 
   /** 显示 */
-  public async show() {
+  public async show(conf: SidebarShowPayload) {
     this.$el.style.transform = '' // 动画清除，防止二次打开失效
 
     // 获取 Layer
@@ -59,54 +60,60 @@ export default class SidebarLayer extends Component {
       this.$el.style.transform = 'translate(0, 0)'
     }, 20)
 
+    // 管理员身份验证 (若身份失效，弹出验证窗口)
+    ;(async () => {
+      const resp = await new Api(this.ctx).loginStatus()
+      if (resp.is_admin && !resp.is_login) {
+        this.layer?.hide()
+        this.firstShow = true
+
+        this.ctx.trigger('checker-admin', {
+          onSuccess: () => {
+            setTimeout(() => {
+              this.show(conf)
+            }, 500)
+          },
+          onCancel: () => {}
+        })
+      }
+    })()
+
+    // 清空 unread
+    this.ctx.trigger('unread-update', { notifies: [] })
+
     // 第一次加载
     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>')
 
+      // 准备 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` : ``)}`)
+      const query: any = {
+        pageKey: this.conf.pageKey,
+        site: this.conf.site || '',
+        user: JSON.stringify(this.ctx.user.data),
+        time: +new Date()
+      }
+
+      if (conf.view) query.view = conf.view
+      if (this.conf.darkMode) query.darkMode = '1'
+
+      const urlParams = new URLSearchParams(query);
+      this.iframeLoad(`${baseURL}?${urlParams.toString()}`)
 
       this.$iframeWrap.append(this.$iframe)
       this.firstShow = false
     } else {
       // 暗黑模式
-      if (this.conf.darkMode && !this.$iframe!.src.match(/darkMode=1$/)) {
+      const isIframeSrcDarkMode = this.$iframe!.src.includes('darkMode=1')
+
+      if (this.conf.darkMode && !isIframeSrcDarkMode)
         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$/, ''))
-      }
+
+      if (!this.conf.darkMode && isIframeSrcDarkMode)
+        this.iframeLoad(this.$iframe!.src.replace('&darkMode=1', ''))
     }
   }
 

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

@@ -15,7 +15,7 @@ const CaptchaChecker: Checker = {
       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.src = `${that.ctx.conf.server}/captcha/get?t=${+new Date()}`
       $iframe.onload = () => {
         $iframe.style.display = ''
         Ui.hideLoading($iframeWrap)

packages/artalk/src/lib/utils.ts

@@ -150,25 +150,34 @@ export function initMarked(ctx: Context) {
     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,
-    highlight: (code) => hanabi(code),
     pedantic: false,
     gfm: true,
     breaks: true,
     smartLists: true,
     smartypants: true,
     xhtml: false,
-    sanitize: true,
-    sanitizer: (html) => insane(html, {
-      ...insane.defaults,
-      allowedAttributes: {
-        ...insane.defaults.allowedAttributes,
-        img: ['src', 'atk-emoticon']
-      },
-    }),
+    sanitize: false,
     silent: true,
   })
 
@@ -177,7 +186,49 @@ export function initMarked(ctx: Context) {
 
 /** 解析 markdown */
 export function marked(ctx: Context, src: string): string {
-  return ctx.markedInstance.parse(src)
+  // @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 */

packages/artalk/src/style/comment.less

@@ -167,6 +167,7 @@
         border-left: 3px solid #eee;
         margin-bottom: 10px;
         position: relative;
+        margin-top: 10px;
 
         .atk-meta {
           font-size: 15px;

packages/artalk/src/style/main.less

@@ -7,28 +7,48 @@
 }
 
 .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;
+  }
+
+  input, textarea, button, optgroup, select {
+    font-family: inherit;
+    color: inherit;
+    font-size: inherit;
+  }
+
+  @codeFont: source code pro, Consolas, Monaco, Menlo, sans-serif;
+
+  code {
+    font-family: @codeFont;
+    margin: 0 .3em;
+    padding: .1em .2em;
+    background-color: var(--at-color-bg-grey);
     color: var(--at-color-font);
-    font-family: @font-family;
-    word-wrap: break-word;
-    word-break: break-all;
+    border-radius: @block-radius;
   }
 
   pre {
-    padding: 10px;
+    margin: 10px 0 0 0;
+    padding: 0;
+    line-height: 0;
+  }
+
+  pre code {
+    * { font-family: @codeFont; }
     line-height: @line-height;
+    display: block;
+    padding: 10px 15px;
+    white-space: pre-wrap;
     background-color: var(--at-color-bg-grey);
     color: var(--at-color-font);
-    padding: 10px 15px;
-    border-radius: @block-radius;
     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;
-
-    code {
-      white-space: pre-wrap;
-    }
   }
 
   a {
@@ -55,6 +75,28 @@
   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 {
@@ -156,6 +198,9 @@
 .atk-fade-out {
   animation: atkFadeOut both .2s;
 }
+.atk-rotate {
+  animation: atkRotate 2s linear infinite;
+}
 
 @keyframes atkFadeIn {
   0% { opacity: 0 }
@@ -167,6 +212,11 @@
   0% {}
 }
 
+@keyframes atkRotate {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+
 i.atk-icon {
   width: 20px;
   height: 20px;
@@ -175,6 +225,7 @@ i.atk-icon {
   background-repeat: no-repeat;
   mask-repeat: no-repeat;
   mask-position: center;
+  mask-size: contain;
 }
 
 .atk-icon-sync {

packages/artalk/types/event.d.ts

@@ -19,7 +19,7 @@ export interface EventPayloadMap {
   'list-refresh-ui': undefined     // 刷新 List UI
 
   // Sidebar
-  'sidebar-show': undefined           // 侧边栏显示
+  'sidebar-show': SidebarShowPayload  // 侧边栏显示
   'sidebar-hide': undefined           // 侧边栏隐藏
 
   // Editor
@@ -70,6 +70,10 @@ export interface EditorReplyPayload {
   scroll?: boolean
 }
 
+export interface SidebarShowPayload {
+  view?: 'comments'|'sites'|'pages'|'transfer'|string
+}
+
 // ============================================
 export interface Handler<P> {
   (payload: P): void