0780 公式RTをFavと誤認する問題を修正

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

diff --git a/Tween/AnalyzeKey.vb b/Tween/AnalyzeKey.vb
index efef4d9..5f79127 100644 (file)
--- a/Tween/AnalyzeKey.vb
+++ b/Tween/AnalyzeKey.vb
@@ -20,9 +20,9 @@
     Public _parseDateTo As String = "'}"">"
     Public _getAuthKey As String = "<input name=""authenticity_token"" value="""
     Public _getAuthKeyTo As String = """"
-    Public _parseStar As String = "<a class="""
-    Public _parseStarTo As String = """"
-    Public _parseStarEmpty As String = "fav-action non-fav"
+    'Public _parseStar As String = "<a class="""
+    'Public _parseStarTo As String = """"
+    'Public _parseStarEmpty As String = "fav-action non-fav"
     Public _followerList As String = "<select id=""direct_message_user_id"" name=""user[id]""><option value="""" selected=""selected"">"
     Public _followerMbr1 As String = "/option>"
     Public _followerMbr2 As String = """>"

diff --git a/Tween/My Project/AssemblyInfo.vb b/Tween/My Project/AssemblyInfo.vb
index ecf0c05..a6cda83 100644 (file)
--- 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.7.*")> 
-<Assembly: AssemblyFileVersion("0.7.7.0")> 
+<Assembly: AssemblyFileVersion("0.7.8.0")> 
 

diff --git a/Tween/Resources/ChangeLog.txt b/Tween/Resources/ChangeLog.txt
index bae109a..a0f8abd 100644 (file)
--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -1,5 +1,7 @@
 更新履歴
 
+==== Ver 0.7.8.0(2009/11/18)
+ * Webモードで、公式ReTweetが有効になっている場合に、RT発言をFav発言と誤認する問題に対応
 ==== Ver 0.7.7.0(2009/11/15)
  * バージョンアップの確認ダイアログをキャンセルして、再度確認して表示する際に例外が発生するバグ修正
  * バージョンアップの確認ダイアログに更新内容を表示するように変更

diff --git a/Tween/Tween.vbproj b/Tween/Tween.vbproj
index 4cb39ab..b044a7d 100644 (file)
--- a/Tween/Tween.vbproj
+++ b/Tween/Tween.vbproj
@@ -339,6 +339,6 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>"C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\Bin\sgen.exe" /f /a:"$(TargetPath)"</PostBuildEvent>
+    <PostBuildEvent>"c:\Program Files\Microsoft.NET\SDK\v2.0\Bin\sgen.exe" /f /a:"$(TargetPath)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb
index 7a65334..bf696ed 100644 (file)
--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -626,23 +626,28 @@ Public Module Twitter
                     If gType = WORKERTYPE.Reply Then post.IsReply = True
 
                     'Get Fav
-                    pos1 = strPost.IndexOf(_parseStar, pos2, StringComparison.Ordinal)
-                    If pos1 > -1 Then
-                        Try
-                            pos2 = strPost.IndexOf(_parseStarTo, pos1 + _parseStar.Length, StringComparison.Ordinal)
-                            If strPost.Substring(pos1 + _parseStar.Length, pos2 - pos1 - _parseStar.Length) = _parseStarEmpty Then
-                                post.IsFav = False
-                            Else
-                                post.IsFav = True
-                            End If
-                        Catch ex As Exception
-                            _signed = False
-                            TraceOut("TM-Fav:" + strPost)
-                            Return "GetTimeline -> Err: Can't get fav status."
-                        End Try
+                    If strPost.IndexOf("class=""fav-action fav""") > -1 Then
+                        post.IsFav = True
                     Else
                         post.IsFav = False
                     End If
+                    'pos1 = strPost.IndexOf(_parseStar, pos2, StringComparison.Ordinal)
+                    'If pos1 > -1 Then
+                    '    Try
+                    '        pos2 = strPost.IndexOf(_parseStarTo, pos1 + _parseStar.Length, StringComparison.Ordinal)
+                    '        If strPost.Substring(pos1 + _parseStar.Length, pos2 - pos1 - _parseStar.Length) = _parseStarEmpty Then
+                    '            post.IsFav = False
+                    '        Else
+                    '            post.IsFav = True
+                    '        End If
+                    '    Catch ex As Exception
+                    '        _signed = False
+                    '        TraceOut("TM-Fav:" + strPost)
+                    '        Return "GetTimeline -> Err: Can't get fav status."
+                    '    End Try
+                    'Else
+                    '    post.IsFav = False
+                    'End If
 
 
                     If _endingFlag Then Return ""
@@ -2454,16 +2459,16 @@ Public Module Twitter
                                 If ln.StartsWith("      ""tagto"": """) Then
                                     _isReplyTo = ln.Substring(16, ln.Length - 1 - 16).Replace("\", "")
                                 End If
-                            Case "GetStar"
-                                If ln.StartsWith("      ""tagfrom"": """) Then
-                                    _parseStar = ln.Substring(18, ln.Length - 1 - 18).Replace("\", "")
-                                End If
-                                If ln.StartsWith("      ""tagfrom2"": """) Then
-                                    _parseStarEmpty = ln.Substring(19, ln.Length - 1 - 19).Replace("\", "")
-                                End If
-                                If ln.StartsWith("      ""tagto"": """) Then
-                                    _parseStarTo = ln.Substring(16, ln.Length - 1 - 16).Replace("\", "")
-                                End If
+                                'Case "GetStar"
+                                '    If ln.StartsWith("      ""tagfrom"": """) Then
+                                '        _parseStar = ln.Substring(18, ln.Length - 1 - 18).Replace("\", "")
+                                '    End If
+                                '    If ln.StartsWith("      ""tagfrom2"": """) Then
+                                '        _parseStarEmpty = ln.Substring(19, ln.Length - 1 - 19).Replace("\", "")
+                                '    End If
+                                '    If ln.StartsWith("      ""tagto"": """) Then
+                                '        _parseStarTo = ln.Substring(16, ln.Length - 1 - 16).Replace("\", "")
+                                '    End If
                             Case "Follower"
                                 If ln.StartsWith("      ""tagfrom"": """) Then
                                     _followerList = ln.Substring(18, ln.Length - 1 - 18).Replace("\", "")
@@ -3482,9 +3487,9 @@ Public Module Twitter
         sw.WriteLine("    Public _parseDateTo As String = " + Chr(34) + _parseDateTo.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _getAuthKey As String = " + Chr(34) + _getAuthKey.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _getAuthKeyTo As String = " + Chr(34) + _getAuthKeyTo.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
-        sw.WriteLine("    Public _parseStar As String = " + Chr(34) + _parseStar.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
-        sw.WriteLine("    Public _parseStarTo As String = " + Chr(34) + _parseStarTo.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
-        sw.WriteLine("    Public _parseStarEmpty As String = " + Chr(34) + _parseStarEmpty.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
+        'sw.WriteLine("    Public _parseStar As String = " + Chr(34) + _parseStar.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
+        'sw.WriteLine("    Public _parseStarTo As String = " + Chr(34) + _parseStarTo.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
+        'sw.WriteLine("    Public _parseStarEmpty As String = " + Chr(34) + _parseStarEmpty.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _followerList As String = " + Chr(34) + _followerList.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _followerMbr1 As String = " + Chr(34) + _followerMbr1.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _followerMbr2 As String = " + Chr(34) + _followerMbr2.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))