From e173d2b99785a0aa4528e4b3ec9f7e0f7266a4e6 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 9 Jan 2025 10:48:54 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20=E3=82=AB=E3=83=A9=E3=83=A0=E5=90=8D?=
 =?UTF-8?q?=E3=81=8C=E6=8C=87=E5=AE=9A=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AB=E3=81=AF=E3=83=81=E3=83=A3?=
 =?UTF-8?q?=E3=83=B3=E3=83=8D=E3=83=AB=E5=90=8D=E3=82=92=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/ui/deck/antenna-column.vue       | 10 ++++++----
 packages/frontend/src/ui/deck/channel-column.vue       |  6 +++++-
 packages/frontend/src/ui/deck/list-column.vue          |  6 +++++-
 packages/frontend/src/ui/deck/role-timeline-column.vue |  8 ++++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index e7ebee24ad..3bad14421c 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -40,11 +40,13 @@ const antennaName = ref<string | null>(null);
 onMounted(() => {
 	if (props.column.antennaId == null) {
 		setAntenna();
-	} else {
+	}
+});
+
+watch([() => props.column.name, () => props.column.antennaId], () => {
+	if (!props.column.name && props.column.antennaId) {
 		misskeyApi('antennas/show', { antennaId: props.column.antennaId })
-			.then(value => {
-				antennaName.value = value.name;
-			});
+			.then(value => antennaName.value = value.name);
 	}
 });
 
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index ce9c1d70e4..876e0bed44 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -47,7 +47,11 @@ const channelName = ref<string | null>(null);
 onMounted(() => {
 	if (props.column.channelId == null) {
 		setChannel();
-	} else {
+	}
+});
+
+watch([() => props.column.name, () => props.column.channelId], () => {
+	if (!props.column.name && props.column.channelId) {
 		misskeyApi('channels/show', { channelId: props.column.channelId })
 			.then(value => channelName.value = value.name);
 	}
diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue
index 71d6bf9f18..5c196c56be 100644
--- a/packages/frontend/src/ui/deck/list-column.vue
+++ b/packages/frontend/src/ui/deck/list-column.vue
@@ -41,7 +41,11 @@ const listName = ref<string | null>(null);
 onMounted(() => {
 	if (props.column.listId == null) {
 		setList();
-	} else {
+	}
+});
+
+watch([() => props.column.name, () => props.column.listId], () => {
+	if (!props.column.name && props.column.listId) {
 		misskeyApi('users/lists/show', { listId: props.column.listId })
 			.then(value => listName.value = value.name);
 	}
diff --git a/packages/frontend/src/ui/deck/role-timeline-column.vue b/packages/frontend/src/ui/deck/role-timeline-column.vue
index 67e43650dd..1b1a5d3257 100644
--- a/packages/frontend/src/ui/deck/role-timeline-column.vue
+++ b/packages/frontend/src/ui/deck/role-timeline-column.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, shallowRef, watch } from 'vue';
+import { computed, onMounted, ref, shallowRef, watch } from 'vue';
 import XColumn from './column.vue';
 import { updateColumn, Column } from './deck-store.js';
 import MkTimeline from '@/components/MkTimeline.vue';
@@ -38,7 +38,11 @@ const roleName = ref<string | null>(null);
 onMounted(() => {
 	if (props.column.roleId == null) {
 		setRole();
-	} else {
+	}
+});
+
+watch([() => props.column.name, () => props.column.roleId], () => {
+	if (!props.column.name && props.column.roleId) {
 		misskeyApi('roles/show', { roleId: props.column.roleId })
 			.then(value => roleName.value = value.name);
 	}