From 5dd24e44d1671e163d43b88a63a6a19873b81c4f Mon Sep 17 00:00:00 2001 From: nenohi Date: Thu, 23 Feb 2023 07:52:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=9E=E3=82=A4=E3=82=B0=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=A4=89=E6=9B=B4=E3=83=9F=E3=82=B9=20(#1002?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/migration/1676438468213-ad3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/migration/1676438468213-ad3.js b/packages/backend/migration/1676438468213-ad3.js index bf1f384adc94..18f56e8d3667 100644 --- a/packages/backend/migration/1676438468213-ad3.js +++ b/packages/backend/migration/1676438468213-ad3.js @@ -4,6 +4,6 @@ export class ad1676438468213 { await queryRunner.query(`ALTER TABLE "ad" ADD "startsAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()`); } async down(queryRunner) { - await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "startsAt"`); + await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "startsAt"`); } } From fb7e5a3face76d67fc375751869d0faab75c2278 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 23 Feb 2023 08:08:17 +0900 Subject: [PATCH 2/3] enhance(client): tweak renote collapsing logic --- packages/frontend/src/components/MkNote.vue | 5 +---- packages/frontend/src/os.ts | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 4986f1b64696..6ed3ee51f553 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -155,7 +155,6 @@ import { deepClone } from '@/scripts/clone'; import { useTooltip } from '@/scripts/use-tooltip'; import { claimAchievement } from '@/scripts/achievements'; import { getNoteSummary } from '@/scripts/get-note-summary'; -import { shownNoteIds } from '@/os'; import { MenuItem } from '@/types/menu'; const props = defineProps<{ @@ -209,9 +208,7 @@ const translation = ref(null); const translating = ref(false); const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || appearNote.userId === $i.id); -let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId)) || shownNoteIds.has(appearNote.id))); - -shownNoteIds.add(appearNote.id); +let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId)) || (appearNote.myReaction != null))); const keymap = { 'r': () => reply(true), diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index a69fe73f3057..7e38fe5f6df8 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -603,9 +603,3 @@ export function checkExistence(fileData: ArrayBuffer): Promise { }); }); }*/ - -export const shownNoteIds = new Set(); - -window.setInterval(() => { - shownNoteIds.clear(); -}, 1000 * 60 * 5); From 8ca2f24df6f43162e861bd79e23cde46929ba66f Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 23 Feb 2023 08:09:22 +0900 Subject: [PATCH 3/3] 13.7.1 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4ea43d10f39..fa56dc29ea3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ You should also include the user name that made the change. --> -## 13.x.x (unreleased) +## 13.7.1 (2023/02/23) ### Improvements - pnpm buildではswcを使うように diff --git a/package.json b/package.json index a251e062abb5..43c480947260 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.7.0", + "version": "13.7.1", "codename": "nasubi", "repository": { "type": "git",