Merge branch 'develop' into release

opentween · Jul 5, 2023 · 57fa9fa · 57fa9fa
2 parents b0f5451 + ba57cfa
commit 57fa9fa
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/OpenTween/Api/GraphQL/TimelineTweet.cs b/OpenTween/Api/GraphQL/TimelineTweet.cs
@@ -52,14 +52,7 @@ public TwitterStatus ToTwitterStatus()
             try
             {
                 var resultElm = this.Element.Element("tweet_results")?.Element("result") ?? throw CreateParseError();
-                var tweetElm = resultElm.Element("__typename")?.Value switch
-                {
-                    "Tweet" => resultElm,
-                    "TweetWithVisibilityResults" => resultElm.Element("tweet") ?? throw CreateParseError(),
-                    _ => throw CreateParseError(),
-                };
-
-                return this.ParseTweet(tweetElm);
+                return this.ParseTweetUnion(resultElm);
             }
             catch (WebApiException ex)
             {
@@ -69,6 +62,18 @@ public TwitterStatus ToTwitterStatus()
             }
         }
 
+        private TwitterStatus ParseTweetUnion(XElement tweetUnionElm)
+        {
+            var tweetElm = tweetUnionElm.Element("__typename")?.Value switch
+            {
+                "Tweet" => tweetUnionElm,
+                "TweetWithVisibilityResults" => tweetUnionElm.Element("tweet") ?? throw CreateParseError(),
+                _ => throw CreateParseError(),
+            };
+
+            return this.ParseTweet(tweetElm);
+        }
+
         private TwitterStatus ParseTweet(XElement tweetElm)
         {
             var tweetLegacyElm = tweetElm.Element("legacy") ?? throw CreateParseError();
@@ -142,7 +147,7 @@ static string GetText(XElement elm, string name)
                     ScreenName = GetText(userLegacyElm, "screen_name"),
                     Protected = GetTextOrNull(userLegacyElm, "protected") == "true",
                 },
-                RetweetedStatus = retweetedTweetElm != null ? this.ParseTweet(retweetedTweetElm) : null,
+                RetweetedStatus = retweetedTweetElm != null ? this.ParseTweetUnion(retweetedTweetElm) : null,
             };
         }
 

diff --git a/OpenTween/Properties/AssemblyInfo.cs b/OpenTween/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 // 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です
 [assembly: Guid("2d0ae0ba-adac-49a2-9b10-26fd69e695bf")]
 
-[assembly: AssemblyVersion("3.6.1.0")]
+[assembly: AssemblyVersion("3.6.2.0")]
 
 [assembly: InternalsVisibleTo("OpenTween.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // for Moq
diff --git a/OpenTween/Properties/Resources.Designer.cs b/OpenTween/Properties/Resources.Designer.cs
diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
@@ -1,5 +1,8 @@
 更新履歴
 
+==== Ver 3.6.2(2023/07/07)
+ * FIX: リプライ制限されたツイートのRTがリストのタイムラインに含まれているとエラーになる不具合を修正
+
 ==== Ver 3.6.1(2023/07/07)
  * CHG: graphqlエンドポイントからのレスポンスの読み込み失敗時に問題の起きたツイートをErrorLogsに書き出す機能を追加
  * FIX: リプライ制限されたツイートがリストのタイムラインに含まれているとエラーになる不具合を修正 (thx @wal_san!)

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.6.0.{build}
+version: 3.6.1.{build}
 
 os: Visual Studio 2022