[FEATURE] add sticky comment support (#509)

* feat: add mark sticky button * feat: add sticky field for sql storage * feat: comment list sort by sticky * feat(client): support sticky badge * refactor(vercel): export sticky field and refactor sticky sort logic Co-authored-by: Mr.Hope <zhangbowang1998@gmail.com>
walinejs · Sep 21, 2021 · e4225d3 · e4225d3
1 parent 4e1fc7e
commit e4225d3
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 3 deletions.
diff --git a/assets/waline.pgsql b/assets/waline.pgsql
@@ -12,6 +12,7 @@ CREATE TABLE wl_comment (
   nick varchar(255) DEFAULT NULL,
   pid int DEFAULT NULL,
   rid int DEFAULT NULL,
+  sticky int DEFAULT NULL,
   status varchar(50) NOT NULL DEFAULT '',
   ua text,
   url varchar(255) DEFAULT NULL,

diff --git a/assets/waline.sql b/assets/waline.sql
@@ -22,6 +22,7 @@ CREATE TABLE `wl_Comment` (
   `nick` varchar(255) DEFAULT NULL,
   `pid` int(11) DEFAULT NULL,
   `rid` int(11) DEFAULT NULL,
+  `sticky` int(11) DEFAULT NULL,
   `status` varchar(50) NOT NULL DEFAULT '',
   `ua` text,
   `url` varchar(255) DEFAULT NULL,

diff --git a/assets/waline.sqlite b/assets/waline.sqlite
diff --git a/packages/admin/src/locales/en.json b/packages/admin/src/locales/en.json
@@ -37,6 +37,8 @@
   "waiting": "Waiting",
   "spam": "Spam",
   "mark as spam": "Mark as Spam",
+  "disable sticky": "Disable sticky",
+  "sticky": "Sticky",
   "edit": "Edit",
   "reply": "Reply",
   "delete": "Delete",

diff --git a/packages/admin/src/locales/zh-CN.json b/packages/admin/src/locales/zh-CN.json
@@ -37,6 +37,8 @@
   "waiting": "待审核",
   "spam": "垃圾",
   "mark as spam": "标记垃圾",
+  "disable sticky": "取消置顶",
+  "sticky": "置顶评论",
   "edit": "编辑",
   "reply": "回复",
   "delete": "删除",

diff --git a/packages/admin/src/locales/zh-TW.json b/packages/admin/src/locales/zh-TW.json
@@ -37,6 +37,8 @@
   "waiting": "待審核",
   "spam": "垃圾",
   "mark as spam": "標記垃圾",
+  "disable sticky": "取消置頂",
+  "sticky": "置頂評論",
   "edit": "編輯",
   "reply": "回覆",
   "delete": "刪除",

diff --git a/packages/admin/src/pages/manage-comments/index.js b/packages/admin/src/pages/manage-comments/index.js
@@ -150,6 +150,23 @@ export default function () {
           }
         },
       },
+      {
+        key: 'sticky',
+        show: comment && !comment.rid && comment.status === 'approved',
+        name: comment && comment.sticky ? t('disable sticky') : t('sticky'),
+        async action(e) {
+          e.preventDefault();
+
+          const sticky = !comment.sticky;
+          list.data.forEach((cmt) => {
+            if (cmt.objectId === comment.objectId) {
+              cmt.sticky = sticky;
+            }
+          });
+          await updateComment(comment.objectId, { sticky });
+          setList({ ...list });
+        },
+      },
       {
         key: 'edit',
         show: comment,
@@ -387,6 +404,7 @@ export default function () {
                             status,
                             rid,
                             pid,
+                            sticky,
                             insertedAt,
                           },
                           idx
@@ -608,6 +626,7 @@ export default function () {
                                     status,
                                     rid,
                                     pid,
+                                    sticky,
                                   }).map(({ key, disable, name, action }) =>
                                     disable ? (
                                       <span className="weak" key={key}>

diff --git a/packages/client/src/components/CommentCard.vue b/packages/client/src/components/CommentCard.vue
@@ -27,6 +27,8 @@
           v-text="locale.admin"
         />
 
+        <span v-if="comment.sticky" class="vbadge" v-text="locale.sticky" />
+
         <span class="vtime" v-text="timeAgo(comment.insertedAt, locale)" />
 
         <button

diff --git a/packages/client/src/config/i18n/en.ts b/packages/client/src/config/i18n/en.ts
@@ -25,6 +25,7 @@ const enLocale: Locale = {
   login: 'Login',
   logout: 'logout',
   admin: 'Admin',
+  sticky: 'Sticky',
   word: 'Words',
   wordHint:
     'Please input comments between $0 and $1 words!\n Current word number: $2',

diff --git a/packages/client/src/config/i18n/jp.ts b/packages/client/src/config/i18n/jp.ts
@@ -25,6 +25,7 @@ const jpLocale: Locale = {
   login: 'ログインする',
   logout: 'ログアウト',
   admin: '管理者',
+  sticky: 'トップに置く',
   word: 'ワード',
   wordHint:
     'コメントは $0 から $1 ワードの間でなければなりません!\n 現在の単語番号: $2',

diff --git a/packages/client/src/config/i18n/typings.ts b/packages/client/src/config/i18n/typings.ts
@@ -23,6 +23,7 @@ export interface Locale {
   login: string;
   logout: string;
   admin: string;
+  sticky: string;
   word: string;
   wordHint: string;
 }
diff --git a/packages/client/src/config/i18n/zh-CN.ts b/packages/client/src/config/i18n/zh-CN.ts
@@ -25,6 +25,7 @@ const zhCNLocale: Locale = {
   login: '登录',
   logout: '退出',
   admin: '博主',
+  sticky: '置顶',
   word: '字',
   wordHint: '评论字数应在 $0 到 $1 字之间！\n当前字数：$2',
 };

diff --git a/packages/client/src/config/i18n/zh-TW.ts b/packages/client/src/config/i18n/zh-TW.ts
@@ -25,6 +25,7 @@ const zhTWLocale: Locale = {
   login: '登錄',
   logout: '退出',
   admin: '博主',
+  sticky: '置頂',
   word: '字',
   wordHint: '評論字數應在 $0 到 $1 字之間！\n當前字數：$2',
 };

diff --git a/packages/client/src/typings/index.ts b/packages/client/src/typings/index.ts
@@ -18,4 +18,5 @@ export interface Comment extends Exclude<CommentData, 'ua'> {
   updateAt: string;
   objectId: string;
   children?: Comment[];
+  sticky?: boolean;
 }
diff --git a/packages/server/src/controller/comment.js b/packages/server/src/controller/comment.js
@@ -169,6 +169,7 @@ module.exports = class extends BaseRest {
               'rid',
               'ua',
               'user_id',
+              'sticky',
             ],
           }
         );
@@ -193,9 +194,10 @@ module.exports = class extends BaseRest {
 
         const rootCount = comments.filter(({ rid }) => !rid).length;
         const pageOffset = Math.max((page - 1) * pageSize, 0);
-        const rootComments = comments
-          .filter(({ rid }) => !rid)
-          .slice(pageOffset, pageOffset + pageSize);
+        const rootComments = [
+          ...comments.filter(({ rid, sticky }) => !rid && sticky),
+          ...comments.filter(({ rid, sticky }) => !rid && !sticky),
+        ].slice(pageOffset, pageOffset + pageSize);
 
         return this.json({
           page,