Changeset 319

Timestamp:

09/29/07 03:03:46 (16 months ago)

Author:

tomoyo

Message:

* チャンネル名を設定できるようにした
* CookieログインモードをMonoでも使えるようにした

Location:

TwitterIrcGateway

Files:

• TwitterIrcGateway/App.config (modified) (1 diff)
• TwitterIrcGateway/Program.cs (modified) (1 diff)
• TwitterIrcGateway/Settings.Designer.cs (modified) (1 diff)
• TwitterIrcGateway/Settings.settings (modified) (1 diff)
• TwitterIrcGatewayCLI/Program.cs (modified) (4 diffs)
• TwitterIrcGatewayCore/Server.cs (modified) (1 diff)
• TwitterIrcGatewayCore/Session.cs (modified) (11 diffs)
• TwitterIrcGatewayCore/TwitterIrcGatewayCore.csproj (modified) (1 diff)
• TwitterIrcGatewayCore/TwitterService.cs (modified) (4 diffs)

TwitterIrcGateway/TwitterIrcGateway/App.config

@@ -41 +41 @@
                 <value>False</value>
             </setting>
+            <setting name="TwitterChannelName" serializeAs="String">
+                <value>twitter</value>
+            </setting>
         </Misuzilla.Applications.TwitterIrcGateway.Settings>
     </userSettings>

TwitterIrcGateway/TwitterIrcGateway/Program.cs

@@ -55 +55 @@
             _server.IntervalDirectMessage = _settings.IntervalDirectMessage;
             _server.CookieLoginMode = _settings.CookieLoginMode;
+            _server.ChannelName = "#"+_settings.TwitterChannelName;
             _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
             try

TwitterIrcGateway/TwitterIrcGateway/Settings.Designer.cs

@@ -155 +155 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("twitter")]
+        public string TwitterChannelName {
+            get {
+                return ((string)(this["TwitterChannelName"]));
+            }
+            set {
+                this["TwitterChannelName"] = value;
+            }
+        }
     }
 }

TwitterIrcGateway/TwitterIrcGateway/Settings.settings

@@ -36 +36 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="TwitterChannelName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">twitter</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

TwitterIrcGateway/TwitterIrcGatewayCLI/Program.cs

@@ -24 +24 @@
             IPAddress bindAddress = IPAddress.Loopback;
             Encoding encoding = Encoding.GetEncoding("ISO-2022-JP");
+            String channelName = "#twitter";
 
             foreach (String arg in args)
@@ -105 +106 @@
                     }
                 }
+                else if (arg.StartsWith("--channel-name="))
+                {
+                    String channelNameT = arg.Substring("--channel-name=".Length).Replace(" ", "");
+                    if (channelName.Length != 0)
+                    {
+                        channelName = "#"+channelNameT;
+                    }
+                }
                 else if (arg.StartsWith("--help"))
                 {
@@ -122 +131 @@
             _server.IntervalDirectMessage = intervalDirectMessage;
             _server.CookieLoginMode = cookieLoginMode;
+            _server.ChannelName = channelName;
             _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
 
@@ -135 +145 @@
             Console.WriteLine("[Configuration] IntervalDirectMessage: {0}", _server.IntervalDirectMessage);
             Console.WriteLine("[Configuration] CookieLoginMode: {0}", _server.CookieLoginMode);
+            Console.WriteLine("[Configuration] ChannelName: {0}", _server.ChannelName);
 
             _server.Start(bindAddress, port);

TwitterIrcGateway/TwitterIrcGatewayCore/Server.cs

@@ -54 +54 @@
         public Boolean CookieLoginMode = false;
 
+        /// <summary>
+        /// Twitter�̃X�e�[�^�X�������`�����l����
+        /// </summary>
+        public String ChannelName = "#twitter";
+
         public const String ServerName = "localhost";
-        public const String ChannelName = "#twitter";
         public const String ServerNick = "$twitterGatewayServer$";
 

TwitterIrcGateway/TwitterIrcGatewayCore/Session.cs

@@ -373 +373 @@
             foreach (String channelName in channelNames)
             {
-                if (!channelName.StartsWith("#") || channelName.Length < 3 || String.Compare(channelName, Server.ChannelName, true) == 0)
+                if (!channelName.StartsWith("#") || channelName.Length < 3 || String.Compare(channelName, _server.ChannelName, true) == 0)
                 {
                     SendErrorReply(ErrorReply.ERR_NOSUCHCHANNEL, "No such nick/channel");
@@ -410 +410 @@
             foreach (String channelName in channelNames)
             {
-                if (!channelName.StartsWith("#") || channelName.Length < 3 || String.Compare(channelName, Server.ChannelName, true) == 0)
+                if (!channelName.StartsWith("#") || channelName.Length < 3 || String.Compare(channelName, _server.ChannelName, true) == 0)
                 {
                     SendErrorReply(ErrorReply.ERR_NOSUCHCHANNEL, "No such nick/channel");
@@ -536 +536 @@
             String channelName = e.Message.CommandParams[1];
             Trace.WriteLine(String.Format("Invite: {0} -> {1}", userName, channelName));
-            if (!channelName.StartsWith("#") || channelName.Length < 3 || String.Compare(channelName, Server.ChannelName, true) == 0)
+            if (!channelName.StartsWith("#") || channelName.Length < 3 || String.Compare(channelName, _server.ChannelName, true) == 0)
             {
                 SendErrorReply(ErrorReply.ERR_NOSUCHCHANNEL, "No such nick/channel");
@@ -591 +591 @@
                 , String.Format("{0} {1}-{2} {3} {4}", Environment.MachineName, t.FullName, t.Assembly.GetName().Version, "", ""));
 
-            JoinMessage joinMsg = new JoinMessage(Server.ChannelName, "");
+            JoinMessage joinMsg = new JoinMessage(_server.ChannelName, "");
             PrivMsgMessage autoMsg = new PrivMsgMessage();
             autoMsg.SenderNick = Server.ServerNick;
             autoMsg.SenderHost = "twitter@" + Server.ServerName;
-            autoMsg.Receiver = Server.ChannelName;
+            autoMsg.Receiver = _server.ChannelName;
             autoMsg.Content = "Twitter IRC Gateway Server Connected.";
 
@@ -651 +651 @@
             {
                 // チャンネル宛は自分のメッセージを書き換え
-                if (message.Receiver == Server.ChannelName || message.Receiver.StartsWith("#"))
+                if ((String.Compare(message.Receiver, _server.ChannelName, true) == 0) || message.Receiver.StartsWith("#"))
                 {
                     try
@@ -675 +675 @@
                     if (_server.SetTopicOnStatusChanged)
                     {
-                        TopicMessage topicMsg = new TopicMessage(Server.ChannelName, message.Content);
+                        TopicMessage topicMsg = new TopicMessage(_server.ChannelName, message.Content);
                         topicMsg.Sender = _clientHost;
                         Send(topicMsg);
@@ -877 +877 @@
                 }));
 
-                SendNumericReply(NumericReply.RPL_NAMREPLY, "=", Server.ChannelName, String.Join(" ", _nickNames.ToArray()));
-                SendNumericReply(NumericReply.RPL_ENDOFNAMES, Server.ChannelName, "End of NAMES list");
+                SendNumericReply(NumericReply.RPL_NAMREPLY, "=", _server.ChannelName, String.Join(" ", _nickNames.ToArray()));
+                SendNumericReply(NumericReply.RPL_ENDOFNAMES, _server.ChannelName, "End of NAMES list");
             }
             catch (WebException ex)
@@ -927 +927 @@
                     if (!_nickNames.Contains(screenName))
                     {
-                        JoinMessage joinMsg = new JoinMessage(Server.ChannelName, "");
+                        JoinMessage joinMsg = new JoinMessage(_server.ChannelName, "");
                         joinMsg.SenderNick = screenName;
                         joinMsg.SenderHost = String.Format("{0}@{1}", "twitter", Server.ServerName);
@@ -938 +938 @@
                     if (!screenNames.Contains(screenName))
                     {
-                        PartMessage partMsg = new PartMessage(Server.ChannelName, "");
+                        PartMessage partMsg = new PartMessage(_server.ChannelName, "");
                         partMsg.SenderNick = screenName;
                         partMsg.SenderHost = String.Format("{0}@{1}", "twitter", Server.ServerName);
@@ -1035 +1035 @@
                             noticeMsg.SenderNick = status.User.ScreenName;
                             noticeMsg.SenderHost = "twitter@" + Server.ServerName;
-                            noticeMsg.Receiver = Server.ChannelName;
+                            noticeMsg.Receiver = _server.ChannelName;
                             noticeMsg.Content = String.Format("{0}: {1}", status.CreatedAt.ToString("HH:mm"), line);
                             Send(noticeMsg);
@@ -1045 +1045 @@
                             {
                                 case "NOTICE":
-                                    msg = new NoticeMessage(Server.ChannelName, line);
+                                    msg = new NoticeMessage(_server.ChannelName, line);
                                     break;
                                 case "PRIVMSG":
                                 default:
-                                    msg = new PrivMsgMessage(Server.ChannelName, line);
+                                    msg = new PrivMsgMessage(_server.ChannelName, line);
                                     break;
                             }

TwitterIrcGateway/TwitterIrcGatewayCore/TwitterIrcGatewayCore.csproj

@@ -48 +48 @@
     <Compile Include="Server.cs" />
     <Compile Include="Session.cs" />
-    <Compile Include="TwitterService.cs" />
+    <Compile Include="TwitterService.cs">
+    </Compile>
     <Compile Include="Utility.cs" />
   </ItemGroup>

TwitterIrcGateway/TwitterIrcGatewayCore/TwitterService.cs

@@ -24 +24 @@
         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/client-info.xml";
+        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";
@@ -402 +402 @@
             url = TwitterService.ServiceServerPrefix + url;
         Retry:
-            using (CookieEnabledWebClient webClient = new CookieEnabledWebClient(_cookies))
-            {
-                try
-                {
-                    System.Diagnostics.Trace.WriteLine(String.Format("GET(Cookie): {0}", url));
-                    return webClient.DownloadString(url);
-                }
-                catch (WebException we)
-                {
-                    HttpWebResponse wResponse = we.Response as HttpWebResponse;
-                    if (wResponse == null || wResponse.StatusCode != HttpStatusCode.Unauthorized || isRetry)
-                        throw;
-
-                    _cookies = Login(_userName, _credential.GetCredential(new Uri("http://twitter.com"), "Basic").Password);
-
-                    isRetry = true;
-                    goto Retry;
-                }
-            }
-        }
-
+            try
+            {
+                System.Diagnostics.Trace.WriteLine(String.Format("GET(Cookie): {0}", url));
+                return DownloadString(url);
+            }
+            catch (WebException we)
+            {
+                HttpWebResponse wResponse = we.Response as HttpWebResponse;
+                if (wResponse == null || wResponse.StatusCode != HttpStatusCode.Unauthorized || isRetry)
+                    throw;
+
+                _cookies = Login(_userName, _credential.GetCredential(new Uri("http://twitter.com"), "Basic").Password);
+
+                isRetry = true;
+                goto Retry;
+            }
+        }
+
+        private CookieCollection Login(String userNameOrEmail, String password)
+        {
+            System.Diagnostics.Trace.WriteLine(String.Format("Cookie Login: {0}", userNameOrEmail));
+
+            HttpWebRequest request = CreateWebRequest("http://twitter.com/sessions") as HttpWebRequest;
+            request.AllowAutoRedirect = false;
+            request.Method = "POST";
+            using (StreamWriter sw = new StreamWriter(request.GetRequestStream()))
+            {
+                sw.Write("username_or_email={0}&password={1}&remember_me=1&commit=Sign%20In", userNameOrEmail, password);
+            }
+            
+            HttpWebResponse response = request.GetResponse() as HttpWebResponse;
+            using (StreamReader sr = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+            {
+                String responseBody = sr.ReadToEnd();
+
+                if (response.Cookies.Count == 0)
+                {
+                    throw new ApplicationException("���O�C���Ɏ��s���܂����B���[�U���܂��̓p�X���[�h���Ԉ��Ă����\�����������B");
+                }
+
+                foreach (Cookie cookie in response.Cookies)
+                {
+                    cookie.Domain = "twitter.com";
+                }
+                return response.Cookies;
+            }
+        }
+
+        WebRequest CreateWebRequest(String uri)
+        {
+            WebRequest request = WebRequest.Create(uri);
+            if (request is HttpWebRequest)
+            {
+                HttpWebRequest httpRequest = request as HttpWebRequest;
+                httpRequest.UserAgent = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)";
+                httpRequest.Referer = Referer;
+                httpRequest.PreAuthenticate = false;
+                httpRequest.Accept = "*/*";
+                httpRequest.CookieContainer = new CookieContainer();
+                if (_cookies != null)
+                {
+                    httpRequest.CookieContainer.Add(_cookies);
+                }
+            }
+            return request;
+        }
+           
+#if FALSE
         private CookieCollection Login(String userNameOrEmail, String password)
         {
@@ -447 +494 @@
             }
         }
-
         class CookieEnabledWebClient : WebClient
         {
@@ -501 +547 @@
                 return response;
             }
+        }
+#endif
+        
+        String DownloadString(String url)
+        {
+            WebRequest request = CreateWebRequest(url);
+            WebResponse response = null;
+            try
+            {
+                response = request.GetResponse();
+                using (StreamReader sr = new StreamReader(response.GetResponseStream()))
+                {
+                    return sr.ReadToEnd();
+                }
+            }
+            finally
+            {
+                if (response != null)
+                {
+                    response.Close();
+                }
+            }
+#if FALSE
+            using (CookieEnabledWebClient webClient = new CookieEnabledWebClient(_cookies))
+            {
+                return webClient.DownloadString(url);
+            }
+#endif
         }
         #endregion