Changeset 24542

Timestamp:

11/21/08 09:14:29 (7 weeks ago)

Author:

kiri_feather

Message:

DMが取得できない場合がある問題を修正
DMでスクリーンネーム、プロテクト状態を取得する処理追加

Location:

lang/vb2005/Tween/Tween

Files:

• AnalyzeKey.vb (modified) (1 diff)
• My Project/AssemblyInfo.vb (modified) (1 diff)
• Resources/ChangeLog.txt (modified) (1 diff)
• Tween.vb (modified) (3 diffs)
• Twitter.vb (modified) (4 diffs)

lang/vb2005/Tween/Tween/AnalyzeKey.vb

@@ -16 +16 @@
     Public _parseDM1 As String = "<span class=""entry-content"">"
     Public _parseDM2 As String = "</span>"
+    Public _parseDM11 As String = "<span class=""protected"">"
     Public _parseDate As String = "<span class=""published"" title="""
     Public _parseDateTo As String = """"

lang/vb2005/Tween/Tween/My Project/AssemblyInfo.vb

@@ -55 +55 @@
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.1.3.0")> 
-<Assembly: AssemblyFileVersion("0.1.3.0")> 
+<Assembly: AssemblyVersion("0.1.3.1")> 
+<Assembly: AssemblyFileVersion("0.1.3.1")> 
 

lang/vb2005/Tween/Tween/Resources/ChangeLog.txt

@@ -1 +1 @@
 更新履歴
 
+***Ver0.1.3.1(Trunk)
+-DMが取れないケースに対応
+-DMで、プロテクト状態取得、スクリーンネーム取得に対応
 ***Ver0.1.3.0(2008/11/20)
 -詳細欄のID/日時部で、余白があるにもかかわらず、ID表示が折り返されてしまう問題を改善

lang/vb2005/Tween/Tween/Tween.vb

@@ -2472 +2472 @@
         Dim _onewaylove As Boolean
         Dim nm As String = ""
+        Dim Protect As String
 
         Dim _item As ListViewItem
@@ -2516 +2517 @@
             _onewaylove = Not IsReceive
             lItem = tlList(cnt)
-            Dim sItem() As String = {"", lItem.Nick, lItem.Data, lItem.PDate.ToString("yy-MM-dd HH:mm:ss"), lItem.Name, lItem.Id, lItem.ImageUrl, lItem.OrgData, _readed.ToString, _fav.ToString, _onewaylove.ToString, "False"}
+            If lItem.Protect = True Then
+                Protect = "Ю"
+            Else
+                Protect = ""
+            End If
+            Dim sItem() As String = {Protect, lItem.Nick, lItem.Data, lItem.PDate.ToString("yy-MM-dd HH:mm:ss"), lItem.Name, lItem.Id, lItem.ImageUrl, lItem.OrgData, _readed.ToString, _fav.ToString, _onewaylove.ToString, "False"}
             Dim lvItem As New ListViewItem(sItem)
             lvItem.Font = _fntReaded
@@ -4703 +4709 @@
         NameLabel.Text = _item.SubItems(1).Text + "/" + _item.SubItems(4).Text
         UserPicture.Image = TIconList.Images(_item.SubItems(6).Text)
-        If ListTab.SelectedTab.Text = "Direct" Then
-            NameLabel.Text = _item.SubItems(1).Text
-        Else
-            NameLabel.Text = _item.SubItems(1).Text + "/" + _item.SubItems(4).Text
-        End If
+        NameLabel.Text = _item.SubItems(1).Text + "/" + _item.SubItems(4).Text
 
         NameLabel.ForeColor = System.Drawing.SystemColors.ControlText

lang/vb2005/Tween/Tween/Twitter.vb

@@ -834 +834 @@
 
                 'Get Nick
-                'pos1 = strPost.IndexOf(_parseNick, pos2)
-                'pos2 = strPost.IndexOf("""", pos1 + _parseNick.Length)
-                'lItem.Nick = HttpUtility.HtmlDecode(strPost.Substring(pos1 + _parseNick.Length, pos2 - pos1 - _parseNick.Length))
-                lItem.Nick = lItem.Name
+                Try
+                    pos1 = strPost.IndexOf(_parseNick, pos2)
+                    pos2 = strPost.IndexOf(_parseNickTo, pos1 + _parseNick.Length)
+                    lItem.Nick = HttpUtility.HtmlDecode(strPost.Substring(pos1 + _parseNick.Length, pos2 - pos1 - _parseNick.Length))
+                Catch ex As Exception
+                    _signed = False
+                    Return "GetDirectMessage -> Err: Can't get Nick."
+                End Try
 
                 If links.Contains(lItem.Id) Then
@@ -854 +858 @@
                     End Try
 
+                    'Get Protect
+                    Try
+                        pos1 = strPost.IndexOf(_isProtect, pos2)
+                        If pos1 > -1 Then lItem.Protect = True
+                    Catch ex As Exception
+                        _signed = False
+                        Return "GetDirectMessage -> Err: Can't get Protect"
+                    End Try
+
                     'Get Message
                     Try
                         pos1 = strPost.IndexOf(_parseDM1, pos2)
-                        pos2 = strPost.IndexOf(_parseDM2, pos1)
-                        orgData = strPost.Substring(pos1 + _parseDM1.Length, pos2 - pos1 - _parseDM1.Length).Trim()
+                        If pos1 > -1 Then
+                            pos2 = strPost.IndexOf(_parseDM2, pos1)
+                            orgData = strPost.Substring(pos1 + _parseDM1.Length, pos2 - pos1 - _parseDM1.Length).Trim()
+                        Else
+                            pos1 = strPost.IndexOf(_parseDM11, pos2)
+                            orgData = strPost.Substring(pos1 + _parseDM11.Length, pos2 - pos1 - _parseDM11.Length).Trim()
+                        End If
                         orgData = orgData.Replace("<3", "♡")
                     Catch ex As Exception
@@ -1662 +1680 @@
                                     _parseDM1 = ln.Substring(18, ln.Length - 1 - 18).Replace("\", "")
                                 End If
+                                If ln.StartsWith("      ""tagfrom2"": """) Then
+                                    _parseDM11 = ln.Substring(19, ln.Length - 1 - 19).Replace("\", "")
+                                End If
                                 If ln.StartsWith("      ""tagto"": """) Then
                                     _parseDM2 = ln.Substring(16, ln.Length - 1 - 16).Replace("\", "")
@@ -1900 +1921 @@
         sw.WriteLine("    Public _parseMsg2 As String = " + Chr(34) + _parseMsg2.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _parseDM1 As String = " + Chr(34) + _parseDM1.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
+        sw.WriteLine("    Public _parseDM11 As String = " + Chr(34) + _parseDM11.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _parseDM2 As String = " + Chr(34) + _parseDM2.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))
         sw.WriteLine("    Public _parseDate As String = " + Chr(34) + _parseDate.Replace(Chr(34), Chr(34) + Chr(34)) + Chr(34))