Changeset 393

Timestamp:

05/20/08 00:26:25 (8 months ago)

Author:

tomoyo

Message:

* Replies チェックの最終アクセス時刻の保存を間違っていたので修正
* 各種リクエストで利用するクライアントの情報を設定できるようにした

Files:

• TwitterIrcGateway/branches/im-support/TwitterIrcGatewayCore/TwitterService.cs (modified) (9 diffs)

TwitterIrcGateway/branches/im-support/TwitterIrcGatewayCore/TwitterService.cs

@@ -43 +43 @@
         public event EventHandler<DirectMessageEventArgs> DirectMessageReceived;
 
-        public static readonly String ServiceServerPrefix = "http://twitter.com";
-        public static readonly String Referer = "http://twitter.com/home";
-        public static readonly String ClientUrl = "http://www.misuzilla.org/dist/net/twitterircgateway/";
-        public static readonly String ClientVersion = typeof(TwitterService).Assembly.GetName().Version.ToString();
-        public static readonly String ClientName = "TwitterIrcGateway";
+        public String ServiceServerPrefix = "http://twitter.com";
+        public String Referer = "http://twitter.com/home";
+        public String ClientUrl = "http://www.misuzilla.org/dist/net/twitterircgateway/";
+        public String ClientVersion = typeof(TwitterService).Assembly.GetName().Version.ToString();
+        public String ClientName = "TwitterIrcGateway";
 
         public TwitterService(String userName, String password)
         {
             CredentialCache credCache = new CredentialCache();
-            credCache.Add(new Uri(TwitterService.ServiceServerPrefix), "Basic", new NetworkCredential(userName, password));
+            credCache.Add(new Uri(ServiceServerPrefix), "Basic", new NetworkCredential(userName, password));
             _credential = credCache;
 
@@ -149 +149 @@
             return ExecuteRequest<Status>(() =>
             {
-                String responseBody = POST(String.Format("/statuses/update.xml?status={0}&source={1}", encodedMessage, TwitterService.ClientName), Encoding.Default.GetBytes("1"));
+                String responseBody = POST(String.Format("/statuses/update.xml?status={0}&source={1}", encodedMessage, ClientName), Encoding.Default.GetBytes("1"));
                 if (NilClasses.CanDeserialize(responseBody))
                 {
@@ -482 +482 @@
                     if (_enableDropProtection)
                     {
-                        // �����ڂ��h�~���Ă������͈��Â���                        if (status.CreatedAt < _lastAccessTimeline)
+                        // �����ڂ��h�~���Ă������͈��Â���                        if (status.CreatedAt < _lastAccessReplies)
                         {
-                            _lastAccessTimeline = status.CreatedAt;
+                            _lastAccessReplies = status.CreatedAt;
                         }
                     }
                     else
                     {
-                        if (status.CreatedAt > _lastAccessTimeline)
+                        if (status.CreatedAt > _lastAccessReplies)
                         {
-                            _lastAccessTimeline = status.CreatedAt;
+                            _lastAccessReplies = status.CreatedAt;
                         }
                     }
@@ -749 +749 @@
         internal class PreAuthenticatedWebClient : WebClient
         {
+            private TwitterService _twitterService;
+            public PreAuthenticatedWebClient(TwitterService twitterService)
+            {
+                _twitterService = twitterService;
+            }
             protected override WebRequest GetWebRequest(Uri address)
             {
@@ -755 +760 @@
                 webRequest.PreAuthenticate = true;
                 webRequest.Accept = "text/xml, application/xml";
-                webRequest.UserAgent = String.Format("{0}/{1}", TwitterService.ClientName, GetType().Assembly.GetName().Version);
+                webRequest.UserAgent = String.Format("{0}/{1}", _twitterService.ClientName, GetType().Assembly.GetName().Version);
                 //webRequest.Referer = TwitterService.Referer;
-                webRequest.Headers["X-Twitter-Client"] = TwitterService.ClientName;
-                webRequest.Headers["X-Twitter-Client-Version"] = TwitterService.ClientVersion;
-                webRequest.Headers["X-Twitter-Client-URL"] = TwitterService.ClientUrl;
+                webRequest.Headers["X-Twitter-Client"] = _twitterService.ClientName;
+                webRequest.Headers["X-Twitter-Client-Version"] = _twitterService.ClientVersion;
+                webRequest.Headers["X-Twitter-Client-URL"] = _twitterService.ClientUrl;
 
                 return webRequest;
@@ -789 +794 @@
             else
             {
-                url = TwitterService.ServiceServerPrefix + url;
+                url = ServiceServerPrefix + url;
                 System.Diagnostics.Trace.WriteLine("GET: " + url);
                 HttpWebRequest webRequest = CreateHttpWebRequest(url, "GET");
@@ -800 +805 @@
         public String POST(String url, Byte[] postData)
         {
-            url = TwitterService.ServiceServerPrefix + url;
+            url = ServiceServerPrefix + url;
             System.Diagnostics.Trace.WriteLine("POST: " + url);
             HttpWebRequest webRequest = CreateHttpWebRequest(url, "POST");
@@ -820 +825 @@
             webRequest.Method = method;
             webRequest.Accept = "text/xml, application/xml";
-            webRequest.UserAgent = String.Format("{0}/{1}", TwitterService.ClientName, TwitterService.ClientVersion);
+            webRequest.UserAgent = String.Format("{0}/{1}", ClientName, ClientVersion);
             //webRequest.Referer = TwitterService.Referer;
-            webRequest.Headers["X-Twitter-Client"] = TwitterService.ClientName;
-            webRequest.Headers["X-Twitter-Client-Version"] = TwitterService.ClientVersion;
-            webRequest.Headers["X-Twitter-Client-URL"] = TwitterService.ClientUrl;
+            webRequest.Headers["X-Twitter-Client"] = ClientName;
+            webRequest.Headers["X-Twitter-Client-Version"] = ClientVersion;
+            webRequest.Headers["X-Twitter-Client-URL"] = ClientUrl;
 
             Uri uri = new Uri(url);
@@ -840 +845 @@
         {
             Boolean isRetry = false;
-            url = TwitterService.ServiceServerPrefix + url;
+            url = ServiceServerPrefix + url;
         Retry:
             try