From 23102a2c082d583e9746f4af6e5015e43f038232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:17:02 +0900 Subject: [PATCH 1/3] build(deps): bump docker/setup-buildx-action from 2.9.1 to 2.10.0 (#11769) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.9.1 to 2.10.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2.9.1...v2.10.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker-develop.yml | 2 +- .github/workflows/docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 4e817b0f2..f51e80f99 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3.6.0 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.9.1 + uses: docker/setup-buildx-action@v2.10.0 with: platforms: linux/amd64,linux/arm64 - name: Docker meta diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 84f74389b..70ebd66e2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3.6.0 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.9.1 + uses: docker/setup-buildx-action@v2.10.0 with: platforms: linux/amd64,linux/arm64 - name: Docker meta From f75ee1eef015d33589f2016b067de82d01e2ca2d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 1 Sep 2023 09:36:19 +0900 Subject: [PATCH 2/3] =?UTF-8?q?enhance(frontend):=20=E3=83=8E=E3=83=BC?= =?UTF-8?q?=E3=83=88=E8=A9=B3=E7=B4=B0=E3=83=9A=E3=83=BC=E3=82=B8=E8=AA=AD?= =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=E6=99=82=E3=81=AB=E5=89=8D=E5=BE=8C?= =?UTF-8?q?=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E8=A1=8C=E3=82=8F?= =?UTF-8?q?=E3=81=AA=E3=81=9A=E3=80=81=E5=B8=B8=E3=81=AB=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=A8=E4=BB=AE=E5=AE=9A=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6=E3=83=91=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=B3=E3=82=B9=E3=82=92=E5=90=91?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/frontend/src/pages/note.vue | 22 +++------------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04eab4707..9e210543c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - メニューのスイッチの動作を改善 - 絵文字ピッカーの検索の表示件数を100件に増加 - 投稿フォームのプレビューの表示状態を記憶するように +- ノート詳細ページ読み込み時のパフォーマンスを改善 - Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように - Enhance: 自分が押したリアクションのデザインを改善 - Enhance: ノート検索にローカルのみ検索可能なオプションの追加 diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue index fb19783f3..48f62c83a 100644 --- a/packages/frontend/src/pages/note.vue +++ b/packages/frontend/src/pages/note.vue @@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -63,8 +63,6 @@ const props = defineProps<{ let note = $ref(); let clips = $ref(); -let hasPrev = $ref(false); -let hasNext = $ref(false); let showPrev = $ref(false); let showNext = $ref(false); let error = $ref(); @@ -89,8 +87,6 @@ const nextPagination = { }; function fetchNote() { - hasPrev = false; - hasNext = false; showPrev = false; showNext = false; note = null; @@ -102,20 +98,8 @@ function fetchNote() { os.api('notes/clips', { noteId: note.id, }), - os.api('users/notes', { - userId: note.userId, - untilId: note.id, - limit: 1, - }), - os.api('users/notes', { - userId: note.userId, - sinceId: note.id, - limit: 1, - }), - ]).then(([_clips, prev, next]) => { + ]).then(([_clips]) => { clips = _clips; - hasPrev = prev.length !== 0; - hasNext = next.length !== 0; }); }).catch(err => { error = err; From 724ed47e5f8cd76e1947f869f7f60f28e659979d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 1 Sep 2023 13:21:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?enhance(frontend):=20AiScript=E3=81=8B?= =?UTF-8?q?=E3=82=89Misskey=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BCAPI?= =?UTF-8?q?=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E9=9A=9B=E3=81=AE?= =?UTF-8?q?=E5=88=B6=E9=99=90=E3=82=92=E6=92=A4=E5=BB=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve #7123 --- CHANGELOG.md | 1 + packages/frontend/src/scripts/aiscript/api.ts | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e210543c..1a379d53e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - 絵文字ピッカーの検索の表示件数を100件に増加 - 投稿フォームのプレビューの表示状態を記憶するように - ノート詳細ページ読み込み時のパフォーマンスを改善 +- AiScriptからMisskeyサーバーAPIを呼び出す際の制限を撤廃 - Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように - Enhance: 自分が押したリアクションのデザインを改善 - Enhance: ノート検索にローカルのみ検索可能なオプションの追加 diff --git a/packages/frontend/src/scripts/aiscript/api.ts b/packages/frontend/src/scripts/aiscript/api.ts index 8dd3b665a..c3acb6d14 100644 --- a/packages/frontend/src/scripts/aiscript/api.ts +++ b/packages/frontend/src/scripts/aiscript/api.ts @@ -11,7 +11,6 @@ import { customEmojis } from '@/custom-emojis'; import { lang } from '@/config'; export function createAiScriptEnv(opts) { - let apiRequests = 0; return { USER_ID: $i ? values.STR($i.id) : values.NULL, USER_NAME: $i ? values.STR($i.name) : values.NULL, @@ -40,8 +39,6 @@ export function createAiScriptEnv(opts) { // バグがあればundefinedもあり得るため念のため if (typeof token.value !== 'string') throw new Error('invalid token'); } - apiRequests++; - if (apiRequests > 16) return values.NULL; const res = await os.api(ep.value, utils.valToJs(param), token ? token.value : (opts.token ?? null)); return utils.jsToVal(res); }),