This commit is contained in:
syuilo
2024-08-26 09:24:39 +09:00
parent 1eca9b9fbd
commit 8775d9f707
5 changed files with 11 additions and 56 deletions

View File

@@ -41,35 +41,23 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts">
import { ref, computed, shallowRef, inject, onActivated } from 'vue';
import * as Misskey from 'misskey-js';
import type { Paging } from '@/components/MkPagination.vue';
import type { ParsedEmbedParams } from '@/embed-page.js';
import EmNotes from '@/embed/components/EmNotes.vue';
import XNotFound from '@/pages/not-found.vue';
import EmTimelineContainer from '@/embed/components/EmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { url, instanceName } from '@/config.js';
import { scrollToTop } from '@/scripts/scroll.js';
import { isLink } from '@/scripts/is-link.js';
import { useRouter } from '@/router/supplier.js';
import { defaultEmbedParams } from '@/scripts/embed-page.js';
import type { ParsedEmbedParams } from '@/scripts/embed-page.js';
import { defaultEmbedParams } from '@/embed-page.js';
const props = defineProps<{
clipId: string;
}>();
function redirectIfNotEmbedPage() {
const inEmbedPage = inject<boolean>('EMBED_PAGE', false);
if (!inEmbedPage) {
const router = useRouter();
router.replace(`/clips/${props.clipId}`);
}
}
redirectIfNotEmbedPage();
onActivated(redirectIfNotEmbedPage);
const embedParams = inject<ParsedEmbedParams>('embedParams', defaultEmbedParams);

View File

@@ -17,23 +17,11 @@ import * as Misskey from 'misskey-js';
import EmNoteDetailed from '@/embed/components/EmNoteDetailed.vue';
import XNotFound from '@/pages/not-found.vue';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { useRouter } from '@/router/supplier.js';
const props = defineProps<{
noteId: string;
}>();
function redirectIfNotEmbedPage() {
const inEmbedPage = inject<boolean>('EMBED_PAGE', false);
if (!inEmbedPage) {
const router = useRouter();
router.replace(`/notes/${props.noteId}`);
}
}
redirectIfNotEmbedPage();
onActivated(redirectIfNotEmbedPage);
provide('EMBED_ORIGINAL_ENTITY_URL', `/notes/${props.noteId}`);

View File

@@ -39,32 +39,22 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts">
import { computed, shallowRef, inject, onActivated } from 'vue';
import type { Paging } from '@/components/MkPagination.vue';
import type { ParsedEmbedParams } from '@/embed-page.js';
import EmNotes from '@/embed/components/EmNotes.vue';
import XNotFound from '@/pages/not-found.vue';
import EmTimelineContainer from '@/embed/components/EmTimelineContainer.vue';
import type { Paging } from '@/components/MkPagination.vue';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { url, instanceName } from '@/config.js';
import { scrollToTop } from '@/scripts/scroll.js';
import { isLink } from '@/scripts/is-link.js';
import { useRouter } from '@/router/supplier.js';
import { defaultEmbedParams } from '@/scripts/embed-page.js';
import type { ParsedEmbedParams } from '@/scripts/embed-page.js';
import { defaultEmbedParams } from '@/embed-page.js';
const props = defineProps<{
tag: string;
}>();
function redirectIfNotEmbedPage() {
const inEmbedPage = inject<boolean>('EMBED_PAGE', false);
if (!inEmbedPage) {
const router = useRouter();
router.replace(`/tags/${props.tag}`);
}
}
redirectIfNotEmbedPage();
onActivated(redirectIfNotEmbedPage);

View File

@@ -49,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { ref, computed, shallowRef, inject, onActivated } from 'vue';
import * as Misskey from 'misskey-js';
import type { Paging } from '@/components/MkPagination.vue';
import type { ParsedEmbedParams } from '@/scripts/embed-page.js';
import type { ParsedEmbedParams } from '@/embed-page.js';
import EmNotes from '@/embed/components/EmNotes.vue';
import XNotFound from '@/pages/not-found.vue';
import EmTimelineContainer from '@/embed/components/EmTimelineContainer.vue';
@@ -59,22 +59,12 @@ import { instance } from '@/instance.js';
import { url, instanceName } from '@/config.js';
import { scrollToTop } from '@/scripts/scroll.js';
import { isLink } from '@/scripts/is-link.js';
import { useRouter } from '@/router/supplier.js';
import { defaultEmbedParams } from '@/scripts/embed-page.js';
import { defaultEmbedParams } from '@/embed-page.js';
const props = defineProps<{
username: string;
}>();
function redirectIfNotEmbedPage() {
const inEmbedPage = inject<boolean>('EMBED_PAGE', false);
if (!inEmbedPage) {
const router = useRouter();
router.replace(`/@${props.username}`);
}
}
redirectIfNotEmbedPage();
onActivated(redirectIfNotEmbedPage);