Changeset 75

Timestamp:

05/16/07 23:55:56 (18 months ago)

Author:

mayuki

Message:

 

Location:

TwitterIrcGateway

Files:

• TwitterIrcGateway/TwitterIrcGateway.csproj (modified) (1 diff)
• TwitterIrcGatewayCore/Filter.cs (modified) (1 diff)
• TwitterIrcGatewayCore/Server.cs (modified) (1 diff)
• TwitterIrcGatewayCore/Session.cs (modified) (9 diffs)
• TwitterIrcGatewayCore/TwitterService.cs (modified) (2 diffs)

TwitterIrcGateway/TwitterIrcGateway/TwitterIrcGateway.csproj

@@ -32 +32 @@
     <ExcludedPermissions>
     </ExcludedPermissions>
-    <ApplicationIcon>Resources\ApplicationIcon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

TwitterIrcGateway/TwitterIrcGatewayCore/Filter.cs

@@ -50 +50 @@
 
         /// <summary>
-        /// メッセージをフィルタします
+        /// メチE��ージをフィルタしまぁE
         /// </summary>
         /// <param name="user"></param>
         /// <param name="message"></param>
-        /// <returns>メッセージを捨てるかどうか</returns>
+        /// <returns>メチE��ージを捨てるかどぁE��</returns>
         public Boolean ExecuteFilters(FilterArgs args)
         {

TwitterIrcGateway/TwitterIrcGatewayCore/Server.cs

@@ -18 +18 @@
         /// </summary>
         public Int32 Interval = 60;
+
+        /// <summary>
+        /// �_�C���N�g���b�Z�[�W��F�b�N�����u
+        /// </summary>
+        public Int32 IntervalDirectMessage = 60 * 5;
 
         /// <summary>

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -28 +28 @@
         private LinkedList<Int32> _lastStatusIdsFromGateway;
         private Timer _timer;
+        private Timer _timerDirectMessage;
         private Groups _groups;
         private Filters _filter;
@@ -37 +38 @@
         private LinkedList<Status> _statusBuffer;
         private Boolean _isCallbackRunning = false;
+        private Boolean _isCallbackDirectMessageRunning = false;
         private TraceListener _traceListeneer;
 
@@ -69 +71 @@
             _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);
         }
 
@@ -123 +126 @@
             try
             {
+                SendPing();
+
+                // Friendsをチェックするのは成功して、チェックが必要となったとき
+                Boolean friendsCheckRequired = false;
+                if (CheckNewTimeLine(out friendsCheckRequired) && friendsCheckRequired)
+                {
+                    CheckFriends();
+                }
+            }
+            finally
+            {
+                _isCallbackRunning = false;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="stateObject"></param>
+        private void OnTimerCallbackDirectMessage(Object stateObject)
+        {
+            // あまりに処理が遅れると二重になる可能性がある
+            lock (_timer)
+            {
+                if (_isCallbackDirectMessageRunning)
+                    return;
+                _isCallbackDirectMessageRunning = true;
+            }
+
+            try
+            {
                 CheckDirectMessage();
-                SendPing();
-                CheckFriends();
-                CheckNewTimeLine();
             }
             finally
             {
-                _isCallbackRunning = false;
+                _isCallbackDirectMessageRunning = false;
             }
         }
@@ -542 +573 @@
 
             Type t = typeof(Server);
-            _clientHost = String.Format("{0}!{1}@{2}", _nick, _username, ((IPEndPoint)(e.Client.Client.RemoteEndPoint)).Address);
+            _clientHost = String.Format("{0}!{1}@{2}", _nick, e.Message.CommandParams[0], ((IPEndPoint)(e.Client.Client.RemoteEndPoint)).Address);
 
             SendNumericReply(NumericReply.RPL_WELCOME
@@ -572 +603 @@
 
             _timer.Change(0, _server.Interval * 1000);
+            _timerDirectMessage.Change(0, _server.IntervalDirectMessage * 1000);
         }
 
@@ -923 +955 @@
         }
 
-        private void CheckNewTimeLine()
-        {
+        private Boolean CheckNewTimeLine(out Boolean friendsCheckRequired)
+        {
+            friendsCheckRequired = false;
+
             try
             {
@@ -962 +996 @@
                         continue;
                     }
+
+                    // friends チェックが必要かどうかを確かめる
+                    // まだないときは取ってくるフラグを立てる
+                    friendsCheckRequired |= !(_nickNames.Contains(status.User.ScreenName));
                     
                     // フィルタ
@@ -1059 +1097 @@
                     SendServerErrorMessage(ex.Message);
                 }
+                return false;
             }
             catch (TwitterServiceException ex2)
             {
                 SendServerErrorMessage(ex2.Message);
-            }
+                return false;
+            }
+
+            return true;
         }
 

TwitterIrcGateway/TwitterIrcGatewayCore/TwitterService.cs

@@ -318 +318 @@
                 webRequest.Accept = "text/xml, application/xml";
                 webRequest.UserAgent = String.Format("{0}/{1}", TwitterService.ClientName, GetType().Assembly.GetName().Version);
-                webRequest.Referer = TwitterService.Referer;
+                //webRequest.Referer = TwitterService.Referer;
                 webRequest.Headers["X-Twitter-Client"] = TwitterService.ClientName;
                 webRequest.Headers["X-Twitter-Client-Version"] = TwitterService.ClientVersion;
@@ -357 +357 @@
             webRequest.Accept = "text/xml, application/xml";
             webRequest.UserAgent = String.Format("{0}/{1}", TwitterService.ClientName, TwitterService.ClientVersion);
-            webRequest.Referer = TwitterService.Referer;
+            //webRequest.Referer = TwitterService.Referer;
             webRequest.Headers["X-Twitter-Client"] = TwitterService.ClientName;
             webRequest.Headers["X-Twitter-Client-Version"] = TwitterService.ClientVersion;