From 47dd30d3b2eb1ada91b621e5201add5a014b587d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 21 Aug 2021 11:16:56 +0900
Subject: [PATCH] =?UTF-8?q?fix(client):=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E3=80=8C=E5=89=8A=E9=99=A4=E3=81=97=E3=81=A6=E7=B7=A8?=
 =?UTF-8?q?=E9=9B=86=E3=80=8D=E3=82=92=E3=81=99=E3=82=8B=E3=81=A8=E3=82=A2?=
 =?UTF-8?q?=E3=83=B3=E3=82=B1=E3=83=BC=E3=83=88=E3=81=AE=E9=81=B8=E6=8A=9E?=
 =?UTF-8?q?=E8=82=A2=E3=81=8C[object=20Object]=E3=81=AB=E3=81=AA=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #7037
---
 CHANGELOG.md                        | 1 +
 src/client/components/post-form.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77ee9b247..21f3add690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 
 ### Bugfixes
 - チャンネルを作成しているとアカウントを削除できないのを修正
+- ノートの「削除して編集」をするとアンケートの選択肢が[object Object]になる問題を修正
 
 ## 12.88.0 (2021/08/17)
 
diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue
index 221dc74313..657053cc93 100644
--- a/src/client/components/post-form.vue
+++ b/src/client/components/post-form.vue
@@ -339,7 +339,12 @@ export default defineComponent({
 				this.cw = init.cw;
 				this.useCw = init.cw != null;
 				if (init.poll) {
-					this.poll = init.poll;
+					this.poll = {
+						choices: init.poll.choices.map(x => x.text),
+						multiple: init.poll.multiple,
+						expiresAt: init.poll.expiresAt,
+						expiredAfter: init.poll.expiredAfter,
+					};
 				}
 				this.visibility = init.visibility;
 				this.localOnly = init.localOnly;