From c2208fb1c51828757a15cace5fffb4cbc8085c01 Mon Sep 17 00:00:00 2001 From: mattyatea Date: Thu, 2 Nov 2023 14:32:07 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B8=E3=82=B1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=81=A8=E3=81=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/index.d.ts | 1 + locales/ja-JP.yml | 1 + package.json | 2 +- packages/backend/src/server/api/endpoints/users/stats.ts | 4 ++-- packages/frontend/src/components/MkLaunchPad.vue | 5 +++-- packages/frontend/src/components/MkNotifications.vue | 3 --- packages/frontend/src/pages/settings/general.vue | 2 ++ packages/frontend/src/pages/settings/notifications.vue | 4 ++-- packages/frontend/src/store.ts | 4 ++++ packages/frontend/src/ui/_common_/navbar-for-mobile.vue | 4 ++-- packages/frontend/src/ui/_common_/navbar.vue | 6 +++--- packages/frontend/src/ui/classic.sidebar.vue | 4 ++-- packages/frontend/src/ui/deck.vue | 3 ++- packages/frontend/src/ui/universal.vue | 4 ++-- packages/misskey-js/etc/misskey-js.api.md | 3 ++- 15 files changed, 29 insertions(+), 21 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index dbc4a16504..b3ace43563 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -14,6 +14,7 @@ export interface Locale { "forgotPassword": string; "fetchingAsApObject": string; "ok": string; + "notificationIndicator": string; "hanntenn": string; "hanntennInfo": string; "ruby": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 78723c06b0..aed6b801f1 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -11,6 +11,7 @@ password: "パスワード" forgotPassword: "パスワードを忘れた" fetchingAsApObject: "連合に照会中" ok: "OK" +notificationIndicator: "通知のインジケーターの数字を表示する" hanntenn: "アイコンとバナーを反転させる" hanntennInfo: "ダークだったらライトのアイコンに、ライトだったらダークのアイコンに。" ruby: "ルビ" diff --git a/package.json b/package.json index 42f7e5a4ec..1b0ca617af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2023.11.0-beta.7-prismisskey.1", + "version": "2023.11.0-beta.7-prismisskey.2", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/backend/src/server/api/endpoints/users/stats.ts b/packages/backend/src/server/api/endpoints/users/stats.ts index f51da1baad..6ee9eba839 100644 --- a/packages/backend/src/server/api/endpoints/users/stats.ts +++ b/packages/backend/src/server/api/endpoints/users/stats.ts @@ -3,7 +3,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; -import type { UsersRepository, NotesRepository, FollowingsRepository, DriveFilesRepository, NoteReactionsRepository, PageLikesRepository, NoteFavoritesRepository, PollVotesRepository } from '@/models/index.js'; +import type { UsersRepository, NotesRepository, FollowingsRepository, DriveFilesRepository, NoteReactionsRepository, PageLikesRepository, NoteFavoritesRepository, PollVotesRepository } from '@/models/_.js'; import { ApiError } from '../../error.js'; export const meta = { @@ -148,7 +148,7 @@ export default class extends Endpoint { private driveFileEntityService: DriveFileEntityService, ) { - super(meta, paramDef, async (ps, me) => { + super(meta, paramDef, async (ps) => { const user = await this.usersRepository.findOneBy({ id: ps.userId }); if (user == null) { throw new ApiError(meta.errors.noSuchUser); diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue index 10ad4b2fe3..05f14589fc 100644 --- a/packages/frontend/src/components/MkLaunchPad.vue +++ b/packages/frontend/src/components/MkLaunchPad.vue @@ -11,13 +11,13 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ item.text }}
- {{ item.indicateValue }} + {{ item.indicateValue }} @@ -34,6 +34,7 @@ import { defaultStore } from '@/store.js'; import { deviceKind } from '@/scripts/device-kind.js'; const gamingType = computed(defaultStore.makeGetterSetter('gamingType')); +const indicatorCounterToggle = computed(defaultStore.makeGetterSetter('indicatorCounterToggle')); const props = withDefaults(defineProps<{ src?: HTMLElement; diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue index 896f97a48d..a77fa23661 100644 --- a/packages/frontend/src/components/MkNotifications.vue +++ b/packages/frontend/src/components/MkNotifications.vue @@ -69,9 +69,6 @@ onUnmounted(() => { if (connection) connection.dispose(); }); -onDeactivated(() => { - if (connection) connection.dispose(); -});