OSDN Git Service

ITwitterCredentialとアクセス手段ごとの具象クラスを追加
[opentween/open-tween.git] / OpenTween / Twitter.cs
index e184c27..48be5ba 100644 (file)
 
 #nullable enable
 
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using System;
-using System.Reflection;
-using System.Collections.Generic;
 using System.Windows.Forms;
 using OpenTween.Api;
 using OpenTween.Api.DataModel;
+using OpenTween.Api.GraphQL;
+using OpenTween.Api.TwitterV2;
 using OpenTween.Connection;
 using OpenTween.Models;
 using OpenTween.Setting;
-using System.Globalization;
 
 namespace OpenTween
 {
@@ -71,47 +72,48 @@ namespace OpenTween
         //   implied. See the License for the specific language governing
         //   permissions and limitations under the License.
 
-        //Hashtag用正規表現
-        private const string LATIN_ACCENTS = @"\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0100-\u024f\u0253\u0254\u0256\u0257\u0259\u025b\u0263\u0268\u026f\u0272\u0289\u028b\u02bb\u1e00-\u1eff";
-        private const string NON_LATIN_HASHTAG_CHARS = @"\u0400-\u04ff\u0500-\u0527\u1100-\u11ff\u3130-\u3185\uA960-\uA97F\uAC00-\uD7AF\uD7B0-\uD7FF";
-        private const string CJ_HASHTAG_CHARACTERS = @"\u30A1-\u30FA\u30FC\u3005\uFF66-\uFF9F\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\u3041-\u309A\u3400-\u4DBF\p{IsCJKUnifiedIdeographs}";
-        private const string HASHTAG_BOUNDARY = @"^|$|\s|「|」|。|\.|!";
-        private const string HASHTAG_ALPHA = "[a-z_" + LATIN_ACCENTS + NON_LATIN_HASHTAG_CHARS + CJ_HASHTAG_CHARACTERS + "]";
-        private const string HASHTAG_ALPHANUMERIC = "[a-z0-9_" + LATIN_ACCENTS + NON_LATIN_HASHTAG_CHARS + CJ_HASHTAG_CHARACTERS + "]";
-        private const string HASHTAG_TERMINATOR = "[^a-z0-9_" + LATIN_ACCENTS + NON_LATIN_HASHTAG_CHARS + CJ_HASHTAG_CHARACTERS + "]";
-        public const string HASHTAG = "(" + HASHTAG_BOUNDARY + ")(#|#)(" + HASHTAG_ALPHANUMERIC + "*" + HASHTAG_ALPHA + HASHTAG_ALPHANUMERIC + "*)(?=" + HASHTAG_TERMINATOR + "|" + HASHTAG_BOUNDARY + ")";
-        //URL正規表現
-        private const string url_valid_preceding_chars = @"(?:[^A-Za-z0-9@@$##\ufffe\ufeff\uffff\u202a-\u202e]|^)";
-        public const string url_invalid_without_protocol_preceding_chars = @"[-_./]$";
-        private const string url_invalid_domain_chars = @"\!'#%&'\(\)*\+,\\\-\.\/:;<=>\?@\[\]\^_{|}~\$\u2000-\u200a\u0009-\u000d\u0020\u0085\u00a0\u1680\u180e\u2028\u2029\u202f\u205f\u3000\ufffe\ufeff\uffff\u202a-\u202e";
-        private const string url_valid_domain_chars = @"[^" + url_invalid_domain_chars + "]";
-        private const string url_valid_subdomain = @"(?:(?:" + url_valid_domain_chars + @"(?:[_-]|" + url_valid_domain_chars + @")*)?" + url_valid_domain_chars + @"\.)";
-        private const string url_valid_domain_name = @"(?:(?:" + url_valid_domain_chars + @"(?:-|" + url_valid_domain_chars + @")*)?" + url_valid_domain_chars + @"\.)";
-        private const string url_valid_GTLD = @"(?:(?:aero|asia|biz|cat|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|net|org|pro|tel|travel|xxx)(?=[^0-9a-zA-Z]|$))";
-        private const string url_valid_CCTLD = @"(?:(?:ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|ss|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)(?=[^0-9a-zA-Z]|$))";
-        private const string url_valid_punycode = @"(?:xn--[0-9a-z]+)";
-        private const string url_valid_domain = @"(?<domain>" + url_valid_subdomain + "*" + url_valid_domain_name + "(?:" + url_valid_GTLD + "|" + url_valid_CCTLD + ")|" + url_valid_punycode + ")";
-        public const string url_valid_ascii_domain = @"(?:(?:[a-z0-9" + LATIN_ACCENTS + @"]+)\.)+(?:" + url_valid_GTLD + "|" + url_valid_CCTLD + "|" + url_valid_punycode + ")";
-        public const string url_invalid_short_domain = "^" + url_valid_domain_name + url_valid_CCTLD + "$";
-        private const string url_valid_port_number = @"[0-9]+";
-
-        private const string url_valid_general_path_chars = @"[a-z0-9!*';:=+,.$/%#\[\]\-_~|&" + LATIN_ACCENTS + "]";
-        private const string url_balance_parens = @"(?:\(" + url_valid_general_path_chars + @"+\))";
-        private const string url_valid_path_ending_chars = @"(?:[+\-a-z0-9=_#/" + LATIN_ACCENTS + "]|" + url_balance_parens + ")";
-        private const string pth = "(?:" +
+        // Hashtag用正規表現
+        private const string LatinAccents = @"\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0100-\u024f\u0253\u0254\u0256\u0257\u0259\u025b\u0263\u0268\u026f\u0272\u0289\u028b\u02bb\u1e00-\u1eff";
+        private const string NonLatinHashtagChars = @"\u0400-\u04ff\u0500-\u0527\u1100-\u11ff\u3130-\u3185\uA960-\uA97F\uAC00-\uD7AF\uD7B0-\uD7FF";
+        private const string CJHashtagCharacters = @"\u30A1-\u30FA\u30FC\u3005\uFF66-\uFF9F\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\u3041-\u309A\u3400-\u4DBF\p{IsCJKUnifiedIdeographs}";
+        private const string HashtagBoundary = @"^|$|\s|「|」|。|\.|!";
+        private const string HashtagAlpha = $"[A-Za-z_{LatinAccents}{NonLatinHashtagChars}{CJHashtagCharacters}]";
+        private const string HashtagAlphanumeric = $"[A-Za-z0-9_{LatinAccents}{NonLatinHashtagChars}{CJHashtagCharacters}]";
+        private const string HashtagTerminator = $"[^A-Za-z0-9_{LatinAccents}{NonLatinHashtagChars}{CJHashtagCharacters}]";
+        public const string Hashtag = $"({HashtagBoundary})(#|#)({HashtagAlphanumeric}*{HashtagAlpha}{HashtagAlphanumeric}*)(?={HashtagTerminator}|{HashtagBoundary})";
+        // URL正規表現
+        private const string UrlValidPrecedingChars = @"(?:[^A-Za-z0-9@@$##\ufffe\ufeff\uffff\u202a-\u202e]|^)";
+        public const string UrlInvalidWithoutProtocolPrecedingChars = @"[-_./]$";
+        private const string UrlInvalidDomainChars = @"\!'#%&'\(\)*\+,\\\-\.\/:;<=>\?@\[\]\^_{|}~\$\u2000-\u200a\u0009-\u000d\u0020\u0085\u00a0\u1680\u180e\u2028\u2029\u202f\u205f\u3000\ufffe\ufeff\uffff\u202a-\u202e";
+        private const string UrlValidDomainChars = $@"[^{UrlInvalidDomainChars}]";
+        private const string UrlValidSubdomain = $@"(?:(?:{UrlValidDomainChars}(?:[_-]|{UrlValidDomainChars})*)?{UrlValidDomainChars}\.)";
+        private const string UrlValidDomainName = $@"(?:(?:{UrlValidDomainChars}(?:-|{UrlValidDomainChars})*)?{UrlValidDomainChars}\.)";
+        private const string UrlValidGTLD = @"(?:(?:aero|asia|biz|cat|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|net|org|pro|tel|travel|xxx)(?=[^0-9a-zA-Z]|$))";
+        private const string UrlValidCCTLD = @"(?:(?:ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|ss|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)(?=[^0-9a-zA-Z]|$))";
+        private const string UrlValidPunycode = @"(?:xn--[0-9a-z]+)";
+        private const string UrlValidDomain = $@"(?<domain>{UrlValidSubdomain}*{UrlValidDomainName}(?:{UrlValidGTLD}|{UrlValidCCTLD})|{UrlValidPunycode})";
+        public const string UrlValidAsciiDomain = $@"(?:(?:[a-z0-9{LatinAccents}]+)\.)+(?:{UrlValidGTLD}|{UrlValidCCTLD}|{UrlValidPunycode})";
+        public const string UrlInvalidShortDomain = $"^{UrlValidDomainName}{UrlValidCCTLD}$";
+        private const string UrlValidPortNumber = @"[0-9]+";
+
+        private const string UrlValidGeneralPathChars = $@"[a-z0-9!*';:=+,.$/%#\[\]\-_~|&{LatinAccents}]";
+        private const string UrlBalanceParens = $@"(?:\({UrlValidGeneralPathChars}+\))";
+        private const string UrlValidPathEndingChars = $@"(?:[+\-a-z0-9=_#/{LatinAccents}]|{UrlBalanceParens})";
+        private const string Pth = "(?:" +
             "(?:" +
-                url_valid_general_path_chars + "*" +
-                "(?:" + url_balance_parens + url_valid_general_path_chars + "*)*" +
-                url_valid_path_ending_chars +
-                ")|(?:@" + url_valid_general_path_chars + "+/)" +
+                $"{UrlValidGeneralPathChars}*" +
+                $"(?:{UrlBalanceParens}{UrlValidGeneralPathChars}*)*" +
+                UrlValidPathEndingChars +
+                $")|(?:@{UrlValidGeneralPathChars}+/)" +
             ")";
-        private const string qry = @"(?<query>\?[a-z0-9!?*'();:&=+$/%#\[\]\-_.,~|]*[a-z0-9_&=#/])?";
-        public const string rgUrl = @"(?<before>" + url_valid_preceding_chars + ")" +
+
+        private const string Qry = @"(?<query>\?[a-z0-9!?*'();:&=+$/%#\[\]\-_.,~|]*[a-z0-9_&=#/])?";
+        public const string RgUrl = $@"(?<before>{UrlValidPrecedingChars})" +
                                     "(?<url>(?<protocol>https?://)?" +
-                                    "(?<domain>" + url_valid_domain + ")" +
-                                    "(?::" + url_valid_port_number + ")?" +
-                                    "(?<path>/" + pth + "*)?" +
-                                    qry +
+                                    $"(?<domain>{UrlValidDomain})" +
+                                    $"(?::{UrlValidPortNumber})?" +
+                                    $"(?<path>/{Pth}*)?" +
+                                    Qry +
                                     ")";
 
         #endregion
@@ -119,62 +121,65 @@ namespace OpenTween
         /// <summary>
         /// Twitter API のステータスページのURL
         /// </summary>
-        public const string ServiceAvailabilityStatusUrl = "https://status.io.watchmouse.com/7617";
+        public const string ServiceAvailabilityStatusUrl = "https://api.twitterstat.us/";
 
         /// <summary>
         /// ツイートへのパーマリンクURLを判定する正規表現
         /// </summary>
-        public static readonly Regex StatusUrlRegex = new Regex(@"https?://([^.]+\.)?twitter\.com/(#!/)?(?<ScreenName>[a-zA-Z0-9_]+)/status(es)?/(?<StatusId>[0-9]+)(/photo)?", RegexOptions.IgnoreCase);
+        public static readonly Regex StatusUrlRegex = new(@"https?://([^.]+\.)?twitter\.com/(#!/)?(?<ScreenName>[a-zA-Z0-9_]+)/status(es)?/(?<StatusId>[0-9]+)(/photo)?", RegexOptions.IgnoreCase);
 
         /// <summary>
         /// attachment_url に指定可能な URL を判定する正規表現
         /// </summary>
-        public static readonly Regex AttachmentUrlRegex = new Regex(@"https?://(
+        public static readonly Regex AttachmentUrlRegex = new(
+            @"https?://(
    twitter\.com/[0-9A-Za-z_]+/status/[0-9]+
  | mobile\.twitter\.com/[0-9A-Za-z_]+/status/[0-9]+
  | twitter\.com/messages/compose\?recipient_id=[0-9]+(&.+)?
-)$", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+)$",
+            RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
         /// <summary>
         /// FavstarやaclogなどTwitter関連サービスのパーマリンクURLからステータスIDを抽出する正規表現
         /// </summary>
-        public static readonly Regex ThirdPartyStatusUrlRegex = new Regex(@"https?://(?:[^.]+\.)?(?:
+        public static readonly Regex ThirdPartyStatusUrlRegex = new(
+            @"https?://(?:[^.]+\.)?(?:
   favstar\.fm/users/[a-zA-Z0-9_]+/status/       # Favstar
 | favstar\.fm/t/                                # Favstar (short)
 | aclog\.koba789\.com/i/                        # aclog
 | frtrt\.net/solo_status\.php\?status=          # RtRT
-)(?<StatusId>[0-9]+)", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+)(?<StatusId>[0-9]+)",
+            RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
         /// <summary>
         /// DM送信かどうかを判定する正規表現
         /// </summary>
-        public static readonly Regex DMSendTextRegex = new Regex(@"^DM? +(?<id>[a-zA-Z0-9_]+) +(?<body>.*)", RegexOptions.IgnoreCase | RegexOptions.Singleline);
+        public static readonly Regex DMSendTextRegex = new(@"^DM? +(?<id>[a-zA-Z0-9_]+) +(?<body>.*)", RegexOptions.IgnoreCase | RegexOptions.Singleline);
 
         public TwitterApi Api { get; }
+
         public TwitterConfiguration Configuration { get; private set; }
+
         public TwitterTextConfiguration TextConfiguration { get; private set; }
 
         public bool GetFollowersSuccess { get; private set; } = false;
+
         public bool GetNoRetweetSuccess { get; private set; } = false;
 
-        delegate void GetIconImageDelegate(PostClass post);
-        private readonly object LockObj = new object();
+        private delegate void GetIconImageDelegate(PostClass post);
+
+        private readonly object lockObj = new();
         private ISet<long> followerId = new HashSet<long>();
         private long[] noRTId = Array.Empty<long>();
 
-        //プロパティからアクセスされる共通情報
-        private readonly List<string> _hashList = new List<string>();
-
-        private string? nextCursorDirectMessage = null;
+        private readonly TwitterPostFactory postFactory;
 
-        private long previousStatusId = -1L;
-
-        public Twitter() : this(new TwitterApi())
-        {
-        }
+        private string? previousStatusId = null;
 
         public Twitter(TwitterApi api)
         {
+            this.postFactory = new(TabInformations.GetInstance());
+
             this.Api = api;
             this.Configuration = TwitterConfiguration.DefaultConfiguration();
             this.TextConfiguration = TwitterTextConfiguration.DefaultConfiguration();
@@ -192,7 +197,6 @@ namespace OpenTween
             this.ResetApiStatus();
         }
 
-        [Obsolete]
         public void VerifyCredentials()
         {
             try
@@ -215,52 +219,23 @@ namespace OpenTween
 
         public void Initialize(string token, string tokenSecret, string username, long userId)
         {
-            //OAuth認証
-            if (string.IsNullOrEmpty(token) || string.IsNullOrEmpty(tokenSecret) || string.IsNullOrEmpty(username))
+            // OAuth認証
+            if (MyCommon.IsNullOrEmpty(token) || MyCommon.IsNullOrEmpty(tokenSecret) || MyCommon.IsNullOrEmpty(username))
             {
                 Twitter.AccountState = MyCommon.ACCOUNT_STATE.Invalid;
             }
             this.ResetApiStatus();
             this.Api.Initialize(token, tokenSecret, userId, username);
-            if (SettingManager.Common.UserstreamStartup) this.ReconnectUserStream();
         }
 
-        internal static string PreProcessUrl(string orgData)
+        public void Initialize(ITwitterCredential credential, string username, long userId)
         {
-            int posl1;
-            var posl2 = 0;
-            var href = "<a href=\"";
-
-            while (true)
-            {
-                if (orgData.IndexOf(href, posl2, StringComparison.Ordinal) > -1)
-                {
-                    // IDN展開
-                    posl1 = orgData.IndexOf(href, posl2, StringComparison.Ordinal);
-                    posl1 += href.Length;
-                    posl2 = orgData.IndexOf("\"", posl1, StringComparison.Ordinal);
-                    var urlStr = orgData.Substring(posl1, posl2 - posl1);
-
-                    if (!urlStr.StartsWith("http://", StringComparison.Ordinal)
-                        && !urlStr.StartsWith("https://", StringComparison.Ordinal)
-                        && !urlStr.StartsWith("ftp://", StringComparison.Ordinal))
-                    {
-                        continue;
-                    }
-
-                    var replacedUrl = MyCommon.IDNEncode(urlStr);
-                    if (replacedUrl == null) continue;
-                    if (replacedUrl == urlStr) continue;
+            // OAuth認証
+            if (credential is TwitterCredentialNone)
+                Twitter.AccountState = MyCommon.ACCOUNT_STATE.Invalid;
 
-                    orgData = orgData.Replace("<a href=\"" + urlStr, "<a href=\"" + replacedUrl);
-                    posl2 = 0;
-                }
-                else
-                {
-                    break;
-                }
-            }
-            return orgData;
+            this.ResetApiStatus();
+            this.Api.Initialize(credential, userId, username);
         }
 
         public async Task<PostClass?> PostStatus(PostStatusParams param)
@@ -276,26 +251,68 @@ namespace OpenTween
                 return null;
             }
 
-            var response = await this.Api.StatusesUpdate(param.Text, param.InReplyToStatusId, param.MediaIds,
-                    param.AutoPopulateReplyMetadata, param.ExcludeReplyUserIds, param.AttachmentUrl)
-                .ConfigureAwait(false);
+            TwitterStatus status;
 
-            var status = await response.LoadJsonAsync()
-                .ConfigureAwait(false);
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new CreateTweetRequest
+                {
+                    TweetText = param.Text,
+                    InReplyToTweetId = param.InReplyToStatusId?.ToTwitterStatusId(),
+                    ExcludeReplyUserIds = param.ExcludeReplyUserIds.Select(x => x.ToString()).ToArray(),
+                    MediaIds = param.MediaIds.Select(x => x.ToString()).ToArray(),
+                    AttachmentUrl = param.AttachmentUrl,
+                };
+
+                status = await request.Send(this.Api.Connection)
+                    .ConfigureAwait(false);
+            }
+            else
+            {
+                var response = await this.Api.StatusesUpdate(
+                        param.Text,
+                        param.InReplyToStatusId?.ToTwitterStatusId(),
+                        param.MediaIds,
+                        param.AutoPopulateReplyMetadata,
+                        param.ExcludeReplyUserIds,
+                        param.AttachmentUrl
+                    )
+                    .ConfigureAwait(false);
+
+                status = await response.LoadJsonAsync()
+                    .ConfigureAwait(false);
+            }
 
             this.UpdateUserStats(status.User);
 
-            if (status.Id == this.previousStatusId)
+            if (status.IdStr == this.previousStatusId)
                 throw new WebApiException("OK:Delaying?");
 
-            this.previousStatusId = status.Id;
+            this.previousStatusId = status.IdStr;
 
-            //投稿したものを返す
-            var post = CreatePostsFromStatusData(status);
+            // 投稿したものを返す
+            var post = this.CreatePostsFromStatusData(status);
             if (this.ReadOwnPost) post.IsRead = true;
             return post;
         }
 
+        public async Task DeleteTweet(TwitterStatusId tweetId)
+        {
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new DeleteTweetRequest
+                {
+                    TweetId = tweetId,
+                };
+                await request.Send(this.Api.Connection);
+            }
+            else
+            {
+                await this.Api.StatusesDestroy(tweetId)
+                    .IgnoreResponse();
+            }
+        }
+
         public async Task<long> UploadMedia(IMediaItem item, string? mediaCategory = null)
         {
             this.CheckAccountState();
@@ -363,7 +380,7 @@ namespace OpenTween
             var body = mc.Groups["body"].Value;
             var recipientName = mc.Groups["id"].Value;
 
-            var recipient = await this.Api.UsersShow(recipientName)
+            var recipient = await this.GetUserInfo(recipientName)
                 .ConfigureAwait(false);
 
             var response = await this.Api.DirectMessagesEventsNew(recipient.Id, body, mediaId)
@@ -376,46 +393,94 @@ namespace OpenTween
                 .ConfigureAwait(false);
         }
 
-        public async Task<PostClass?> PostRetweet(long id, bool read)
+        public async Task<PostClass?> PostRetweet(PostId id, bool read)
         {
             this.CheckAccountState();
 
-            //データ部分の生成
+            // データ部分の生成
             var post = TabInformations.GetInstance()[id];
             if (post == null)
                 throw new WebApiException("Err:Target isn't found.");
 
-            var target = post.RetweetedId ?? id;  //再RTの場合は元発言をRT
+            var target = post.RetweetedId ?? id;  // 再RTの場合は元発言をRT
+
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new CreateRetweetRequest
+                {
+                    TweetId = target.ToTwitterStatusId(),
+                };
+                await request.Send(this.Api.Connection).ConfigureAwait(false);
+                return null;
+            }
 
-            var response = await this.Api.StatusesRetweet(target)
+            var response = await this.Api.StatusesRetweet(target.ToTwitterStatusId())
                 .ConfigureAwait(false);
 
             var status = await response.LoadJsonAsync()
                 .ConfigureAwait(false);
 
-            //二重取得回避
-            lock (LockObj)
+            // 二重取得回避
+            lock (this.lockObj)
             {
-                if (TabInformations.GetInstance().ContainsKey(status.Id))
+                var statusId = new TwitterStatusId(status.IdStr);
+                if (TabInformations.GetInstance().ContainsKey(statusId))
                     return null;
             }
 
-            //Retweet判定
+            // Retweet判定
             if (status.RetweetedStatus == null)
                 throw new WebApiException("Invalid Json!");
 
-            //Retweetしたものを返す
-            post = CreatePostsFromStatusData(status);
+            // Retweetしたものを返す
+            return this.CreatePostsFromStatusData(status) with
+            {
+                IsMe = true,
+                IsRead = this.ReadOwnPost ? true : read,
+                IsOwl = false,
+            };
+        }
 
-            //ユーザー情報
-            post.IsMe = true;
+        public async Task DeleteRetweet(PostClass post)
+        {
+            if (post.RetweetedId == null)
+                throw new ArgumentException("post is not retweeted status", nameof(post));
 
-            post.IsRead = read;
-            post.IsOwl = false;
-            if (this.ReadOwnPost) post.IsRead = true;
-            post.IsDm = false;
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new DeleteRetweetRequest
+                {
+                    SourceTweetId = post.RetweetedId.ToTwitterStatusId(),
+                };
+                await request.Send(this.Api.Connection).ConfigureAwait(false);
+            }
+            else
+            {
+                await this.Api.StatusesDestroy(post.StatusId.ToTwitterStatusId())
+                    .IgnoreResponse();
+            }
+        }
 
-            return post;
+        public async Task<TwitterUser> GetUserInfo(string screenName)
+        {
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new UserByScreenNameRequest
+                {
+                    ScreenName = screenName,
+                };
+                var response = await request.Send(this.Api.Connection)
+                    .ConfigureAwait(false);
+
+                return response.ToTwitterUser();
+            }
+            else
+            {
+                var user = await this.Api.UsersShow(screenName)
+                    .ConfigureAwait(false);
+
+                return user;
+            }
         }
 
         public string Username
@@ -425,13 +490,19 @@ namespace OpenTween
             => this.Api.CurrentUserId;
 
         public static MyCommon.ACCOUNT_STATE AccountState { get; set; } = MyCommon.ACCOUNT_STATE.Valid;
+
         public bool RestrictFavCheck { get; set; }
+
         public bool ReadOwnPost { get; set; }
 
         public int FollowersCount { get; private set; }
+
         public int FriendsCount { get; private set; }
+
         public int StatusesCount { get; private set; }
+
         public string Location { get; private set; } = "";
+
         public string Bio { get; private set; } = "";
 
         /// <summary>ユーザーのフォロワー数などの情報を更新します</summary>
@@ -471,7 +542,7 @@ namespace OpenTween
             // https://dev.twitter.com/rest/public
             return type switch
             {
-                MyCommon.WORKERTYPE.Timeline => 200,
+                MyCommon.WORKERTYPE.Timeline => 100,
                 MyCommon.WORKERTYPE.Reply => 200,
                 MyCommon.WORKERTYPE.UserTimeline => 200,
                 MyCommon.WORKERTYPE.Favorites => 200,
@@ -486,42 +557,42 @@ namespace OpenTween
         /// </summary>
         public static int GetApiResultCount(MyCommon.WORKERTYPE type, bool more, bool startup)
         {
-            if (SettingManager.Common.UseAdditionalCount)
+            if (SettingManager.Instance.Common.UseAdditionalCount)
             {
                 switch (type)
                 {
                     case MyCommon.WORKERTYPE.Favorites:
-                        if (SettingManager.Common.FavoritesCountApi != 0)
-                            return SettingManager.Common.FavoritesCountApi;
+                        if (SettingManager.Instance.Common.FavoritesCountApi != 0)
+                            return SettingManager.Instance.Common.FavoritesCountApi;
                         break;
                     case MyCommon.WORKERTYPE.List:
-                        if (SettingManager.Common.ListCountApi != 0)
-                            return SettingManager.Common.ListCountApi;
+                        if (SettingManager.Instance.Common.ListCountApi != 0)
+                            return SettingManager.Instance.Common.ListCountApi;
                         break;
                     case MyCommon.WORKERTYPE.PublicSearch:
-                        if (SettingManager.Common.SearchCountApi != 0)
-                            return SettingManager.Common.SearchCountApi;
+                        if (SettingManager.Instance.Common.SearchCountApi != 0)
+                            return SettingManager.Instance.Common.SearchCountApi;
                         break;
                     case MyCommon.WORKERTYPE.UserTimeline:
-                        if (SettingManager.Common.UserTimelineCountApi != 0)
-                            return SettingManager.Common.UserTimelineCountApi;
+                        if (SettingManager.Instance.Common.UserTimelineCountApi != 0)
+                            return SettingManager.Instance.Common.UserTimelineCountApi;
                         break;
                 }
-                if (more && SettingManager.Common.MoreCountApi != 0)
+                if (more && SettingManager.Instance.Common.MoreCountApi != 0)
                 {
-                    return Math.Min(SettingManager.Common.MoreCountApi, GetMaxApiResultCount(type));
+                    return Math.Min(SettingManager.Instance.Common.MoreCountApi, GetMaxApiResultCount(type));
                 }
-                if (startup && SettingManager.Common.FirstCountApi != 0 && type != MyCommon.WORKERTYPE.Reply)
+                if (startup && SettingManager.Instance.Common.FirstCountApi != 0 && type != MyCommon.WORKERTYPE.Reply)
                 {
-                    return Math.Min(SettingManager.Common.FirstCountApi, GetMaxApiResultCount(type));
+                    return Math.Min(SettingManager.Instance.Common.FirstCountApi, GetMaxApiResultCount(type));
                 }
             }
 
             // 上記に当てはまらない場合の共通処理
-            var count = SettingManager.Common.CountApi;
+            var count = SettingManager.Instance.Common.CountApi;
 
             if (type == MyCommon.WORKERTYPE.Reply)
-                count = SettingManager.Common.CountApiReply;
+                count = SettingManager.Instance.Common.CountApiReply;
 
             return Math.Min(count, GetMaxApiResultCount(type));
         }
@@ -533,20 +604,36 @@ namespace OpenTween
             var count = GetApiResultCount(MyCommon.WORKERTYPE.Timeline, more, startup);
 
             TwitterStatus[] statuses;
-            if (more)
+            if (SettingManager.Instance.Common.EnableTwitterV2Api)
             {
-                statuses = await this.Api.StatusesHomeTimeline(count, maxId: tab.OldestId)
+                var request = new GetTimelineRequest(this.UserId)
+                {
+                    MaxResults = count,
+                    UntilId = more ? tab.OldestId as TwitterStatusId : null,
+                };
+
+                var response = await request.Send(this.Api.Connection)
+                    .ConfigureAwait(false);
+
+                if (response.Data == null || response.Data.Length == 0)
+                    return;
+
+                var tweetIds = response.Data.Select(x => x.Id).ToList();
+
+                statuses = await this.Api.StatusesLookup(tweetIds)
                     .ConfigureAwait(false);
             }
             else
             {
-                statuses = await this.Api.StatusesHomeTimeline(count)
+                var maxId = more ? tab.OldestId : null;
+
+                statuses = await this.Api.StatusesHomeTimeline(count, maxId as TwitterStatusId)
                     .ConfigureAwait(false);
             }
 
             var minimumId = this.CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.Timeline, tab, read);
             if (minimumId != null)
-                tab.OldestId = minimumId.Value;
+                tab.OldestId = minimumId;
         }
 
         public async Task GetMentionsTimelineApi(bool read, MentionsTabModel tab, bool more, bool startup)
@@ -558,7 +645,7 @@ namespace OpenTween
             TwitterStatus[] statuses;
             if (more)
             {
-                statuses = await this.Api.StatusesMentionsTimeline(count, maxId: tab.OldestId)
+                statuses = await this.Api.StatusesMentionsTimeline(count, maxId: tab.OldestId as TwitterStatusId)
                     .ConfigureAwait(false);
             }
             else
@@ -569,52 +656,90 @@ namespace OpenTween
 
             var minimumId = this.CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.Reply, tab, read);
             if (minimumId != null)
-                tab.OldestId = minimumId.Value;
+                tab.OldestId = minimumId;
         }
 
-        public async Task GetUserTimelineApi(bool read, string userName, UserTimelineTabModel tab, bool more)
+        public async Task GetUserTimelineApi(bool read, UserTimelineTabModel tab, bool more)
         {
             this.CheckAccountState();
 
             var count = GetApiResultCount(MyCommon.WORKERTYPE.UserTimeline, more, false);
 
             TwitterStatus[] statuses;
-            if (string.IsNullOrEmpty(userName))
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
             {
-                var target = tab.ScreenName;
-                if (string.IsNullOrEmpty(target)) return;
-                userName = target;
-                statuses = await this.Api.StatusesUserTimeline(userName, count)
+                var userId = tab.UserId;
+                if (MyCommon.IsNullOrEmpty(userId))
+                {
+                    var user = await this.GetUserInfo(tab.ScreenName)
+                        .ConfigureAwait(false);
+
+                    userId = user.IdStr;
+                    tab.UserId = user.IdStr;
+                }
+
+                var request = new UserTweetsAndRepliesRequest(userId)
+                {
+                    Count = count,
+                    Cursor = more ? tab.CursorBottom : tab.CursorTop,
+                };
+                var response = await request.Send(this.Api.Connection)
                     .ConfigureAwait(false);
+
+                statuses = response.Tweets
+                    .Where(x => !x.IsTombstone)
+                    .Select(x => x.ToTwitterStatus())
+                    .Where(x => x.User.IdStr == userId) // リプライツリーに含まれる他ユーザーのツイートを除外
+                    .ToArray();
+
+                tab.CursorBottom = response.CursorBottom;
+
+                if (!more)
+                    tab.CursorTop = response.CursorTop;
             }
             else
             {
                 if (more)
                 {
-                    statuses = await this.Api.StatusesUserTimeline(userName, count, maxId: tab.OldestId)
+                    statuses = await this.Api.StatusesUserTimeline(tab.ScreenName, count, maxId: tab.OldestId as TwitterStatusId)
                         .ConfigureAwait(false);
                 }
                 else
                 {
-                    statuses = await this.Api.StatusesUserTimeline(userName, count)
+                    statuses = await this.Api.StatusesUserTimeline(tab.ScreenName, count)
                         .ConfigureAwait(false);
                 }
             }
 
-            var minimumId = CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.UserTimeline, tab, read);
+            var minimumId = this.CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.UserTimeline, tab, read);
 
             if (minimumId != null)
-                tab.OldestId = minimumId.Value;
+                tab.OldestId = minimumId;
         }
 
-        public async Task<PostClass> GetStatusApi(bool read, long id)
+        public async Task<PostClass> GetStatusApi(bool read, TwitterStatusId id)
         {
             this.CheckAccountState();
 
-            var status = await this.Api.StatusesShow(id)
-                .ConfigureAwait(false);
+            TwitterStatus status;
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new TweetDetailRequest
+                {
+                    FocalTweetId = id,
+                };
+                var tweets = await request.Send(this.Api.Connection).ConfigureAwait(false);
+                status = tweets.Select(x => x.ToTwitterStatus())
+                    .Where(x => x.IdStr == id.Id)
+                    .FirstOrDefault() ?? throw new WebApiException("Empty result set");
+            }
+            else
+            {
+                status = await this.Api.StatusesShow(id)
+                    .ConfigureAwait(false);
+            }
 
-            var item = CreatePostsFromStatusData(status);
+            var item = this.CreatePostsFromStatusData(status);
 
             item.IsRead = read;
             if (item.IsMe && !read && this.ReadOwnPost) item.IsRead = true;
@@ -622,12 +747,12 @@ namespace OpenTween
             return item;
         }
 
-        public async Task GetStatusApi(bool read, long id, TabModel tab)
+        public async Task GetStatusApi(bool read, TwitterStatusId id, TabModel tab)
         {
             var post = await this.GetStatusApi(read, id)
                 .ConfigureAwait(false);
 
-            //非同期アイコン取得&StatusDictionaryに追加
+            // 非同期アイコン取得&StatusDictionaryに追加
             if (tab != null && tab.IsInnerStorageTabType)
                 tab.AddPostQueue(post);
             else
@@ -635,234 +760,44 @@ namespace OpenTween
         }
 
         private PostClass CreatePostsFromStatusData(TwitterStatus status)
-            => this.CreatePostsFromStatusData(status, false);
+            => this.CreatePostsFromStatusData(status, favTweet: false);
 
         private PostClass CreatePostsFromStatusData(TwitterStatus status, bool favTweet)
-        {
-            var post = new PostClass();
-            TwitterEntities entities;
-            string sourceHtml;
-
-            post.StatusId = status.Id;
-            if (status.RetweetedStatus != null)
-            {
-                var retweeted = status.RetweetedStatus;
-
-                post.CreatedAt = MyCommon.DateTimeParse(retweeted.CreatedAt);
-
-                //Id
-                post.RetweetedId = retweeted.Id;
-                //本文
-                post.TextFromApi = retweeted.FullText;
-                entities = retweeted.MergedEntities;
-                sourceHtml = retweeted.Source;
-                //Reply先
-                post.InReplyToStatusId = retweeted.InReplyToStatusId;
-                post.InReplyToUser = retweeted.InReplyToScreenName;
-                post.InReplyToUserId = status.InReplyToUserId;
-
-                if (favTweet)
-                {
-                    post.IsFav = true;
-                }
-                else
-                {
-                    //幻覚fav対策
-                    var tc = TabInformations.GetInstance().FavoriteTab;
-                    post.IsFav = tc.Contains(retweeted.Id);
-                }
-
-                if (retweeted.Coordinates != null)
-                    post.PostGeo = new PostClass.StatusGeo(retweeted.Coordinates.Coordinates[0], retweeted.Coordinates.Coordinates[1]);
-
-                //以下、ユーザー情報
-                var user = retweeted.User;
-                if (user != null)
-                {
-                    post.UserId = user.Id;
-                    post.ScreenName = user.ScreenName;
-                    post.Nickname = user.Name.Trim();
-                    post.ImageUrl = user.ProfileImageUrlHttps;
-                    post.IsProtect = user.Protected;
-                }
-                else
-                {
-                    post.UserId = 0L;
-                    post.ScreenName = "?????";
-                    post.Nickname = "Unknown User";
-                }
-
-                //Retweetした人
-                if (status.User != null)
-                {
-                    post.RetweetedBy = status.User.ScreenName;
-                    post.RetweetedByUserId = status.User.Id;
-                    post.IsMe = post.RetweetedByUserId == this.UserId;
-                }
-                else
-                {
-                    post.RetweetedBy = "?????";
-                    post.RetweetedByUserId = 0L;
-                }
-            }
-            else
-            {
-                post.CreatedAt = MyCommon.DateTimeParse(status.CreatedAt);
-                //本文
-                post.TextFromApi = status.FullText;
-                entities = status.MergedEntities;
-                sourceHtml = status.Source;
-                post.InReplyToStatusId = status.InReplyToStatusId;
-                post.InReplyToUser = status.InReplyToScreenName;
-                post.InReplyToUserId = status.InReplyToUserId;
-
-                if (favTweet)
-                {
-                    post.IsFav = true;
-                }
-                else
-                {
-                    //幻覚fav対策
-                    var tc = TabInformations.GetInstance().FavoriteTab;
-                    post.IsFav = tc.Posts.TryGetValue(post.StatusId, out var tabinfoPost) && tabinfoPost.IsFav;
-                }
-
-                if (status.Coordinates != null)
-                    post.PostGeo = new PostClass.StatusGeo(status.Coordinates.Coordinates[0], status.Coordinates.Coordinates[1]);
-
-                //以下、ユーザー情報
-                var user = status.User;
-                if (user != null)
-                {
-                    post.UserId = user.Id;
-                    post.ScreenName = user.ScreenName;
-                    post.Nickname = user.Name.Trim();
-                    post.ImageUrl = user.ProfileImageUrlHttps;
-                    post.IsProtect = user.Protected;
-                    post.IsMe = post.UserId == this.UserId;
-                }
-                else
-                {
-                    post.UserId = 0L;
-                    post.ScreenName = "?????";
-                    post.Nickname = "Unknown User";
-                }
-            }
-            //HTMLに整形
-            var textFromApi = post.TextFromApi;
-
-            var quotedStatusLink = (status.RetweetedStatus ?? status).QuotedStatusPermalink;
-
-            if (quotedStatusLink != null && entities.Urls.Any(x => x.ExpandedUrl == quotedStatusLink.Expanded))
-                quotedStatusLink = null; // 移行期は entities.urls と quoted_status_permalink の両方に含まれる場合がある
-
-            post.Text = CreateHtmlAnchor(textFromApi, entities, quotedStatusLink);
-            post.TextFromApi = textFromApi;
-            post.TextFromApi = this.ReplaceTextFromApi(post.TextFromApi, entities, quotedStatusLink);
-            post.TextFromApi = WebUtility.HtmlDecode(post.TextFromApi);
-            post.TextFromApi = post.TextFromApi.Replace("<3", "\u2661");
-            post.AccessibleText = CreateAccessibleText(textFromApi, entities, (status.RetweetedStatus ?? status).QuotedStatus, quotedStatusLink);
-            post.AccessibleText = WebUtility.HtmlDecode(post.AccessibleText);
-            post.AccessibleText = post.AccessibleText.Replace("<3", "\u2661");
-
-            this.ExtractEntities(entities, post.ReplyToList, post.Media);
-
-            post.QuoteStatusIds = GetQuoteTweetStatusIds(entities, quotedStatusLink)
-                .Where(x => x != post.StatusId && x != post.RetweetedId)
-                .Distinct().ToArray();
+            => this.postFactory.CreateFromStatus(status, this.UserId, this.followerId, favTweet);
 
-            post.ExpandedUrls = entities.OfType<TwitterEntityUrl>()
-                .Select(x => new PostClass.ExpandedUrlInfo(x.Url, x.ExpandedUrl))
-                .ToArray();
-
-            // メモリ使用量削減 (同一のテキストであれば同一の string インスタンスを参照させる)
-            if (post.Text == post.TextFromApi)
-                post.Text = post.TextFromApi;
-            if (post.AccessibleText == post.TextFromApi)
-                post.AccessibleText = post.TextFromApi;
-
-            // 他の発言と重複しやすい (共通化できる) 文字列は string.Intern を通す
-            post.ScreenName = string.Intern(post.ScreenName);
-            post.Nickname = string.Intern(post.Nickname);
-            post.ImageUrl = string.Intern(post.ImageUrl);
-            post.RetweetedBy = post.RetweetedBy != null ? string.Intern(post.RetweetedBy) : null;
-
-            //Source整形
-            var (sourceText, sourceUri) = ParseSource(sourceHtml);
-            post.Source = string.Intern(sourceText);
-            post.SourceUri = sourceUri;
-
-            post.IsReply = post.RetweetedId == null && post.ReplyToList.Any(x => x.UserId == this.UserId);
-            post.IsExcludeReply = false;
-
-            if (post.IsMe)
-            {
-                post.IsOwl = false;
-            }
-            else
-            {
-                if (followerId.Count > 0) post.IsOwl = !followerId.Contains(post.UserId);
-            }
-
-            post.IsDm = false;
-            return post;
-        }
-
-        /// <summary>
-        /// ツイートに含まれる引用ツイートのURLからステータスIDを抽出
-        /// </summary>
-        public static IEnumerable<long> GetQuoteTweetStatusIds(IEnumerable<TwitterEntity>? entities, TwitterQuotedStatusPermalink? quotedStatusLink)
+        private PostId? CreatePostsFromJson(TwitterStatus[] items, MyCommon.WORKERTYPE gType, TabModel? tab, bool read)
         {
-            entities ??= Enumerable.Empty<TwitterEntity>();
-
-            var urls = entities.OfType<TwitterEntityUrl>().Select(x => x.ExpandedUrl);
+            PostId? minimumId = null;
 
-            if (quotedStatusLink != null)
-                urls = urls.Append(quotedStatusLink.Expanded);
+            var posts = items.Select(x => this.CreatePostsFromStatusData(x)).ToArray();
 
-            return GetQuoteTweetStatusIds(urls);
-        }
+            TwitterPostFactory.AdjustSortKeyForPromotedPost(posts);
 
-        public static IEnumerable<long> GetQuoteTweetStatusIds(IEnumerable<string> urls)
-        {
-            foreach (var url in urls)
+            foreach (var post in posts)
             {
-                var match = Twitter.StatusUrlRegex.Match(url);
-                if (match.Success)
+                if (!post.IsPromoted)
                 {
-                    if (long.TryParse(match.Groups["StatusId"].Value, out var statusId))
-                        yield return statusId;
+                    if (minimumId == null || minimumId > post.StatusId)
+                        minimumId = post.StatusId;
                 }
-            }
-        }
-
-        private long? CreatePostsFromJson(TwitterStatus[] items, MyCommon.WORKERTYPE gType, TabModel? tab, bool read)
-        {
-            long? minimumId = null;
-
-            foreach (var status in items)
-            {
-                if (minimumId == null || minimumId.Value > status.Id)
-                    minimumId = status.Id;
 
-                //二重取得回避
-                lock (LockObj)
+                // 二重取得回避
+                lock (this.lockObj)
                 {
+                    var id = post.StatusId;
                     if (tab == null)
                     {
-                        if (TabInformations.GetInstance().ContainsKey(status.Id)) continue;
+                        if (TabInformations.GetInstance().ContainsKey(id)) continue;
                     }
                     else
                     {
-                        if (tab.Contains(status.Id)) continue;
+                        if (tab.Contains(id)) continue;
                     }
                 }
 
-                //RT禁止ユーザーによるもの
+                // RT禁止ユーザーによるもの
                 if (gType != MyCommon.WORKERTYPE.UserTimeline &&
-                    status.RetweetedStatus != null && this.noRTId.Contains(status.User.Id)) continue;
-
-                var post = CreatePostsFromStatusData(status);
+                    post.RetweetedByUserId != null && this.noRTId.Contains(post.RetweetedByUserId.Value)) continue;
 
                 post.IsRead = read;
                 if (post.IsMe && !read && this.ReadOwnPost) post.IsRead = true;
@@ -876,23 +811,31 @@ namespace OpenTween
             return minimumId;
         }
 
-        private long? CreatePostsFromSearchJson(TwitterSearchResult items, PublicSearchTabModel tab, bool read, bool more)
+        private PostId? CreatePostsFromSearchJson(TwitterStatus[] statuses, PublicSearchTabModel tab, bool read, bool more)
         {
-            long? minimumId = null;
+            PostId? minimumId = null;
 
-            foreach (var status in items.Statuses)
-            {
-                if (minimumId == null || minimumId.Value > status.Id)
-                    minimumId = status.Id;
+            var posts = statuses.Select(x => this.CreatePostsFromStatusData(x)).ToArray();
 
-                if (!more && status.Id > tab.SinceId) tab.SinceId = status.Id;
-                //二重取得回避
-                lock (LockObj)
+            TwitterPostFactory.AdjustSortKeyForPromotedPost(posts);
+
+            foreach (var post in posts)
+            {
+                if (!post.IsPromoted)
                 {
-                    if (tab.Contains(status.Id)) continue;
+                    if (minimumId == null || minimumId > post.StatusId)
+                        minimumId = post.StatusId;
+
+                    if (!more && (tab.SinceId == null || post.StatusId > tab.SinceId))
+                        tab.SinceId = post.StatusId;
                 }
 
-                var post = CreatePostsFromStatusData(status);
+                // 二重取得回避
+                lock (this.lockObj)
+                {
+                    if (tab.Contains(post.StatusId))
+                        continue;
+                }
 
                 post.IsRead = read;
                 if ((post.IsMe && !read) && this.ReadOwnPost) post.IsRead = true;
@@ -913,13 +856,14 @@ namespace OpenTween
                 if (minimumId == null || minimumId.Value > status.Id)
                     minimumId = status.Id;
 
-                //二重取得回避
-                lock (LockObj)
+                // 二重取得回避
+                lock (this.lockObj)
                 {
-                    if (favTab.Contains(status.Id)) continue;
+                    if (favTab.Contains(new TwitterStatusId(status.IdStr)))
+                        continue;
                 }
 
-                var post = CreatePostsFromStatusData(status, true);
+                var post = this.CreatePostsFromStatusData(status, true);
 
                 post.IsRead = read;
 
@@ -934,38 +878,61 @@ namespace OpenTween
             var count = GetApiResultCount(MyCommon.WORKERTYPE.List, more, startup);
 
             TwitterStatus[] statuses;
-            if (more)
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new ListLatestTweetsTimelineRequest(tab.ListInfo.Id.ToString())
+                {
+                    Count = count,
+                    Cursor = more ? tab.CursorBottom : tab.CursorTop,
+                };
+                var response = await request.Send(this.Api.Connection)
+                    .ConfigureAwait(false);
+
+                var convertedStatuses = response.Tweets
+                    .Where(x => !x.IsTombstone)
+                    .Select(x => x.ToTwitterStatus());
+
+                if (!SettingManager.Instance.Common.IsListsIncludeRts)
+                    convertedStatuses = convertedStatuses.Where(x => x.RetweetedStatus == null);
+
+                statuses = convertedStatuses.ToArray();
+                tab.CursorBottom = response.CursorBottom;
+
+                if (!more)
+                    tab.CursorTop = response.CursorTop;
+            }
+            else if (more)
             {
-                statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, maxId: tab.OldestId, includeRTs: SettingManager.Common.IsListsIncludeRts)
+                statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, maxId: tab.OldestId as TwitterStatusId, includeRTs: SettingManager.Instance.Common.IsListsIncludeRts)
                     .ConfigureAwait(false);
             }
             else
             {
-                statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, includeRTs: SettingManager.Common.IsListsIncludeRts)
+                statuses = await this.Api.ListsStatuses(tab.ListInfo.Id, count, includeRTs: SettingManager.Instance.Common.IsListsIncludeRts)
                     .ConfigureAwait(false);
             }
 
-            var minimumId = CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.List, tab, read);
+            var minimumId = this.CreatePostsFromJson(statuses, MyCommon.WORKERTYPE.List, tab, read);
 
             if (minimumId != null)
-                tab.OldestId = minimumId.Value;
+                tab.OldestId = minimumId;
         }
 
         /// <summary>
         /// startStatusId からリプライ先の発言を辿る。発言は posts 以外からは検索しない。
         /// </summary>
         /// <returns>posts の中から検索されたリプライチェインの末端</returns>
-        internal static PostClass FindTopOfReplyChain(IDictionary<long, PostClass> posts, long startStatusId)
+        internal static PostClass FindTopOfReplyChain(IDictionary<PostId, PostClass> posts, PostId startStatusId)
         {
             if (!posts.ContainsKey(startStatusId))
-                throw new ArgumentException("startStatusId (" + startStatusId + ") が posts の中から見つかりませんでした。", nameof(startStatusId));
+                throw new ArgumentException("startStatusId (" + startStatusId.Id + ") が posts の中から見つかりませんでした。", nameof(startStatusId));
 
             var nextPost = posts[startStatusId];
             while (nextPost.InReplyToStatusId != null)
             {
-                if (!posts.ContainsKey(nextPost.InReplyToStatusId.Value))
+                if (!posts.ContainsKey(nextPost.InReplyToStatusId))
                     break;
-                nextPost = posts[nextPost.InReplyToStatusId.Value];
+                nextPost = posts[nextPost.InReplyToStatusId];
             }
 
             return nextPost;
@@ -974,10 +941,22 @@ namespace OpenTween
         public async Task GetRelatedResult(bool read, RelatedPostsTabModel tab)
         {
             var targetPost = tab.TargetPost;
-            var relPosts = new Dictionary<long, PostClass>();
+
+            if (targetPost.RetweetedId != null)
+            {
+                var originalPost = targetPost with
+                {
+                    StatusId = targetPost.RetweetedId,
+                    RetweetedId = null,
+                    RetweetedBy = null,
+                };
+                targetPost = originalPost;
+            }
+
+            var relPosts = new Dictionary<PostId, PostClass>();
             if (targetPost.TextFromApi.Contains("@") && targetPost.InReplyToStatusId == null)
             {
-                //検索結果対応
+                // 検索結果対応
                 var p = TabInformations.GetInstance()[targetPost.StatusId];
                 if (p != null && p.InReplyToStatusId != null)
                 {
@@ -985,7 +964,7 @@ namespace OpenTween
                 }
                 else
                 {
-                    p = await this.GetStatusApi(read, targetPost.StatusId)
+                    p = await this.GetStatusApi(read, targetPost.StatusId.ToTwitterStatusId())
                         .ConfigureAwait(false);
                     targetPost = p;
                 }
@@ -999,14 +978,14 @@ namespace OpenTween
             var loopCount = 1;
             while (nextPost.InReplyToStatusId != null && loopCount++ <= 20)
             {
-                var inReplyToId = nextPost.InReplyToStatusId.Value;
+                var inReplyToId = nextPost.InReplyToStatusId;
 
                 var inReplyToPost = TabInformations.GetInstance()[inReplyToId];
                 if (inReplyToPost == null)
                 {
                     try
                     {
-                        inReplyToPost = await this.GetStatusApi(read, inReplyToId)
+                        inReplyToPost = await this.GetStatusApi(read, inReplyToId.ToTwitterStatusId())
                             .ConfigureAwait(false);
                     }
                     catch (WebApiException ex)
@@ -1021,23 +1000,21 @@ namespace OpenTween
                 nextPost = FindTopOfReplyChain(relPosts, nextPost.StatusId);
             }
 
-            //MRTとかに対応のためツイート内にあるツイートを指すURLを取り込む
+            // MRTとかに対応のためツイート内にあるツイートを指すURLを取り込む
             var text = targetPost.Text;
             var ma = Twitter.StatusUrlRegex.Matches(text).Cast<Match>()
                 .Concat(Twitter.ThirdPartyStatusUrlRegex.Matches(text).Cast<Match>());
-            foreach (var _match in ma)
+            foreach (var match in ma)
             {
-                if (long.TryParse(_match.Groups["StatusId"].Value, out var _statusId))
+                var statusId = new TwitterStatusId(match.Groups["StatusId"].Value);
+                if (!relPosts.ContainsKey(statusId))
                 {
-                    if (relPosts.ContainsKey(_statusId))
-                        continue;
-
-                    var p = TabInformations.GetInstance()[_statusId];
+                    var p = TabInformations.GetInstance()[statusId];
                     if (p == null)
                     {
                         try
                         {
-                            p = await this.GetStatusApi(read, _statusId)
+                            p = await this.GetStatusApi(read, statusId)
                                 .ConfigureAwait(false);
                         }
                         catch (WebApiException ex)
@@ -1052,164 +1029,114 @@ namespace OpenTween
                 }
             }
 
+            try
+            {
+                var firstPost = nextPost;
+                var posts = await this.GetConversationPosts(firstPost, targetPost)
+                    .ConfigureAwait(false);
+
+                foreach (var post in posts.OrderBy(x => x.StatusId))
+                {
+                    if (relPosts.ContainsKey(post.StatusId))
+                        continue;
+
+                    // リプライチェーンが繋がらないツイートは除外
+                    if (post.InReplyToStatusId == null || !relPosts.ContainsKey(post.InReplyToStatusId))
+                        continue;
+
+                    relPosts.Add(post.StatusId, post);
+                }
+            }
+            catch (WebException ex)
+            {
+                lastException = ex;
+            }
+
             relPosts.Values.ToList().ForEach(p =>
             {
-                if (p.IsMe && !read && this.ReadOwnPost)
-                    p.IsRead = true;
+                var post = p with { };
+                if (post.IsMe && !read && this.ReadOwnPost)
+                    post.IsRead = true;
                 else
-                    p.IsRead = read;
+                    post.IsRead = read;
 
-                tab.AddPostQueue(p);
+                tab.AddPostQueue(post);
             });
 
             if (lastException != null)
                 throw new WebApiException(lastException.Message, lastException);
         }
 
-        public async Task GetSearch(bool read, PublicSearchTabModel tab, bool more)
+        private async Task<PostClass[]> GetConversationPosts(PostClass firstPost, PostClass targetPost)
         {
-            var count = GetApiResultCount(MyCommon.WORKERTYPE.PublicSearch, more, false);
+            var conversationId = firstPost.StatusId;
+            var query = $"conversation_id:{conversationId.Id}";
 
-            long? maxId = null;
-            long? sinceId = null;
-            if (more)
-            {
-                maxId = tab.OldestId - 1;
-            }
+            if (targetPost.InReplyToUser != null && targetPost.InReplyToUser != targetPost.ScreenName)
+                query += $" (from:{targetPost.ScreenName} to:{targetPost.InReplyToUser}) OR (from:{targetPost.InReplyToUser} to:{targetPost.ScreenName})";
             else
-            {
-                sinceId = tab.SinceId;
-            }
+                query += $" from:{targetPost.ScreenName} to:{targetPost.ScreenName}";
 
-            var searchResult = await this.Api.SearchTweets(tab.SearchWords, tab.SearchLang, count, maxId, sinceId)
+            var statuses = await this.Api.SearchTweets(query, count: 100)
                 .ConfigureAwait(false);
 
-            if (!TabInformations.GetInstance().ContainsTab(tab))
-                return;
-
-            var minimumId = this.CreatePostsFromSearchJson(searchResult, tab, read, more);
-
-            if (minimumId != null)
-                tab.OldestId = minimumId.Value;
+            return statuses.Statuses.Select(x => this.CreatePostsFromStatusData(x)).ToArray();
         }
 
-        private void CreateDirectMessagesFromJson(TwitterDirectMessage[] item, MyCommon.WORKERTYPE gType, bool read)
+        public async Task GetSearch(bool read, PublicSearchTabModel tab, bool more)
         {
-            foreach (var message in item)
+            var count = GetApiResultCount(MyCommon.WORKERTYPE.PublicSearch, more, false);
+
+            TwitterStatus[] statuses;
+            if (this.Api.AppToken.AuthType == APIAuthType.TwitterComCookie)
             {
-                var post = new PostClass();
-                try
+                var request = new SearchTimelineRequest(tab.SearchWords)
                 {
-                    post.StatusId = message.Id;
+                    Count = count,
+                    Cursor = more ? tab.CursorBottom : tab.CursorTop,
+                };
+                var response = await request.Send(this.Api.Connection)
+                    .ConfigureAwait(false);
 
-                    //二重取得回避
-                    lock (LockObj)
-                    {
-                        if (TabInformations.GetInstance().DirectMessageTab.Contains(post.StatusId)) continue;
-                    }
-                    //sender_id
-                    //recipient_id
-                    post.CreatedAt = MyCommon.DateTimeParse(message.CreatedAt);
-                    //本文
-                    var textFromApi = message.Text;
-                    //HTMLに整形
-                    post.Text = CreateHtmlAnchor(textFromApi, message.Entities, quotedStatusLink: null);
-                    post.TextFromApi = this.ReplaceTextFromApi(textFromApi, message.Entities, quotedStatusLink: null);
-                    post.TextFromApi = WebUtility.HtmlDecode(post.TextFromApi);
-                    post.TextFromApi = post.TextFromApi.Replace("<3", "\u2661");
-                    post.AccessibleText = CreateAccessibleText(textFromApi, message.Entities, quotedStatus: null, quotedStatusLink: null);
-                    post.AccessibleText = WebUtility.HtmlDecode(post.AccessibleText);
-                    post.AccessibleText = post.AccessibleText.Replace("<3", "\u2661");
-                    post.IsFav = false;
-
-                    this.ExtractEntities(message.Entities, post.ReplyToList, post.Media);
-
-                    post.QuoteStatusIds = GetQuoteTweetStatusIds(message.Entities, quotedStatusLink: null)
-                        .Distinct().ToArray();
-
-                    post.ExpandedUrls = message.Entities.OfType<TwitterEntityUrl>()
-                        .Select(x => new PostClass.ExpandedUrlInfo(x.Url, x.ExpandedUrl))
-                        .ToArray();
-
-                    //以下、ユーザー情報
-                    TwitterUser? user;
-                    if (gType == MyCommon.WORKERTYPE.UserStream)
-                    {
-                        if (this.Api.CurrentUserId == message.Recipient?.Id)
-                        {
-                            user = message.Sender;
-                            post.IsMe = false;
-                            post.IsOwl = true;
-                        }
-                        else
-                        {
-                            user = message.Recipient;
-                            post.IsMe = true;
-                            post.IsOwl = false;
-                        }
-                    }
-                    else
-                    {
-                        if (gType == MyCommon.WORKERTYPE.DirectMessegeRcv)
-                        {
-                            user = message.Sender;
-                            post.IsMe = false;
-                            post.IsOwl = true;
-                        }
-                        else
-                        {
-                            user = message.Recipient;
-                            post.IsMe = true;
-                            post.IsOwl = false;
-                        }
-                    }
-
-                    if (user != null)
-                    {
-                        post.UserId = user.Id;
-                        post.ScreenName = user.ScreenName;
-                        post.Nickname = user.Name.Trim();
-                        post.ImageUrl = user.ProfileImageUrlHttps;
-                        post.IsProtect = user.Protected;
-                        post.IsMe = post.UserId == this.UserId;
-                    }
-                    else
-                    {
-                        post.UserId = 0L;
-                        post.ScreenName = "?????";
-                        post.Nickname = "Unknown User";
-                    }
+                statuses = response.Tweets
+                    .Where(x => !x.IsTombstone)
+                    .Select(x => x.ToTwitterStatus())
+                    .ToArray();
 
-                    // メモリ使用量削減 (同一のテキストであれば同一の string インスタンスを参照させる)
-                    if (post.Text == post.TextFromApi)
-                        post.Text = post.TextFromApi;
-                    if (post.AccessibleText == post.TextFromApi)
-                        post.AccessibleText = post.TextFromApi;
+                tab.CursorBottom = response.CursorBottom;
 
-                    // 他の発言と重複しやすい (共通化できる) 文字列は string.Intern を通す
-                    post.ScreenName = string.Intern(post.ScreenName);
-                    post.Nickname = string.Intern(post.Nickname);
-                    post.ImageUrl = string.Intern(post.ImageUrl);
+                if (!more)
+                    tab.CursorTop = response.CursorTop;
+            }
+            else
+            {
+                TwitterStatusId? maxId = null;
+                TwitterStatusId? sinceId = null;
+                if (more)
+                {
+                    maxId = tab.OldestId as TwitterStatusId;
                 }
-                catch(Exception ex)
+                else
                 {
-                    MyCommon.TraceOut(ex, MethodBase.GetCurrentMethod().Name);
-                    MessageBox.Show("Parse Error(CreateDirectMessagesFromJson)");
-                    continue;
+                    sinceId = tab.SinceId as TwitterStatusId;
                 }
 
-                post.IsRead = read;
-                if (post.IsMe && !read && this.ReadOwnPost) post.IsRead = true;
-                post.IsReply = false;
-                post.IsExcludeReply = false;
-                post.IsDm = true;
+                var searchResult = await this.Api.SearchTweets(tab.SearchWords, tab.SearchLang, count, maxId, sinceId)
+                    .ConfigureAwait(false);
 
-                var dmTab = TabInformations.GetInstance().DirectMessageTab;
-                dmTab.AddPostQueue(post);
+                statuses = searchResult.Statuses;
             }
+
+            if (!TabInformations.GetInstance().ContainsTab(tab))
+                return;
+
+            var minimumId = this.CreatePostsFromSearchJson(statuses, tab, read, more);
+
+            if (minimumId != null)
+                tab.OldestId = minimumId;
         }
 
-        public async Task GetDirectMessageEvents(bool read, bool backward)
+        public async Task GetDirectMessageEvents(bool read, DirectMessagesTabModel dmTab, bool backward)
         {
             this.CheckAccountState();
             this.CheckAccessLevel(TwitterApiAccessLevel.ReadWriteAndDirectMessage);
@@ -1219,7 +1146,7 @@ namespace OpenTween
             TwitterMessageEventList eventList;
             if (backward)
             {
-                eventList = await this.Api.DirectMessagesEventsList(count, this.nextCursorDirectMessage)
+                eventList = await this.Api.DirectMessagesEventsList(count, dmTab.NextCursor)
                     .ConfigureAwait(false);
             }
             else
@@ -1228,7 +1155,7 @@ namespace OpenTween
                     .ConfigureAwait(false);
             }
 
-            this.nextCursorDirectMessage = eventList.NextCursor;
+            dmTab.NextCursor = eventList.NextCursor;
 
             await this.CreateDirectMessagesEventFromJson(eventList, read)
                 .ConfigureAwait(false);
@@ -1268,99 +1195,22 @@ namespace OpenTween
             this.CreateDirectMessagesEventFromJson(events, users, apps, read);
         }
 
-        private void CreateDirectMessagesEventFromJson(IEnumerable<TwitterMessageEvent> events, IReadOnlyDictionary<string, TwitterUser> users,
-            IReadOnlyDictionary<string, TwitterMessageEventList.App> apps, bool read)
+        private void CreateDirectMessagesEventFromJson(
+            IEnumerable<TwitterMessageEvent> events,
+            IReadOnlyDictionary<string, TwitterUser> users,
+            IReadOnlyDictionary<string, TwitterMessageEventList.App> apps,
+            bool read)
         {
+            var dmTab = TabInformations.GetInstance().DirectMessageTab;
+
             foreach (var eventItem in events)
             {
-                var post = new PostClass();
-                post.StatusId = long.Parse(eventItem.Id);
-
-                var timestamp = long.Parse(eventItem.CreatedTimestamp);
-                post.CreatedAt = DateTimeUtc.UnixEpoch + TimeSpan.FromTicks(timestamp * TimeSpan.TicksPerMillisecond);
-                //本文
-                var textFromApi = eventItem.MessageCreate.MessageData.Text;
-
-                var entities = eventItem.MessageCreate.MessageData.Entities;
-                var mediaEntity = eventItem.MessageCreate.MessageData.Attachment?.Media;
-
-                if (mediaEntity != null)
-                    entities.Media = new[] { mediaEntity };
-
-                //HTMLに整形
-                post.Text = CreateHtmlAnchor(textFromApi, entities, quotedStatusLink: null);
-                post.TextFromApi = this.ReplaceTextFromApi(textFromApi, entities, quotedStatusLink: null);
-                post.TextFromApi = WebUtility.HtmlDecode(post.TextFromApi);
-                post.TextFromApi = post.TextFromApi.Replace("<3", "\u2661");
-                post.AccessibleText = CreateAccessibleText(textFromApi, entities, quotedStatus: null, quotedStatusLink: null);
-                post.AccessibleText = WebUtility.HtmlDecode(post.AccessibleText);
-                post.AccessibleText = post.AccessibleText.Replace("<3", "\u2661");
-                post.IsFav = false;
-
-                this.ExtractEntities(entities, post.ReplyToList, post.Media);
-
-                post.QuoteStatusIds = GetQuoteTweetStatusIds(entities, quotedStatusLink: null)
-                    .Distinct().ToArray();
-
-                post.ExpandedUrls = entities.OfType<TwitterEntityUrl>()
-                    .Select(x => new PostClass.ExpandedUrlInfo(x.Url, x.ExpandedUrl))
-                    .ToArray();
-
-                //以下、ユーザー情報
-                string userId;
-                if (eventItem.MessageCreate.SenderId != this.Api.CurrentUserId.ToString(CultureInfo.InvariantCulture))
-                {
-                    userId = eventItem.MessageCreate.SenderId;
-                    post.IsMe = false;
-                    post.IsOwl = true;
-                }
-                else
-                {
-                    userId = eventItem.MessageCreate.Target.RecipientId;
-                    post.IsMe = true;
-                    post.IsOwl = false;
-                }
-
-                if (!users.TryGetValue(userId, out var user))
-                    continue;
-
-                post.UserId = user.Id;
-                post.ScreenName = user.ScreenName;
-                post.Nickname = user.Name.Trim();
-                post.ImageUrl = user.ProfileImageUrlHttps;
-                post.IsProtect = user.Protected;
-
-                // メモリ使用量削減 (同一のテキストであれば同一の string インスタンスを参照させる)
-                if (post.Text == post.TextFromApi)
-                    post.Text = post.TextFromApi;
-                if (post.AccessibleText == post.TextFromApi)
-                    post.AccessibleText = post.TextFromApi;
-
-                // 他の発言と重複しやすい (共通化できる) 文字列は string.Intern を通す
-                post.ScreenName = string.Intern(post.ScreenName);
-                post.Nickname = string.Intern(post.Nickname);
-                post.ImageUrl = string.Intern(post.ImageUrl);
-
-                var appId = eventItem.MessageCreate.SourceAppId;
-                if (appId != null && apps.TryGetValue(appId, out var app))
-                {
-                    post.Source = string.Intern(app.Name);
-
-                    try
-                    {
-                        post.SourceUri = new Uri(SourceUriBase, app.Url);
-                    }
-                    catch (UriFormatException) { }
-                }
+                var post = this.postFactory.CreateFromDirectMessageEvent(eventItem, users, apps, this.UserId);
 
                 post.IsRead = read;
                 if (post.IsMe && !read && this.ReadOwnPost)
                     post.IsRead = true;
-                post.IsReply = false;
-                post.IsExcludeReply = false;
-                post.IsDm = true;
 
-                var dmTab = TabInformations.GetInstance().DirectMessageTab;
                 dmTab.AddPostQueue(post);
             }
         }
@@ -1389,88 +1239,13 @@ namespace OpenTween
                 tab.OldestId = minimumId.Value;
         }
 
-        private string ReplaceTextFromApi(string text, TwitterEntities? entities, TwitterQuotedStatusPermalink? quotedStatusLink)
-        {
-            if (entities != null)
-            {
-                if (entities.Urls != null)
-                {
-                    foreach (var m in entities.Urls)
-                    {
-                        if (!string.IsNullOrEmpty(m.DisplayUrl)) text = text.Replace(m.Url, m.DisplayUrl);
-                    }
-                }
-                if (entities.Media != null)
-                {
-                    foreach (var m in entities.Media)
-                    {
-                        if (!string.IsNullOrEmpty(m.DisplayUrl)) text = text.Replace(m.Url, m.DisplayUrl);
-                    }
-                }
-            }
-
-            if (quotedStatusLink != null)
-                text += " " + quotedStatusLink.Display;
-
-            return text;
-        }
-
-        internal static string CreateAccessibleText(string text, TwitterEntities? entities, TwitterStatus? quotedStatus, TwitterQuotedStatusPermalink? quotedStatusLink)
-        {
-            if (entities == null)
-                return text;
-
-            if (entities.Urls != null)
-            {
-                foreach (var entity in entities.Urls)
-                {
-                    if (quotedStatus != null)
-                    {
-                        var matchStatusUrl = Twitter.StatusUrlRegex.Match(entity.ExpandedUrl);
-                        if (matchStatusUrl.Success && matchStatusUrl.Groups["StatusId"].Value == quotedStatus.IdStr)
-                        {
-                            var quotedText = CreateAccessibleText(quotedStatus.FullText, quotedStatus.MergedEntities, quotedStatus: null, quotedStatusLink: null);
-                            text = text.Replace(entity.Url, string.Format(Properties.Resources.QuoteStatus_AccessibleText, quotedStatus.User.ScreenName, quotedText));
-                            continue;
-                        }
-                    }
-
-                    if (!string.IsNullOrEmpty(entity.DisplayUrl))
-                        text = text.Replace(entity.Url, entity.DisplayUrl);
-                }
-            }
-
-            if (entities.Media != null)
-            {
-                foreach (var entity in entities.Media)
-                {
-                    if (!string.IsNullOrEmpty(entity.AltText))
-                    {
-                        text = text.Replace(entity.Url, string.Format(Properties.Resources.ImageAltText, entity.AltText));
-                    }
-                    else if (!string.IsNullOrEmpty(entity.DisplayUrl))
-                    {
-                        text = text.Replace(entity.Url, entity.DisplayUrl);
-                    }
-                }
-            }
-
-            if (quotedStatus != null && quotedStatusLink != null)
-            {
-                var quoteText = CreateAccessibleText(quotedStatus.FullText, quotedStatus.MergedEntities, quotedStatus: null, quotedStatusLink: null);
-                text += " " + string.Format(Properties.Resources.QuoteStatus_AccessibleText, quotedStatus.User.ScreenName, quoteText);
-            }
-
-            return text;
-        }
-
         /// <summary>
         /// フォロワーIDを更新します
         /// </summary>
         /// <exception cref="WebApiException"/>
         public async Task RefreshFollowerIds()
         {
-            if (MyCommon._endingFlag) return;
+            if (MyCommon.EndingFlag) return;
 
             var cursor = -1L;
             var newFollowerIds = Enumerable.Empty<long>();
@@ -1484,7 +1259,8 @@ namespace OpenTween
 
                 newFollowerIds = newFollowerIds.Concat(ret.Ids);
                 cursor = ret.NextCursor;
-            } while (cursor != 0);
+            }
+            while (cursor != 0);
 
             this.followerId = newFollowerIds.ToHashSet();
             TabInformations.GetInstance().RefreshOwl(this.followerId);
@@ -1498,7 +1274,7 @@ namespace OpenTween
         /// <exception cref="WebApiException"/>
         public async Task RefreshNoRetweetIds()
         {
-            if (MyCommon._endingFlag) return;
+            if (MyCommon.EndingFlag) return;
 
             this.noRTId = await this.Api.NoRetweetIds()
                 .ConfigureAwait(false);
@@ -1603,109 +1379,11 @@ namespace OpenTween
             }
         }
 
-        private void ExtractEntities(TwitterEntities? entities, List<(long UserId, string ScreenName)> AtList, List<MediaInfo> media)
-        {
-            if (entities != null)
-            {
-                if (entities.Hashtags != null)
-                {
-                    lock (this.LockObj)
-                    {
-                        this._hashList.AddRange(entities.Hashtags.Select(x => "#" + x.Text));
-                    }
-                }
-                if (entities.UserMentions != null)
-                {
-                    foreach (var ent in entities.UserMentions)
-                    {
-                        AtList.Add((ent.Id, ent.ScreenName));
-                    }
-                }
-                if (entities.Media != null)
-                {
-                    if (media != null)
-                    {
-                        foreach (var ent in entities.Media)
-                        {
-                            if (!media.Any(x => x.Url == ent.MediaUrlHttps))
-                            {
-                                if (ent.VideoInfo != null &&
-                                    ent.Type == "animated_gif" || ent.Type == "video")
-                                {
-                                    media.Add(new MediaInfo(ent.MediaUrlHttps, ent.AltText, ent.ExpandedUrl));
-                                }
-                                else
-                                    media.Add(new MediaInfo(ent.MediaUrlHttps, ent.AltText, videoUrl: null));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        internal static string CreateHtmlAnchor(string text, TwitterEntities? entities, TwitterQuotedStatusPermalink? quotedStatusLink)
-        {
-            var mergedEntities = entities.Concat(TweetExtractor.ExtractEmojiEntities(text));
-
-            // PostClass.ExpandedUrlInfo を使用して非同期に URL 展開を行うためここでは expanded_url を使用しない
-            text = TweetFormatter.AutoLinkHtml(text, mergedEntities, keepTco: true);
-
-            text = Regex.Replace(text, "(^|[^a-zA-Z0-9_/&##@@>=.~])(sm|nm)([0-9]{1,10})", "$1<a href=\"https://www.nicovideo.jp/watch/$2$3\">$2$3</a>");
-            text = PreProcessUrl(text); //IDN置換
-
-            if (quotedStatusLink != null)
-            {
-                text += string.Format(" <a href=\"{0}\" title=\"{0}\">{1}</a>",
-                    WebUtility.HtmlEncode(quotedStatusLink.Url),
-                    WebUtility.HtmlEncode(quotedStatusLink.Display));
-            }
-
-            return text;
-        }
-
-        private static readonly Uri SourceUriBase = new Uri("https://twitter.com/");
-
-        /// <summary>
-        /// Twitter APIから得たHTML形式のsource文字列を分析し、source名とURLに分離します
-        /// </summary>
-        internal static (string SourceText, Uri? SourceUri) ParseSource(string? sourceHtml)
-        {
-            if (string.IsNullOrEmpty(sourceHtml))
-                return ("", null);
-
-            string sourceText;
-            Uri? sourceUri;
-
-            // sourceHtmlの例: <a href="http://twitter.com" rel="nofollow">Twitter Web Client</a>
-
-            var match = Regex.Match(sourceHtml, "^<a href=\"(?<uri>.+?)\".*?>(?<text>.+)</a>$", RegexOptions.IgnoreCase);
-            if (match.Success)
-            {
-                sourceText = WebUtility.HtmlDecode(match.Groups["text"].Value);
-                try
-                {
-                    var uriStr = WebUtility.HtmlDecode(match.Groups["uri"].Value);
-                    sourceUri = new Uri(SourceUriBase, uriStr);
-                }
-                catch (UriFormatException)
-                {
-                    sourceUri = null;
-                }
-            }
-            else
-            {
-                sourceText = WebUtility.HtmlDecode(sourceHtml);
-                sourceUri = null;
-            }
-
-            return (sourceText, sourceUri);
-        }
-
         public async Task<TwitterApiStatus?> GetInfoApi()
         {
             if (Twitter.AccountState != MyCommon.ACCOUNT_STATE.Valid) return null;
 
-            if (MyCommon._endingFlag) return null;
+            if (MyCommon.EndingFlag) return null;
 
             var limits = await this.Api.ApplicationRateLimitStatus()
                 .ConfigureAwait(false);
@@ -1721,7 +1399,7 @@ namespace OpenTween
         /// <exception cref="WebApiException"/>
         public async Task RefreshBlockIds()
         {
-            if (MyCommon._endingFlag) return;
+            if (MyCommon.EndingFlag) return;
 
             var cursor = -1L;
             var newBlockIds = Enumerable.Empty<long>();
@@ -1732,7 +1410,8 @@ namespace OpenTween
 
                 newBlockIds = newBlockIds.Concat(ret.Ids);
                 cursor = ret.NextCursor;
-            } while (cursor != 0);
+            }
+            while (cursor != 0);
 
             var blockIdsSet = newBlockIds.ToHashSet();
             blockIdsSet.Remove(this.UserId); // 元のソースにあったので一応残しておく
@@ -1746,7 +1425,7 @@ namespace OpenTween
         /// <exception cref="WebApiException"/>
         public async Task RefreshMuteUserIdsAsync()
         {
-            if (MyCommon._endingFlag) return;
+            if (MyCommon.EndingFlag) return;
 
             var ids = await TwitterIds.GetAllItemsAsync(x => this.Api.MutesUsersIds(x))
                 .ConfigureAwait(false);
@@ -1755,21 +1434,7 @@ namespace OpenTween
         }
 
         public string[] GetHashList()
-        {
-            string[] hashArray;
-            lock (LockObj)
-            {
-                hashArray = _hashList.ToArray();
-                _hashList.Clear();
-            }
-            return hashArray;
-        }
-
-        public string AccessToken
-            => ((TwitterApiConnection)this.Api.Connection).AccessToken;
-
-        public string AccessTokenSecret
-            => ((TwitterApiConnection)this.Api.Connection).AccessSecret;
+            => this.postFactory.GetReceivedHashtags();
 
         private void CheckAccountState()
         {
@@ -1872,489 +1537,53 @@ namespace OpenTween
             return remainWeight / config.Scale;
         }
 
-
-#region "UserStream"
-        public string TrackWord { get; set; } = "";
-        public bool AllAtReply { get; set; } = false;
-
-        public event EventHandler NewPostFromStream;
-        public event EventHandler UserStreamStarted;
-        public event EventHandler UserStreamStopped;
-        public event EventHandler<PostDeletedEventArgs> PostDeleted;
-        public event EventHandler<UserStreamEventReceivedEventArgs> UserStreamEventReceived;
-        private DateTimeUtc _lastUserstreamDataReceived;
-        private StreamAutoConnector? userStreamConnector;
-
-        public class FormattedEvent
-        {
-            public MyCommon.EVENTTYPE Eventtype { get; set; }
-            public DateTimeUtc CreatedAt { get; set; }
-            public string Event { get; set; } = "";
-            public string Username { get; set; } = "";
-            public string Target { get; set; } = "";
-            public long Id { get; set; }
-            public bool IsMe { get; set; }
-        }
-
-        public List<FormattedEvent> StoredEvent { get; } = new List<FormattedEvent>();
-
-        private readonly IReadOnlyDictionary<string, MyCommon.EVENTTYPE> eventTable = new Dictionary<string, MyCommon.EVENTTYPE>
-        {
-            ["favorite"] = MyCommon.EVENTTYPE.Favorite,
-            ["unfavorite"] = MyCommon.EVENTTYPE.Unfavorite,
-            ["follow"] = MyCommon.EVENTTYPE.Follow,
-            ["list_member_added"] = MyCommon.EVENTTYPE.ListMemberAdded,
-            ["list_member_removed"] = MyCommon.EVENTTYPE.ListMemberRemoved,
-            ["block"] = MyCommon.EVENTTYPE.Block,
-            ["unblock"] = MyCommon.EVENTTYPE.Unblock,
-            ["user_update"] = MyCommon.EVENTTYPE.UserUpdate,
-            ["deleted"] = MyCommon.EVENTTYPE.Deleted,
-            ["list_created"] = MyCommon.EVENTTYPE.ListCreated,
-            ["list_destroyed"] = MyCommon.EVENTTYPE.ListDestroyed,
-            ["list_updated"] = MyCommon.EVENTTYPE.ListUpdated,
-            ["unfollow"] = MyCommon.EVENTTYPE.Unfollow,
-            ["list_user_subscribed"] = MyCommon.EVENTTYPE.ListUserSubscribed,
-            ["list_user_unsubscribed"] = MyCommon.EVENTTYPE.ListUserUnsubscribed,
-            ["mute"] = MyCommon.EVENTTYPE.Mute,
-            ["unmute"] = MyCommon.EVENTTYPE.Unmute,
-            ["quoted_tweet"] = MyCommon.EVENTTYPE.QuotedTweet,
-        };
-
-        public bool IsUserstreamDataReceived
-            => (DateTimeUtc.Now - this._lastUserstreamDataReceived).TotalSeconds < 31;
-
-        private void userStream_MessageReceived(ITwitterStreamMessage message)
-        {
-            this._lastUserstreamDataReceived = DateTimeUtc.Now;
-
-            switch (message)
-            {
-                case StreamMessageStatus statusMessage:
-                    var status = statusMessage.Status.Normalize();
-
-                    if (status.RetweetedStatus is TwitterStatus retweetedStatus)
-                    {
-                        var sourceUserId = statusMessage.Status.User.Id;
-                        var targetUserId = retweetedStatus.User.Id;
-
-                        // 自分に関係しないリツイートの場合は無視する
-                        var selfUserId = this.UserId;
-                        if (sourceUserId == selfUserId || targetUserId == selfUserId)
-                        {
-                            // 公式 RT をイベントとしても扱う
-                            var evt = this.CreateEventFromRetweet(status);
-                            this.StoredEvent.Insert(0, evt);
-                            this.UserStreamEventReceived?.Invoke(this, new UserStreamEventReceivedEventArgs(evt));
-                        }
-                        // 従来通り公式 RT の表示も行うため break しない
-                    }
-
-                    this.CreatePostsFromJson(new[] { status }, MyCommon.WORKERTYPE.UserStream, null, false);
-                    this.NewPostFromStream?.Invoke(this, EventArgs.Empty);
-                    break;
-
-                case StreamMessageDirectMessage dmMessage:
-                    this.CreateDirectMessagesFromJson(new[] { dmMessage.DirectMessage }, MyCommon.WORKERTYPE.UserStream, false);
-                    this.NewPostFromStream?.Invoke(this, EventArgs.Empty);
-                    break;
-
-                case StreamMessageDelete deleteMessage:
-                    var deletedId = deleteMessage.Status?.Id ?? deleteMessage.DirectMessage?.Id;
-                    if (deletedId == null)
-                        break;
-
-                    this.PostDeleted?.Invoke(this, new PostDeletedEventArgs(deletedId.Value));
-
-                    foreach (var index in MyCommon.CountDown(this.StoredEvent.Count - 1, 0))
-                    {
-                        var evt = this.StoredEvent[index];
-                        if (evt.Id == deletedId.Value && (evt.Event == "favorite" || evt.Event == "unfavorite"))
-                        {
-                            this.StoredEvent.RemoveAt(index);
-                        }
-                    }
-                    break;
-
-                case StreamMessageEvent eventMessage:
-                    this.CreateEventFromJson(eventMessage);
-                    break;
-
-                case StreamMessageScrubGeo scrubGeoMessage:
-                    TabInformations.GetInstance().ScrubGeoReserve(scrubGeoMessage.UserId, scrubGeoMessage.UpToStatusId);
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
         /// <summary>
-        /// UserStreamsから受信した公式RTをイベントに変換します
+        /// プロフィール画像のサイズを指定したURLを生成
         /// </summary>
-        private FormattedEvent CreateEventFromRetweet(TwitterStatus status)
+        /// <remarks>
+        /// https://developer.twitter.com/en/docs/twitter-api/v1/accounts-and-users/user-profile-images-and-banners を参照
+        /// </remarks>
+        public static string CreateProfileImageUrl(string normalUrl, string size)
         {
-            if (status.RetweetedStatus == null)
-                throw new InvalidOperationException();
-
-            return new FormattedEvent
+            return size switch
             {
-                Eventtype = MyCommon.EVENTTYPE.Retweet,
-                Event = "retweet",
-                CreatedAt = MyCommon.DateTimeParse(status.CreatedAt),
-                IsMe = status.User.Id == this.UserId,
-                Username = status.User.ScreenName,
-                Target = string.Format("@{0}:{1}", new[]
-                {
-                    status.RetweetedStatus.User.ScreenName,
-                    WebUtility.HtmlDecode(status.RetweetedStatus.FullText),
-                }),
-                Id = status.RetweetedStatus.Id,
+                "original" => normalUrl.Replace("_normal.", "."),
+                "normal" => normalUrl,
+                "bigger" or "mini" => normalUrl.Replace("_normal.", $"_{size}."),
+                _ => throw new ArgumentException($"Invalid size: ${size}", nameof(size)),
             };
         }
 
-        private void CreateEventFromJson(StreamMessageEvent message)
+        public static string DecideProfileImageSize(int sizePx)
         {
-            var eventData = message.Event;
-
-            var evt = new FormattedEvent
+            return sizePx switch
             {
-                CreatedAt = MyCommon.DateTimeParse(eventData.CreatedAt),
-                Event = eventData.Event,
-                Username = eventData.Source.ScreenName,
-                IsMe = eventData.Source.Id == this.UserId,
-                Eventtype = eventTable.TryGetValue(eventData.Event, out var eventType) ? eventType : MyCommon.EVENTTYPE.None,
+                <= 24 => "mini",
+                <= 48 => "normal",
+                <= 73 => "bigger",
+                _ => "original",
             };
-
-            TwitterStreamEvent<TwitterStatusCompat> tweetEvent;
-            TwitterStatus tweet;
-
-            switch (eventData.Event)
-            {
-                case "access_revoked":
-                case "access_unrevoked":
-                case "user_delete":
-                case "user_suspend":
-                    return;
-                case "follow":
-                    if (eventData.Target.Id == this.UserId)
-                    {
-                        if (!this.followerId.Contains(eventData.Source.Id)) this.followerId.Add(eventData.Source.Id);
-                    }
-                    else
-                    {
-                        return;    //Block後のUndoをすると、SourceとTargetが逆転したfollowイベントが帰ってくるため。
-                    }
-                    evt.Target = "";
-                    break;
-                case "unfollow":
-                    evt.Target = "@" + eventData.Target.ScreenName;
-                    break;
-                case "favorited_retweet":
-                case "retweeted_retweet":
-                    return;
-                case "favorite":
-                case "unfavorite":
-                    tweetEvent = message.ParseTargetObjectAs<TwitterStatusCompat>();
-                    tweet = tweetEvent.TargetObject.Normalize();
-                    evt.Target = "@" + tweet.User.ScreenName + ":" + WebUtility.HtmlDecode(tweet.FullText);
-                    evt.Id = tweet.Id;
-
-                    if (SettingManager.Common.IsRemoveSameEvent)
-                    {
-                        if (this.StoredEvent.Any(ev => ev.Username == evt.Username && ev.Eventtype == evt.Eventtype && ev.Target == evt.Target))
-                            return;
-                    }
-
-                    var tabinfo = TabInformations.GetInstance();
-
-                    var statusId = tweet.Id;
-                    if (!tabinfo.Posts.TryGetValue(statusId, out var post))
-                        break;
-
-                    if (eventData.Event == "favorite")
-                    {
-                        var favTab = tabinfo.FavoriteTab;
-                        favTab.AddPostQueue(post);
-
-                        if (tweetEvent.Source.Id == this.UserId)
-                        {
-                            post.IsFav = true;
-                        }
-                        else if (tweetEvent.Target.Id == this.UserId)
-                        {
-                            post.FavoritedCount++;
-
-                            if (SettingManager.Common.FavEventUnread)
-                                tabinfo.SetReadAllTab(post.StatusId, read: false);
-                        }
-                    }
-                    else // unfavorite
-                    {
-                        if (tweetEvent.Source.Id == this.UserId)
-                        {
-                            post.IsFav = false;
-                        }
-                        else if (tweetEvent.Target.Id == this.UserId)
-                        {
-                            post.FavoritedCount = Math.Max(0, post.FavoritedCount - 1);
-                        }
-                    }
-                    break;
-                case "quoted_tweet":
-                    if (evt.IsMe) return;
-
-                    tweetEvent = message.ParseTargetObjectAs<TwitterStatusCompat>();
-                    tweet = tweetEvent.TargetObject.Normalize();
-                    evt.Target = "@" + tweet.User.ScreenName + ":" + WebUtility.HtmlDecode(tweet.FullText);
-                    evt.Id = tweet.Id;
-
-                    if (SettingManager.Common.IsRemoveSameEvent)
-                    {
-                        if (this.StoredEvent.Any(ev => ev.Username == evt.Username && ev.Eventtype == evt.Eventtype && ev.Target == evt.Target))
-                            return;
-                    }
-                    break;
-                case "list_member_added":
-                case "list_member_removed":
-                case "list_created":
-                case "list_destroyed":
-                case "list_updated":
-                case "list_user_subscribed":
-                case "list_user_unsubscribed":
-                    var listEvent = message.ParseTargetObjectAs<TwitterList>();
-                    evt.Target = listEvent.TargetObject.FullName;
-                    break;
-                case "block":
-                    if (!TabInformations.GetInstance().BlockIds.Contains(eventData.Target.Id)) TabInformations.GetInstance().BlockIds.Add(eventData.Target.Id);
-                    evt.Target = "";
-                    break;
-                case "unblock":
-                    if (TabInformations.GetInstance().BlockIds.Contains(eventData.Target.Id)) TabInformations.GetInstance().BlockIds.Remove(eventData.Target.Id);
-                    evt.Target = "";
-                    break;
-                case "user_update":
-                    evt.Target = "";
-                    break;
-                
-                // Mute / Unmute
-                case "mute":
-                    evt.Target = "@" + eventData.Target.ScreenName;
-                    if (!TabInformations.GetInstance().MuteUserIds.Contains(eventData.Target.Id))
-                    {
-                        TabInformations.GetInstance().MuteUserIds.Add(eventData.Target.Id);
-                    }
-                    break;
-                case "unmute":
-                    evt.Target = "@" + eventData.Target.ScreenName;
-                    if (TabInformations.GetInstance().MuteUserIds.Contains(eventData.Target.Id))
-                    {
-                        TabInformations.GetInstance().MuteUserIds.Remove(eventData.Target.Id);
-                    }
-                    break;
-
-                default:
-                    MyCommon.TraceOut("Unknown Event:" + evt.Event + Environment.NewLine + message.Json);
-                    break;
-            }
-            this.StoredEvent.Insert(0, evt);
-
-            this.UserStreamEventReceived?.Invoke(this, new UserStreamEventReceivedEventArgs(evt));
         }
 
-        private void userStream_Started()
-            => this.UserStreamStarted?.Invoke(this, EventArgs.Empty);
-
-        private void userStream_Stopped()
-            => this.UserStreamStopped?.Invoke(this, EventArgs.Empty);
-
-        public bool UserStreamActive
-            => this.userStreamConnector != null && this.userStreamConnector.IsStreamActive;
-
-        public void StartUserStream()
-        {
-            var replies = this.AllAtReply ? "all" : null;
-            var streamObservable = this.Api.UserStreams(replies, this.TrackWord);
-            var newConnector = new StreamAutoConnector(streamObservable);
-
-            newConnector.MessageReceived += userStream_MessageReceived;
-            newConnector.Started += userStream_Started;
-            newConnector.Stopped += userStream_Stopped;
+        public bool IsDisposed { get; private set; } = false;
 
-            newConnector.Start();
-
-            var oldConnector = Interlocked.Exchange(ref this.userStreamConnector, newConnector);
-            oldConnector?.Dispose();
-        }
-
-        public void StopUserStream()
-        {
-            var oldConnector = Interlocked.Exchange(ref this.userStreamConnector, null);
-            oldConnector?.Dispose();
-        }
-
-        public void ReconnectUserStream()
-        {
-            if (this.userStreamConnector != null)
-            {
-                this.StartUserStream();
-            }
-        }
-
-        private class StreamAutoConnector : IDisposable
+        protected virtual void Dispose(bool disposing)
         {
-            private readonly TwitterStreamObservable streamObservable;
-
-            public bool IsStreamActive { get; private set; }
-            public bool IsDisposed { get; private set; }
-
-            public event Action<ITwitterStreamMessage>? MessageReceived;
-            public event Action? Stopped;
-            public event Action? Started;
-
-            private Task? streamTask;
-            private CancellationTokenSource streamCts = new CancellationTokenSource();
-
-            public StreamAutoConnector(TwitterStreamObservable streamObservable)
-                => this.streamObservable = streamObservable;
-
-            public void Start()
-            {
-                var cts = new CancellationTokenSource();
-
-                this.streamCts = cts;
-                this.streamTask = Task.Run(async () =>
-                {
-                    try
-                    {
-                        await this.StreamLoop(cts.Token)
-                            .ConfigureAwait(false);
-                    }
-                    catch (OperationCanceledException) { }
-                });
-            }
-
-            public void Stop()
-            {
-                this.streamCts?.Cancel();
-
-                // streamTask の完了を待たずに IsStreamActive を false にセットする
-                this.IsStreamActive = false;
-                this.Stopped?.Invoke();
-            }
-
-            private async Task StreamLoop(CancellationToken cancellationToken)
-            {
-                var sleep = TimeSpan.Zero;
-                for (; ; )
-                {
-                    if (sleep != TimeSpan.Zero)
-                    {
-                        await Task.Delay(sleep, cancellationToken)
-                            .ConfigureAwait(false);
-                        sleep = TimeSpan.Zero;
-                    }
-
-                    if (!MyCommon.IsNetworkAvailable())
-                    {
-                        sleep = TimeSpan.FromSeconds(30);
-                        continue;
-                    }
-
-                    this.IsStreamActive = true;
-                    this.Started?.Invoke();
-
-                    try
-                    {
-                        await this.streamObservable.ForEachAsync(
-                            x => this.MessageReceived?.Invoke(x),
-                            cancellationToken);
-
-                        // キャンセルされていないのにストリームが終了した場合
-                        sleep = TimeSpan.FromSeconds(30);
-                    }
-                    catch (TwitterApiException ex) when (ex.StatusCode == HttpStatusCode.Gone)
-                    {
-                        // UserStreams停止によるエラーの場合は長めに間隔を開ける
-                        sleep = TimeSpan.FromMinutes(10);
-                    }
-                    catch (TwitterApiException) { sleep = TimeSpan.FromSeconds(30); }
-                    catch (IOException) { sleep = TimeSpan.FromSeconds(30); }
-                    catch (OperationCanceledException)
-                    {
-                        if (cancellationToken.IsCancellationRequested)
-                            throw;
-
-                        // cancellationToken によるキャンセルではない(=タイムアウトエラー)
-                        sleep = TimeSpan.FromSeconds(30);
-                    }
-                    catch (Exception ex)
-                    {
-                        MyCommon.ExceptionOut(ex);
-                        sleep = TimeSpan.FromSeconds(30);
-                    }
-                    finally
-                    {
-                        this.IsStreamActive = false;
-                        this.Stopped?.Invoke();
-                    }
-                }
-            }
+            if (this.IsDisposed)
+                return;
 
-            public void Dispose()
+            if (disposing)
             {
-                if (this.IsDisposed)
-                    return;
-
-                this.IsDisposed = true;
-
-                this.Stop();
-
-                this.Started = null;
-                this.Stopped = null;
-                this.MessageReceived = null;
+                this.Api.Dispose();
             }
-        }
-#endregion
 
-#region "IDisposable Support"
-        private bool disposedValue; // 重複する呼び出しを検出するには
-
-        // IDisposable
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!this.disposedValue)
-            {
-                if (disposing)
-                {
-                    this.StopUserStream();
-                }
-            }
-            this.disposedValue = true;
+            this.IsDisposed = true;
         }
 
-        // このコードは、破棄可能なパターンを正しく実装できるように Visual Basic によって追加されました。
         public void Dispose()
         {
-            // このコードを変更しないでください。クリーンアップ コードを上の Dispose(bool disposing) に記述します。
-            Dispose(true);
+            this.Dispose(true);
             GC.SuppressFinalize(this);
         }
-#endregion
-    }
-
-    public class PostDeletedEventArgs : EventArgs
-    {
-        public long StatusId { get; }
-
-        public PostDeletedEventArgs(long statusId)
-            => this.StatusId = statusId;
-    }
-
-    public class UserStreamEventReceivedEventArgs : EventArgs
-    {
-        public Twitter.FormattedEvent EventData { get; }
-
-        public UserStreamEventReceivedEventArgs(Twitter.FormattedEvent eventData)
-            => this.EventData = eventData;
     }
 }