提交: 2e071159cebdcf934eafa43ba76731e929014cac - opentween (git)

OpenTweenのfork

Commit MetaInfo

• 修订版: 2e071159cebdcf934eafa43ba76731e929014cac (tree)
• 时间: 2012-02-18 23:11:09
• 作者: kiri_feather <kiri_feather@user...>
• Commiter: Kimura Youichi

Log Message

0881開発版。OAuth(xAuth)対応。URL検出正規表現修正。

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@116 e39ad16e-3079-482e-bb30-4b4d378143b6

更改概述

• modified: Tween/Connection/HttpConnection.vb
• modified: Tween/Connection/HttpConnectionApi.vb
• modified: Tween/Connection/HttpConnectionOAuth.vb
• modified: Tween/Connection/HttpTwitter.vb
• modified: Tween/Connection/HttpVarious.vb
• modified: Tween/My Project/AssemblyInfo.vb
• modified: Tween/My Project/Resources.Designer.vb
• modified: Tween/My Project/Resources.en.resx
• modified: Tween/My Project/Resources.resx
• modified: Tween/Outputz.vb
• modified: Tween/Resources/ChangeLog.txt
• modified: Tween/Setting.Designer.vb
• modified: Tween/Setting.en.resx
• modified: Tween/Setting.resx
• modified: Tween/Setting.vb
• modified: Tween/Tween.vb
• modified: Tween/Twitter.vb

差异

--- a/Tween/Connection/HttpConnection.vb
+++ b/Tween/Connection/HttpConnection.vb
@@ -56,7 +56,7 @@ Public Class HttpConnection
     '''<returns>引数で指定された内容を反映したHttpWebRequestオブジェクト</returns>
     Protected Function CreateRequest(ByVal method As RequestMethod, _
                                             ByVal requestUri As Uri, _
-                                            ByVal param As SortedList(Of String, String), _
+                                            ByVal param As Dictionary(Of String, String), _
                                             ByVal withCookie As Boolean _
                                         ) As HttpWebRequest
         If Not isInitialize Then Throw New Exception("Sequence error.(not initialized)")
@@ -166,7 +166,7 @@ Public Class HttpConnection
     End Function
 
     Protected Function GetResponse(ByVal webRequest As HttpWebRequest, _
-                                        ByVal contentBitmap As Bitmap, _
+                                        ByRef contentBitmap As Bitmap, _
                                         ByVal headerInfo As Dictionary(Of String, String), _
                                         ByVal withCookie As Boolean _
                                     ) As HttpStatusCode
@@ -251,7 +251,7 @@ Public Class HttpConnection
     '''クエリコレクションをkey=value形式の文字列に構成して戻す
     '''</summary>
     '''<param name="param">クエリ、またはポストデータとなるkey-valueコレクション</param>
-    Protected Function CreateQueryString(ByVal param As SortedList(Of String, String)) As String
+    Protected Function CreateQueryString(ByVal param As IDictionary(Of String, String)) As String
         If param Is Nothing OrElse param.Count = 0 Then Return String.Empty
 
         Dim query As New StringBuilder

--- a/Tween/Connection/HttpConnectionApi.vb
+++ b/Tween/Connection/HttpConnectionApi.vb
@@ -10,7 +10,7 @@ Public Class HttpConnectionApi
 
     Protected Function GetContent(ByVal method As RequestMethod, _
             ByVal requestUri As Uri, _
-            ByVal param As SortedList(Of String, String), _
+            ByVal param As Dictionary(Of String, String), _
             ByRef content As String, _
             ByVal headerInfo As Dictionary(Of String, String), _
             ByVal authRequired As Boolean) As HttpStatusCode

--- a/Tween/Connection/HttpConnectionOAuth.vb
+++ b/Tween/Connection/HttpConnectionOAuth.vb
@@ -21,24 +21,24 @@ Public Class HttpConnectionOAuth
     '''<summary>
     '''OAuthのアクセストークン。永続化可能（ユーザー取り消しの可能性はある）。
     '''</summary>
-    Private Shared token As String = ""
+    Private token As String = ""
 
     '''<summary>
     '''OAuthの署名作成用秘密アクセストークン。永続化可能（ユーザー取り消しの可能性はある）。
     '''</summary>
-    Private Shared tokenSecret As String = ""
+    Private tokenSecret As String = ""
 
     '''<summary>
     '''OAuthのコンシューマー鍵
     '''</summary>
-    Private Shared consumerKey As String
+    Private consumerKey As String
 
     '''<summary>
     '''OAuthの署名作成用秘密コンシューマーデータ
     '''</summary>
-    Private Shared consumerSecret As String
+    Private consumerSecret As String
 
-    Private Shared authorizedUsername As String
+    Private authorizedUsername As String
     '''<summary>
     '''HTTP通信してコンテンツを取得する（文字列コンテンツ）
     '''</summary>
@@ -55,7 +55,7 @@ Public Class HttpConnectionOAuth
     '''<returns>通信結果のHttpStatusCode</returns>
     Protected Function GetContent(ByVal method As RequestMethod, _
             ByVal requestUri As Uri, _
-            ByVal param As SortedList(Of String, String), _
+            ByVal param As Dictionary(Of String, String), _
             ByRef content As String, _
             ByVal headerInfo As Dictionary(Of String, String)) As HttpStatusCode
         '認証済かチェック
@@ -76,22 +76,21 @@ Public Class HttpConnectionOAuth
     End Function
 
 #Region "認証処理"
-    Protected Function AuthorizePinFlow(ByVal requestTokenUrl As String, _
-                                        ByVal accessTokenUrl As String, _
-                                        ByVal authorizeUrl As String) As Boolean
+    Protected Function AuthorizePinFlowRequest(ByVal requestTokenUrl As String, _
+                                        ByVal authorizeUrl As String, _
+                                        ByRef requestToken As String, _
+                                        ByRef authUri As Uri) As Boolean
         'PIN-based flow
-        Dim requestToken As String = ""
-        Dim authUri As Uri = GetAuthorizePageUri(requestTokenUrl, authorizeUrl, requestToken)
+        authUri = GetAuthorizePageUri(requestTokenUrl, authorizeUrl, requestToken)
         If authUri Is Nothing Then Return False
-        System.Diagnostics.Process.Start(authUri.PathAndQuery) 'ブラウザで表示
-        Dim inputForm As New InputTabName
-        inputForm.FormTitle = "Input PIN code"
-        inputForm.FormDescription = "Input the PIN code shown in the browser after you accept OAuth request."
-        If inputForm.ShowDialog() = DialogResult.OK AndAlso Not String.IsNullOrEmpty(inputForm.TabName) Then
-            Return GetAccessToken(accessTokenUrl, inputForm.TabName, requestToken)
-        Else
-            Return False
-        End If
+        Return True
+    End Function
+
+    Protected Function AuthorizePinFlow(ByVal accessTokenUrl As String, _
+                                        ByVal requestToken As String, _
+                                        ByVal pinCode As String) As Boolean
+        'PIN-based flow
+        Return GetAccessToken(accessTokenUrl, pinCode, requestToken)
     End Function
 
     Protected Function AuthorizeXAuth(ByVal url As String, ByVal username As String, ByVal password As String) As Boolean
@@ -99,40 +98,29 @@ Public Class HttpConnectionOAuth
         If String.IsNullOrEmpty(username) OrElse String.IsNullOrEmpty(password) Then
             Throw New Exception("Sequence error.(username or password is blank)")
         End If
-        Dim reqUri As New Uri(url)
-        Dim parameter As New SortedList(Of String, String)
+        Dim parameter As New Dictionary(Of String, String)
         parameter.Add("x_auth_mode", "client_auth")
         parameter.Add("x_auth_username", username)
         parameter.Add("x_auth_password", password)
 
-        webReq = CreateRequest(RequestMethod.ReqPost, reqUri, parameter, False)
+        Dim accessTokenData As NameValueCollection = GetOAuthToken(New Uri(url), "", "", parameter)
 
-        AppendOAuthInfo(webReq, parameter, "", "")
-
-        Try
-            Dim status As HttpStatusCode
-            Dim contentText As String = ""
-            status = GetResponse(webReq, contentText, Nothing, False)
-            If status = HttpStatusCode.OK Then
-                Dim tokenData As NameValueCollection = ParseQueryString(contentText)
-                token = tokenData.Item("oauth_token")
-                tokenSecret = tokenData.Item("oauth_token_secret")
-                ''' TODO:その他情報も格納するか検討（user_idなど）
-                If token = "" Then Return False
-                Return True
-            Else
-                Return False
-            End If
-        Catch ex As Exception
+        If accessTokenData IsNot Nothing Then
+            token = accessTokenData.Item("oauth_token")
+            tokenSecret = accessTokenData.Item("oauth_token_secret")
+            authorizedUsername = accessTokenData.Item("screen_name")
+            If token = "" Then Return False
+            Return True
+        Else
             Return False
-        End Try
+        End If
     End Function
 
     Private Function GetAuthorizePageUri(ByVal requestTokenUrl As String, _
                                         ByVal authorizeUrl As String, _
                                         ByRef requestToken As String) As Uri
         Const tokenKey As String = "oauth_token"
-        Dim reqTokenData As NameValueCollection = GetOAuthToken(New Uri(requestTokenUrl), "", "")
+        Dim reqTokenData As NameValueCollection = GetOAuthToken(New Uri(requestTokenUrl), "", "", Nothing)
         If reqTokenData IsNot Nothing Then
             requestToken = reqTokenData.Item(tokenKey)
             Dim ub As New UriBuilder(authorizeUrl)
@@ -146,7 +134,7 @@ Public Class HttpConnectionOAuth
     Private Function GetAccessToken(ByVal accessTokenUrl As String, ByVal pinCode As String, ByVal requestToken As String) As Boolean
         If String.IsNullOrEmpty(requestToken) Then Throw New Exception("Sequence error.(requestToken is blank)")
 
-        Dim accessTokenData As NameValueCollection = GetOAuthToken(New Uri(accessTokenUrl), pinCode, requestToken)
+        Dim accessTokenData As NameValueCollection = GetOAuthToken(New Uri(accessTokenUrl), pinCode, requestToken, Nothing)
 
         If accessTokenData IsNot Nothing Then
             token = accessTokenData.Item("oauth_token")
@@ -158,14 +146,19 @@ Public Class HttpConnectionOAuth
         End If
     End Function
 
-    Private Function GetOAuthToken(ByVal requestUri As Uri, ByVal pinCode As String, ByVal requestToken As String) As NameValueCollection
+    Private Function GetOAuthToken(ByVal requestUri As Uri, ByVal pinCode As String, ByVal requestToken As String, ByVal parameter As Dictionary(Of String, String)) As NameValueCollection
         Dim webReq As HttpWebRequest = Nothing
-        If String.IsNullOrEmpty(pinCode) Then
+        If String.IsNullOrEmpty(pinCode) AndAlso parameter Is Nothing Then
             webReq = CreateRequest(RequestMethod.ReqGet, requestUri, Nothing, False)
         Else
-            webReq = CreateRequest(RequestMethod.ReqPost, requestUri, Nothing, False)
+            webReq = CreateRequest(RequestMethod.ReqPost, requestUri, parameter, False)
+        End If
+        Dim query As New Dictionary(Of String, String)
+        If parameter IsNot Nothing Then
+            For Each kvp As KeyValuePair(Of String, String) In parameter
+                query.Add(kvp.Key, kvp.Value)
+            Next
         End If
-        Dim query As New SortedList(Of String, String)
         If Not String.IsNullOrEmpty(pinCode) Then query.Add("oauth_verifier", pinCode)
         AppendOAuthInfo(webReq, query, requestToken, "")
         Try
@@ -185,10 +178,10 @@ Public Class HttpConnectionOAuth
 
 #Region "OAuth認証用ヘッダ作成・付加処理"
     Private Sub AppendOAuthInfo(ByVal webRequest As HttpWebRequest, _
-                                        ByVal query As SortedList(Of String, String), _
+                                        ByVal query As Dictionary(Of String, String), _
                                         ByVal token As String, _
                                         ByVal tokenSecret As String)
-        Dim parameter As SortedList(Of String, String) = GetOAuthParameter(token)
+        Dim parameter As Dictionary(Of String, String) = GetOAuthParameter(token)
         If query IsNot Nothing Then
             For Each item As KeyValuePair(Of String, String) In query
                 parameter.Add(item.Key, item.Value)
@@ -204,8 +197,8 @@ Public Class HttpConnectionOAuth
         webRequest.Headers.Add(HttpRequestHeader.Authorization, sb.ToString)
     End Sub
 
-    Private Function GetOAuthParameter(ByVal token As String) As SortedList(Of String, String)
-        Dim parameter As New SortedList(Of String, String)
+    Private Function GetOAuthParameter(ByVal token As String) As Dictionary(Of String, String)
+        Dim parameter As New Dictionary(Of String, String)
         parameter.Add("oauth_consumer_key", consumerKey)
         parameter.Add("oauth_signature_method", "HMAC-SHA1")
         parameter.Add("oauth_timestamp", GetTimestamp())
@@ -218,9 +211,10 @@ Public Class HttpConnectionOAuth
     Private Function CreateSignature(ByVal tokenSecret As String, _
                                             ByVal method As String, _
                                             ByVal uri As Uri, _
-                                            ByVal parameter As SortedList(Of String, String) _
+                                            ByVal parameter As Dictionary(Of String, String) _
                                         ) As String
-        Dim paramString As String = CreateQueryString(parameter)
+        Dim sorted As New SortedDictionary(Of String, String)(parameter)
+        Dim paramString As String = CreateQueryString(sorted)
         Dim url As String = String.Format("{0}://{1}{2}", uri.Scheme, uri.Host, uri.AbsolutePath)
         Dim signatureBase As String = String.Format("{0}&{1}&{2}", method, UrlEncode(url), UrlEncode(paramString))
         Dim key As String = UrlEncode(consumerSecret) + "&"
@@ -239,17 +233,17 @@ Public Class HttpConnectionOAuth
     End Function
 #End Region
 
-    Protected Shared Sub Initialize(ByVal consumerKeyStr As String, _
+    Protected Sub Initialize(ByVal consumerKeyStr As String, _
                                     ByVal consumerSecretStr As String, _
                                     ByVal accessToken As String, _
                                     ByVal accessTokenSecret As String)
-        consumerKey = consumerKeyStr
-        consumerSecret = consumerSecretStr
-        HttpConnectionOAuth.token = accessToken
-        HttpConnectionOAuth.tokenSecret = accessTokenSecret
+        Me.consumerKey = consumerKeyStr
+        Me.consumerSecret = consumerSecretStr
+        Me.token = accessToken
+        Me.tokenSecret = accessTokenSecret
     End Sub
 
-    Protected Shared Sub Initialize(ByVal consumerKeyStr As String, _
+    Protected Sub Initialize(ByVal consumerKeyStr As String, _
                                 ByVal consumerSecretStr As String, _
                                 ByVal accessToken As String, _
                                 ByVal accessTokenSecret As String, _
@@ -258,21 +252,21 @@ Public Class HttpConnectionOAuth
         authorizedUsername = username
     End Sub
 
-    Protected Shared ReadOnly Property AccessToken() As String
+    Protected ReadOnly Property AccessToken() As String
         Get
-            Return HttpConnectionOAuth.token
+            Return token
         End Get
     End Property
 
-    Protected Shared ReadOnly Property AccessTokenSecret() As String
+    Protected ReadOnly Property AccessTokenSecret() As String
         Get
-            Return HttpConnectionOAuth.tokenSecret
+            Return tokenSecret
         End Get
     End Property
 
-    Protected Shared ReadOnly Property AuthUsername() As String
+    Protected ReadOnly Property AuthUsername() As String
         Get
-            Return HttpConnectionOAuth.authorizedUsername
+            Return authorizedUsername
         End Get
     End Property
 End Class

--- a/Tween/Connection/HttpTwitter.vb
+++ b/Tween/Connection/HttpTwitter.vb
@@ -7,12 +7,12 @@ Public Class HttpTwitter
     '''<summary>
     '''OAuth‚̃Rƒ“ƒVƒ…[ƒ}[Œ®
     '''</summary>
-    Private Const ConsumerKey As String = "EANjQEa5LokuVld682tTDA"
+    Private Const ConsumerKey As String = "iOQHfiCUsyOyamW8JJ8jg"
 
     '''<summary>
     '''OAuth‚̏–¼ì¬—p”é–§ƒRƒ“ƒVƒ…[ƒ}[ƒf[ƒ^
     '''</summary>
-    Private Const ConsumerSecret As String = "zXfwkzmuO6FcHtoikleV3EVgdh5vVAs6ft6ZxtYTYM"
+    Private Const ConsumerSecret As String = "5PS2oa5f2VaKMPrlZa7DTbz0aFULKd3Ojxqgsm142Dw"
 
     '''<summary>
     '''OAuth‚̃AƒNƒZƒXƒg[ƒNƒ“Žæ“¾æURI
@@ -29,24 +29,24 @@ Public Class HttpTwitter
     Public Overloads Sub Initialize(ByVal accessToken As String, _
                                     ByVal accessTokenSecret As String, _
                                     ByVal username As String)
-        HttpConnectionOAuth.Initialize(ConsumerKey, ConsumerSecret, accessToken, accessTokenSecret, username)
+        Initialize(ConsumerKey, ConsumerSecret, accessToken, accessTokenSecret, username)
     End Sub
 
     Public Overloads ReadOnly Property AccessToken() As String
         Get
-            Return HttpConnectionOAuth.AccessToken
+            Return MyBase.AccessToken
         End Get
     End Property
 
     Public Overloads ReadOnly Property AccessTokenSecret() As String
         Get
-            Return HttpConnectionOAuth.AccessTokenSecret
+            Return MyBase.AccessTokenSecret
         End Get
     End Property
 
     Public Overloads ReadOnly Property AuthUsername() As String
         Get
-            Return HttpConnectionOAuth.AuthUsername
+            Return MyBase.AuthUsername
         End Get
     End Property
 
@@ -55,7 +55,7 @@ Public Class HttpTwitter
     End Function
 
     Public Sub ClearAuthInfo()
-        HttpConnectionOAuth.Initialize(ConsumerKey, ConsumerSecret, "", "", "")
+        MyBase.Initialize(ConsumerKey, ConsumerSecret, "", "", "")
     End Sub
 
     Public Shared WriteOnly Property UseSsl() As Boolean
@@ -75,10 +75,10 @@ Public Class HttpTwitter
     End Property
 
     Public Function UpdateStatus(ByVal status As String, ByVal replyToId As Long, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         param.Add("status", status)
         If replyToId > 0 Then param.Add("in_reply_to_status_id", replyToId.ToString)
         Try
@@ -97,7 +97,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function DestroyStatus(ByVal id As Long) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -116,7 +116,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function DestroyDirectMessage(ByVal id As Long) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -135,7 +135,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function RetweetStatus(ByVal id As Long, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -154,10 +154,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function CreateFriendships(ByVal screenName As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         param.Add("screen_name", screenName)
         Try
             Return GetContent(RequestMethod.ReqPost, _
@@ -175,10 +175,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function DestroyFriendships(ByVal screenName As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         param.Add("screen_name", screenName)
         Try
             Return GetContent(RequestMethod.ReqPost, _
@@ -196,10 +196,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function ShowFriendships(ByVal souceScreenName As String, ByVal targetScreenName As String, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         param.Add("source_screen_name", souceScreenName)
         param.Add("target_screen_name", targetScreenName)
         Try
@@ -218,7 +218,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function ShowStatuses(ByVal id As Long, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -237,7 +237,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function CreateFavorites(ByVal id As Long) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -256,7 +256,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function DestroyFavorites(ByVal id As Long) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -275,10 +275,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function HomeTimeline(ByVal count As Integer, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         If count > 0 Then
             param.Add("count", count.ToString())
         End If
@@ -298,10 +298,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function Mentions(ByVal count As Integer, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         If count > 0 Then
             param.Add("count", count.ToString())
         End If
@@ -321,7 +321,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function DirectMessages(ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -340,7 +340,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function DirectMessagesSent(ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try
@@ -359,10 +359,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function Favorites(ByVal count As Integer, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         If count <> 20 Then param.Add("count", count.ToString())
         Try
             Return GetContent(RequestMethod.ReqGet, _
@@ -380,7 +380,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function Search(ByVal words As String, ByVal lang As String, ByVal rpp As Integer, ByVal page As Integer, ByRef content As String) As HttpStatusCode
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         If Not String.IsNullOrEmpty(words) Then param.Add("q", words)
         If Not String.IsNullOrEmpty(lang) Then param.Add("lang", lang)
         If rpp > 0 Then param.Add("rpp", rpp.ToString())
@@ -405,10 +405,10 @@ Public Class HttpTwitter
     End Function
 
     Public Function FollowerIds(ByVal cursor As Long, ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         param.Add("cursor", cursor.ToString())
         Try
             Return GetContent(RequestMethod.ReqGet, _
@@ -426,7 +426,7 @@ Public Class HttpTwitter
     End Function
 
     Public Function RateLimitStatus(ByRef content As String) As HttpStatusCode
-        If HttpConnectionOAuth.AuthUsername = "" Then
+        If Me.AuthUsername = "" Then
             Return HttpStatusCode.Unauthorized
         End If
         Try

--- a/Tween/Connection/HttpVarious.vb
+++ b/Tween/Connection/HttpVarious.vb
@@ -34,7 +34,7 @@ Public Class HttpVarious
         End Try
     End Function
 
-    Public Function PostData(ByVal Url As String, ByVal param As SortedList(Of String, String)) As Boolean
+    Public Function PostData(ByVal Url As String, ByVal param As Dictionary(Of String, String)) As Boolean
         Dim req As HttpWebRequest = CreateRequest(RequestMethod.ReqPost, New Uri(Url), param, False)
         Try
             Dim res As HttpStatusCode = Me.GetResponse(req, Nothing, False)
@@ -45,7 +45,7 @@ Public Class HttpVarious
         End Try
     End Function
 
-    Public Function PostData(ByVal Url As String, ByVal param As SortedList(Of String, String), ByRef content As String) As Boolean
+    Public Function PostData(ByVal Url As String, ByVal param As Dictionary(Of String, String), ByRef content As String) As Boolean
         Dim req As HttpWebRequest = CreateRequest(RequestMethod.ReqPost, New Uri(Url), param, False)
         Try
             Dim res As HttpStatusCode = Me.GetResponse(req, content, Nothing, False)
@@ -56,7 +56,7 @@ Public Class HttpVarious
         End Try
     End Function
 
-    Public Function GetData(ByVal Url As String, ByVal param As SortedList(Of String, String), ByRef content As String) As Boolean
+    Public Function GetData(ByVal Url As String, ByVal param As Dictionary(Of String, String), ByRef content As String) As Boolean
         Dim req As HttpWebRequest = CreateRequest(RequestMethod.ReqGet, New Uri(Url), param, False)
         Try
             Dim res As HttpStatusCode = Me.GetResponse(req, content, Nothing, False)

--- a/Tween/My Project/AssemblyInfo.vb	
+++ b/Tween/My Project/AssemblyInfo.vb	
@@ -55,5 +55,5 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
 <Assembly: AssemblyVersion("0.1.0.0")> 
-<Assembly: AssemblyFileVersion("0.8.8.0")> 
+<Assembly: AssemblyFileVersion("0.8.8.1")> 
 

--- a/Tween/My Project/Resources.Designer.vb	
+++ b/Tween/My Project/Resources.Designer.vb	
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     このコードはツールによって生成されました。
-'     ランタイム バージョン:2.0.50727.4927
+'     ランタイム バージョン:2.0.50727.3603
 '
 '     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
 '     コードが再生成されるときに損失したりします。
@@ -1646,6 +1646,15 @@ Namespace My.Resources
         End Property
         
         '''<summary>
+        '''  アカウントが認証されていません。閉じてもよろしいですか？ に類似しているローカライズされた文字列を検索します。
+        '''</summary>
+        Friend ReadOnly Property Setting_FormClosing1() As String
+            Get
+                Return ResourceManager.GetString("Setting_FormClosing1", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
         '''  まだあなたのプロフィール情報を取得していません。投稿後に再度お試しください。 に類似しているローカライズされた文字列を検索します。
         '''</summary>
         Friend ReadOnly Property ShowYourProfileText1() As String

--- a/Tween/My Project/Resources.en.resx	
+++ b/Tween/My Project/Resources.en.resx	
@@ -756,4 +756,7 @@
   <data name="AuthorizeButton_Click4" xml:space="preserve">
     <value>Not authenticated</value>
   </data>
+  <data name="Setting_FormClosing1" xml:space="preserve">
+    <value>Account is not Validated. Will you close setting dialog?</value>
+  </data>
 </root>
\ No newline at end of file

--- a/Tween/My Project/Resources.resx	
+++ b/Tween/My Project/Resources.resx	
@@ -808,4 +808,7 @@
   <data name="AuthorizeButton_Click4" xml:space="preserve">
     <value>未認証</value>
   </data>
+  <data name="Setting_FormClosing1" xml:space="preserve">
+    <value>アカウントが認証されていません。閉じてもよろしいですか？</value>
+  </data>
 </root>
\ No newline at end of file

--- a/Tween/Outputz.vb
+++ b/Tween/Outputz.vb
@@ -75,7 +75,7 @@ Public Module Outputz
 
         Dim content As String = ""
         Dim output As String = "http://outputz.com/api/post"
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         param.Add("key", myApikeyEncoded)
         param.Add("uri", myOuturlEncoded)
         param.Add("size", length.ToString)

--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -1,5 +1,11 @@
 更新履歴
 
+==== Ver 0.8.8.1(2010/03/3)
+ * Webモード廃止
+ * OAuth（xAuth）対応（API上限が350へ）
+ * URL等のリンク検出ロジックの調整
+ * フォロー・アンフォロー等のID指定画面でIDを変更しても、結果画面のIDが変わらないバグ修正
+ * 時速表示バグの修正
 ==== Ver 0.8.8.0(2010/02/23)
  * ふぁぼったーのURLを変更（favotter.matope.com→favotter.netに変更）
 ==== Ver 0.8.7.0(2010/02/23)

--- a/Tween/Setting.Designer.vb
+++ b/Tween/Setting.Designer.vb
@@ -127,6 +127,7 @@ Partial Class Setting
         Me.Label47 = New System.Windows.Forms.Label
         Me.TabControl1 = New System.Windows.Forms.TabControl
         Me.TabPage1 = New System.Windows.Forms.TabPage
+        Me.AuthClearButton = New System.Windows.Forms.Button
         Me.AuthUserLabel = New System.Windows.Forms.Label
         Me.AuthStateLabel = New System.Windows.Forms.Label
         Me.Label4 = New System.Windows.Forms.Label
@@ -217,7 +218,6 @@ Partial Class Setting
         Me.Label59 = New System.Windows.Forms.Label
         Me.TextBoxOutputzKey = New System.Windows.Forms.TextBox
         Me.CheckOutputz = New System.Windows.Forms.CheckBox
-        Me.AuthClearButton = New System.Windows.Forms.Button
         Me.GroupBox1.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -889,6 +889,12 @@ Partial Class Setting
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.UseVisualStyleBackColor = True
         '
+        'AuthClearButton
+        '
+        resources.ApplyResources(Me.AuthClearButton, "AuthClearButton")
+        Me.AuthClearButton.Name = "AuthClearButton"
+        Me.AuthClearButton.UseVisualStyleBackColor = True
+        '
         'AuthUserLabel
         '
         Me.AuthUserLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -1502,12 +1508,6 @@ Partial Class Setting
         Me.CheckOutputz.Name = "CheckOutputz"
         Me.CheckOutputz.UseVisualStyleBackColor = True
         '
-        'AuthClearButton
-        '
-        resources.ApplyResources(Me.AuthClearButton, "AuthClearButton")
-        Me.AuthClearButton.Name = "AuthClearButton"
-        Me.AuthClearButton.UseVisualStyleBackColor = True
-        '
         'Setting
         '
         Me.AcceptButton = Me.Save

--- a/Tween/Setting.en.resx
+++ b/Tween/Setting.en.resx
@@ -139,30 +139,12 @@
   <data name="Label3.Text" xml:space="preserve">
     <value>Timeline Fetching Interval (sec.)</value>
   </data>
-  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 12</value>
-  </data>
-  <data name="Label4.Text" xml:space="preserve">
-    <value>Threshold of Fetching (1-20)</value>
-  </data>
   <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
     <value>144, 12</value>
   </data>
   <data name="Label5.Text" xml:space="preserve">
     <value>DM Fetching Interval (sec.)</value>
   </data>
-  <data name="Label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>205, 12</value>
-  </data>
-  <data name="Label6.Text" xml:space="preserve">
-    <value>Fetching Pages at Once over threshold</value>
-  </data>
-  <data name="Label8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>142, 12</value>
-  </data>
-  <data name="Label8.Text" xml:space="preserve">
-    <value>First-time Fetching Pages:</value>
-  </data>
   <data name="Label9.Size" type="System.Drawing.Size, System.Drawing">
     <value>135, 12</value>
   </data>
@@ -478,12 +460,6 @@
   <data name="Label44.Text" xml:space="preserve">
     <value>Path to Browser</value>
   </data>
-  <data name="CheckboxReply.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 16</value>
-  </data>
-  <data name="CheckboxReply.Text" xml:space="preserve">
-    <value>Fetch Replies</value>
-  </data>
   <data name="CheckDispUsername.Size" type="System.Drawing.Size, System.Drawing">
     <value>58, 16</value>
   </data>
@@ -529,23 +505,23 @@
   <data name="Label47.Text" xml:space="preserve">
     <value>Apply after restarting</value>
   </data>
-  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 12</value>
+  <data name="AuthClearButton.Text" xml:space="preserve">
+    <value>Clear</value>
   </data>
-  <data name="Label7.Text" xml:space="preserve">
-    <value>Public Search Interval (sec.)</value>
+  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
   </data>
-  <data name="Label70.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 12</value>
+  <data name="Label4.Text" xml:space="preserve">
+    <value>Auth status</value>
   </data>
-  <data name="Label70.Text" xml:space="preserve">
-    <value>Show warning if API isn't enabled</value>
+  <data name="AuthorizeButton.Text" xml:space="preserve">
+    <value>Auth</value>
   </data>
-  <data name="CheckStartupAPImodeNoWarning.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 16</value>
+  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 12</value>
   </data>
-  <data name="CheckStartupAPImodeNoWarning.Text" xml:space="preserve">
-    <value>Don't show</value>
+  <data name="Label7.Text" xml:space="preserve">
+    <value>Public Search Interval (sec.)</value>
   </data>
   <data name="Label69.Size" type="System.Drawing.Size, System.Drawing">
     <value>156, 12</value>
@@ -565,30 +541,6 @@
   <data name="Label67.Text" xml:space="preserve">
     <value>Getting number of tweets/mentions in API </value>
   </data>
-  <data name="Label66.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 12</value>
-  </data>
-  <data name="Label66.Text" xml:space="preserve">
-    <value>POST method</value>
-  </data>
-  <data name="CheckPostMethod.Size" type="System.Drawing.Size, System.Drawing">
-    <value>58, 16</value>
-  </data>
-  <data name="CheckPostMethod.Text" xml:space="preserve">
-    <value>Enable</value>
-  </data>
-  <data name="Label43.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="Label43.Text" xml:space="preserve">
-    <value>TwitterAPI</value>
-  </data>
-  <data name="CheckUseApi.Size" type="System.Drawing.Size, System.Drawing">
-    <value>58, 16</value>
-  </data>
-  <data name="CheckUseApi.Text" xml:space="preserve">
-    <value>Enable</value>
-  </data>
   <data name="Label54.Size" type="System.Drawing.Size, System.Drawing">
     <value>131, 12</value>
   </data>
@@ -601,18 +553,6 @@
   <data name="CheckStartupFollowers.Text" xml:space="preserve">
     <value>Enable</value>
   </data>
-  <data name="Label53.Size" type="System.Drawing.Size, System.Drawing">
-    <value>169, 12</value>
-  </data>
-  <data name="Label53.Text" xml:space="preserve">
-    <value>Update Parsing Keys in Starting</value>
-  </data>
-  <data name="CheckStartupKey.Size" type="System.Drawing.Size, System.Drawing">
-    <value>58, 16</value>
-  </data>
-  <data name="CheckStartupKey.Text" xml:space="preserve">
-    <value>Enable</value>
-  </data>
   <data name="Label51.Size" type="System.Drawing.Size, System.Drawing">
     <value>158, 12</value>
   </data>

--- a/Tween/Setting.resx
+++ b/Tween/Setting.resx
@@ -273,7 +273,7 @@
     <value>130, 12</value>
   </data>
   <data name="Label3.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="Label3.Text" xml:space="preserve">
     <value>タイムライン更新間隔（秒）</value>
@@ -297,7 +297,7 @@
     <value>65, 19</value>
   </data>
   <data name="TimelinePeriod.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="&gt;&gt;TimelinePeriod.Name" xml:space="preserve">
     <value>TimelinePeriod</value>
@@ -2989,7 +2989,7 @@
     <value>75, 23</value>
   </data>
   <data name="AuthorizeButton.TabIndex" type="System.Int32, mscorlib">
-    <value>43</value>
+    <value>4</value>
   </data>
   <data name="AuthorizeButton.Text" xml:space="preserve">
     <value>認証する</value>
@@ -3142,7 +3142,7 @@
     <value>84, 16</value>
   </data>
   <data name="CheckPostAndGet.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="CheckPostAndGet.Text" xml:space="preserve">
     <value>投稿時取得</value>

--- a/Tween/Setting.vb
+++ b/Tween/Setting.vb
@@ -286,6 +286,14 @@ Public Class Setting
         End Try
     End Sub
 
+    Private Sub Setting_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
+        If Twitter.Username = "" Then
+            If MessageBox.Show(My.Resources.Setting_FormClosing1, "Confirm", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) = Windows.Forms.DialogResult.Cancel Then
+                e.Cancel = True
+            End If
+        End If
+    End Sub
+
     Private Sub Setting_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
         'Username.Text = _MyuserID
         'Password.Text = _Mypassword
@@ -1829,27 +1837,27 @@ Public Class Setting
         End Set
     End Property
 
-    Private Sub Username_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles Username.Validating
-        If Username.Text.Trim = "" Then
-            MessageBox.Show(My.Resources.Save_ClickText1)
-            e.Cancel = True
-            Exit Sub
-        End If
-        If Username.Text.Contains("@") Then
-            MessageBox.Show(My.Resources.Save_ClickText2)
-            e.Cancel = True
-            Exit Sub
-        End If
+    'Private Sub Username_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles Username.Validating
+    '    If Username.Text.Trim = "" Then
+    '        MessageBox.Show(My.Resources.Save_ClickText1)
+    '        e.Cancel = True
+    '        Exit Sub
+    '    End If
+    '    If Username.Text.Contains("@") Then
+    '        MessageBox.Show(My.Resources.Save_ClickText2)
+    '        e.Cancel = True
+    '        Exit Sub
+    '    End If
 
-    End Sub
+    'End Sub
 
-    Private Sub Password_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles Password.Validating
-        If Password.Text.Trim = "" Then
-            MessageBox.Show(My.Resources.Save_ClickText1)
-            e.Cancel = True
-            Exit Sub
-        End If
-    End Sub
+    'Private Sub Password_Validating(ByVal sender As System.Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles Password.Validating
+    '    If Password.Text.Trim = "" Then
+    '        MessageBox.Show(My.Resources.Save_ClickText1)
+    '        e.Cancel = True
+    '        Exit Sub
+    '    End If
+    'End Sub
 
     Private Sub ComboBoxAutoShortUrlFirst_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ComboBoxAutoShortUrlFirst.SelectedIndexChanged
         If ComboBoxAutoShortUrlFirst.SelectedIndex = UrlConverter.Bitly OrElse _
@@ -1940,5 +1948,6 @@ Public Class Setting
         Me.AuthStateLabel.Text = My.Resources.AuthorizeButton_Click4
         Me.AuthUserLabel.Text = ""
     End Sub
+
 End Class
 

--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -1813,6 +1813,21 @@ Public Class TweenMain
         Me.Activate()
     End Sub
 
+    Private Shared Function CheckAccountValid() As Boolean
+        Static errorCount As Integer = 0
+        If Twitter.AccountState <> ACCOUNT_STATE.Valid Then
+            errorCount += 1
+            If errorCount > 5 Then
+                errorCount = 0
+                Twitter.AccountState = ACCOUNT_STATE.Valid
+                Return True
+            End If
+            Return False
+        End If
+        errorCount = 0
+        Return True
+    End Function
+
     Private Sub GetTimelineWorker_DoWork(ByVal sender As System.Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
         Dim bw As BackgroundWorker = DirectCast(sender, BackgroundWorker)
         If bw.CancellationPending OrElse _endingFlag Then
@@ -1832,6 +1847,12 @@ Public Class TweenMain
 
         Dim args As GetWorkerArg = DirectCast(e.Argument, GetWorkerArg)
 
+        If Not CheckAccountValid() Then
+            rslt.retMsg = "Auth error. Check your account"
+            rslt.type = args.type
+            rslt.tName = args.tName
+            e.Result = rslt
+        End If
 
         If args.type <> WORKERTYPE.OpenUri Then bw.ReportProgress(0, "") 'Notifyアイコンアニメーション開始
         Select Case args.type
@@ -4873,121 +4894,104 @@ RETRY:
     Private Sub SaveConfigsCommon()
         If _ignoreConfigSave Then Exit Sub
 
-        If Twitter.Username <> "" Then
-            modifySettingCommon = False
-            SyncLock _syncObject
-                _cfgCommon.UserName = Twitter.Username
-                '_cfgCommon.Password = SettingDialog.PasswordStr
-                _cfgCommon.Token = Twitter.AccessToken
-                _cfgCommon.TokenSecret = Twitter.AccessTokenSecret
-                '_cfgCommon.NextPageThreshold = SettingDialog.NextPageThreshold
-                '_cfgCommon.NextPages = SettingDialog.NextPagesInt
-                _cfgCommon.TimelinePeriod = SettingDialog.TimelinePeriodInt
-                _cfgCommon.ReplyPeriod = SettingDialog.ReplyPeriodInt
-                _cfgCommon.DMPeriod = SettingDialog.DMPeriodInt
-                _cfgCommon.PubSearchPeriod = SettingDialog.PubSearchPeriodInt
-                _cfgCommon.MaxPostNum = SettingDialog.MaxPostNum
-                '_cfgCommon.ReadPages = SettingDialog.ReadPages
-                '_cfgCommon.ReadPagesReply = SettingDialog.ReadPagesReply
-                '_cfgCommon.ReadPagesDM = SettingDialog.ReadPagesDM
-                _cfgCommon.Read = SettingDialog.Readed
-                _cfgCommon.IconSize = SettingDialog.IconSz
-                _cfgCommon.UnreadManage = SettingDialog.UnreadManage
-                _cfgCommon.PlaySound = SettingDialog.PlaySound
-                _cfgCommon.OneWayLove = SettingDialog.OneWayLove
-
-                _cfgCommon.NameBalloon = SettingDialog.NameBalloon
-                _cfgCommon.PostCtrlEnter = SettingDialog.PostCtrlEnter
-                '_cfgCommon.UseApi = SettingDialog.UseAPI
-                _cfgCommon.CountApi = SettingDialog.CountApi
-                _cfgCommon.CountApiReply = SettingDialog.CountApiReply
-                '_cfgCommon.UsePostMethod = False
-                _cfgCommon.HubServer = SettingDialog.HubServer
-                '_cfgCommon.CheckReply = SettingDialog.CheckReply
-                _cfgCommon.PostAndGet = SettingDialog.PostAndGet
-                _cfgCommon.DispUsername = SettingDialog.DispUsername
-                _cfgCommon.MinimizeToTray = SettingDialog.MinimizeToTray
-                _cfgCommon.CloseToExit = SettingDialog.CloseToExit
-                _cfgCommon.DispLatestPost = SettingDialog.DispLatestPost
-                _cfgCommon.SortOrderLock = SettingDialog.SortOrderLock
-                _cfgCommon.TinyUrlResolve = SettingDialog.TinyUrlResolve
-                _cfgCommon.PeriodAdjust = SettingDialog.PeriodAdjust
-                _cfgCommon.StartupVersion = SettingDialog.StartupVersion
-                '_cfgCommon.StartupKey = SettingDialog.StartupKey
-                _cfgCommon.StartupFollowers = SettingDialog.StartupFollowers
-                '_cfgCommon.StartupApiModeNoWarning = SettingDialog.StartupAPImodeNoWarning
-                _cfgCommon.RestrictFavCheck = SettingDialog.RestrictFavCheck
-                _cfgCommon.AlwaysTop = SettingDialog.AlwaysTop
-                _cfgCommon.UrlConvertAuto = SettingDialog.UrlConvertAuto
-                _cfgCommon.Outputz = SettingDialog.OutputzEnabled
-                _cfgCommon.OutputzKey = SettingDialog.OutputzKey
-                _cfgCommon.OutputzUrlMode = SettingDialog.OutputzUrlmode
-                _cfgCommon.UseUnreadStyle = SettingDialog.UseUnreadStyle
-                _cfgCommon.DateTimeFormat = SettingDialog.DateTimeFormat
-                _cfgCommon.DefaultTimeOut = SettingDialog.DefaultTimeOut
-                _cfgCommon.ProtectNotInclude = SettingDialog.ProtectNotInclude
-                _cfgCommon.LimitBalloon = SettingDialog.LimitBalloon
-                _cfgCommon.AutoShortUrlFirst = SettingDialog.AutoShortUrlFirst
-                _cfgCommon.TabIconDisp = SettingDialog.TabIconDisp
-                _cfgCommon.ReplyIconState = SettingDialog.ReplyIconState
-                _cfgCommon.ReadOwnPost = SettingDialog.ReadOwnPost
-                _cfgCommon.GetFav = SettingDialog.GetFav
-                _cfgCommon.IsMonospace = SettingDialog.IsMonospace
-                If IdeographicSpaceToSpaceToolStripMenuItem IsNot Nothing AndAlso _
-                   IdeographicSpaceToSpaceToolStripMenuItem.IsDisposed = False Then
-                    _cfgCommon.WideSpaceConvert = Me.IdeographicSpaceToSpaceToolStripMenuItem.Checked
-                End If
-                _cfgCommon.ReadOldPosts = SettingDialog.ReadOldPosts
-                _cfgCommon.UseSsl = SettingDialog.UseSsl
-                _cfgCommon.BilyUser = SettingDialog.BitlyUser
-                _cfgCommon.BitlyPwd = SettingDialog.BitlyPwd
-                _cfgCommon.ShowGrid = SettingDialog.ShowGrid
-                _cfgCommon.UseAtIdSupplement = SettingDialog.UseAtIdSupplement
-                _cfgCommon.UseHashSupplement = SettingDialog.UseHashSupplement
-                _cfgCommon.Language = SettingDialog.Language
-
-                _cfgCommon.SortOrder = _statuses.SortOrder
-                Select Case _statuses.SortMode
-                    Case IdComparerClass.ComparerMode.Nickname  'ニックネーム
-                        _cfgCommon.SortColumn = 1
-                    Case IdComparerClass.ComparerMode.Data  '本文
-                        _cfgCommon.SortColumn = 2
-                    Case IdComparerClass.ComparerMode.Id  '時刻=発言Id
-                        _cfgCommon.SortColumn = 3
-                    Case IdComparerClass.ComparerMode.Name  '名前
-                        _cfgCommon.SortColumn = 4
-                    Case IdComparerClass.ComparerMode.Source  'Source
-                        _cfgCommon.SortColumn = 7
-                End Select
+        modifySettingCommon = False
+        SyncLock _syncObject
+            _cfgCommon.UserName = Twitter.Username
+            '_cfgCommon.Password = SettingDialog.PasswordStr
+            _cfgCommon.Token = Twitter.AccessToken
+            _cfgCommon.TokenSecret = Twitter.AccessTokenSecret
+            '_cfgCommon.NextPageThreshold = SettingDialog.NextPageThreshold
+            '_cfgCommon.NextPages = SettingDialog.NextPagesInt
+            _cfgCommon.TimelinePeriod = SettingDialog.TimelinePeriodInt
+            _cfgCommon.ReplyPeriod = SettingDialog.ReplyPeriodInt
+            _cfgCommon.DMPeriod = SettingDialog.DMPeriodInt
+            _cfgCommon.PubSearchPeriod = SettingDialog.PubSearchPeriodInt
+            _cfgCommon.MaxPostNum = SettingDialog.MaxPostNum
+            '_cfgCommon.ReadPages = SettingDialog.ReadPages
+            '_cfgCommon.ReadPagesReply = SettingDialog.ReadPagesReply
+            '_cfgCommon.ReadPagesDM = SettingDialog.ReadPagesDM
+            _cfgCommon.Read = SettingDialog.Readed
+            _cfgCommon.IconSize = SettingDialog.IconSz
+            _cfgCommon.UnreadManage = SettingDialog.UnreadManage
+            _cfgCommon.PlaySound = SettingDialog.PlaySound
+            _cfgCommon.OneWayLove = SettingDialog.OneWayLove
+
+            _cfgCommon.NameBalloon = SettingDialog.NameBalloon
+            _cfgCommon.PostCtrlEnter = SettingDialog.PostCtrlEnter
+            '_cfgCommon.UseApi = SettingDialog.UseAPI
+            _cfgCommon.CountApi = SettingDialog.CountApi
+            _cfgCommon.CountApiReply = SettingDialog.CountApiReply
+            '_cfgCommon.UsePostMethod = False
+            _cfgCommon.HubServer = SettingDialog.HubServer
+            '_cfgCommon.CheckReply = SettingDialog.CheckReply
+            _cfgCommon.PostAndGet = SettingDialog.PostAndGet
+            _cfgCommon.DispUsername = SettingDialog.DispUsername
+            _cfgCommon.MinimizeToTray = SettingDialog.MinimizeToTray
+            _cfgCommon.CloseToExit = SettingDialog.CloseToExit
+            _cfgCommon.DispLatestPost = SettingDialog.DispLatestPost
+            _cfgCommon.SortOrderLock = SettingDialog.SortOrderLock
+            _cfgCommon.TinyUrlResolve = SettingDialog.TinyUrlResolve
+            _cfgCommon.PeriodAdjust = SettingDialog.PeriodAdjust
+            _cfgCommon.StartupVersion = SettingDialog.StartupVersion
+            '_cfgCommon.StartupKey = SettingDialog.StartupKey
+            _cfgCommon.StartupFollowers = SettingDialog.StartupFollowers
+            '_cfgCommon.StartupApiModeNoWarning = SettingDialog.StartupAPImodeNoWarning
+            _cfgCommon.RestrictFavCheck = SettingDialog.RestrictFavCheck
+            _cfgCommon.AlwaysTop = SettingDialog.AlwaysTop
+            _cfgCommon.UrlConvertAuto = SettingDialog.UrlConvertAuto
+            _cfgCommon.Outputz = SettingDialog.OutputzEnabled
+            _cfgCommon.OutputzKey = SettingDialog.OutputzKey
+            _cfgCommon.OutputzUrlMode = SettingDialog.OutputzUrlmode
+            _cfgCommon.UseUnreadStyle = SettingDialog.UseUnreadStyle
+            _cfgCommon.DateTimeFormat = SettingDialog.DateTimeFormat
+            _cfgCommon.DefaultTimeOut = SettingDialog.DefaultTimeOut
+            _cfgCommon.ProtectNotInclude = SettingDialog.ProtectNotInclude
+            _cfgCommon.LimitBalloon = SettingDialog.LimitBalloon
+            _cfgCommon.AutoShortUrlFirst = SettingDialog.AutoShortUrlFirst
+            _cfgCommon.TabIconDisp = SettingDialog.TabIconDisp
+            _cfgCommon.ReplyIconState = SettingDialog.ReplyIconState
+            _cfgCommon.ReadOwnPost = SettingDialog.ReadOwnPost
+            _cfgCommon.GetFav = SettingDialog.GetFav
+            _cfgCommon.IsMonospace = SettingDialog.IsMonospace
+            If IdeographicSpaceToSpaceToolStripMenuItem IsNot Nothing AndAlso _
+               IdeographicSpaceToSpaceToolStripMenuItem.IsDisposed = False Then
+                _cfgCommon.WideSpaceConvert = Me.IdeographicSpaceToSpaceToolStripMenuItem.Checked
+            End If
+            _cfgCommon.ReadOldPosts = SettingDialog.ReadOldPosts
+            _cfgCommon.UseSsl = SettingDialog.UseSsl
+            _cfgCommon.BilyUser = SettingDialog.BitlyUser
+            _cfgCommon.BitlyPwd = SettingDialog.BitlyPwd
+            _cfgCommon.ShowGrid = SettingDialog.ShowGrid
+            _cfgCommon.UseAtIdSupplement = SettingDialog.UseAtIdSupplement
+            _cfgCommon.UseHashSupplement = SettingDialog.UseHashSupplement
+            _cfgCommon.Language = SettingDialog.Language
+
+            _cfgCommon.SortOrder = _statuses.SortOrder
+            Select Case _statuses.SortMode
+                Case IdComparerClass.ComparerMode.Nickname  'ニックネーム
+                    _cfgCommon.SortColumn = 1
+                Case IdComparerClass.ComparerMode.Data  '本文
+                    _cfgCommon.SortColumn = 2
+                Case IdComparerClass.ComparerMode.Id  '時刻=発言Id
+                    _cfgCommon.SortColumn = 3
+                Case IdComparerClass.ComparerMode.Name  '名前
+                    _cfgCommon.SortColumn = 4
+                Case IdComparerClass.ComparerMode.Source  'Source
+                    _cfgCommon.SortColumn = 7
+            End Select
 
-                _cfgCommon.Nicoms = SettingDialog.Nicoms
-                _cfgCommon.HashTags = HashMgr.HashHistories
-                If HashMgr.IsPermanent Then
-                    _cfgCommon.HashSelected = HashMgr.UseHash
-                Else
-                    _cfgCommon.HashSelected = ""
-                End If
-                _cfgCommon.HashIsHead = HashMgr.IsHead
-                _cfgCommon.HashIsPermanent = HashMgr.IsPermanent
-                '_cfgCommon.HashSelected = Me.HashSelectComboBox.Text
-
-                '                _cfgCommon.TabList.Clear()
-                '                For i As Integer = 0 To ListTab.TabPages.Count - 1
-                '                    Dim tnList As String = ListTab.TabPages(i).Text
-                '                    Dim seq As Integer = 1
-                'RETRY:
-                '                    seq += 1
-                '                    For Each tn As String In _cfgCommon.TabList
-                '                        If tn.ToLower() = tnList.ToLower() Then
-                '                            tnList += "_" + seq.ToString()
-                '                        End If
-                '                    Next
-                '                    _cfgCommon.TabList.Add(ListTab.TabPages(i).Text)
-                '                Next
-
-                _cfgCommon.Save()
-            End SyncLock
-        End If
+            _cfgCommon.Nicoms = SettingDialog.Nicoms
+            _cfgCommon.HashTags = HashMgr.HashHistories
+            If HashMgr.IsPermanent Then
+                _cfgCommon.HashSelected = HashMgr.UseHash
+            Else
+                _cfgCommon.HashSelected = ""
+            End If
+            _cfgCommon.HashIsHead = HashMgr.IsHead
+            _cfgCommon.HashIsPermanent = HashMgr.IsPermanent
+
+            _cfgCommon.Save()
+        End SyncLock
     End Sub
 
     Private Sub SaveConfigsLocal()
@@ -6385,15 +6389,20 @@ RETRY:
     Private Function UrlConvert(ByVal Converter_Type As UrlConverter) As Boolean
         'Converter_Type=Nicomsの場合は、nicovideoのみ短縮する
         Dim result As String = ""
-        Dim url As Regex = New Regex("(?<![0-9A-Za-z])(?:https?|shttp)://(?:(?:[-_.!~*'()a-zA-Z0-9;:&=+$,]|%[0-9A-Fa-f" + _
-                                     "][0-9A-Fa-f])*@)?(?:(?:[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.)" + _
-                                     "*[a-zA-Z](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.?|[0-9]+\.[0-9]+\.[0-9]+\." + _
-                                     "[0-9]+)(?::[0-9]*)?(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f]" + _
-                                     "[0-9A-Fa-f])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-" + _
-                                     "Fa-f])*)*(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f" + _
-                                     "])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)*)" + _
-                                     "*)?(?:\?(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])" + _
-                                     "*)?(?:#(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)?")
+        Dim url As Regex = New Regex("(?<before>(?:[^\/""':!=]|^|\:))" + _
+                                    "(?<url>(?<protocol>https?://|www\.)" + _
+                                    "(?<domain>(?:[\.-]|[^\p{P}])+\.[a-z]{2,}(?::[0-9]+)?)" + _
+                                    "(?<path>/[a-z0-9!*'();:&=+$/%#\[\]\-_.,~]*[a-z0-9)=#/]?)?" + _
+                                    "(?<query>\?[a-z0-9!*'();:&=+$/%#\[\]\-_.,~]*[a-z0-9_&=#])?)", RegexOptions.IgnoreCase Or RegexOptions.Compiled)
+        'Dim url As Regex = New Regex("(?<![0-9A-Za-z])(?:https?|shttp)://(?:(?:[-_.!~*'()a-zA-Z0-9;:&=+$,]|%[0-9A-Fa-f" + _
+        '                             "][0-9A-Fa-f])*@)?(?:(?:[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.)" + _
+        '                             "*[a-zA-Z](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.?|[0-9]+\.[0-9]+\.[0-9]+\." + _
+        '                             "[0-9]+)(?::[0-9]*)?(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f]" + _
+        '                             "[0-9A-Fa-f])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-" + _
+        '                             "Fa-f])*)*(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f" + _
+        '                             "])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)*)" + _
+        '                             "*)?(?:\?(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])" + _
+        '                             "*)?(?:#(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)?")
         Dim nico As Regex = New Regex("^https?://[a-z]+\.(nicovideo|niconicommons)\.jp/[a-z]+/[a-z0-9]+$")
 
         If StatusText.SelectionLength > 0 Then
@@ -6439,16 +6448,14 @@ RETRY:
                 End If
             End If
         Else
-            Dim urls As RegularExpressions.MatchCollection = Nothing
-            urls = url.Matches(StatusText.Text)
-
             ' 正規表現にマッチしたURL文字列をtinyurl化
-            For Each tmp2 As Match In urls
-                Dim tmp As String = tmp2.ToString
+            For Each mt As Match In url.Matches(StatusText.Text)
+                Dim tmp As String = mt.Result("${url}")
+                If tmp.StartsWith("w", StringComparison.OrdinalIgnoreCase) Then tmp = "http://" + tmp
                 Dim undotmp As New urlUndo
 
                 '選んだURLを選択（？）
-                StatusText.Select(StatusText.Text.IndexOf(tmp, StringComparison.Ordinal), tmp.Length)
+                StatusText.Select(StatusText.Text.IndexOf(mt.Result("${url}"), StringComparison.Ordinal), mt.Result("${url}").Length)
 
                 'nico.ms使用、nicovideoにマッチしたら変換
                 If SettingDialog.Nicoms AndAlso nico.IsMatch(tmp) Then
@@ -6469,10 +6476,10 @@ RETRY:
                 End If
 
                 If Not result = "" Then
-                    StatusText.Select(StatusText.Text.IndexOf(tmp, StringComparison.Ordinal), tmp.Length)
+                    StatusText.Select(StatusText.Text.IndexOf(mt.Result("${url}"), StringComparison.Ordinal), mt.Result("${url}").Length)
                     StatusText.SelectedText = result
                     'undoバッファにセット
-                    undotmp.Before = tmp
+                    undotmp.Before = mt.Result("${url}")
                     undotmp.After = result
 
                     If urlUndoBuffer Is Nothing Then

--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -2974,7 +2974,7 @@ Public Module Twitter
 
     Public Function MakeShortUrl(ByVal ConverterType As UrlConverter, ByVal SrcUrl As String) As String
         Dim src As String = urlEncodeMultibyteChar(SrcUrl)
-        Dim param As New SortedList(Of String, String)
+        Dim param As New Dictionary(Of String, String)
         Dim content As String = ""
 
         For Each svc As String In _ShortUrlService
@@ -3236,6 +3236,11 @@ Public Module Twitter
     Public WriteOnly Property UseSsl() As Boolean
         Set(ByVal value As Boolean)
             HttpTwitter.UseSsl = value
+            If value Then
+                _protocol = "https://"
+            Else
+                _protocol = "http://"
+            End If
         End Set
     End Property
 
@@ -3856,40 +3861,32 @@ Public Module Twitter
         'Dim retStr As String = HttpUtility.HtmlDecode(Text)
         Dim retStr As String = ""
         'uriの正規表現
-        Dim rgUrl As Regex = New Regex("(?<![0-9A-Za-z=])(?:https?|shttp|ftps?)://(?:(?:[-_.!~*'()a-zA-Z0-9;:&=+$,]|%[0-9A-Fa-f" + _
-                         "][0-9A-Fa-f])*@)?(?:(?:[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.)" + _
-                         "*[a-zA-Z](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.?|[0-9]+\.[0-9]+\.[0-9]+\." + _
-                         "[0-9]+)(?::[0-9]*)?(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f]" + _
-                         "[0-9A-Fa-f])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-" + _
-                         "Fa-f])*)*(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f" + _
-                         "])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)*)" + _
-                         "*)?(?:\?(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])" + _
-                         "*)?(?:#(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)?")
-        Dim rgUrl2 As Regex = New Regex("(?<![^\/""':!=]|^|\:)" + _
-                                    "(?:https?://|www\.)" + _
-                                    "((?:[\.-]|[^\p{IsGeneralPunctuation}])+\.[a-z]{2,}(?::[0-9]+)?)" + _
-                                    "(/[a-z0-9!*'();:&=+$/%#\[\]\-_.,~]*[a-z0-9)=#/]?)?" + _
-                                    "(\?[a-z0-9!*'();:&=+$/%#\[\]\-_.,~]*[a-z0-9_&=#])?)")
+        'Dim rgUrl As Regex = New Regex("(?<![0-9A-Za-z=])(?:https?|shttp|ftps?)://(?:(?:[-_.!~*'()a-zA-Z0-9;:&=+$,]|%[0-9A-Fa-f" + _
+        '                 "][0-9A-Fa-f])*@)?(?:(?:[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.)" + _
+        '                 "*[a-zA-Z](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?\.?|[0-9]+\.[0-9]+\.[0-9]+\." + _
+        '                 "[0-9]+)(?::[0-9]*)?(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f]" + _
+        '                 "[0-9A-Fa-f])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-" + _
+        '                 "Fa-f])*)*(?:/(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f" + _
+        '                 "])*(?:;(?:[-_.!~*'()a-zA-Z0-9:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)*)" + _
+        '                 "*)?(?:\?(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])" + _
+        '                 "*)?(?:#(?:[-_.!~*'()a-zA-Z0-9;/?:@&=+$,]|%[0-9A-Fa-f][0-9A-Fa-f])*)?")
+        Dim rgUrl As Regex = New Regex("(?<before>(?:[^\/""':!=]|^|\:))" + _
+                                    "(?<url>(?<protocol>https?://|www\.)" + _
+                                    "(?<domain>(?:[\.-]|[^\p{P}])+\.[a-z]{2,}(?::[0-9]+)?)" + _
+                                    "(?<path>/[a-z0-9!*'();:&=+$/%#\[\]\-_.,~]*[a-z0-9)=#/]?)?" + _
+                                    "(?<query>\?[a-z0-9!*'();:&=+$/%#\[\]\-_.,~]*[a-z0-9_&=#])?)", RegexOptions.IgnoreCase Or RegexOptions.Compiled)
         '絶対パス表現のUriをリンクに置換
-        retStr = rgUrl.Replace(Text, "<a href=""$&"">$&</a>")
-        'Dim mts As MatchCollection = rgUrl.Matches(retStr)
-        '''半角スペースを置換（Thanks @anis774）
-        ''Text = Text.Replace(" ", "&nbsp;")                  'HttpUtility.HtmlEncode()ではスペースが処理されない為
-
-        'For Each mt As Match In mts
-        '    Text = Text.Replace(mt.Result("$&"), "<a href=""" + mt.Result("$&") + """>" + mt.Result("$&") + "</a>")
-        'Next
-        'retStr = Text
+        retStr = rgUrl.Replace(Text, New MatchEvaluator(AddressOf AutoLinkUrl))
 
         '@返信を抽出し、@先リスト作成
         'Dim rg As New Regex("(^|[ -/:-@[-^`{-~])@([a-zA-Z0-9_]{1,20}/[a-zA-Z0-9_\-]{1,24}[a-zA-Z0-9_])")
-        Dim rg As New Regex("(^|[^a-zA-Z0-9_])[@＠]([a-zA-Z0-9_]{1,20}/[a-zA-Z0-9_\-]{1,80}[a-zA-Z0-9_])")
+        Dim rg As New Regex("(^|[^a-zA-Z0-9_])[@＠]([a-zA-Z0-9_]{1,20}/[a-zA-Z0-9_\-]{1,79}[a-zA-Z0-9_])", RegexOptions.Compiled)
         Dim m As Match = rg.Match(retStr)
         '@先をリンクに置換
         retStr = rg.Replace(retStr, "$1@<a href=""/$2"">$2</a>")
 
         'rg = New Regex("(^|[ -/:-@[-^`{-~])@([a-zA-Z0-9_]{1,20})")
-        rg = New Regex("(^|[^a-zA-Z0-9_])[@＠]([a-zA-Z0-9_]{1,20})")
+        rg = New Regex("(^|[^a-zA-Z0-9_])[@＠]([a-zA-Z0-9_]{1,20})", RegexOptions.Compiled)
         m = rg.Match(retStr)
         While m.Success
             AtList.Add(m.Result("$2").ToLower)
@@ -3900,7 +3897,7 @@ Public Module Twitter
 
         'ハッシュタグを抽出し、リンクに置換
         'Dim rgh As New Regex("(^|[ .!,\-:;<>?])#([^] !""#$%&'()*+,.:;<=>?@\-[\^`{|}~\r\n]+)")
-        Dim rgh As New Regex("(^|[^a-zA-Z0-9_/&])[#＃]([a-zA-Z0-9_]+)")
+        Dim rgh As New Regex("(^|[^a-zA-Z0-9_/&])[#＃]([a-zA-Z0-9_]+)", RegexOptions.Compiled)
         Dim mhs As MatchCollection = rgh.Matches(retStr)
         For Each mt As Match In mhs
             If Not IsNumeric(mt.Result("$2")) Then
@@ -3910,24 +3907,27 @@ Public Module Twitter
                 End SyncLock
             End If
         Next
-        retStr = rgh.Replace(retStr, "$1<a href=""" + _protocol + "twitter.com/search?q=%23$2"">#$2</a>")
-        '数字のみハッシュタグを戻す
-        Dim rgnh As New Regex("<a href=""" + _protocol + "twitter.com/search\?q=%23[0-9]+"">(#[0-9]+)</a>")
-        retStr = rgnh.Replace(retStr, "$1")
-        'If mh.Success Then
-        '    retStr = rgh.Replace(retStr, "$1<a href=""" + _protocol + "twitter.com/search?q=%23$2"">#$2</a>")
-        'End If
-        'While mh.Success
-        '    SyncLock LockObj
-        '        _hashList.Add("#" + mh.Result("$2"))
-        '    End SyncLock
-        '    mh = mh.NextMatch
-        'End While
+        retStr = rgh.Replace(retStr, New MatchEvaluator(AddressOf AutoLinkHashtag))
 
         retStr = AdjustHtml(ShortUrlResolve(PreProcessUrl(retStr))) 'IDN置換、短縮Uri解決、@リンクを相対→絶対にしてtarget属性付与
         Return retStr
     End Function
 
+    Private Function AutoLinkUrl(ByVal m As Match) As String
+        Dim sb As New StringBuilder(m.Result("${before}<a href="""))
+        If m.Result("${protocol}").StartsWith("w", StringComparison.OrdinalIgnoreCase) Then
+            sb.Append("http://")
+        End If
+        sb.Append(m.Result("${url}"">")).Append(m.Result("${url}")).Append("</a>")
+        Return sb.ToString
+    End Function
+
+    Private Function AutoLinkHashtag(ByVal m As Match) As String
+        If IsNumeric(m.Result("$2")) Then Return m.Result("$1#$2")
+        Dim sb As New StringBuilder(m.Result("$1<a href="""))
+        Return sb.Append(_protocol).Append("twitter.com/search?q=%23").Append(m.Result("$2"">#$2</a>")).ToString
+    End Function
+
     Public ReadOnly Property RemainCountApi() As Integer
         Get
             Return twCon.RemainCountApi
@@ -4044,4 +4044,5 @@ Public Module Twitter
             Return twCon.AccessTokenSecret
         End Get
     End Property
+
 End Module