From d7c82c0536eb7e56a7aba6113223669a941d5c17 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 7 Jun 2024 02:41:04 +0900
Subject: [PATCH] =?utf8?q?=E5=BC=95=E7=94=A8RN=E3=81=AE=E8=A1=A8=E7=A4=BA?=
 =?utf8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../SocialProtocol/Misskey/MisskeyPostFactory.cs      | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/OpenTween/SocialProtocol/Misskey/MisskeyPostFactory.cs b/OpenTween/SocialProtocol/Misskey/MisskeyPostFactory.cs
index 29d42eb6..fa473466 100644
--- a/OpenTween/SocialProtocol/Misskey/MisskeyPostFactory.cs
+++ b/OpenTween/SocialProtocol/Misskey/MisskeyPostFactory.cs
@@ -48,8 +48,22 @@ namespace OpenTween.SocialProtocol.Misskey
             var noteUser = note.User;
             var noteUserId = new MisskeyUserId(noteUser.Id);
 
-            var renotedNote = note.Renote;
-            var renoterUser = renotedNote != null ? noteUser : null;
+            MisskeyNote? renotedNote = null;
+            MisskeyUserLite? renoterUser = null;
+            PostId[] quotedNoteIds = Array.Empty<PostId>();
+
+            if (note.Renote != null)
+            {
+                if (MyCommon.IsNullOrEmpty(note.Text))
+                {
+                    renotedNote = note.Renote;
+                    renoterUser = noteUser;
+                }
+                else
+                {
+                    quotedNoteIds = new PostId[] { new MisskeyNoteId(note.Renote.Id) };
+                }
+            }
 
             // リツイートであるか否かに関わらず常にオリジナルのツイート及びユーザーを指す
             var originalNote = renotedNote ?? note;
@@ -80,6 +94,7 @@ namespace OpenTween.SocialProtocol.Misskey
                 Text = textHtml,
                 TextFromApi = originalText,
                 AccessibleText = originalText,
+                QuoteStatusIds = quotedNoteIds,
                 PreloadedThumbnails = this.CreateThumbnailInfoList(originalNote.Files),
                 IsFav = reactionSent,
                 IsReply = renotedNote == null && originalNote.Mentions?.Any(x => x == accountState.UserId.Id) == true,
-- 
2.11.0