公式検索対応中

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

diff --git a/Tween/StatusDictionary.vb b/Tween/StatusDictionary.vb
index 328f0cc..a6bc935 100644 (file)
--- a/Tween/StatusDictionary.vb
+++ b/Tween/StatusDictionary.vb
@@ -53,6 +53,7 @@ Public NotInheritable Class PostClass
     Private _FilterHit As Boolean
     Private _RetweetedBy As String = ""
     Private _RetweetedId As Long = 0
+    Private _searchTabName As String = ""
 
     <FlagsAttribute()> _
     Private Enum Statuses
@@ -335,6 +336,14 @@ Public NotInheritable Class PostClass
             _RetweetedId = value
         End Set
     End Property
+    Public Property SearchTabName() As String
+        Get
+            Return _searchTabName
+        End Get
+        Set(ByVal value As String)
+            _searchTabName = value
+        End Set
+    End Property
 End Class
 
 Public NotInheritable Class TabInformations
@@ -533,18 +542,22 @@ Public NotInheritable Class TabInformations
            tb.Contains(tb.OldestUnreadId) AndAlso _
            tb.UnreadCount > 0 Then
             '未読アイテムへ
-            If _statuses.Item(tb.OldestUnreadId).IsRead Then
-                '状態不整合（最古未読ＩＤが実は既読）
-                SyncLock LockUnread
-                    Me.SetNextUnreadId(-1, tb)  '頭から探索
-                End SyncLock
-                If tb.OldestUnreadId = -1 Then
-                    Return -1
+            If tb.TabType <> TabUsageType.PublicSearch Then
+                If _statuses.Item(tb.OldestUnreadId).IsRead Then
+                    '状態不整合（最古未読ＩＤが実は既読）
+                    SyncLock LockUnread
+                        Me.SetNextUnreadId(-1, tb)  '頭から探索
+                    End SyncLock
+                    If tb.OldestUnreadId = -1 Then
+                        Return -1
+                    Else
+                        Return tb.IndexOf(tb.OldestUnreadId)
+                    End If
                 Else
-                    Return tb.IndexOf(tb.OldestUnreadId)
+                    Return tb.IndexOf(tb.OldestUnreadId)    '最短経路
                 End If
             Else
-                Return tb.IndexOf(tb.OldestUnreadId)    '最短経路
+
             End If
         Else
             '一見未読なさそうだが、未読カウントはあるので探索
@@ -1108,6 +1121,7 @@ Public NotInheritable Class TabClass
     Private _tmpIds As List(Of TempolaryId)
     Private _tabName As String = ""
     Private _tabType As TabUsageType = TabUsageType.Undefined
+    Private _searchedPosts As Dictionary(Of Long, PostClass)
 
     'Search query
     Private _searchLang As String = ""
@@ -1159,6 +1173,12 @@ Public NotInheritable Class TabClass
         End Get
     End Property
 
+    Public Function SearchedPost(ByVal Id As Long) As PostClass
+        If _searchedPosts Is Nothing Then Return Nothing
+        If Not _searchedPosts.ContainsKey(Id) Then Return Nothing
+        Return _searchedPosts(Id)
+    End Function
+
     Private Structure TempolaryId
         Public Id As Long
         Public Read As Boolean
@@ -1258,6 +1278,15 @@ Public NotInheritable Class TabClass
         'End Try
     End Function
 
+    '検索結果の追加
+    Public Sub AddSearchedPost(ByVal Post As PostClass)
+        If _searchedPosts Is Nothing Then _searchedPosts = New Dictionary(Of Long, PostClass)
+        If _searchedPosts.ContainsKey(Post.Id) Then Exit Sub
+        _searchedPosts.Add(Post.Id, Post)
+        If _tmpIds Is Nothing Then _tmpIds = New List(Of TempolaryId)
+        _tmpIds.Add(New TempolaryId(Post.Id, Post.IsRead))
+    End Sub
+
     Public Sub AddSubmit()
         If _tmpIds Is Nothing Then Exit Sub
         For Each tId As TempolaryId In _tmpIds

diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb
index 8ce1b68..7a6fafb 100644 (file)
--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -3261,8 +3261,8 @@ Public Module Twitter
 
                 post.IsOwl = False
                 If post.IsMe AndAlso Not read AndAlso _readOwnPost Then post.IsRead = True
-
                 post.IsDm = False
+                post.SearchTabName = tabName
             Catch ex As Exception
                 TraceOut(retMsg)
                 Continue For