Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/clicker.vue
#	packages/frontend/src/pages/my-lists/index.vue
#	packages/frontend/src/pages/notifications.vue
#	packages/frontend/src/pages/settings/emoji-picker.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/universal.vue
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2024-02-16 19:40:51 +09:00
commit 2b52a215e5
238 changed files with 3369 additions and 3002 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packages/frontend/src/pages/user/followers.vue
View file

@ -52,11 +52,14 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
definePageMetadata(computed(() => user.value ? {
definePageMetadata(() => ({
title: i18n.ts.user,
icon: 'ti ti-user',
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`,
subtitle: i18n.ts.followers,
userName: user.value,
avatar: user.value,
} : null));
...user.value ? {
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`,
subtitle: i18n.ts.followers,
userName: user.value,
avatar: user.value,
} : {},
}));
</script>

15
packages/frontend/src/pages/user/following.vue
View file

@ -52,11 +52,14 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
definePageMetadata(computed(() => user.value ? {
definePageMetadata(() => ({
title: i18n.ts.user,
icon: 'ti ti-user',
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`,
subtitle: i18n.ts.following,
userName: user.value,
avatar: user.value,
} : null));
...user.value ? {
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`,
subtitle: i18n.ts.following,
userName: user.value,
avatar: user.value,
} : {},
}));
</script>

23
packages/frontend/src/pages/user/index.vue
View file

@ -126,15 +126,18 @@ const headerTabs = computed(() => user.value ? [{
icon: 'ti ti-code',
}] : []);
definePageMetadata(computed(() => user.value ? {
definePageMetadata(() => ({
title: i18n.ts.user,
icon: 'ti ti-user',
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`,
subtitle: `@${getAcct(user.value)}`,
userName: user.value,
avatar: user.value,
path: `/@${user.value.username}`,
share: {
title: user.value.name,
},
} : null));
...user.value ? {
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`,
subtitle: `@${getAcct(user.value)}`,
userName: user.value,
avatar: user.value,
path: `/@${user.value.username}`,
share: {
title: user.value.name,
},
} : {},
}));
</script>