From 69e1596c24a35b75e6c2dfe1dc53861133b881ab Mon Sep 17 00:00:00 2001
From: kiri_feather <kiri_feather@users.sourceforge.jp>
Date: Wed, 18 Nov 2009 04:44:37 +0000
Subject: [PATCH] =?utf8?q?0780=E3=80=80=E5=85=AC=E5=BC=8FRT=E3=82=92Fav?=
 =?utf8?q?=E3=81=A8=E8=AA=A4=E8=AA=8D=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@14 e39ad16e-3079-482e-bb30-4b4d378143b6
---
 Tween/AnalyzeKey.vb              |  6 ++--
 Tween/My Project/AssemblyInfo.vb |  2 +-
 Tween/Resources/ChangeLog.txt    |  2 ++
 Tween/Tween.vbproj               |  2 +-
 Tween/Twitter.vb                 | 59 ++++++++++++++++++++++------------------
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/Tween/AnalyzeKey.vb b/Tween/AnalyzeKey.vb
index efef4d95..5f79127f 100644
--- 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 ecf0c050..a6cda835 100644
--- 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 bae109a4..a0f8abd6 100644
--- 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 4cb39ab0..b044a7dc 100644
--- 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 7a653349..bf696edd 100644
--- 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))
-- 
2.11.0