Changeset 341

Timestamp:

10/22/07 07:28:19 (15 months ago)

Author:

tomoyo

Message:

replies パッチを取り込んだ。

Location:

TwitterIrcGateway/TwitterIrcGatewayCore

Files:

• Session.cs (modified) (1 diff)
• TwitterService.cs (modified) (1 diff)

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -970 +970 @@
                 Statuses statuses = _twitter.GetTimeline(_lastAccessTimeline);
                 Array.Reverse(statuses.Status);
+                foreach (Status status in statuses.Status)
+                {
+                    ProcessTimelineStatus (status, ref friendsCheckRequired);
+                }
+                statuses = _twitter.GetReplies();
+                Array.Reverse(statuses.Status);
+                bool dummy = false;
+                foreach (Status status in statuses.Status)
+                {
+                    if (status.CreatedAt < _lastAccessTimeline)
+                        continue;
+                    // Here I pass dummy, because no matter how the replier flags
+                    // friendsCheckRequired, we cannot receive his or her info
+                    // through get_friends.
+                    ProcessTimelineStatus (status, ref dummy);
+                }
+
                 if (_isFirstTime && _server.EnableDropProtection)
                 {
                     _lastAccessTimeline = DateTime.Now;
                 }
-                foreach (Status status in statuses.Status)
-                {
-                    // 差分チェック
-                    if (_server.EnableDropProtection)
-                    {
-                        if (_statusBuffer.Contains(status))
-                            continue;
-
-                        _statusBuffer.AddLast(status);
-                        if (_statusBuffer.Count > 100)
+                _isFirstTime = false;
+            }
+            catch (WebException ex)
+            {
+                if (ex.Response == null || !(ex.Response is HttpWebResponse) || ((HttpWebResponse)(ex.Response)).StatusCode != HttpStatusCode.NotModified)
+                {
+                    // not-modified 以外
+                    SendServerErrorMessage(ex.Message);
+                }
+                return false;
+            }
+            catch (TwitterServiceException ex2)
+            {
+                SendServerErrorMessage(ex2.Message);
+                return false;
+            }
+
+            return true;
+        }
+
+        private void ProcessTimelineStatus (Status status, ref Boolean friendsCheckRequired)
+        {
+            // 差分チェック
+            if (_server.EnableDropProtection)
+            {
+                if (_statusBuffer.Contains(status))
+                    return;
+
+                _statusBuffer.AddLast(status);
+                if (_statusBuffer.Count > 100)
+                {
+                    // 一番古いのを消す
+                    //Status oldStatus = null;
+                    //foreach (Status statTmp in _statusBuffer)
+                    //{
+                    //    if (oldStatus == null || oldStatus.CreatedAt > statTmp.CreatedAt)
+                    //    {
+                    //        oldStatus = statTmp;
+                    //    }
+                    //}
+                    //_statusBuffer.Remove(oldStatus);
+                    _statusBuffer.RemoveFirst();
+                }
+            }
+
+            // チェック
+            if (status.User == null || String.IsNullOrEmpty(status.User.ScreenName))
+            {
+                return;
+            }
+
+            // friends チェックが必要かどうかを確かめる
+            // まだないときは取ってくるフラグを立てる
+            friendsCheckRequired |= !(_nickNames.Contains(status.User.ScreenName));
+            
+            // フィルタ
+            FilterArgs filterArgs = new FilterArgs(this, status.Text, status.User, "PRIVMSG", false);
+            if (!_filter.ExecuteFilters(filterArgs))
+            {
+                // 捨てる
+                return;
+            }
+
+            // 自分がゲートウェイを通して発言したものは捨てる
+            if (_lastStatusIdsFromGateway.Contains(status.Id))
+            {
+                return;
+            }
+
+            // TinyURL
+            String text = (_server.ResolveTinyUrl) ? Utility.ResolveTinyUrlInMessage(filterArgs.Content) : filterArgs.Content;
+
+            String[] lines = text.Split(new Char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (String line in lines)
+            {
+                // 初回はrecentろぐっぽく
+                if (_isFirstTime)
+                {
+                    NoticeMessage noticeMsg = new NoticeMessage();
+                    noticeMsg.SenderNick = status.User.ScreenName;
+                    noticeMsg.SenderHost = "twitter@" + Server.ServerName;
+                    noticeMsg.Receiver = _server.ChannelName;
+                    noticeMsg.Content = String.Format("{0}: {1}", status.CreatedAt.ToString("HH:mm"), line);
+                    Send(noticeMsg);
+                }
+                else
+                {
+                    IRCMessage msg;
+                    switch (filterArgs.IRCMessageType.ToUpperInvariant())
+                    {
+                        case "NOTICE":
+                            msg = new NoticeMessage(_server.ChannelName, line);
+                            break;
+                        case "PRIVMSG":
+                        default:
+                            msg = new PrivMsgMessage(_server.ChannelName, line);
+                            break;
+                    }
+                    msg.SenderNick = status.User.ScreenName;
+                    msg.SenderHost = "twitter@" + Server.ServerName;
+                    Send(msg);
+
+                    // グループにも投げる
+                    foreach (Group group in _groups.Values)
+                    {
+                        if (group.IsJoined && group.Exists(status.User.ScreenName))
                         {
-                            // 一番古いのを消す
-                            //Status oldStatus = null;
-                            //foreach (Status statTmp in _statusBuffer)
-                            //{
-                            //    if (oldStatus == null || oldStatus.CreatedAt > statTmp.CreatedAt)
-                            //    {
-                            //        oldStatus = statTmp;
-                            //    }
-                            //}
-                            //_statusBuffer.Remove(oldStatus);
-                            _statusBuffer.RemoveFirst();
-                        }
-                    }
-
-                    // チェック
-                    if (status.User == null || String.IsNullOrEmpty(status.User.ScreenName))
-                    {
-                        continue;
-                    }
-
-                    // friends チェックが必要かどうかを確かめる
-                    // まだないときは取ってくるフラグを立てる
-                    friendsCheckRequired |= !(_nickNames.Contains(status.User.ScreenName));
-                    
-                    // フィルタ
-                    FilterArgs filterArgs = new FilterArgs(this, status.Text, status.User, "PRIVMSG", false);
-                    if (!_filter.ExecuteFilters(filterArgs))
-                    {
-                        // 捨てる
-                        continue;
-                    }
-
-                    // 自分がゲートウェイを通して発言したものは捨てる
-                    if (_lastStatusIdsFromGateway.Contains(status.Id))
-                    {
-                        continue;
-                    }
-
-                    // TinyURL
-                    String text = (_server.ResolveTinyUrl) ? Utility.ResolveTinyUrlInMessage(filterArgs.Content) : filterArgs.Content;
-
-                    String[] lines = text.Split(new Char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (String line in lines)
-                    {
-                        // 初回はrecentろぐっぽく
-                        if (_isFirstTime)
-                        {
-                            NoticeMessage noticeMsg = new NoticeMessage();
-                            noticeMsg.SenderNick = status.User.ScreenName;
-                            noticeMsg.SenderHost = "twitter@" + Server.ServerName;
-                            noticeMsg.Receiver = _server.ChannelName;
-                            noticeMsg.Content = String.Format("{0}: {1}", status.CreatedAt.ToString("HH:mm"), line);
-                            Send(noticeMsg);
-                        }
-                        else
-                        {
-                            IRCMessage msg;
                             switch (filterArgs.IRCMessageType.ToUpperInvariant())
                             {
                                 case "NOTICE":
-                                    msg = new NoticeMessage(_server.ChannelName, line);
+                                    msg = new NoticeMessage(group.Name, line);
                                     break;
                                 case "PRIVMSG":
                                 default:
-                                    msg = new PrivMsgMessage(_server.ChannelName, line);
+                                    msg = new PrivMsgMessage(group.Name, line);
                                     break;
-                            }
+                            } 
                             msg.SenderNick = status.User.ScreenName;
                             msg.SenderHost = "twitter@" + Server.ServerName;
                             Send(msg);
-
-                            // グループにも投げる
-                            foreach (Group group in _groups.Values)
-                            {
-                                if (group.IsJoined && group.Exists(status.User.ScreenName))
-                                {
-                                    switch (filterArgs.IRCMessageType.ToUpperInvariant())
-                                    {
-                                        case "NOTICE":
-                                            msg = new NoticeMessage(group.Name, line);
-                                            break;
-                                        case "PRIVMSG":
-                                        default:
-                                            msg = new PrivMsgMessage(group.Name, line);
-                                            break;
-                                    } 
-                                    msg.SenderNick = status.User.ScreenName;
-                                    msg.SenderHost = "twitter@" + Server.ServerName;
-                                    Send(msg);
-                                }
-                            }
                         }
                     }
-
-                    // 最終更新時刻
-                    if (_server.EnableDropProtection)
-                    {
-                        // 取りこぼし防止しているときは一番古い日付
-                        if (status.CreatedAt < _lastAccessTimeline)
-                        {
-                            _lastAccessTimeline = status.CreatedAt;
-                        }
-                    }
-                    else
-                    {
-                        if (status.CreatedAt > _lastAccessTimeline)
-                        {
-                            _lastAccessTimeline = status.CreatedAt;
-                        }
-                    }
-                }
-                _isFirstTime = false;
-            }
-            catch (WebException ex)
-            {
-                if (ex.Response == null || !(ex.Response is HttpWebResponse) || ((HttpWebResponse)(ex.Response)).StatusCode != HttpStatusCode.NotModified)
-                {
-                    // not-modified 以外
-                    SendServerErrorMessage(ex.Message);
-                }
-                return false;
-            }
-            catch (TwitterServiceException ex2)
-            {
-                SendServerErrorMessage(ex2.Message);
-                return false;
-            }
-
-            return true;
+                }
+            }
+
+            // 最終更新時刻
+            if (_server.EnableDropProtection)
+            {
+                // 取りこぼし防止しているときは一番古い日付
+                if (status.CreatedAt < _lastAccessTimeline)
+                {
+                    _lastAccessTimeline = status.CreatedAt;
+                }
+            }
+            else
+            {
+                if (status.CreatedAt > _lastAccessTimeline)
+                {
+                    _lastAccessTimeline = status.CreatedAt;
+                }
+            }
         }
 

TwitterIrcGateway/TwitterIrcGatewayCore/TwitterService.cs

@@ -211 +211 @@
             {
                 String responseBody = GET(String.Format("/statuses/friends_timeline.xml?since={0}", Utility.UrlEncode(since.ToUniversalTime().ToString("r"))));
+                Statuses statuses;
+                if (NilClasses.CanDeserialize(responseBody))
+                {
+                    statuses = new Statuses();
+                    statuses.Status = new Status[0];
+                }
+                else
+                {
+                    statuses = Statuses.Serializer.Deserialize(new StringReader(responseBody)) as Statuses;
+                    if (statuses == null || statuses.Status == null)
+                    {
+                        statuses = new Statuses();
+                        statuses.Status = new Status[0];
+                    }
+                }
+
+                return statuses;
+            }
+            catch (WebException we)
+            {
+                throw;
+            }
+            catch (InvalidOperationException ioe)
+            {
+                // XmlSerializer
+                throw new TwitterServiceException(ioe);
+            }
+            catch (XmlException xe)
+            {
+                throw new TwitterServiceException(xe);
+            }
+            catch (IOException ie)
+            {
+                throw new TwitterServiceException(ie);
+            }
+        }
+
+        /// <summary>
+        /// replies ������܂��B
+        /// </summary>
+        /// <exception cref="WebException"></exception>
+        /// <exception cref="TwitterServiceException"></exception>
+        public Statuses GetReplies()
+        {
+            try
+            {
+                String responseBody = GET("/statuses/replies.xml");
                 Statuses statuses;
                 if (NilClasses.CanDeserialize(responseBody))