Merge pull request #375 from opentween/rename-twitter-classes

OpenTween.SocialProtocol.Twitter名前空間への不要な参照を削除
opentween · Jun 21, 2024 · ebcba50 · ebcba50
2 parents e8fe7e8 + 433ffad
commit ebcba50
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs b/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
@@ -92,7 +92,7 @@ public void LoadFromSettings_RemoveTest()
 
             // 欠けている ID は削除される
             Assert.Empty(accounts.Items);
-            Assert.Equal(APIAuthType.None, ((TwitterAccount)accounts.Primary).AuthType);
+            Assert.IsType<InvalidAccount>(accounts.Primary);
             Assert.True(accountItem1.IsDisposed);
         }
 

diff --git a/OpenTween/ApplicationEvents.cs b/OpenTween/ApplicationEvents.cs
@@ -28,13 +28,11 @@
 #nullable enable
 
 using System;
-using System.Linq;
 using System.Windows.Forms;
 using OpenTween.Connection;
 using OpenTween.Models;
 using OpenTween.Setting;
 using OpenTween.SocialProtocol;
-using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween
 {

diff --git a/OpenTween/SocialProtocol/AccountCollection.cs b/OpenTween/SocialProtocol/AccountCollection.cs
@@ -25,15 +25,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenTween.Models;
-using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.SocialProtocol
 {
     public sealed class AccountCollection : IDisposable
     {
         private Dictionary<AccountKey, ISocialAccount> accounts = new();
         private AccountKey? primaryAccountKey;
-        private readonly ISocialAccount emptyAccount = new TwitterAccount(AccountKey.Empty);
+        private readonly ISocialAccount emptyAccount = new InvalidAccount(AccountKey.Empty);
 
         public bool IsDisposed { get; private set; }
 

diff --git a/OpenTween/SocialProtocol/InvalidAccount.cs b/OpenTween/SocialProtocol/InvalidAccount.cs
@@ -26,7 +26,6 @@
 using OpenTween.Api;
 using OpenTween.Connection;
 using OpenTween.Models;
-using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.SocialProtocol
 {
@@ -64,6 +63,15 @@ public bool CanUsePostId(PostId postId)
         public void Dispose()
             => this.IsDisposed = true;
 
+        private class InvalidPersonId : PersonId
+        {
+            public override string IdType
+                => "invalid";
+
+            public override string Id
+                => "0";
+        }
+
         private class InvalidAccountConnection : IApiConnection
         {
             public void ThrowIfUnauthorizedScope(string scope)
@@ -135,7 +143,7 @@ private WebApiException CreateException()
         private class InvalidAccountState : ISocialAccountState
         {
             public PersonId UserId
-                => new TwitterUserId("0");
+                => new InvalidPersonId();
 
             public string UserName
                 => "(Unknown account)";