Changeset 347

Timestamp:

10/30/07 10:29:55 (13 months ago)

Author:

tomoyo

Message:

* Redirect フィルタを追加
* Replies の扱いをいろいろ修正
* その他こまごまとした修正

Location:

TwitterIrcGateway/TwitterIrcGatewayCore

Files:

• Filter.cs (modified) (4 diffs)
• Server.cs (modified) (1 diff)
• Session.cs (modified) (24 diffs)

TwitterIrcGateway/TwitterIrcGatewayCore/Filter.cs

@@ -10 +10 @@
 {
     [XmlInclude(typeof(Drop))]
-    [XmlInclude(typeof(Reroute))]
+    [XmlInclude(typeof(Redirect))]
     [XmlInclude(typeof(RewriteContent))]
     public class Filters
@@ -204 +204 @@
     }
     
-    public class Reroute : FilterItem
+    public class Redirect : FilterItem
     {
         private String _matchPattern = "";
@@ -236 +236 @@
         public override void Execute(FilterArgs args)
         {
+            if (String.IsNullOrEmpty(_channelName))
+                return;
+
             if (!String.IsNullOrEmpty(_matchPattern))
             {
@@ -266 +269 @@
         public override string ToString()
         {
-            return "Reroute:"
+            return "Redirect:"
                 + ((Enabled) ? "" : "[DISABLED]")
                 + ((String.IsNullOrEmpty(_userMatchPattern)) ? "" : String.Format(" UserMatchPattern={0}", _userMatchPattern))
                 + ((String.IsNullOrEmpty(_matchPattern)) ? "" : String.Format(" MatchPattern={0}", _matchPattern))
+                + ((String.IsNullOrEmpty(_channelName)) ? "" : String.Format(" ChannelName={0}", _channelName))
                 + ((_duplicate) ? " Duplicate" : "")
             ;

TwitterIrcGateway/TwitterIrcGatewayCore/Server.cs

@@ -23 +23 @@
         /// </summary>
         public Int32 IntervalDirectMessage = 60 * 5;
+
+        /// <summary>
+        /// Replies��F�b�N���邩�ǂ���
+        /// </summary>
+        public Boolean EnableRepliesCheck = false;
+        
+        /// <summary>
+        /// Replies�`�F�b�N�����u
+        /// </summary>
+        public Int32 IntervalReplies = 60 * 5;
 
         /// <summary>

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
 using System.Net.Sockets;
 using System.Net;
-using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
 using System.Web;
-using System.Threading;
+using System.Xml;
+
 using Misuzilla.Net.Irc;
-using System.Xml;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text.RegularExpressions;
 using Misuzilla.Applications.TwitterIrcGateway.Filter;
-using System.Reflection;
 
 namespace Misuzilla.Applications.TwitterIrcGateway
@@ -29 +30 @@
         private Timer _timer;
         private Timer _timerDirectMessage;
+        private Timer _timerReplies;
         private Groups _groups;
         private Filters _filter;
@@ -37 +39 @@
         private DateTime _lastAccessDirectMessage = DateTime.Now;
         private LinkedList<Status> _statusBuffer;
-        private Boolean _isCallbackRunning = false;
-        private Boolean _isCallbackDirectMessageRunning = false;
+        private LinkedList<Status> _repliesBuffer;
         private TraceListener _traceListeneer;
 
@@ -69 +70 @@
             _tcpClient = tcpClient;
             _statusBuffer = new LinkedList<Status>();
+            _repliesBuffer = new LinkedList<Status>();
             _lastStatusIdsFromGateway = new LinkedList<int>();
             _timer = new Timer(new TimerCallback(OnTimerCallback), null, Timeout.Infinite, Timeout.Infinite);
             _timerDirectMessage = new Timer(new TimerCallback(OnTimerCallbackDirectMessage), null, Timeout.Infinite, Timeout.Infinite);
+            _timerReplies = new Timer(new TimerCallback(OnTimerCallbackReplies), null, Timeout.Infinite, Timeout.Infinite);
         }
 
@@ -109 +112 @@
             }
         }
-
+        
         /// <summary>
         /// 
@@ -116 +119 @@
         private void OnTimerCallback(Object stateObject)
         {
-            // あまりに処理が遅れると二重になる可能性がある
-            lock (_timer)
-            {
-                if (_isCallbackRunning)
-                    return;
-                _isCallbackRunning = true;
-            }
-
-            try
+            RunCallback(_timer, delegate
             {
                 SendPing();
@@ -140 +135 @@
                     CheckFriends();
                 }
-            }
-            finally
-            {
-                _isCallbackRunning = false;
-            }
+            });
         }
 
@@ -153 +144 @@
         private void OnTimerCallbackDirectMessage(Object stateObject)
         {
+            RunCallback(_timerDirectMessage, delegate
+            {
+                CheckDirectMessage();
+            });
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="stateObject"></param>
+        private void OnTimerCallbackReplies(Object stateObject)
+        {
+            RunCallback(_timerReplies, delegate
+            {
+                CheckDirectMessage();
+            });
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private delegate void CallbackProcedure();
+
+        /// <summary>
+        /// タイマーコールバックの処理を実行します。
+        /// </summary>
+        /// <param name="timer"></param>
+        /// <param name="callbackProcedure"></param>
+        private void RunCallback(Timer timer, CallbackProcedure callbackProcedure)
+        {
             // あまりに処理が遅れると二重になる可能性がある
-            lock (_timer)
-            {
-                if (_isCallbackDirectMessageRunning)
-                    return;
-                _isCallbackDirectMessageRunning = true;
-            }
-
-            try
-            {
-                CheckDirectMessage();
-            }
-            finally
-            {
-                _isCallbackDirectMessageRunning = false;
+            if (Monitor.TryEnter(timer))
+            {
+                try
+                {
+                    callbackProcedure();
+                }
+                finally
+                {
+                    Monitor.Exit(timer);
+                }
             }
         }
@@ -190 +207 @@
                         try
                         {
-                            //Console.WriteLine(line);
-                            line = line.Replace('〜', '～'); // FIXME: 
                             IRCMessage msg = IRCMessage.CreateMessage(line);
                             OnMessageRecieved(msg);
                         }
                         catch (IRCException)
-                        {
-                        }
+                        {}
                     }
                 }
             }
             catch (IOException ie)
-            {
-            }
+            {}
             catch (NullReferenceException ne)
-            {
-            }
+            {}
             finally
             {
@@ -611 +623 @@
             _timer.Change(0, _server.Interval * 1000);
             _timerDirectMessage.Change(0, _server.IntervalDirectMessage * 1000);
+            _timerReplies.Change(0, _server.IntervalReplies * 1000);
         }
 
@@ -870 +883 @@
         void GetFriendNames()
         {
-            try
+            RunCheck(delegate
             {
                 User[] friends = _twitter.GetFriends();
-                _nickNames = new List<string>(Array.ConvertAll<User, String>(friends, delegate(User u) {
+                _nickNames = new List<string>(Array.ConvertAll<User, String>(friends, delegate(User u)
+                {
                     return u.ScreenName;
                 }));
@@ -879 +893 @@
                 SendNumericReply(NumericReply.RPL_NAMREPLY, "=", _server.ChannelName, String.Join(" ", _nickNames.ToArray()));
                 SendNumericReply(NumericReply.RPL_ENDOFNAMES, _server.ChannelName, "End of NAMES list");
-            }
-            catch (WebException ex)
-            {
-                if (ex.Response == null || (ex.Response is HttpWebResponse) && ((HttpWebResponse)(ex.Response)).StatusCode != HttpStatusCode.NotModified)
-                {
-                    // not-modified 以外
-                    SendTwitterGatewayServerMessage(ex.Message);
-                }
-            }
-            catch (TwitterServiceException ex2)
-            {
-                SendTwitterGatewayServerMessage(ex2.Message);
-            }
+            });
         }
 
@@ -913 +915 @@
             }
 
-            try
+            RunCheck(delegate
             {
                 User[] friends = _twitter.GetFriends();
@@ -947 +949 @@
                 _nickNames = screenNames;
 
-            }
-            catch (WebException ex)
-            {
-                if (ex.Response == null || !(ex.Response is HttpWebResponse) || ((HttpWebResponse)(ex.Response)).StatusCode != HttpStatusCode.NotModified)
-                {
-                    // not-modified 以外
-                    SendServerErrorMessage(ex.Message);
-                }
-            }
-            catch (TwitterServiceException ex2)
-            {
-                SendServerErrorMessage(ex2.Message);
-            }
+            });
         }
 
         private Boolean CheckNewTimeLine(out Boolean friendsCheckRequired)
         {
-            friendsCheckRequired = false;
-
-            try
+            Boolean friendsCheckRequiredAnon = false;
+            Boolean returnValue = RunCheck(delegate
             {
                 Statuses statuses = _twitter.GetTimeline(_lastAccessTimeline);
@@ -972 +961 @@
                 foreach (Status status in statuses.Status)
                 {
-                    ProcessTimelineStatus (status, ref friendsCheckRequired);
-                }
-                statuses = _twitter.GetReplies();
+                    // 差分チェック
+                    if (ProcessDropProtection(_statusBuffer, status))
+                    {
+                        ProcessTimelineStatus(status, ref friendsCheckRequiredAnon);
+                    }
+                }
+
+                if (_isFirstTime && _server.EnableDropProtection)
+                {
+                    _lastAccessTimeline = DateTime.Now;
+                }
+                _isFirstTime = false;
+            });
+            
+            friendsCheckRequired = friendsCheckRequiredAnon;
+            return returnValue;
+        }
+
+        private Boolean CheckNewReplies(out Boolean friendsCheckRequired)
+        {
+            friendsCheckRequired = false;
+            return RunCheck(delegate
+            {
+                Statuses statuses = _twitter.GetReplies();
                 Array.Reverse(statuses.Status);
                 bool dummy = false;
@@ -981 +991 @@
                     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 (ProcessDropProtection(_statusBuffer, status) && ProcessDropProtection(_repliesBuffer, status))
+                    {
+                        // 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);
+                    }
                 }
 
@@ -992 +1006 @@
                 }
                 _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)
+            });
+        }
+        
+        /// <summary>
+        /// 既に受信したstatusかどうかをチェックします。既に送信済みの場合falseを返します。
+        /// </summary>
+        /// <param name="statusBuffer"></param>
+        /// <param name="status"></param>
+        /// <returns></returns>
+        private Boolean ProcessDropProtection(LinkedList<Status> statusBuffer, Status status)
         {
             // 差分チェック
             if (_server.EnableDropProtection)
             {
-                if (_statusBuffer.Contains(status))
-                    return;
-
-                _statusBuffer.AddLast(status);
-                if (_statusBuffer.Count > 100)
+                if (statusBuffer.Contains(status))
+                    return false;
+
+                statusBuffer.AddLast(status);
+                if (statusBuffer.Count > 100)
                 {
                     // 一番古いのを消す
@@ -1032 +1036 @@
                     //}
                     //_statusBuffer.Remove(oldStatus);
-                    _statusBuffer.RemoveFirst();
-                }
-            }
+                    statusBuffer.RemoveFirst();
+                }
+            }
+            
+            return true;
+        }
+        
+        private void ProcessTimelineStatus (Status status, ref Boolean friendsCheckRequired)
+        {
 
             // チェック
@@ -1140 +1150 @@
         private void CheckDirectMessage()
         {
-            try
+            RunCheck(delegate
             {
                 DirectMessages directMessages = _twitter.GetDirectMessages(_lastAccessDirectMessage);
@@ -1152 +1162 @@
                     }
 
-                    String text = (_server.ResolveTinyUrl) ? Utility.ResolveTinyUrlInMessage(message.Text) : message.Text; 
+                    String text = (_server.ResolveTinyUrl) ? Utility.ResolveTinyUrlInMessage(message.Text) : message.Text;
                     String[] lines = text.Split(new Char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
 
@@ -1171 +1181 @@
                     }
                 }
+            });
+        }
+
+        private delegate void CheckProcedure();
+        /// <summary>
+        /// チェックを実行します。例外が発生した場合には自動的にメッセージを送信します。
+        /// </summary>
+        /// <param name="proc">実行するチェック処理</param>
+        /// <returns></returns>
+        private Boolean RunCheck(CheckProcedure proc)
+        {
+            try
+            {
+                proc();
             }
             catch (WebException ex)
@@ -1178 +1202 @@
                     // not-modified 以外
                     SendServerErrorMessage(ex.Message);
+                    return false;
                 }
             }
@@ -1183 +1208 @@
             {
                 SendServerErrorMessage(ex2.Message);
-            }
-        }
+                return false;
+            }
+
+            return true;
+        }
+        
 
         /// <summary>
@@ -1225 +1254 @@
                     _timerDirectMessage = null;
                 }
-
-                // 一応待つ
-                while (_isCallbackRunning || _isCallbackDirectMessageRunning)
-                    Thread.Sleep(100);
+                if (_timerReplies != null)
+                {
+                    _timerReplies.Dispose();
+                    _timerReplies = null;
+                }
 
                 if (_twitter != null)