From 5887c5da6c2097b8f6344bf137daef1f355746e4 Mon Sep 17 00:00:00 2001 From: yupix Date: Sun, 29 Oct 2023 11:10:01 +0900 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E3=83=81=E3=83=A3=E3=83=B3?= =?UTF-8?q?=E3=83=8D=E3=83=AB=E3=81=AE=E4=BD=9C=E6=88=90=E3=83=BB=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=99=82=E3=81=ABapiWithDialog=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=20(#12142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: チャンネル作成、更新時にapiWithDialogを使うように * chore: 不要なsuccessの呼び出しを削除 * chore: 誤って削除した必要なコードを元通りに --- CHANGELOG.md | 1 + packages/frontend/src/pages/channel-editor.vue | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c5c582fdc..914167f283 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Fix: ユーザーページの ノート > ファイル付き タブにリプライが表示されてしまう - Fix: 「検索」MFMにおいて一部の検索キーワードが正しく認識されない問題を修正 - Fix: 一部の言語でMisskey Webがクラッシュする問題を修正 +- Fix: チャンネルの作成・更新時に失敗した場合何も表示されない問題を修正 #11983 ### Server - Enhance: RedisへのTLのキャッシュをオフにできるように diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue index 39ce093cf2..faef8fdb1f 100644 --- a/packages/frontend/src/pages/channel-editor.vue +++ b/packages/frontend/src/pages/channel-editor.vue @@ -154,12 +154,9 @@ function save() { if (props.channelId) { params.channelId = props.channelId; - os.api('channels/update', params).then(() => { - os.success(); - }); + os.apiWithDialog('channels/update', params); } else { - os.api('channels/create', params).then(created => { - os.success(); + os.apiWithDialog('channels/create', params).then(created => { router.push(`/channels/${created.id}`); }); } From 2a61a0c0264c347ebd94c980a09180fd423b7506 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 29 Oct 2023 13:07:49 +0900 Subject: [PATCH 02/10] Update .eslintrc.js --- packages/shared/.eslintrc.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/shared/.eslintrc.js b/packages/shared/.eslintrc.js index c578894f60..3f19aad685 100644 --- a/packages/shared/.eslintrc.js +++ b/packages/shared/.eslintrc.js @@ -67,6 +67,11 @@ module.exports = { 'object-curly-spacing': ['error', 'always'], 'space-infix-ops': ['error'], 'space-before-blocks': ['error', 'always'], + 'padding-line-between-statements': [ + 'error', + { 'blankLine': 'always', 'prev': 'function', 'next': '*' }, + { 'blankLine': 'always', 'prev': '*', 'next': 'function' }, + ], '@typescript-eslint/func-call-spacing': ['error', 'never'], '@typescript-eslint/no-explicit-any': ['warn'], '@typescript-eslint/no-unused-vars': ['warn'], From b627978d00cbca0f89e100f8ec6d96d537154819 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 29 Oct 2023 13:12:04 +0900 Subject: [PATCH 03/10] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 914167f283..aa65bf8135 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ ### General - Feat: アイコンデコレーション機能 - Enhance: すでにフォローしたすべての人の返信をTLに追加できるように +- Enhance: ローカリゼーションの更新 +- Enhance: 依存関係の更新 ### Client - Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました From feedad7d8b2ba3251edcdf294d16aef7ff0474c2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 29 Oct 2023 13:49:26 +0900 Subject: [PATCH 04/10] enhance(frontend): tweak about-misskey page --- locales/index.d.ts | 1 + locales/ja-JP.yml | 3 ++- packages/frontend/src/pages/about-misskey.vue | 26 ++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index bfe25c94a7..5f156b617a 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1707,6 +1707,7 @@ export interface Locale { "donate": string; "morePatrons": string; "patrons": string; + "projectMembers": string; }; "_displayOfSensitiveMedia": { "respect": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 2b475e2134..f7e73042b7 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1617,13 +1617,14 @@ _registry: _aboutMisskey: about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。" - contributors: "主なコントリビューター" + contributors: "コントリビューター" allContributors: "全てのコントリビューター" source: "ソースコード" translation: "Misskeyを翻訳" donate: "Misskeyに寄付" morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰" patrons: "支援者" + projectMembers: "プロジェクトメンバー" _displayOfSensitiveMedia: respect: "センシティブ設定されたメディアを隠す" diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index c443cdeb76..7a2c698d11 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + - + + + + {{ i18n.ts._aboutMisskey.allContributors }} @@ -95,6 +94,9 @@ SPDX-License-Identifier: AGPL-3.0-only
Mask Network
+
+ XServer +
Skeb
From 1a8243f1cace06c2eb872177d39536f76c9a8f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sun, 29 Oct 2023 14:12:40 +0900 Subject: [PATCH 05/10] =?UTF-8?q?MkCode=E3=81=AE=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=82=A8=E3=83=B3=E3=82=B8=E3=83=B3=E3=82=92Shiki?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=20(#12102)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (swap) prism -> shiki * fix styles * (bump) aiscript-vscode to v0.0.5 * refactor * replace prism-editor (beta) * Update scratchpad.vue * (enhance) MkCodeEditor自動インデント改行 * (fix) lint * (add) scratchpad: MkStickyContainer * Update CHANGELOG.md * clean up --------- Co-authored-by: syuilo --- CHANGELOG.md | 3 + packages/frontend/package.json | 4 +- .../frontend/src/components/MkCode.core.vue | 85 ++++++++- packages/frontend/src/components/MkCode.vue | 21 ++- .../frontend/src/components/MkCodeEditor.vue | 166 ++++++++++++++++++ packages/frontend/src/pages/flash/flash.vue | 2 +- packages/frontend/src/pages/scratchpad.vue | 60 +++---- .../frontend/src/pages/settings/plugin.vue | 2 +- .../frontend/src/scripts/code-highlighter.ts | 31 ++++ packages/frontend/src/style.scss | 4 - pnpm-lock.yaml | 87 +++++---- scripts/build-assets.mjs | 8 + 12 files changed, 380 insertions(+), 93 deletions(-) create mode 100644 packages/frontend/src/components/MkCodeEditor.vue create mode 100644 packages/frontend/src/scripts/code-highlighter.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index aa65bf8135..b909b26cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ - Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました - 外部サイトでの実装が必要です。詳細は Misskey Hub をご覧ください https://misskey-hub.net/docs/advanced/publish-on-your-website.html +- Enhance: コードのシンタックスハイライトエンジンをShikiに変更 + - AiScriptのシンタックスハイライトに対応 + - MFMでAiScriptをハイライトする場合、コードブロックの開始部分を ` ```is ` もしくは ` ```aiscript ` としてください - Enhance: データセーバー有効時はアニメーション付きのアバター画像が停止するように - Enhance: プラグインを削除した際には、使用されていたアクセストークンも同時に削除されるようになりました - Enhance: プラグインで`Plugin:register_note_view_interruptor`を用いてnoteの代わりにnullを返却することでノートを非表示にできるようになりました diff --git a/packages/frontend/package.json b/packages/frontend/package.json index f8492b3e56..fe35519d27 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -29,6 +29,7 @@ "@vue/compiler-sfc": "3.3.7", "astring": "1.8.6", "autosize": "6.0.1", + "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.5", "broadcast-channel": "5.5.1", "browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3", "buraha": "0.0.1", @@ -54,11 +55,11 @@ "mfm-js": "0.23.3", "misskey-js": "workspace:*", "photoswipe": "5.4.2", - "prismjs": "1.29.0", "punycode": "2.3.0", "querystring": "0.2.1", "rollup": "4.1.4", "sanitize-html": "2.11.0", + "shiki": "^0.14.5", "sass": "1.69.5", "strict-event-emitter-types": "2.0.0", "textarea-caret": "3.1.0", @@ -74,7 +75,6 @@ "vanilla-tilt": "1.8.1", "vite": "4.5.0", "vue": "3.3.7", - "vue-prism-editor": "2.0.0-alpha.2", "vuedraggable": "next" }, "devDependencies": { diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index a1300be1f6..4ec3540419 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -5,21 +5,90 @@ SPDX-License-Identifier: AGPL-3.0-only + + diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue index 8972b1863b..b39e6ff23c 100644 --- a/packages/frontend/src/components/MkCode.vue +++ b/packages/frontend/src/components/MkCode.vue @@ -4,11 +4,18 @@ SPDX-License-Identifier: AGPL-3.0-only --> + + diff --git a/packages/frontend/src/components/MkCodeEditor.vue b/packages/frontend/src/components/MkCodeEditor.vue new file mode 100644 index 0000000000..2d56a61963 --- /dev/null +++ b/packages/frontend/src/components/MkCodeEditor.vue @@ -0,0 +1,166 @@ + + + + + + + diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue index 32a835831c..ebf117ffbf 100644 --- a/packages/frontend/src/pages/flash/flash.vue +++ b/packages/frontend/src/pages/flash/flash.vue @@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +
diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue index 3dfd2d661f..f8d3187bd4 100644 --- a/packages/frontend/src/pages/scratchpad.vue +++ b/packages/frontend/src/pages/scratchpad.vue @@ -4,46 +4,46 @@ SPDX-License-Identifier: AGPL-3.0-only -->