Changeset 389

Timestamp:

05/17/08 22:02:44 (6 months ago)

Author:

tomoyo

Message:

* TIGIMDISABLE コマンドを追加
* 恥ずかしいtypoを修正

Location:

TwitterIrcGateway/branches/im-support

Files:

• TwitterIrcGateway.sln (modified) (2 diffs)
• TwitterIrcGateway/Program.cs (modified) (2 diffs)
• TwitterIrcGatewayCLI/Program.cs (modified) (2 diffs)
• TwitterIrcGatewayCore/EventArgs.cs (modified) (1 diff)
• TwitterIrcGatewayCore/Server.cs (modified) (3 diffs)
• TwitterIrcGatewayCore/Session.cs (modified) (21 diffs)

TwitterIrcGateway/branches/im-support/TwitterIrcGateway.sln

@@ -12 +12 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "agsXMPP2008", "TwitterIrcGatewayCore\agsXMPP\agsXMPP2008.csproj", "{DC39021C-FA24-4E34-AB4A-3260BB5314AF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{1CF042F6-5557-4AB9-9C53-55F24611E673}"
 EndProject
 Global
@@ -37 +35 @@
                 {DC39021C-FA24-4E34-AB4A-3260BB5314AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {DC39021C-FA24-4E34-AB4A-3260BB5314AF}.Release|Any CPU.Build.0 = Release|Any CPU
-                {1CF042F6-5557-4AB9-9C53-55F24611E673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {1CF042F6-5557-4AB9-9C53-55F24611E673}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {1CF042F6-5557-4AB9-9C53-55F24611E673}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {1CF042F6-5557-4AB9-9C53-55F24611E673}.Release|Any CPU.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

TwitterIrcGateway/branches/im-support/TwitterIrcGateway/Program.cs

@@ -62 +62 @@
             _server.ClientMessageWait = _settings.ClientMessageWait;
             _server.BroadcastUpdateMessageIsNotice = _settings.BroadcastUpdateMessageIsNotice;
-            _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
+            _server.SessionStartedReceived += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedReceived);
             try
             {
@@ -96 +96 @@
         }
 
-        void _server_SessionStartedRecieved(object sender, SessionStartedEventArgs e)
+        void _server_SessionStartedReceived(object sender, SessionStartedEventArgs e)
         {
             _notifyIcon.ShowBalloonTip(1000 * 10, Name, String.Format("���[�U {0} ���T�[�o�ɐڑ����܂����B", e.UserName), ToolTipIcon.Info);

TwitterIrcGateway/branches/im-support/TwitterIrcGatewayCLI/Program.cs

@@ -72 +72 @@
             _server.ClientMessageWait = options.ClientMessageWait;
             _server.BroadcastUpdateMessageIsNotice = options.BroadcastUpdateMessageIsNotice;
-            _server.SessionStartedRecieved += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedRecieved);
+            _server.SessionStartedReceived += new EventHandler<SessionStartedEventArgs>(_server_SessionStartedReceived);
             _server.Proxy = proxy;
 
@@ -108 +108 @@
         }
 
-        static void _server_SessionStartedRecieved(object sender, SessionStartedEventArgs e)
+        static void _server_SessionStartedReceived(object sender, SessionStartedEventArgs e)
         {
             //Console.WriteLine("[Connect] User: {0}", e.UserName);

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

@@ -8 +8 @@
 namespace Misuzilla.Applications.TwitterIrcGateway
 {
-    public class MessageRecievedEventArgs : EventArgs
+    public class MessageReceivedEventArgs : EventArgs
     {
         public IRCMessage Message;
         public TcpClient Client;
         public StreamWriter Writer;
-        public MessageRecievedEventArgs(IRCMessage msg, StreamWriter sw, TcpClient tcpClient)
+        public MessageReceivedEventArgs(IRCMessage msg, StreamWriter sw, TcpClient tcpClient)
         {
             Writer = sw;

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

@@ -96 +96 @@
         public const String ServerNick = "$TwitterIrcGatewayServer$";
 
-        public event EventHandler<SessionStartedEventArgs> SessionStartedRecieved;
+        public event EventHandler<SessionStartedEventArgs> SessionStartedReceived;
 
         void AcceptHandled(IAsyncResult ar)
@@ -111 +111 @@
                     _sessions.Add(session);
                 }
-                session.SessionStarted += new EventHandler<SessionStartedEventArgs>(session_SessionStartedRecieved);
+                session.SessionStarted += new EventHandler<SessionStartedEventArgs>(session_SessionStartedReceived);
                 session.SessionEnded += new EventHandler(session_SessionEnded);
                 session.Start();
@@ -125 +125 @@
         }
 
-        void session_SessionStartedRecieved(object sender, SessionStartedEventArgs e)
+        void session_SessionStartedReceived(object sender, SessionStartedEventArgs e)
         {
             // ���p
-            if (SessionStartedRecieved != null)
+            if (SessionStartedReceived != null)
             {
-                SessionStartedRecieved(sender, e);
+                SessionStartedReceived(sender, e);
             }
         }

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

@@ -47 +47 @@
         private TraceListener _traceListeneer;
 
-        private event EventHandler<MessageRecievedEventArgs> MessageRecieved;
+        private event EventHandler<MessageReceivedEventArgs> MessageReceived;
         private String _username;
         private String _password;
@@ -57 +57 @@
         public Session(Server server, TcpClient tcpClient)
         {
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_USER);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_NICK);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_PASS);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_QUIT);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_PRIVMSG);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_WHOIS);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_INVITE);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_JOIN);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_PART);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_KICK);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_LIST);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_TIGGC);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_TOPIC);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_MODE);
-            MessageRecieved += new EventHandler<MessageRecievedEventArgs>(MessageRecieved_TIGIMENABLE);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_USER);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_NICK);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_PASS);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_QUIT);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_PRIVMSG);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_WHOIS);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_INVITE);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_JOIN);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_PART);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_KICK);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_LIST);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_TIGGC);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_TOPIC);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_MODE);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_TIGIMENABLE);
+            MessageReceived += new EventHandler<MessageReceivedEventArgs>(MessageReceived_TIGIMDISABLE);
 
             _groups = new Groups();
@@ -218 +219 @@
                         {
                             IRCMessage msg = IRCMessage.CreateMessage(line);
-                            OnMessageRecieved(msg);
+                            OnMessageReceived(msg);
                         }
                         catch (IRCException)
@@ -238 +239 @@
         #region イベント実行メソッド
 
-        protected virtual void OnMessageRecieved(IRCMessage msg)
-        {
-            if (MessageRecieved != null)
-            {
-                MessageRecieved(this, new MessageRecievedEventArgs(msg, _writer, _tcpClient));
+        protected virtual void OnMessageReceived(IRCMessage msg)
+        {
+            if (MessageReceived != null)
+            {
+                MessageReceived(this, new MessageReceivedEventArgs(msg, _writer, _tcpClient));
             }
         }
@@ -252 +253 @@
             LoadConfig();
 
-            if (_config.IMServiceServerName != null)
+            if (!String.IsNullOrEmpty(_config.IMServiceServerName))
             {
                 ConnectToIMService();
@@ -383 +384 @@
 
         #region メッセージ処理イベント
-        private void MessageRecieved_JOIN(object sender, MessageRecievedEventArgs e)
+        private void MessageReceived_JOIN(object sender, MessageReceivedEventArgs e)
         {
             Trace.WriteLine(e.Message.ToString());
@@ -435 +436 @@
        }
 
-        private void MessageRecieved_PART(object sender, MessageRecievedEventArgs e)
+        private void MessageReceived_PART(object sender, MessageReceivedEventArgs e)
         {
             if (!(e.Message is PartMessage)) return;
@@ -477 +478 @@
             }
         }
-        private void MessageRecieved_KICK(object sender, MessageRecievedEventArgs e)
+        private void MessageReceived_KICK(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "KICK", true) != 0) return;
@@ -551 +552 @@
             SaveGroups();
         }
-        private void MessageRecieved_LIST(object sender, MessageRecievedEventArgs e)
+        private void MessageReceived_LIST(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "LIST", true) != 0) return;
@@ -560 +561 @@
             SendNumericReply(NumericReply.RPL_LISTEND, "End of LIST");
         }
-        private void MessageRecieved_INVITE(object sender, MessageRecievedEventArgs e)
+        private void MessageReceived_INVITE(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "INVITE", true) != 0) return;
@@ -595 +596 @@
         }
 
-        private void MessageRecieved_USER(object sender, MessageRecievedEventArgs e)
+        private void MessageReceived_USER(object sender, MessageReceivedEventArgs e)
         {
             if (!(e.Message is UserMessage)) return;
@@ -656 +657 @@
         }
 
-        void MessageRecieved_NICK(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_NICK(object sender, MessageReceivedEventArgs e)
         {
             if (!(e.Message is NickMessage)) return;
@@ -663 +664 @@
         }
 
-        void MessageRecieved_PASS(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_PASS(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "PASS", true) != 0) return;
@@ -673 +674 @@
         }
 
-        void MessageRecieved_QUIT(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_QUIT(object sender, MessageReceivedEventArgs e)
         {
             if (!(e.Message is QuitMessage)) return;
@@ -684 +685 @@
         }
 
-        void MessageRecieved_PRIVMSG(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_PRIVMSG(object sender, MessageReceivedEventArgs e)
         {
             PrivMsgMessage message = e.Message as PrivMsgMessage;
@@ -810 +811 @@
         }
 
-        void MessageRecieved_WHOIS(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_WHOIS(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "WHOIS", true) != 0) return;
@@ -856 +857 @@
         }
 
-        void MessageRecieved_TIGGC(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_TIGGC(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "TIGGC", true) != 0) return;
@@ -864 +865 @@
         }
 
-        void MessageRecieved_TOPIC(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_TOPIC(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "TOPIC", true) != 0) return;
@@ -884 +885 @@
         }
         
-        void MessageRecieved_MODE(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_MODE(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "MODE", true) != 0) return;
@@ -932 +933 @@
         }
 
-        void MessageRecieved_TIGIMENABLE(object sender, MessageRecievedEventArgs e)
+        void MessageReceived_TIGIMENABLE(object sender, MessageReceivedEventArgs e)
         {
             if (String.Compare(e.Message.Command, "TIGIMENABLE", true) != 0) return;
@@ -948 +949 @@
             ConnectToIMService();
         }
+
+        void MessageReceived_TIGIMDISABLE(object sender, MessageReceivedEventArgs e)
+        {
+            if (String.Compare(e.Message.Command, "TIGIMDISABLE", true) != 0) return;
+            _config.IMServiceServerName = _config.IMServerName = _config.IMUserName = _config.IMEncryptoPassword = "";
+            SaveConfig();
+            DisconnectToIMService();
+        }
+
+        private void DisconnectToIMService()
+        {
+            if (_twitterIm != null)
+            {
+                SendTwitterGatewayServerMessage("インスタントメッセージングサービスから切断します。");
+                _twitterIm.Close();
+            }
+        }
         
         private void ConnectToIMService()
         {
-            if (_twitterIm != null)
-            {
-                _twitterIm.Close();
-            }
+            DisconnectToIMService();
+            SendTwitterGatewayServerMessage(String.Format("インスタントメッセージングサービス \"{0}\" (サーバ: {1}) にユーザ \"{2}\" でログインします。", _config.IMServerName, _config.IMServiceServerName, _config.IMUserName));
+
             _twitterIm = new TwitterIMService(_config.IMServiceServerName, _config.IMServerName, _config.IMUserName, _config.GetIMPassword(_password));
             _twitterIm.StatusUpdateReceived += new EventHandler<TwitterIMService.StatusUpdateReceivedEventArgs>(twitterIm_StatusUpdateReceived);