From 7d842c1a95e28af445c30ca47fb96479b3301456 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 30 Mar 2025 09:07:15 +0900
Subject: [PATCH] fix(frontend): avoid naming confliction of MkAd
---
packages/frontend/src/components/global/MkAd.vue | 4 ++--
packages/frontend/src/pages/chat/home.home.vue | 2 +-
packages/frontend/src/pages/flash/flash.vue | 2 +-
packages/frontend/src/pages/gallery/post.vue | 2 +-
packages/frontend/src/pages/page.vue | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue
index b55069ca25..29b2ce0487 100644
--- a/packages/frontend/src/components/global/MkAd.vue
+++ b/packages/frontend/src/components/global/MkAd.vue
@@ -53,7 +53,7 @@ import { prefer } from '@/preferences.js';
type Ad = (typeof instance)['ads'][number];
const props = defineProps<{
- prefer: string[];
+ preferForms: string[];
specify?: Ad;
}>();
@@ -72,7 +72,7 @@ const choseAd = (): Ad | null => {
ratio: 0,
} : ad);
- let ads = allAds.filter(ad => props.prefer.includes(ad.place));
+ let ads = allAds.filter(ad => props.preferForms.includes(ad.place));
if (ads.length === 0) {
ads = allAds.filter(ad => ad.place === 'square');
diff --git a/packages/frontend/src/pages/chat/home.home.vue b/packages/frontend/src/pages/chat/home.home.vue
index 007e9fc1f4..49857db9ab 100644
--- a/packages/frontend/src/pages/chat/home.home.vue
+++ b/packages/frontend/src/pages/chat/home.home.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._chat.chatNotAvailableForThisAccountOrServer }}
-
+
{{ i18n.ts._play.editThisPage }}
-
+
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index 81d553c035..6b37a0b470 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -42,7 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
{{ i18n.ts.recentPosts }}
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index b684d4b68b..6c2eced4e6 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -80,7 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.updatedAt }}:
-
+
{{ i18n.ts.recentPosts }}