mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-23 00:29:22 +09:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge cebaab47e4 into 3c81926f71

Browse Source
This commit is contained in:
かっこかり 2024-12-22 04:46:12 +00:00 committed by GitHub
commit fa61dfac35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -13,6 +13,8 @@
- Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
- Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正
- Fix: リモートユーザーのページでは連合されない項目（クリップ・ページ・Playなど）のタブが表示されないように
(Cherry-picked from https://github.com/okayurisotto/wisteria/commit/2b8bdeea431b1e8fc380e3b2bba5f5f37262fbf7)
### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )

67
packages/frontend/src/pages/user/index.vue
View File

@ -95,51 +95,28 @@ watch(() => props.acct, fetchUser, {
const headerActions = computed(() => []);
const headerTabs = computed(() => user.value ? [{
key: 'home',
title: i18n.ts.overview,
icon: 'ti ti-home',
}, {
key: 'notes',
title: i18n.ts.notes,
icon: 'ti ti-pencil',
}, {
key: 'activity',
title: i18n.ts.activity,
icon: 'ti ti-chart-line',
}, ...(user.value.host == null ? [{
key: 'achievements',
title: i18n.ts.achievements,
icon: 'ti ti-medal',
}] : []), ...($i && ($i.id === user.value.id || $i.isAdmin || $i.isModerator)) || user.value.publicReactions ? [{
key: 'reactions',
title: i18n.ts.reaction,
icon: 'ti ti-mood-happy',
}] : [], {
key: 'clips',
title: i18n.ts.clips,
icon: 'ti ti-paperclip',
}, {
key: 'lists',
title: i18n.ts.lists,
icon: 'ti ti-list',
}, {
key: 'pages',
title: i18n.ts.pages,
icon: 'ti ti-news',
}, {
key: 'flashs',
title: 'Play',
icon: 'ti ti-player-play',
}, {
key: 'gallery',
title: i18n.ts.gallery,
icon: 'ti ti-icons',
}, {
key: 'raw',
title: 'Raw',
icon: 'ti ti-code',
}] : []);
const headerTabs = computed(() => {
if (user.value == null) return [];
const isReactionsVisible = user.value.publicReactions || ($i && ($i.id === user.value.id || $i.isAdmin || $i.isModerator));
const isLocalUser = user.value.host === null;
return [
{ key: 'home', title: i18n.ts.overview, icon: 'ti ti-home' },
{ key: 'notes', title: i18n.ts.notes, icon: 'ti ti-pencil' },
{ key: 'activity', title: i18n.ts.activity, icon: 'ti ti-chart-line', },
...(isLocalUser ? [{ key: 'achievements', title: i18n.ts.achievements, icon: 'ti ti-medal' }] : []),
...(isReactionsVisible ? [{ key: 'reactions', title: i18n.ts.reaction, icon: 'ti ti-mood-happy' }] : []),
...(isLocalUser ? [
{ key: 'clips', title: i18n.ts.clips, icon: 'ti ti-paperclip' },
{ key: 'lists', title: i18n.ts.lists, icon: 'ti ti-list' },
{ key: 'pages', title: i18n.ts.pages, icon: 'ti ti-news' },
{ key: 'flashs', title: 'Play', icon: 'ti ti-player-play' },
{ key: 'gallery', title: i18n.ts.gallery, icon: 'ti ti-icons' },
] : []),
{ key: 'raw', title: 'Raw', icon: 'ti ti-code' },
];
});
definePageMetadata(() => ({
title: i18n.ts.user,