OSDN Git Service

IApiConnectionをIApiConnectionLegacyに名前変更
authorKimura Youichi <kim.upsilon@bucyou.net>
Fri, 8 Dec 2023 13:41:01 +0000 (22:41 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Fri, 8 Dec 2023 15:10:15 +0000 (00:10 +0900)
25 files changed:
OpenTween.Tests/Api/GraphQL/CreateRetweetRequestTest.cs
OpenTween.Tests/Api/GraphQL/CreateTweetRequestTest.cs
OpenTween.Tests/Api/GraphQL/DeleteRetweetRequestTest.cs
OpenTween.Tests/Api/GraphQL/DeleteTweetRequestTest.cs
OpenTween.Tests/Api/GraphQL/ListLatestTweetsTimelineRequestTest.cs
OpenTween.Tests/Api/GraphQL/SearchTimelineRequestTest.cs
OpenTween.Tests/Api/GraphQL/TweetDetailRequestTest.cs
OpenTween.Tests/Api/GraphQL/UserByScreenNameRequestTest.cs
OpenTween.Tests/Api/GraphQL/UserTweetsAndRepliesRequestTest.cs
OpenTween.Tests/Api/TwitterApiTest.cs
OpenTween.Tests/Api/TwitterV2/GetTimelineRequestTest.cs
OpenTween/Api/GraphQL/CreateRetweetRequest.cs
OpenTween/Api/GraphQL/CreateTweetRequest.cs
OpenTween/Api/GraphQL/DeleteRetweetRequest.cs
OpenTween/Api/GraphQL/DeleteTweetRequest.cs
OpenTween/Api/GraphQL/ListLatestTweetsTimelineRequest.cs
OpenTween/Api/GraphQL/SearchTimelineRequest.cs
OpenTween/Api/GraphQL/TweetDetailRequest.cs
OpenTween/Api/GraphQL/UserByScreenNameRequest.cs
OpenTween/Api/GraphQL/UserTweetsAndRepliesRequest.cs
OpenTween/Api/TwitterApi.cs
OpenTween/Api/TwitterV2/GetTimelineRequest.cs
OpenTween/Connection/IApiConnectionLegacy.cs [moved from OpenTween/Connection/IApiConnection.cs with 97% similarity]
OpenTween/Connection/TwitterApiConnection.cs
OpenTween/Thumbnail/Services/TonTwitterCom.cs

index 418d38f..5fee385 100644 (file)
@@ -38,7 +38,7 @@ namespace OpenTween.Api.GraphQL
         {
             var responseText = File.ReadAllText("Resources/Responses/CreateRetweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.PostJsonAsync(It.IsAny<Uri>(), It.IsAny<string>())
                 )
index ef5d8e8..ad08aec 100644 (file)
@@ -38,7 +38,7 @@ namespace OpenTween.Api.GraphQL
         {
             var responseText = File.ReadAllText("Resources/Responses/CreateTweet_CircleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.PostJsonAsync(It.IsAny<Uri>(), It.IsAny<string>())
                 )
@@ -67,7 +67,7 @@ namespace OpenTween.Api.GraphQL
         {
             var responseText = File.ReadAllText("Resources/Responses/CreateTweet_CircleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.PostJsonAsync(It.IsAny<Uri>(), It.IsAny<string>())
                 )
@@ -92,7 +92,7 @@ namespace OpenTween.Api.GraphQL
         {
             var responseText = File.ReadAllText("Resources/Responses/CreateTweet_CircleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.PostJsonAsync(It.IsAny<Uri>(), It.IsAny<string>())
                 )
index fad2f63..9a52489 100644 (file)
@@ -36,7 +36,7 @@ namespace OpenTween.Api.GraphQL
         [Fact]
         public async Task Send_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.PostJsonAsync(It.IsAny<Uri>(), It.IsAny<string>())
                 )
index f8c1583..3db62cc 100644 (file)
@@ -36,7 +36,7 @@ namespace OpenTween.Api.GraphQL
         [Fact]
         public async Task Send_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.PostJsonAsync(It.IsAny<Uri>(), It.IsAny<string>())
                 )
index cf623b5..1a59659 100644 (file)
@@ -39,7 +39,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/ListLatestTweetsTimeline_SimpleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
@@ -71,7 +71,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/ListLatestTweetsTimeline_SimpleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
index f424861..426df27 100644 (file)
@@ -38,7 +38,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/SearchTimeline_SimpleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
@@ -70,7 +70,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/SearchTimeline_SimpleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
index 93e857f..44aebf5 100644 (file)
@@ -39,7 +39,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/TweetDetail.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
index 075ee34..9f8ee7d 100644 (file)
@@ -38,7 +38,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/UserByScreenName.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
@@ -66,7 +66,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/UserByScreenName_Suspended.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
index b829b19..690cd44 100644 (file)
@@ -38,7 +38,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/UserTweetsAndReplies_SimpleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
@@ -70,7 +70,7 @@ namespace OpenTween.Api.GraphQL
         {
             using var responseStream = File.OpenRead("Resources/Responses/UserTweetsAndReplies_SimpleTweet.json");
 
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                     x.GetStreamAsync(It.IsAny<Uri>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>())
                 )
index 49ca6b9..d74088b 100644 (file)
@@ -84,7 +84,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesHomeTimeline_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus[]>(
                     new Uri("statuses/home_timeline.json", UriKind.Relative),
@@ -112,7 +112,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesMentionsTimeline_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus[]>(
                     new Uri("statuses/mentions_timeline.json", UriKind.Relative),
@@ -140,7 +140,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesUserTimeline_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus[]>(
                     new Uri("statuses/user_timeline.json", UriKind.Relative),
@@ -170,7 +170,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesShow_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus>(
                     new Uri("statuses/show.json", UriKind.Relative),
@@ -196,7 +196,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesLookup_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus[]>(
                     new Uri("statuses/lookup.json", UriKind.Relative),
@@ -223,7 +223,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesUpdate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterStatus>(
                     new Uri("statuses/update.json", UriKind.Relative),
@@ -261,7 +261,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesUpdate_ExcludeReplyUserIdsEmptyTest()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterStatus>(
                     new Uri("statuses/update.json", UriKind.Relative),
@@ -288,7 +288,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterStatus>(
                     new Uri("statuses/destroy.json", UriKind.Relative),
@@ -308,7 +308,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task StatusesRetweet_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterStatus>(
                     new Uri("statuses/retweet.json", UriKind.Relative),
@@ -334,7 +334,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task SearchTweets_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterSearchResult>(
                     new Uri("search/tweets.json", UriKind.Relative),
@@ -365,7 +365,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsOwnerships_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterLists>(
                     new Uri("lists/ownerships.json", UriKind.Relative),
@@ -390,7 +390,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsSubscriptions_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterLists>(
                     new Uri("lists/subscriptions.json", UriKind.Relative),
@@ -415,7 +415,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsMemberships_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterLists>(
                     new Uri("lists/memberships.json", UriKind.Relative),
@@ -441,7 +441,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsCreate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterList>(
                     new Uri("lists/create.json", UriKind.Relative),
@@ -466,7 +466,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsUpdate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterList>(
                     new Uri("lists/update.json", UriKind.Relative),
@@ -492,7 +492,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterList>(
                     new Uri("lists/destroy.json", UriKind.Relative),
@@ -515,7 +515,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsStatuses_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus[]>(
                     new Uri("lists/statuses.json", UriKind.Relative),
@@ -545,7 +545,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsMembers_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterUsers>(
                     new Uri("lists/members.json", UriKind.Relative),
@@ -572,7 +572,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsMembersShow_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterUser>(
                     new Uri("lists/members/show.json", UriKind.Relative),
@@ -599,7 +599,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsMembersCreate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("lists/members/create.json", UriKind.Relative),
@@ -626,7 +626,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ListsMembersDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("lists/members/destroy.json", UriKind.Relative),
@@ -653,7 +653,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task DirectMessagesEventsList_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterMessageEventList>(
                     new Uri("direct_messages/events/list.json", UriKind.Relative),
@@ -677,7 +677,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task DirectMessagesEventsNew_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             var responseText = """
                 {
                   "event": {
@@ -717,7 +717,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task DirectMessagesEventsDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.DeleteAsync(
                     new Uri("direct_messages/events/destroy.json?id=100", UriKind.Relative))
@@ -735,7 +735,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task UsersShow_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterUser>(
                     new Uri("users/show.json", UriKind.Relative),
@@ -761,7 +761,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task UsersLookup_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterUser[]>(
                     new Uri("users/lookup.json", UriKind.Relative),
@@ -787,7 +787,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task UsersReportSpam_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("users/report_spam.json", UriKind.Relative),
@@ -811,7 +811,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FavoritesList_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterStatus[]>(
                     new Uri("favorites/list.json", UriKind.Relative),
@@ -839,7 +839,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FavoritesCreate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterStatus>(
                     new Uri("favorites/create.json", UriKind.Relative),
@@ -863,7 +863,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FavoritesDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterStatus>(
                     new Uri("favorites/destroy.json", UriKind.Relative),
@@ -887,7 +887,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FriendshipsShow_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterFriendship>(
                     new Uri("friendships/show.json", UriKind.Relative),
@@ -907,7 +907,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FriendshipsCreate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterFriendship>(
                     new Uri("friendships/create.json", UriKind.Relative),
@@ -927,7 +927,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FriendshipsDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterFriendship>(
                     new Uri("friendships/destroy.json", UriKind.Relative),
@@ -947,7 +947,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task NoRetweetIds_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<long[]>(
                     new Uri("friendships/no_retweets/ids.json", UriKind.Relative),
@@ -967,7 +967,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task FollowersIds_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterIds>(
                     new Uri("followers/ids.json", UriKind.Relative),
@@ -987,7 +987,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task MutesUsersIds_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterIds>(
                     new Uri("mutes/users/ids.json", UriKind.Relative),
@@ -1007,7 +1007,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task BlocksIds_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterIds>(
                     new Uri("blocks/ids.json", UriKind.Relative),
@@ -1027,7 +1027,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task BlocksCreate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("blocks/create.json", UriKind.Relative),
@@ -1051,7 +1051,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task BlocksDestroy_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("blocks/destroy.json", UriKind.Relative),
@@ -1075,7 +1075,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task AccountVerifyCredentials_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterUser>(
                     new Uri("account/verify_credentials.json", UriKind.Relative),
@@ -1107,7 +1107,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task AccountUpdateProfile_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("account/update_profile.json", UriKind.Relative),
@@ -1138,7 +1138,7 @@ namespace OpenTween.Api
         {
             using var image = TestUtils.CreateDummyImage();
             using var media = new MemoryImageMediaItem(image);
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUser>(
                     new Uri("account/update_profile_image.json", UriKind.Relative),
@@ -1164,7 +1164,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task ApplicationRateLimitStatus_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterRateLimits>(
                     new Uri("application/rate_limit_status.json", UriKind.Relative),
@@ -1184,7 +1184,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task Configuration_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterConfiguration>(
                     new Uri("help/configuration.json", UriKind.Relative),
@@ -1204,7 +1204,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task MediaUploadInit_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUploadMediaInit>(
                     new Uri("https://upload.twitter.com/1.1/media/upload.json", UriKind.Absolute),
@@ -1232,7 +1232,7 @@ namespace OpenTween.Api
         {
             using var image = TestUtils.CreateDummyImage();
             using var media = new MemoryImageMediaItem(image);
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostAsync(
                     new Uri("https://upload.twitter.com/1.1/media/upload.json", UriKind.Absolute),
@@ -1257,7 +1257,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task MediaUploadFinalize_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostLazyAsync<TwitterUploadMediaResult>(
                     new Uri("https://upload.twitter.com/1.1/media/upload.json", UriKind.Absolute),
@@ -1281,7 +1281,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task MediaUploadStatus_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterUploadMediaResult>(
                     new Uri("https://upload.twitter.com/1.1/media/upload.json", UriKind.Absolute),
@@ -1305,7 +1305,7 @@ namespace OpenTween.Api
         [Fact]
         public async Task MediaMetadataCreate_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.PostJsonAsync(
                     new Uri("https://upload.twitter.com/1.1/media/metadata/create.json", UriKind.Absolute),
index fcf5adf..a2b00fd 100644 (file)
@@ -34,7 +34,7 @@ namespace OpenTween.Api.TwitterV2
         [Fact]
         public async Task StatusesMentionsTimeline_Test()
         {
-            var mock = new Mock<IApiConnection>();
+            var mock = new Mock<IApiConnectionLegacy>();
             mock.Setup(x =>
                 x.GetAsync<TwitterV2TweetIds>(
                     new Uri("/2/users/100/timelines/reverse_chronological", UriKind.Relative),
index 33c579d..35b5060 100644 (file)
@@ -49,7 +49,7 @@ namespace OpenTween.Api.GraphQL
             """;
         }
 
-        public async Task<TwitterStatusId> Send(IApiConnection apiConnection)
+        public async Task<TwitterStatusId> Send(IApiConnectionLegacy apiConnection)
         {
             var json = this.CreateRequestBody();
             var response = await apiConnection.PostJsonAsync(EndpointUri, json);
index d2b0f22..46e1075 100644 (file)
@@ -153,7 +153,7 @@ namespace OpenTween.Api.GraphQL
             return JsonUtils.SerializeJsonByDataContract(body);
         }
 
-        public async Task<TwitterStatus> Send(IApiConnection apiConnection)
+        public async Task<TwitterStatus> Send(IApiConnectionLegacy apiConnection)
         {
             var json = this.CreateRequestBody();
             var response = await apiConnection.PostJsonAsync(EndpointUri, json);
index ab5b0ae..00a0b83 100644 (file)
@@ -45,7 +45,7 @@ namespace OpenTween.Api.GraphQL
             """;
         }
 
-        public async Task Send(IApiConnection apiConnection)
+        public async Task Send(IApiConnectionLegacy apiConnection)
         {
             var json = this.CreateRequestBody();
             var responseText = await apiConnection.PostJsonAsync(EndpointUri, json);
index feeee14..adccace 100644 (file)
@@ -45,7 +45,7 @@ namespace OpenTween.Api.GraphQL
             """;
         }
 
-        public async Task Send(IApiConnection apiConnection)
+        public async Task Send(IApiConnectionLegacy apiConnection)
         {
             var json = this.CreateRequestBody();
             var responseText = await apiConnection.PostJsonAsync(EndpointUri, json);
index a241e4a..fc1326b 100644 (file)
@@ -84,7 +84,7 @@ namespace OpenTween.Api.GraphQL
             };
         }
 
-        public async Task<TimelineResponse> Send(IApiConnection apiConnection)
+        public async Task<TimelineResponse> Send(IApiConnectionLegacy apiConnection)
         {
             var param = this.CreateParameters();
 
index 9e76ca0..e157a29 100644 (file)
@@ -86,7 +86,7 @@ namespace OpenTween.Api.GraphQL
             };
         }
 
-        public async Task<TimelineResponse> Send(IApiConnection apiConnection)
+        public async Task<TimelineResponse> Send(IApiConnectionLegacy apiConnection)
         {
             var param = this.CreateParameters();
 
index 496e2f4..0bf750c 100644 (file)
@@ -60,7 +60,7 @@ namespace OpenTween.Api.GraphQL
             };
         }
 
-        public async Task<TimelineTweet[]> Send(IApiConnection apiConnection)
+        public async Task<TimelineTweet[]> Send(IApiConnectionLegacy apiConnection)
         {
             var param = this.CreateParameters();
 
index 8d5607e..b4c04fa 100644 (file)
@@ -59,7 +59,7 @@ namespace OpenTween.Api.GraphQL
             };
         }
 
-        public async Task<TwitterGraphqlUser> Send(IApiConnection apiConnection)
+        public async Task<TwitterGraphqlUser> Send(IApiConnectionLegacy apiConnection)
         {
             var param = this.CreateParameters();
 
index 916a914..3fad578 100644 (file)
@@ -69,7 +69,7 @@ namespace OpenTween.Api.GraphQL
             };
         }
 
-        public async Task<TimelineResponse> Send(IApiConnection apiConnection)
+        public async Task<TimelineResponse> Send(IApiConnectionLegacy apiConnection)
         {
             var param = this.CreateParameters();
 
index 1f3b68e..abce763 100644 (file)
@@ -41,9 +41,9 @@ namespace OpenTween.Api
 
         public string CurrentScreenName { get; private set; } = "";
 
-        public IApiConnection Connection => this.ApiConnection ?? throw new InvalidOperationException();
+        public IApiConnectionLegacy Connection => this.ApiConnection ?? throw new InvalidOperationException();
 
-        internal IApiConnection? ApiConnection;
+        internal IApiConnectionLegacy? ApiConnection;
 
         public TwitterAppToken AppToken { get; private set; } = TwitterAppToken.GetDefault();
 
index 6ff98cf..677d167 100644 (file)
@@ -69,7 +69,7 @@ namespace OpenTween.Api.TwitterV2
             return param;
         }
 
-        public Task<TwitterV2TweetIds> Send(IApiConnection apiConnection)
+        public Task<TwitterV2TweetIds> Send(IApiConnectionLegacy apiConnection)
         {
             var uri = this.CreateEndpointUri();
             var param = this.CreateParameters();
similarity index 97%
rename from OpenTween/Connection/IApiConnection.cs
rename to OpenTween/Connection/IApiConnectionLegacy.cs
index b7c866f..9e22318 100644 (file)
@@ -30,7 +30,7 @@ using System.Threading.Tasks;
 
 namespace OpenTween.Connection
 {
-    public interface IApiConnection : IDisposable
+    public interface IApiConnectionLegacy : IDisposable
     {
         Task<T> GetAsync<T>(Uri uri, IDictionary<string, string>? param, string? endpointName);
 
index b8bd085..338c835 100644 (file)
@@ -39,7 +39,7 @@ using OpenTween.Api.DataModel;
 
 namespace OpenTween.Connection
 {
-    public class TwitterApiConnection : IApiConnection, IDisposable
+    public class TwitterApiConnection : IApiConnectionLegacy, IDisposable
     {
         public static Uri RestApiBase { get; set; } = new("https://api.twitter.com/1.1/");
 
index 80fe74f..b428448 100644 (file)
@@ -40,7 +40,7 @@ namespace OpenTween.Thumbnail.Services
     /// </summary>
     public class TonTwitterCom : IThumbnailService
     {
-        internal static Func<IApiConnection>? GetApiConnection;
+        internal static Func<IApiConnectionLegacy>? GetApiConnection;
 
         public override Task<ThumbnailInfo?> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {