From 6b95317f942732576bc2b39d091656bfdfccab28 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:45:55 +0900 Subject: [PATCH] Update EmNoteDetailed.vue --- .../frontend-embed/src/components/EmNoteDetailed.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue index 813d93fb5b..b52a0756f4 100644 --- a/packages/frontend-embed/src/components/EmNoteDetailed.vue +++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue @@ -139,11 +139,9 @@ import MkReactionsViewer from '@/components/MkReactionsViewer.vue'; import MkCwButton from '@/components/MkCwButton.vue'; import MkPoll from '@/components/MkPoll.vue'; import MkInstanceTicker from '@/components/MkInstanceTicker.vue'; -import { userPage } from '@/filters/user.js'; -import { notePage } from '@/filters/note.js'; +import { userPage } from '@/utils.js'; +import { notePage } from '@/utils.js'; import number from '@/filters/number.js'; -import { defaultStore } from '@/store.js'; -import { $i } from '@/account.js'; import { i18n } from '@/i18n.js'; import { deepClone } from '@/scripts/clone.js'; import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; @@ -175,8 +173,7 @@ const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null; const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url && appearNote.value.renote?.uri !== url) : null; const isLong = shouldCollapsed(appearNote.value, urls ?? []); const collapsed = ref(appearNote.value.cw == null && isLong); -const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance); -const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id); +const showTicker = appearNote.value.user.instance != null;