diff --git a/CHANGELOG.md b/CHANGELOG.md index 770b37a206..71273f705a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ - Fix: ユーザーの前後ノートを閲覧する機能が動作しない問題を修正 - Fix: 照会ダイアログでap/showでローカルユーザーを解決した際@username@nullに飛ばされる問題を修正 - Fix: アイコンのデコレーションを付ける際にデコレーションが表示されなくなる問題を修正 +- Fix: 管理中アカウント一覧で正しい表示が行われない問題を修正 ### Server - Feat: サーバー管理コマンド diff --git a/packages/frontend/src/pages/settings/accounts.vue b/packages/frontend/src/pages/settings/accounts.vue index 26010e93eb..764ec72652 100644 --- a/packages/frontend/src/pages/settings/accounts.vue +++ b/packages/frontend/src/pages/settings/accounts.vue @@ -11,7 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -24,29 +26,29 @@ import MkButton from '@/components/MkButton.vue'; import * as os from '@/os.js'; import { misskeyApi } from '@/utility/misskey-api.js'; import { $i } from '@/i.js'; -import { switchAccount, removeAccount, login, getAccountWithSigninDialog, getAccountWithSignupDialog } from '@/accounts.js'; +import { switchAccount, removeAccount, login, getAccountWithSigninDialog, getAccountWithSignupDialog, getAccounts } from '@/accounts.js'; import { i18n } from '@/i18n.js'; import { definePage } from '@/page.js'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; import { prefer } from '@/preferences.js'; -const accounts = prefer.r.accounts; +const accounts = await getAccounts(); function refreshAllAccounts() { // TODO } -function showMenu(host: string, account: Misskey.entities.UserDetailed, ev: MouseEvent) { +function showMenu(host: string, id: string, ev: MouseEvent) { let menu: MenuItem[]; menu = [{ text: i18n.ts.switch, icon: 'ti ti-switch-horizontal', - action: () => switchAccount(host, account.id), + action: () => switchAccount(host, id), }, { text: i18n.ts.remove, icon: 'ti ti-trash', - action: () => removeAccount(host, account.id), + action: () => removeAccount(host, id), }]; os.popupMenu(menu, ev.currentTarget ?? ev.target); diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue index fb1a409180..fdf2373bfc 100644 --- a/packages/frontend/src/pages/settings/preferences.vue +++ b/packages/frontend/src/pages/settings/preferences.vue @@ -1031,7 +1031,6 @@ function testNotification(): void { const notification: Misskey.entities.Notification = { id: genId(), createdAt: new Date().toUTCString(), - isRead: false, type: 'test', };