feat: Now you can publish private or scheduled posts.

devbean · devbean · commit 7a19a5f9abe5 · 2023-12-20T11:19:09.000+08:00
diff --git a/main.js b/main.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
 		"esbuild": "0.17.3",
 		"eslint-plugin-node": "^11.1.0",
 		"file-type-checker": "^1.0.8",
+		"imask": "^7.2.1",
 		"juice": "^10.0.0",
 		"lodash-es": "^4.17.21",
 		"markdown-it": "^13.0.1",
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -50,6 +50,7 @@
   "settings_defaultPostStatusDesc": "Post status which will be published to WordPress.",
   "settings_defaultPostStatusDraft": "Draft",
   "settings_defaultPostStatusPublish": "Publish",
+  "settings_defaultPostStatusPrivate": "Private",
   "settings_rememberLastSelectedCategories": "Remember last selected categories",
   "settings_rememberLastSelectedCategoriesDesc": "Remember last selected post categories of this site.",
   "settings_showWordPressEditPageModal": "Show WordPress edit confirmation",
@@ -94,6 +95,10 @@
   "publishModal_postStatus": "Post Status",
   "publishModal_postStatusDraft": "Draft",
   "publishModal_postStatusPublish": "Publish",
+  "publishModal_postStatusPrivate": "Private",
+  "publishModal_postStatusFuture": "Future",
+  "publishModal_postDateTime": "Post Date",
+  "publishModal_postDateTimeDesc": "With format YYYY-MM-DD or YYYY-MM-DD HH:MM:SS",
   "publishModal_commentStatus": "Comment Status",
   "publishModal_commentStatusOpen": "Open",
   "publishModal_commentStatusClosed": "Closed",
diff --git a/src/i18n/zh-cn.json b/src/i18n/zh-cn.json
@@ -50,6 +50,7 @@
   "settings_defaultPostStatusDesc": "发布到 WordPress 的文章默认状态",
   "settings_defaultPostStatusDraft": "草稿",
   "settings_defaultPostStatusPublish": "正式发布",
+  "settings_defaultPostStatusPrivate": "私有",
   "settings_rememberLastSelectedCategories": "记住上次选择的分类",
   "settings_rememberLastSelectedCategoriesDesc": "记住该站点上次发布时选择的分类",
   "settings_showWordPressEditPageModal": "显示 WordPress 编辑确认框",
@@ -94,6 +95,10 @@
   "publishModal_postStatus": "文章状态",
   "publishModal_postStatusDraft": "草稿",
   "publishModal_postStatusPublish": "正式发布",
+  "publishModal_postStatusPrivate": "私有",
+  "publishModal_postStatusFuture": "定时",
+  "publishModal_postDateTime": "时间",
+  "publishModal_postDateTimeDesc": "格式 YYYY-MM-DD 或 YYYY-MM-DD HH:MM:SS",
   "publishModal_commentStatus": "评论状态",
   "publishModal_commentStatusOpen": "开启",
   "publishModal_commentStatusClosed": "关闭",
diff --git a/src/settings.ts b/src/settings.ts
@@ -83,7 +83,7 @@ export class WordpressSettingTab extends PluginSettingTab {
         dropdown
           .addOption(PostStatus.Draft, t('settings_defaultPostStatusDraft'))
           .addOption(PostStatus.Publish, t('settings_defaultPostStatusPublish'))
-          // .addOption(PostStatus.Future, 'future')
+          .addOption(PostStatus.Private, t('settings_defaultPostStatusPrivate'))
           .setValue(this.plugin.settings.defaultPostStatus)
           .onChange(async (value) => {
             this.plugin.settings.defaultPostStatus = value as PostStatus;
diff --git a/src/wp-api.ts b/src/wp-api.ts
@@ -1,7 +1,8 @@
 export const enum PostStatus {
   Draft = 'draft',
   Publish = 'publish',
-  // Future = 'future'
+  Private = 'private',
+  Future = 'future'
 }
 
 export const enum CommentStatus {
diff --git a/src/wp-client.ts b/src/wp-client.ts
@@ -69,6 +69,8 @@ export interface WordPressPostParams {
    * WordPress profile name.
    */
   profileName?: string;
+
+  datetime?: Date;
 }
 
 export interface WordPressPublishParams extends WordPressAuthParams {
diff --git a/src/wp-publish-modal.ts b/src/wp-publish-modal.ts
@@ -6,13 +6,18 @@ import { toNumber } from 'lodash-es';
 import { MatterData } from './types';
 import { ConfirmCode, openConfirmModal } from './confirm-modal';
 import { AbstractModal } from './abstract-modal';
+import IMask, { DynamicMaskType, InputMask } from 'imask';
+import { SafeAny } from './utils';
+import { format, parse } from 'date-fns';
 
 
 /**
  * WordPress publish modal.
  */
 export class WpPublishModal extends AbstractModal {
 
+  private dateInputMask: InputMask<DynamicMaskType> | null = null;
+
   constructor(
     readonly plugin: WordpressPlugin,
     private readonly categories: {
@@ -46,6 +51,9 @@ export class WpPublishModal extends AbstractModal {
   onClose() {
     const { contentEl } = this;
     contentEl.empty();
+    if (this.dateInputMask) {
+      this.dateInputMask.destroy();
+    }
   }
 
   private display(params: WordPressPostParams): void {
@@ -61,19 +69,103 @@ export class WpPublishModal extends AbstractModal {
         dropdown
           .addOption(PostStatus.Draft, this.t('publishModal_postStatusDraft'))
           .addOption(PostStatus.Publish, this.t('publishModal_postStatusPublish'))
-          // .addOption(PostStatus.Future, 'future')
-          .setValue(this.plugin.settings.defaultPostStatus)
+          .addOption(PostStatus.Private, this.t('publishModal_postStatusPrivate'))
+          .addOption(PostStatus.Future, this.t('publishModal_postStatusFuture'))
+          .setValue(params.status)
           .onChange((value) => {
             params.status = value as PostStatus;
+            this.display(params);
           });
       });
+
+    if (params.status === PostStatus.Future) {
+      new Setting(contentEl)
+        .setName(this.t('publishModal_postDateTime'))
+        .setDesc(this.t('publishModal_postDateTimeDesc'))
+        .addText(text => {
+          const dateFormat = 'yyyy-MM-dd';
+          const dateTimeFormat = 'yyyy-MM-dd HH:mm:ss';
+          const dateBlocks = {
+            yyyy: {
+              mask: IMask.MaskedRange,
+              from: 1970,
+              to: 9999,
+            },
+            MM: {
+              mask: IMask.MaskedRange,
+              from: 1,
+              to: 12,
+            },
+            dd: {
+              mask: IMask.MaskedRange,
+              from: 1,
+              to: 31,
+            },
+          };
+          const dateMask = {
+            mask: Date,
+            lazy: false,
+            overwrite: true,
+          };
+          if (this.dateInputMask) {
+            this.dateInputMask.destroy();
+          }
+          this.dateInputMask = IMask(text.inputEl, [
+            {
+              ...dateMask,
+              pattern: dateFormat,
+              blocks: dateBlocks,
+              format: (date: SafeAny) => format(date, dateFormat),
+              parse: (str: string) => parse(str, dateFormat, new Date())
+            },
+            {
+              ...dateMask,
+              pattern: dateTimeFormat,
+              blocks: {
+                ...dateBlocks,
+                HH: {
+                  mask: IMask.MaskedRange,
+                  from: 0,
+                  to: 23,
+                },
+                mm: {
+                  mask: IMask.MaskedRange,
+                  from: 0,
+                  to: 59,
+                },
+                ss: {
+                  mask: IMask.MaskedRange,
+                  from: 0,
+                  to: 59,
+                },
+              },
+              format: (date: SafeAny) => format(date, dateTimeFormat),
+              parse: (str: string) => parse(str, dateTimeFormat, new Date())
+            }
+          ]);
+
+          this.dateInputMask.on('accept', () => {
+            if (this.dateInputMask) {
+              if (this.dateInputMask.masked.isComplete) {
+                text.inputEl.style.borderColor = '';
+                params.datetime = this.dateInputMask.typedValue;
+              } else {
+                text.inputEl.style.borderColor = 'red';
+              }
+            }
+          });
+        });
+    } else {
+      delete params.datetime;
+    }
+
     new Setting(contentEl)
       .setName(this.t('publishModal_commentStatus'))
       .addDropdown((dropdown) => {
         dropdown
           .addOption(CommentStatus.Open, this.t('publishModal_commentStatusOpen'))
           .addOption(CommentStatus.Closed, this.t('publishModal_commentStatusClosed'))
-          .setValue(this.plugin.settings.defaultCommentStatus)
+          .setValue(params.commentStatus)
           .onChange((value) => {
             params.commentStatus = value as CommentStatus;
           });
diff --git a/src/wp-rest-client.ts b/src/wp-rest-client.ts
@@ -8,12 +8,13 @@ import {
 } from './wp-client';
 import { AbstractWordPressClient } from './abstract-wp-client';
 import WordpressPlugin from './main';
-import { PostType, Term } from './wp-api';
+import { PostStatus, PostType, Term } from './wp-api';
 import { RestClient } from './rest-client';
 import { isArray, isFunction, isNumber, isObject, isString, template } from 'lodash-es';
 import { SafeAny } from './utils';
 import { WpProfile } from './wp-profile';
 import { FormItemNameMapper, FormItems, Media } from './types';
+import { formatISO } from 'date-fns';
 
 
 interface WpRestEndpoint {
@@ -65,6 +66,10 @@ export class WpRestClient extends AbstractWordPressClient {
     } else {
       url = getUrl(this.context.endpoints?.newPost, 'wp-json/wp/v2/posts');
     }
+    const extra: Record<string, string> = {};
+    if (postParams.status === PostStatus.Future) {
+      extra.date = formatISO(postParams.datetime ?? new Date());
+    }
     const resp: SafeAny = await this.client.httpPost(
       url,
       {
@@ -73,7 +78,8 @@ export class WpRestClient extends AbstractWordPressClient {
         status: postParams.status,
         comment_status: postParams.commentStatus,
         categories: postParams.categories,
-        tags: postParams.tags ?? []
+        tags: postParams.tags ?? [],
+        ...extra
       },
       {
         headers: this.context.getHeaders(certificate)
diff --git a/src/wp-xml-rpc-client.ts b/src/wp-xml-rpc-client.ts
@@ -9,7 +9,7 @@ import {
 } from './wp-client';
 import { XmlRpcClient } from './xmlrpc-client';
 import { AbstractWordPressClient } from './abstract-wp-client';
-import { PostType, PostTypeConst, Term } from './wp-api';
+import { PostStatus, PostType, PostTypeConst, Term } from './wp-api';
 import { SafeAny, showError } from './utils';
 import { WpProfile } from './wp-profile';
 import { Media } from './types';
@@ -69,6 +69,12 @@ export class WpXmlRpcClient extends AbstractWordPressClient {
         }
       };
     }
+    if (postParams.status === PostStatus.Future) {
+      publishContent = {
+        ...publishContent,
+        post_date: postParams.datetime ?? new Date()
+      };
+    }
     let publishPromise;
     if (postParams.postId) {
       publishPromise = this.client.methodCall('wp.editPost', [
diff --git a/src/xmlrpc-client.ts b/src/xmlrpc-client.ts
@@ -103,7 +103,7 @@ export class XmlRpcClient {
       value.appendChild(boolean);
     } else if (isDate(data)) {
       const date = doc.createElement('dateTime.iso8601');
-      date.appendText(format(data as Date, 'yyyyMMddTHH:mm:ss'));
+      date.appendText(format(data as Date, "yyyyMMdd'T'HH:mm:ss"));
       value.appendChild(date);
     } else if (isArray(data)) {
       const array = doc.createElement('array');

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`export const enum PostStatus {`
`2`	`2`	`Draft = 'draft',`
`3`	`3`	`Publish = 'publish',`
`4`		`- // Future = 'future'`
	`4`	`+ Private = 'private',`
	`5`	`+ Future = 'future'`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`export const enum CommentStatus {`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ export interface WordPressPostParams {`
`69`	`69`	`* WordPress profile name.`
`70`	`70`	`*/`
`71`	`71`	`profileName?: string;`
	`72`	`+`
	`73`	`+ datetime?: Date;`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`export interface WordPressPublishParams extends WordPressAuthParams {`