rev1300の変更をユーザー情報ダイアログにも適用

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

diff --git a/Tween/ShowUserInfo.vb b/Tween/ShowUserInfo.vb
index 037b55c..ecb2886 100644 (file)
--- a/Tween/ShowUserInfo.vb
+++ b/Tween/ShowUserInfo.vb
@@ -337,14 +337,13 @@ Public Class ShowUserInfo
                 MyOwner.HashMgr.AddHashToHistory(hash.Trim, False)
                 MyOwner.AddNewTabForSearch(hash)
                 Exit Sub
-            ElseIf e.Url.AbsoluteUri.StartsWith("http://twitter.com/") Then
-                MyOwner.AddNewTabForUserTimeline(e.Url.AbsoluteUri.Remove(0, "http://twitter.com/".Length))
-                Exit Sub
-            ElseIf e.Url.AbsoluteUri.StartsWith("https://twitter.com/") Then
-                MyOwner.AddNewTabForUserTimeline(e.Url.AbsoluteUri.Remove(0, "https://twitter.com/".Length))
-                Exit Sub
             Else
-                MyOwner.OpenUriAsync(e.Url.OriginalString)
+                Dim m As Match = Regex.Match(e.Url.AbsoluteUri, "^https?://twitter.com/(#!/)?(?<name>[a-zA-Z0-9_]+)$")
+                If m.Success AndAlso MyOwner.IsTwitterId(m.Result("${name}")) Then
+                    MyOwner.AddNewTabForUserTimeline(m.Result("${name}"))
+                Else
+                    MyOwner.OpenUriAsync(e.Url.OriginalString)
+                End If
             End If
         End If
     End Sub

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 30a82ea..f5af2e2 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -9059,7 +9059,7 @@ RETRY:
     ' TwitterIDでない固定文字列を調べる（文字列検証のみ　実際に取得はしない）
     ' URLから切り出した文字列を渡す
 
-    Private Function IsTwitterId(ByVal name As String) As Boolean
+    Public Function IsTwitterId(ByVal name As String) As Boolean
         Return Not Regex.Match(name, "^(about|jobs|tos|privacy)$").Success
     End Function