[Tween-svn] [1338] ・PostClassの一部メンバをリネーム

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 1月 10日 (月) 19:05:39 JST


Revision: 1338
          http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1338
Author:   syo68k
Date:     2011-01-10 19:05:39 +0900 (Mon, 10 Jan 2011)

Log Message:
-----------
・PostClassの一部メンバをリネーム
・PostClassへInReplyToUserIdを追加
・リネーム、メンバ追加にあわせてドキュメント修正

Modified Paths:
--------------
    branches/query/Tween/DynamicQuery.txt
    branches/query/Tween/MyLists.vb
    branches/query/Tween/StatusDictionary.vb
    branches/query/Tween/Tween.vb
    branches/query/Tween/Twitter.vb


-------------- next part --------------
Modified: branches/query/Tween/DynamicQuery.txt
===================================================================
(Binary files differ)

Modified: branches/query/Tween/MyLists.vb
===================================================================
--- branches/query/Tween/MyLists.vb	2011-01-10 06:49:05 UTC (rev 1337)
+++ branches/query/Tween/MyLists.vb	2011-01-10 10:05:39 UTC (rev 1338)
@@ -50,8 +50,8 @@
             Dim listNewistPostCreatedAt As DateTime = DateTime.MinValue
 
             For Each post As PostClass In listPost
-                If post.Uid > 0 AndAlso Not listPostUserIDs.Contains(post.Uid) Then
-                    listPostUserIDs.Add(post.Uid)
+                If post.UserId > 0 AndAlso Not listPostUserIDs.Contains(post.UserId) Then
+                    listPostUserIDs.Add(post.UserId)
                 End If
                 If post.Name IsNot Nothing AndAlso Not listPostUserNames.Contains(post.Name) Then
                     listPostUserNames.Add(post.Name)

Modified: branches/query/Tween/StatusDictionary.vb
===================================================================
--- branches/query/Tween/StatusDictionary.vb	2011-01-10 06:49:05 UTC (rev 1337)
+++ branches/query/Tween/StatusDictionary.vb	2011-01-10 10:05:39 UTC (rev 1338)
@@ -48,19 +48,20 @@
     Private _IsOWL As Boolean
     Private _IsMark As Boolean
     Private _InReplyToUser As String
-    Private _InReplyToId As Long
+    Private _InReplyToStatusId As Long
     Private _Source As String
     Private _SourceHtml As String
     Private _ReplyToList As New List(Of String)
     Private _IsMe As Boolean
     Private _IsDm As Boolean
     Private _statuses As Statuses = Statuses.None
-    Private _Uid As Long
+    Private _UserId As Long
     Private _FilterHit As Boolean
     Private _RetweetedBy As String = ""
     Private _RetweetedId As Long = 0
-    Private _searchTabName As String = ""
-    Private _isDeleted As Boolean = False
+    Private _SearchTabName As String = ""
+    Private _IsDeleted As Boolean = False
+    Private _InReplyToUserId As Long = 0
 
     <FlagsAttribute()> _
     Private Enum Statuses
@@ -86,13 +87,13 @@
             ByVal IsOwl As Boolean, _
             ByVal IsMark As Boolean, _
             ByVal InReplyToUser As String, _
-            ByVal InReplyToId As Long, _
+            ByVal InReplyToStatusId As Long, _
             ByVal Source As String, _
             ByVal SourceHtml As String, _
             ByVal ReplyToList As List(Of String), _
             ByVal IsMe As Boolean, _
             ByVal IsDm As Boolean, _
-            ByVal Uid As Long, _
+            ByVal userId As Long, _
             ByVal FilterHit As Boolean, _
             ByVal RetweetedBy As String, _
             ByVal RetweetedId As Long)
@@ -111,13 +112,13 @@
         _IsOWL = IsOwl
         _IsMark = IsMark
         _InReplyToUser = InReplyToUser
-        _InReplyToId = InReplyToId
+        _InReplyToStatusId = InReplyToStatusId
         _Source = Source
         _SourceHtml = SourceHtml
         _ReplyToList = ReplyToList
         _IsMe = IsMe
         _IsDm = IsDm
-        _Uid = Uid
+        _UserId = userId
         _FilterHit = FilterHit
         _RetweetedBy = RetweetedBy
         _RetweetedId = RetweetedId
@@ -268,14 +269,23 @@
             _InReplyToUser = value
         End Set
     End Property
-    Public Property InReplyToId() As Long
+    Public Property InReplyToStatusId() As Long
         Get
-            Return _InReplyToId
+            Return _InReplyToStatusId
         End Get
         Set(ByVal value As Long)
-            _InReplyToId = value
+            _InReplyToStatusId = value
         End Set
     End Property
+
+    Public Property InReplyToUserId() As Long
+        Get
+            Return _inReplyToUserId
+        End Get
+        Set(ByVal value As Long)
+            _inReplyToUserId = value
+        End Set
+    End Property
     Public Property Source() As String
         Get
             Return _Source
@@ -321,12 +331,12 @@
     '        Return _statuses
     '    End Get
     'End Property
-    Public Property Uid() As Long
+    Public Property UserId() As Long
         Get
-            Return _Uid
+            Return _UserId
         End Get
         Set(ByVal value As Long)
-            _Uid = value
+            _UserId = value
         End Set
     End Property
     Public Property FilterHit() As Boolean
@@ -355,24 +365,25 @@
     End Property
     Public Property RelTabName() As String
         Get
-            Return _searchTabName
+            Return _SearchTabName
         End Get
         Set(ByVal value As String)
-            _searchTabName = value
+            _SearchTabName = value
         End Set
     End Property
     Public Property IsDeleted As Boolean
         Get
-            Return _isDeleted
+            Return _IsDeleted
         End Get
         Set(ByVal value As Boolean)
             If value Then
-                Me.InReplyToId = 0
+                Me.InReplyToStatusId = 0
                 Me.InReplyToUser = ""
+                Me.InReplyToUserId = 0
                 Me.IsReply = False
                 Me.ReplyToList = New List(Of String)
             End If
-            _isDeleted = value
+            _IsDeleted = value
         End Set
     End Property
     Public Property FavoritedCount As Integer
@@ -1023,13 +1034,13 @@
                         item.IsOwl, _
                         item.IsMark, _
                         item.InReplyToUser, _
-                        item.InReplyToId, _
+                        item.InReplyToStatusId, _
                         item.Source, _
                         item.SourceHtml, _
                         item.ReplyToList, _
                         item.IsMe, _
                         item.IsDm, _
-                        item.Uid, _
+                        item.UserId, _
                         item.FilterHit, _
                         "", _
                         0 _
@@ -1468,11 +1479,11 @@
         SyncLock LockObj
             If follower.Count > 0 Then
                 For Each post As PostClass In _statuses.Values
-                    'If post.Uid = 0 OrElse post.IsDm Then Continue For
+                    'If post.UserId = 0 OrElse post.IsDm Then Continue For
                     If post.IsMe Then
                         post.IsOwl = False
                     Else
-                        post.IsOwl = Not follower.Contains(post.Uid)
+                        post.IsOwl = Not follower.Contains(post.UserId)
                     End If
                 Next
             Else

Modified: branches/query/Tween/Tween.vb
===================================================================
--- branches/query/Tween/Tween.vb	2011-01-10 06:49:05 UTC (rev 1337)
+++ branches/query/Tween/Tween.vb	2011-01-10 10:05:39 UTC (rev 1338)
@@ -1439,7 +1439,7 @@
 
     Private Sub NotifyNewPosts(ByVal notifyPosts() As PostClass, ByVal soundFile As String, ByVal addCount As Integer, ByVal newMentions As Boolean)
         If notifyPosts IsNot Nothing AndAlso _
-            notifyPosts.All(Function(post) post.Uid.ToString() = tw.UserIdNo OrElse post.Name = tw.Username) Then
+            notifyPosts.All(Function(post) post.UserId.ToString() = tw.UserIdNo OrElse post.Name = tw.Username) Then
             Exit Sub
         End If
 
@@ -1620,7 +1620,7 @@
 
     Private Function JudgeColor(ByVal BasePost As PostClass, ByVal TargetPost As PostClass) As Color
         Dim cl As Color
-        If TargetPost.Id = BasePost.InReplyToId Then
+        If TargetPost.Id = BasePost.InReplyToStatusId Then
             '@先
             cl = _clAtTo
         ElseIf TargetPost.IsMe Then
@@ -2769,7 +2769,7 @@
         End If
         If _statuses.Tabs(ListTab.SelectedTab.Text).TabType = TabUsageType.PublicSearch _
                             OrElse Not Me.ExistCurrentPost _
-                            OrElse Not _curPost.InReplyToId > 0 Then
+                            OrElse Not _curPost.InReplyToStatusId > 0 Then
             RepliedStatusOpenMenuItem.Enabled = False
         Else
             RepliedStatusOpenMenuItem.Enabled = True
@@ -3998,7 +3998,7 @@
         Dim mk As String = ""
         If Post.IsMark Then mk += "♪"
         If Post.IsProtect Then mk += "Ю"
-        If Post.InReplyToId > 0 Then mk += "⇒"
+        If Post.InReplyToStatusId > 0 Then mk += "⇒"
         If Post.FavoritedCount > 0 Then mk += "+" + Post.FavoritedCount.ToString
         Dim itm As ImageListViewItem
         If Post.RetweetedId = 0 Then
@@ -4734,7 +4734,7 @@
             sb.AppendFormat("Id             : {0}<br>", _curPost.Id.ToString)
             'sb.AppendFormat("ImageIndex     : {0}<br>", _curPost.ImageIndex.ToString)
             sb.AppendFormat("ImageUrl       : {0}<br>", _curPost.ImageUrl)
-            sb.AppendFormat("InReplyToId    : {0}<br>", _curPost.InReplyToId.ToString)
+            sb.AppendFormat("InReplyToStatusId    : {0}<br>", _curPost.InReplyToStatusId.ToString)
             sb.AppendFormat("InReplyToUser  : {0}<br>", _curPost.InReplyToUser)
             sb.AppendFormat("IsDM           : {0}<br>", _curPost.IsDm.ToString)
             sb.AppendFormat("IsFav          : {0}<br>", _curPost.IsFav.ToString)
@@ -4755,7 +4755,7 @@
             sb.AppendFormat("(PlainText)    : <xmp>{0}</xmp><br>", _curPost.OriginalData)
             sb.AppendFormat("PDate          : {0}<br>", _curPost.PDate.ToString)
             sb.AppendFormat("Source         : {0}<br>", _curPost.Source)
-            sb.AppendFormat("Uid            : {0}<br>", _curPost.Uid)
+            sb.AppendFormat("UserId            : {0}<br>", _curPost.UserId)
             sb.AppendFormat("FilterHit      : {0}<br>", _curPost.FilterHit)
             sb.AppendFormat("RetweetedBy    : {0}<br>", _curPost.RetweetedBy)
             sb.AppendFormat("RetweetedId    : {0}<br>", _curPost.RetweetedId)
@@ -5568,11 +5568,11 @@
 
         Dim curTabClass As TabClass = _statuses.Tabs(_curTab.Text)
 
-        If curTabClass.TabType = TabUsageType.PublicSearch AndAlso _curPost.InReplyToId = 0 AndAlso _curPost.Data.Contains("@") Then
+        If curTabClass.TabType = TabUsageType.PublicSearch AndAlso _curPost.InReplyToStatusId = 0 AndAlso _curPost.Data.Contains("@") Then
             Dim post As PostClass = Nothing
             Dim r As String = tw.GetStatusApi(False, _curPost.Id, post)
             If r = "" AndAlso post IsNot Nothing Then
-                _curPost.InReplyToId = post.InReplyToId
+                _curPost.InReplyToStatusId = post.InReplyToStatusId
                 _curPost.InReplyToUser = post.InReplyToUser
                 _curPost.IsReply = post.IsReply
                 _itemCache = Nothing
@@ -5582,16 +5582,16 @@
             End If
         End If
 
-        If Not (Me.ExistCurrentPost AndAlso _curPost.InReplyToUser IsNot Nothing AndAlso _curPost.InReplyToId > 0) Then Return
+        If Not (Me.ExistCurrentPost AndAlso _curPost.InReplyToUser IsNot Nothing AndAlso _curPost.InReplyToStatusId > 0) Then Return
 
         If replyChains Is Nothing OrElse (replyChains.Count > 0 AndAlso replyChains.Peek().InReplyToId <> _curPost.Id) Then
             replyChains = New Stack(Of ReplyChain)
         End If
-        replyChains.Push(New ReplyChain(_curPost.Id, _curPost.InReplyToId, _curTab))
+        replyChains.Push(New ReplyChain(_curPost.Id, _curPost.InReplyToStatusId, _curTab))
 
         Dim inReplyToIndex As Integer
         Dim inReplyToTabName As String
-        Dim inReplyToId As Long = _curPost.InReplyToId
+        Dim inReplyToId As Long = _curPost.InReplyToStatusId
         Dim inReplyToUser As String = _curPost.InReplyToUser
         Dim curTabPosts As Dictionary(Of Long, PostClass)
 
@@ -5615,7 +5615,7 @@
             inReplyToIndex = inReplyPost.Index
         Catch ex As InvalidOperationException
             Dim post As PostClass = Nothing
-            Dim r As String = tw.GetStatusApi(False, _curPost.InReplyToId, post)
+            Dim r As String = tw.GetStatusApi(False, _curPost.InReplyToStatusId, post)
             If r = "" AndAlso post IsNot Nothing Then
                 post.IsRead = True
                 _statuses.AddPost(post)
@@ -5655,10 +5655,10 @@
         Dim curTabPosts As Dictionary(Of Long, PostClass) = DirectCast(IIf(curTabClass.IsInnerStorageTabType, curTabClass.Posts, _statuses.Posts), Dictionary(Of Long, PostClass))
 
         If parallel Then
-            If _curPost.InReplyToId <> 0 Then
+            If _curPost.InReplyToStatusId <> 0 Then
                 Dim posts = From t In _statuses.Tabs
                             From p In DirectCast(IIf(t.Value.IsInnerStorageTabType, t.Value.Posts, _statuses.Posts), Dictionary(Of Long, PostClass))
-                            Where p.Value.Id <> _curPost.Id AndAlso p.Value.InReplyToId = _curPost.InReplyToId
+                            Where p.Value.Id <> _curPost.Id AndAlso p.Value.InReplyToStatusId = _curPost.InReplyToStatusId
                             Let indexOf = t.Value.IndexOf(p.Value.Id)
                             Where indexOf > -1
                             Order By IIf(isForward, indexOf, indexOf * -1)
@@ -5687,7 +5687,7 @@
             If replyChains Is Nothing OrElse replyChains.Count < 1 Then
                 Dim posts = From t In _statuses.Tabs
                             From p In DirectCast(IIf(t.Value.IsInnerStorageTabType, t.Value.Posts, _statuses.Posts), Dictionary(Of Long, PostClass))
-                            Where p.Value.InReplyToId = _curPost.Id
+                            Where p.Value.InReplyToStatusId = _curPost.Id
                             Let indexOf = t.Value.IndexOf(p.Value.Id)
                             Where indexOf > -1
                             Order By indexOf
@@ -7778,22 +7778,22 @@
     End Sub
 
     Private Sub doRepliedStatusOpen()
-        If Me.ExistCurrentPost AndAlso _curPost.InReplyToUser IsNot Nothing AndAlso _curPost.InReplyToId > 0 Then
+        If Me.ExistCurrentPost AndAlso _curPost.InReplyToUser IsNot Nothing AndAlso _curPost.InReplyToStatusId > 0 Then
             If My.Computer.Keyboard.ShiftKeyDown Then
-                OpenUriAsync("http://twitter.com/" + _curPost.InReplyToUser + "/status/" + _curPost.InReplyToId.ToString())
+                OpenUriAsync("http://twitter.com/" + _curPost.InReplyToUser + "/status/" + _curPost.InReplyToStatusId.ToString())
                 Exit Sub
             End If
-            If _statuses.ContainsKey(_curPost.InReplyToId) Then
-                Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToId)
+            If _statuses.ContainsKey(_curPost.InReplyToStatusId) Then
+                Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToStatusId)
                 MessageBox.Show(repPost.Name + " / " + repPost.Nickname + "   (" + repPost.PDate.ToString() + ")" + Environment.NewLine + repPost.Data)
             Else
                 For Each tb As TabClass In _statuses.GetTabsByType(TabUsageType.Lists Or TabUsageType.PublicSearch)
-                    If tb Is Nothing OrElse Not tb.Contains(_curPost.InReplyToId) Then Exit For
-                    Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToId)
+                    If tb Is Nothing OrElse Not tb.Contains(_curPost.InReplyToStatusId) Then Exit For
+                    Dim repPost As PostClass = _statuses.Item(_curPost.InReplyToStatusId)
                     MessageBox.Show(repPost.Name + " / " + repPost.Nickname + "   (" + repPost.PDate.ToString() + ")" + Environment.NewLine + repPost.Data)
                     Exit Sub
                 Next
-                OpenUriAsync("http://twitter.com/" + _curPost.InReplyToUser + "/status/" + _curPost.InReplyToId.ToString())
+                OpenUriAsync("http://twitter.com/" + _curPost.InReplyToUser + "/status/" + _curPost.InReplyToStatusId.ToString())
             End If
         End If
     End Sub
@@ -9502,7 +9502,7 @@
         End If
         If _statuses.Tabs(ListTab.SelectedTab.Text).TabType = TabUsageType.PublicSearch _
                             OrElse Not Me.ExistCurrentPost _
-                            OrElse Not _curPost.InReplyToId > 0 Then
+                            OrElse Not _curPost.InReplyToStatusId > 0 Then
             OpenRepSourceOpMenuItem.Enabled = False
         Else
             OpenRepSourceOpMenuItem.Enabled = True

Modified: branches/query/Tween/Twitter.vb
===================================================================
--- branches/query/Tween/Twitter.vb	2011-01-10 06:49:05 UTC (rev 1337)
+++ branches/query/Tween/Twitter.vb	2011-01-10 10:05:39 UTC (rev 1338)
@@ -1459,14 +1459,15 @@
             'Source取得(htmlの場合は、中身を取り出し)
             post.Source = retweeted.Source
             'Reply先
-            Long.TryParse(retweeted.InReplyToStatusId, post.InReplyToId)
+            Long.TryParse(retweeted.InReplyToStatusId, post.InReplyToStatusId)
             post.InReplyToUser = retweeted.InReplyToScreenName
+            Long.TryParse(status.InReplyToUserId, post.InReplyToUserId)
             post.IsFav = TabInformations.GetInstance.GetTabByType(TabUsageType.Favorites).Contains(post.RetweetedId)
 
             '以下、ユーザー情報
             Dim user As TwitterDataModel.User = retweeted.User
 
-            post.Uid = user.Id
+            post.UserId = user.Id
             post.Name = user.ScreenName
             post.Nickname = user.Name
             post.ImageUrl = user.ProfileImageUrl
@@ -1481,21 +1482,22 @@
             post.Data = status.Text
             'Source取得(htmlの場合は、中身を取り出し)
             post.Source = status.Source
-            Long.TryParse(status.InReplyToStatusId, post.InReplyToId)
+            Long.TryParse(status.InReplyToStatusId, post.InReplyToStatusId)
             post.InReplyToUser = status.InReplyToScreenName
+            Long.TryParse(status.InReplyToUserId, post.InReplyToUserId)
 
             post.IsFav = status.Favorited
 
             '以下、ユーザー情報
             Dim user As TwitterDataModel.User = status.User
 
-            post.Uid = user.Id
+            post.UserId = user.Id
             post.Name = user.ScreenName
             post.Nickname = user.Name
             post.ImageUrl = user.ProfileImageUrl
             post.IsProtect = user.Protected
             post.IsMe = post.Name.ToLower.Equals(_uid)
-            If post.IsMe Then _UserIdNo = post.Uid.ToString
+            If post.IsMe Then _UserIdNo = post.UserId.ToString
         End If
         'HTMLに整形
         post.OriginalData = CreateHtmlAnchor(post.Data, post.ReplyToList)
@@ -1510,7 +1512,7 @@
         If post.IsMe Then
             post.IsOwl = False
         Else
-            If followerId.Count > 0 Then post.IsOwl = Not followerId.Contains(post.Uid)
+            If followerId.Count > 0 Then post.IsOwl = Not followerId.Contains(post.UserId)
         End If
 
         post.IsDm = False
@@ -1600,10 +1602,10 @@
         Dim tmpPost As PostClass = relPosts(0)
         Dim lastPost As PostClass = Nothing
         Do While tmpPost IsNot Nothing
-            If tmpPost.InReplyToId = 0 Then Return Nothing
+            If tmpPost.InReplyToStatusId = 0 Then Return Nothing
             lastPost = tmpPost
             Dim replyToPost = From p In relPosts
-                             Where p.Id = tmpPost.InReplyToId
+                             Where p.Id = tmpPost.InReplyToStatusId
                              Select p
             tmpPost = replyToPost.FirstOrDefault()
         Loop
@@ -1613,10 +1615,10 @@
     Public Function GetRelatedResult(ByVal read As Boolean, ByVal tab As TabClass) As String
         Dim rslt As String = ""
         Dim relPosts As New List(Of PostClass)
-        If tab.RelationTargetPost.Data.Contains("@") AndAlso tab.RelationTargetPost.InReplyToId = 0 Then
+        If tab.RelationTargetPost.Data.Contains("@") AndAlso tab.RelationTargetPost.InReplyToStatusId = 0 Then
             '検索結果対応
             Dim p As PostClass = TabInformations.GetInstance.Item(tab.RelationTargetPost.Id)
-            If p IsNot Nothing AndAlso p.InReplyToId > 0 Then
+            If p IsNot Nothing AndAlso p.InReplyToStatusId > 0 Then
                 tab.RelationTargetPost = p
             Else
                 rslt = Me.GetStatusApi(read, tab.RelationTargetPost.Id, p)
@@ -1685,8 +1687,8 @@
 
         Dim replyToItem As PostClass = Nothing
         Dim replyToUserName As String = targetItem.InReplyToUser
-        If targetItem.InReplyToId > 0 AndAlso TabInformations.GetInstance.Item(targetItem.InReplyToId) IsNot Nothing Then
-            replyToItem = TabInformations.GetInstance.Item(targetItem.InReplyToId).Copy
+        If targetItem.InReplyToStatusId > 0 AndAlso TabInformations.GetInstance.Item(targetItem.InReplyToStatusId) IsNot Nothing Then
+            replyToItem = TabInformations.GetInstance.Item(targetItem.InReplyToStatusId).Copy
             replyToItem.IsRead = read
             If replyToItem.IsMe AndAlso Not read AndAlso _readOwnPost Then replyToItem.IsRead = True
             replyToItem.RelTabName = tab.TabName
@@ -1697,7 +1699,7 @@
             For Each result As TwitterDataModel.RelatedTweet In relatedData.Results
                 Dim item As PostClass = CreatePostsFromStatusData(result.Status)
                 If item Is Nothing Then Continue For
-                If targetItem.InReplyToId = item.Id Then
+                If targetItem.InReplyToStatusId = item.Id Then
                     replyToItem = Nothing
                     replyAdded = True
                 End If
@@ -1710,10 +1712,10 @@
         Next
         If replyToItem IsNot Nothing Then
             relatedPosts.Add(replyToItem)
-        ElseIf targetItem.InReplyToId > 0 AndAlso Not replyAdded Then
+        ElseIf targetItem.InReplyToStatusId > 0 AndAlso Not replyAdded Then
             Dim p As PostClass = Nothing
             Dim rslt As String = ""
-            rslt = GetStatusApi(read, targetItem.InReplyToId, p)
+            rslt = GetStatusApi(read, targetItem.InReplyToStatusId, p)
             If String.IsNullOrEmpty(rslt) Then
                 p.IsRead = read
                 p.RelTabName = tab.TabName
@@ -1794,13 +1796,14 @@
                 post.Data = xentry.Item("title").InnerText
                 'Source取得(htmlの場合は、中身を取り出し)
                 post.Source = xentry.Item("twitter:source").InnerText
-                post.InReplyToId = 0
+                post.InReplyToStatusId = 0
                 post.InReplyToUser = ""
+                post.InReplyToUserId = 0
                 post.IsFav = False
 
                 '以下、ユーザー情報
                 Dim xUentry As XmlElement = CType(xentry.SelectSingleNode("./search:author", nsmgr), XmlElement)
-                post.Uid = 0
+                post.UserId = 0
                 post.Name = xUentry.Item("name").InnerText.Split(" "c)(0).Trim
                 post.Nickname = xUentry.Item("name").InnerText.Substring(post.Name.Length).Trim
                 If post.Nickname.Length > 2 Then
@@ -1922,7 +1925,7 @@
                     End If
                 End If
 
-                post.Uid = user.Id
+                post.UserId = user.Id
                 post.Name = user.ScreenName
                 post.Nickname = user.Name
                 post.ImageUrl = user.ProfileImageUrl
@@ -2054,19 +2057,20 @@
                     'Source取得(htmlの場合は、中身を取り出し)
                     post.Source = retweeted.Source
                     'Reply先
-                    Long.TryParse(retweeted.InReplyToStatusId, post.InReplyToId)
+                    Long.TryParse(retweeted.InReplyToStatusId, post.InReplyToStatusId)
                     post.InReplyToUser = retweeted.InReplyToScreenName
+                    Long.TryParse(retweeted.InReplyToUserId, post.InReplyToUserId)
                     post.IsFav = retweeted.Favorited
 
                     '以下、ユーザー情報
                     Dim user As TwitterDataModel.User = retweeted.User
-                    post.Uid = user.Id
+                    post.UserId = user.Id
                     post.Name = user.ScreenName
                     post.Nickname = user.Name
                     post.ImageUrl = user.ProfileImageUrl
                     post.IsProtect = user.Protected
                     post.IsMe = post.Name.ToLower.Equals(_uid)
-                    If post.IsMe Then _UserIdNo = post.Uid.ToString()
+                    If post.IsMe Then _UserIdNo = post.UserId.ToString()
 
                     'Retweetした人
                     post.RetweetedBy = status.User.ScreenName
@@ -2077,20 +2081,21 @@
                     post.Data = status.Text
                     'Source取得(htmlの場合は、中身を取り出し)
                     post.Source = status.Source
-                    Long.TryParse(status.InReplyToStatusId, post.InReplyToId)
+                    Long.TryParse(status.InReplyToStatusId, post.InReplyToStatusId)
                     post.InReplyToUser = status.InReplyToScreenName
+                    Long.TryParse(status.InReplyToUserId, post.InReplyToUserId)
 
                     post.IsFav = status.Favorited
 
                     '以下、ユーザー情報
                     Dim user As TwitterDataModel.User = status.User
-                    post.Uid = user.Id
+                    post.UserId = user.Id
                     post.Name = user.ScreenName
                     post.Nickname = user.Name
                     post.ImageUrl = user.ProfileImageUrl
                     post.IsProtect = user.Protected
                     post.IsMe = post.Name.ToLower.Equals(_uid)
-                    If post.IsMe Then _UserIdNo = post.Uid.ToString
+                    If post.IsMe Then _UserIdNo = post.UserId.ToString
                 End If
                 'HTMLに整形
                 post.OriginalData = CreateHtmlAnchor(post.Data, post.ReplyToList)
@@ -2106,7 +2111,7 @@
                 If post.IsMe Then
                     post.IsOwl = False
                 Else
-                    If followerId.Count > 0 Then post.IsOwl = Not followerId.Contains(post.Uid)
+                    If followerId.Count > 0 Then post.IsOwl = Not followerId.Contains(post.UserId)
                 End If
 
                 post.IsDm = False



Tween-svn メーリングリストの案内
Back to archive index