提交: 7f803eae20d8c19c0388de2ca2e2170be05c0883 - open_tween (git)

dev

Commit MetaInfo

• 修訂: 7f803eae20d8c19c0388de2ca2e2170be05c0883 (tree)
• 時間: 2012-02-18 23:19:53
• 作者: kiri_feather <kiri_feather@user...>
• Commiter: Kimura Youichi

Log Message

1070リリース
UAC不要な環境で、自動バージョンアップ後Tweenが起動してこないバグ修正
非公式RTで正規表現でのReplaceポカミス修正
投稿欄の文字数カウントで一部URLの認識バグ修正
Fav時のエラーメッセージがFavQueueのままになっていたので戻し

Change Summary

• modified: Tween/My Project/AssemblyInfo.vb
• modified: Tween/Resources/ChangeLog.txt
• modified: Tween/Tween.vb
• modified: Tween/Twitter.vb
• modified: TweenUp/Form1.vb

差異

--- 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("1.0.6.0")> 
+<Assembly: AssemblyFileVersion("1.0.7.0")> 
 

--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -1,5 +1,9 @@
 更新履歴
 
+==== Ver 1.0.7.0(2011/9/11)
+ * FIX: 非公式RT・QTで元発言中URLが{$title}となってしまうバグ修正
+ * FIX: 一部URLのt.co換算文字カウントが正しくなかったのを修正
+ * FIX: Fav失敗時のメッセージを一部修正
 ==== Ver 1.0.6.0(2011/9/11)
  * FIX: 起動するたびに発言詳細、投稿入力欄が小さくなってしまうバグ修正
  * FIX: 非公式RT、QTで、元発言中のURLが表示通りの省略表記のまま発言欄にコピーされるバグ修正

--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -8863,7 +8863,7 @@ RETRY:
         'Else
         '    status = Regex.Replace(status, "<a target=""_self"" href=""(?<url>[^""]+)""[^>]*>(?<link>(https?|shttp|ftps?)://[^<]+)</a>", "${link}")
         'End If
-        status = Regex.Replace(status, "<a target=""_self"" href=""(?<url>[^""]+)"" title=""(?<title>[^""]+)""[^>]*>(?<link>[^<]+)</a>", "{$title}")
+        status = Regex.Replace(status, "<a target=""_self"" href=""(?<url>[^""]+)"" title=""(?<title>[^""]+)""[^>]*>(?<link>[^<]+)</a>", "${title}")
 
         'その他のリンク(@IDなど)を置き換える
         status = Regex.Replace(status, "@<a target=""_self"" href=""https?://twitter.com/(#!/)?(?<url>[^""]+)""[^>]*>(?<link>[^<]+)</a>", "@${url}")

--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -52,7 +52,7 @@ Public Class Twitter
     Public Const HASHTAG As String = "(" + HASHTAG_BOUNDARY + ")(#|＃)(" + HASHTAG_ALPHANUMERIC + "*" + HASHTAG_ALPHA + HASHTAG_ALPHANUMERIC + "*)(?=" + HASHTAG_TERMINATOR + "|" + HASHTAG_BOUNDARY + ")"
     'URL正規表現
     Private Const url_valid_domain As String = "(?<domain>(?:[^\p{P}\s][\.\-_](?=[^\p{P}\s])|[^\p{P}\s]){1,}\.[a-z]{2,}(?::[0-9]+)?)"
-    Private Const url_valid_general_path_chars As String = "[a-z0-9!*';:=+$/%#\[\]\-_,~]"
+    Private Const url_valid_general_path_chars As String = "[a-z0-9!*';:=+$/%#\[\]\-_&,~]"
     Private Const url_balance_parens As String = "(?:\(" + url_valid_general_path_chars + "+\))"
     Private Const url_valid_url_path_ending_chars As String = "(?:[a-z0-9=_#/\-\+]+|" + url_balance_parens + ")"
     Private Const pth As String = "(?:" + url_balance_parens +
@@ -1107,7 +1107,8 @@ Public Class Twitter
             res = twCon.CreateFavorites(id, content)
         Catch ex As Exception
             'Me.favQueue.Add(id)
-            Return "Err:->FavoriteQueue:" + ex.Message + "(" + GetCurrentMethod.Name + ")"
+            'Return "Err:->FavoriteQueue:" + ex.Message + "(" + GetCurrentMethod.Name + ")"
+            Return "Err:" + ex.Message + "(" + GetCurrentMethod.Name + ")"
         End Try
 
         Select Case res
@@ -1123,15 +1124,15 @@ Public Class Twitter
                 If String.IsNullOrEmpty(errMsg) Then
                     Return "Err:Forbidden(" + GetCurrentMethod.Name + ")"
                 Else
-                    If errMsg.Contains("It's great that you like so many updates") Then
-                        'Me.favQueue.Add(id)
-                        Return "Err:->FavoriteQueue:" + errMsg
-                    End If
+                    'If errMsg.Contains("It's great that you like so many updates") Then
+                    '    'Me.favQueue.Add(id)
+                    '    Return "Err:->FavoriteQueue:" + errMsg
+                    'End If
                     Return "Err:" + errMsg
                 End If
-            Case HttpStatusCode.BadGateway, HttpStatusCode.ServiceUnavailable, HttpStatusCode.InternalServerError, HttpStatusCode.RequestTimeout
-                'Me.favQueue.Add(id)
-                Return "Err:->FavoriteQueue:" + res.ToString + "(" + GetCurrentMethod.Name + ")"
+                'Case HttpStatusCode.BadGateway, HttpStatusCode.ServiceUnavailable, HttpStatusCode.InternalServerError, HttpStatusCode.RequestTimeout
+                '    'Me.favQueue.Add(id)
+                '    Return "Err:->FavoriteQueue:" + res.ToString + "(" + GetCurrentMethod.Name + ")"
             Case Else
                 Return "Err:" + res.ToString + "(" + GetCurrentMethod.Name + ")"
         End Select

--- a/TweenUp/Form1.vb
+++ b/TweenUp/Form1.vb
@@ -253,6 +253,10 @@ Public Class Form1
         ' 「新しいTweenを起動しています」
         BackgroundWorker1.ReportProgress(0, userState:=My.Resources.ProgressExecuteTween)
 
+        If My.Application.CommandLineArgs.Count = 1 Then
+            Process.Start(Path.Combine(TWEENEXEPATH, My.Resources.FilenameTweenExe))
+        End If
+
         'Process.Start(Path.Combine(TWEENEXEPATH, My.Resources.FilenameTweenExe))
 
     End Sub