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

fix: フォロー・フォロワーの公開状況によってはフォロー関連のチャートを表示できないように

Browse source
This commit is contained in:
kakkokari-gtyih 2024-10-24 20:25:42 +09:00
parent 15ae1605ec
commit 8bacd4aa27
4 changed files with 74 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/frontend/src/components/MkChart.vue
View file

@ -53,7 +53,7 @@ export type ChartSrc =
import { onMounted, ref, shallowRef, watch } from 'vue';
import { Chart } from 'chart.js';
import * as Misskey from 'misskey-js';
import { misskeyApiGet } from '@/scripts/misskey-api.js';
import { misskeyApiGet, misskeyApi } from '@/scripts/misskey-api.js';
import { defaultStore } from '@/store.js';
import { useChartTooltip } from '@/scripts/use-chart-tooltip.js';
import { chartVLine } from '@/scripts/chart-vline.js';
@ -758,8 +758,10 @@ const fetchPerUserPvChart = async (): Promise<typeof chartData> => {
};
const fetchPerUserFollowingChart = async (): Promise<typeof chartData> => {
const raw = await misskeyApiGet('charts/user/following', { userId: props.args?.user?.id, limit: props.limit, span: props.span });
return {
const raw = await misskeyApi('charts/user/following', { userId: props.args?.user?.id!, limit: props.limit, span: props.span }).catch(() => {
return null;
});
return raw != null ? {
series: [{
name: 'Local',
type: 'area',
@ -769,12 +771,14 @@ const fetchPerUserFollowingChart = async (): Promise<typeof chartData> => {
type: 'area',
data: format(raw.remote.followings.total),
}],
};
} : raw;
};
const fetchPerUserFollowersChart = async (): Promise<typeof chartData> => {
const raw = await misskeyApiGet('charts/user/following', { userId: props.args?.user?.id, limit: props.limit, span: props.span });
return {
const raw = await misskeyApi('charts/user/following', { userId: props.args?.user?.id!, limit: props.limit, span: props.span }).catch(() => {
return null;
});
return raw != null ? {
series: [{
name: 'Local',
type: 'area',
@ -784,7 +788,7 @@ const fetchPerUserFollowersChart = async (): Promise<typeof chartData> => {
type: 'area',
data: format(raw.remote.followers.total),
}],
};
} : raw;
};
const fetchPerUserDriveChart = async (): Promise<typeof chartData> => {

4
packages/frontend/src/pages/user/activity.following.vue
View file

@ -32,7 +32,7 @@ const props = defineProps<{
user: Misskey.entities.User;
}>();
const chartEl = shallowRef<HTMLCanvasElement>(null);
const chartEl = shallowRef<HTMLCanvasElement>();
const legendEl = shallowRef<InstanceType<typeof MkChartLegend>>();
const now = new Date();
let chartInstance: Chart = null;
@ -88,7 +88,7 @@ async function renderChart() {
}, extra);
}
chartInstance = new Chart(chartEl.value, {
chartInstance = new Chart(chartEl.value!, {
type: 'bar',
data: {
datasets: [

8
packages/frontend/src/pages/user/activity.vue
View file

@ -14,7 +14,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #header><i class="ti ti-pencil"></i> Notes</template>
<XNotes :user="user"/>
</MkFoldableSection>
<MkFoldableSection class="item">
<MkFoldableSection
v-if="isFollowersVisibleForMe(user) && isFollowingVisibleForMe(user)"
class="item"
>
<template #header><i class="ti ti-users"></i> Following</template>
<XFollowing :user="user"/>
</MkFoldableSection>
@ -33,9 +36,10 @@ import XNotes from './activity.notes.vue';
import XFollowing from './activity.following.vue';
import MkFoldableSection from '@/components/MkFoldableSection.vue';
import MkHeatmap from '@/components/MkHeatmap.vue';
import { isFollowersVisibleForMe, isFollowingVisibleForMe } from '@/scripts/isFfVisibleForMe.js';
const props = defineProps<{
user: Misskey.entities.User;
user: Misskey.entities.UserDetailed;
}>();
</script>