[Bobbot-cvs] Bob/Core/Irc NetworkConnection.cs,1.5,1.6 NetworkPump.cs,1.2,1.3 NetworkUser.cs,1.1,1.2

[Iain M. <iai...@us...>]

Update of /cvsroot/bobbot/Bob/Core/Irc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8381/Core/Irc

Modified Files:
	NetworkConnection.cs NetworkPump.cs NetworkUser.cs 
Log Message:
Many new changes.  Most notably host-based recognition.

Index: NetworkConnection.cs
===================================================================
RCS file: /cvsroot/bobbot/Bob/Core/Irc/NetworkConnection.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NetworkConnection.cs	23 Dec 2004 22:56:12 -0000	1.5
--- NetworkConnection.cs	30 Dec 2004 03:33:28 -0000	1.6
***************
*** 218,229 ****
  		public event NickInUseReplyEventHandler NickInUse;
  
- 		public event JoinChannelMessageEventHandler Join;		
  		public event PartMessageEventHandler Part;
  		public event PingMessageEventHandler Ping;		
  		public event NickMessageEventHandler NickChanged;
  		public event ModeMessageEventHandler ModeChanged;
! 		public event PrivateMessageEventHandler PrivateMessage;
! 		public event ClientNoticeMessageEventHandler ClientNotice;
  		public event ChannelMessageEventHandler ChannelMessage;
  		
  		public event MessageReceivedEventHandler MessageReceived;
--- 218,229 ----
  		public event NickInUseReplyEventHandler NickInUse;
  
  		public event PartMessageEventHandler Part;
  		public event PingMessageEventHandler Ping;		
+ 		public event NoticeMessageEventHandler Notice;
  		public event NickMessageEventHandler NickChanged;
  		public event ModeMessageEventHandler ModeChanged;
! 		public event JoinChannelMessageEventHandler Join;		
  		public event ChannelMessageEventHandler ChannelMessage;
+ 		public event PrivateMessageEventHandler PrivateMessage;
  		
  		public event MessageReceivedEventHandler MessageReceived;
***************
*** 337,341 ****
  		{
  			if(nick == null)
! 				throw new ArgumentNullException("nick cannot be null", "nick");
  		
  			if(Nickname.ToLower() == nick.ToLower())
--- 337,341 ----
  		{
  			if(nick == null)
! 				throw new ArgumentNullException("nick", "nick cannot be null");
  		
  			if(Nickname.ToLower() == nick.ToLower())
***************
*** 348,352 ****
  		{
  			if(user == null)
! 				throw new ArgumentNullException("user cannot be null", "user");
  		
  			return IsMe(user.Nickname);
--- 348,352 ----
  		{
  			if(user == null)
! 				throw new ArgumentNullException("user", "user cannot be null");
  		
  			return IsMe(user.Nickname);
***************
*** 358,362 ****
  				throw new InvalidChannelNameException();
  			if(message == null)
! 				throw new ArgumentNullException("message cannot be null", "message");
  				
  			Send(new ChannelMessage(dest, String.Format(message, args)));
--- 358,362 ----
  				throw new InvalidChannelNameException();
  			if(message == null)
! 				throw new ArgumentNullException("message", "message cannot be null");	
  				
  			Send(new ChannelMessage(dest, String.Format(message, args)));
***************
*** 366,372 ****
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(message == null)
! 				throw new ArgumentNullException("message cannot be null", "message");		
  				
  			Send(new ChannelMessage(dest, String.Format(message, args)));
--- 366,372 ----
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(message == null)
! 				throw new ArgumentNullException("message", "message cannot be null");		
  				
  			Send(new ChannelMessage(dest, String.Format(message, args)));
***************
*** 378,382 ****
  				throw new InvalidNicknameException();
  			if(message == null)
! 				throw new ArgumentNullException("message cannot be null", "message");
  							
  			Send(new PrivateMessage(dest, String.Format(message, args)));
--- 378,382 ----
  				throw new InvalidNicknameException();
  			if(message == null)
! 				throw new ArgumentNullException("message", "message cannot be null");
  							
  			Send(new PrivateMessage(dest, String.Format(message, args)));
***************
*** 386,414 ****
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(message == null)
! 				throw new ArgumentNullException("message cannot be null", "message");			
  				
  			Send(new PrivateMessage(dest, String.Format(message, args)));
  		}
  		
! 		public void SendClientNotice(string dest, string message, params object[] args)
  		{
  			if(!IrcHelper.IsValidNickname(dest))
  				throw new InvalidNicknameException();
  			if(message == null)
! 				throw new ArgumentNullException("message cannot be null", "message");	
  				
! 			Send(new ClientNoticeMessage(dest, String.Format(message, args)));
  		}
  		
! 		public void SendClientNotice(NetworkUser dest, string message, params object[] args)
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(message == null)
! 				throw new ArgumentNullException("message cannot be null", "message");		
  						
! 			Send(new ClientNoticeMessage(dest, String.Format(message, args)));
  		}
  		
--- 386,414 ----
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(message == null)
! 				throw new ArgumentNullException("message", "message cannot be null");			
  				
  			Send(new PrivateMessage(dest, String.Format(message, args)));
  		}
  		
! 		public void SendNotice(string dest, string message, params object[] args)
  		{
  			if(!IrcHelper.IsValidNickname(dest))
  				throw new InvalidNicknameException();
  			if(message == null)
! 				throw new ArgumentNullException("message", "message cannot be null");	
  				
! 			Send(new NoticeMessage(dest, String.Format(message, args)));
  		}
  		
! 		public void SendNotice(NetworkUser dest, string message, params object[] args)
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(message == null)
! 				throw new ArgumentNullException("message", "message cannot be null");		
  						
! 			Send(new NoticeMessage(dest, String.Format(message, args)));
  		}
  		
***************
*** 426,432 ****
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(reason == null)
! 				throw new ArgumentNullException("reason cannot be null", "reason");
  				
  			Send(new PartMessage(dest, String.Format(reason, args)));	
--- 426,432 ----
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(reason == null)
! 				throw new ArgumentNullException("reason", "reason cannot be null");
  				
  			Send(new PartMessage(dest, String.Format(reason, args)));	
***************
*** 436,442 ****
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(reason == null)
! 				throw new ArgumentNullException("reason cannot be null", "reason");
  							
  			Send(new PartMessage(dest, String.Format(reason, args)));
--- 436,442 ----
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(reason == null)
! 				throw new ArgumentNullException("reason", "reason cannot be null");
  							
  			Send(new PartMessage(dest, String.Format(reason, args)));
***************
*** 451,457 ****
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(key == null)
! 				throw new ArgumentNullException("key cannot be null", "key");
  							
  			Send(new JoinChannelMessage(dest, key));
--- 451,457 ----
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(key == null)
! 				throw new ArgumentNullException("key", "key cannot be null");	
  							
  			Send(new JoinChannelMessage(dest, key));
***************
*** 466,472 ****
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest cannot be null", "dest");
  			if(key == null)
! 				throw new ArgumentNullException("key cannot be null", "key");		
  		
  			Send(new JoinChannelMessage(dest, key));
--- 466,472 ----
  		{
  			if(dest == null)
! 				throw new ArgumentNullException("dest", "dest cannot be null");
  			if(key == null)
! 				throw new ArgumentNullException("key", "key cannot be null");		
  		
  			Send(new JoinChannelMessage(dest, key));
***************
*** 663,671 ****
  			if(args.Message.IsClient)
  			{
! 				ClientNoticeMessage msg = new ClientNoticeMessage(args.Message.Destination, args.Message.Message);
  				msg.From = args.Message.From;
  			
! 				if(ClientNotice != null)
! 					ClientNotice(this, new ClientNoticeMessageEventArgs(msg));
  			}
  		}
--- 663,671 ----
  			if(args.Message.IsClient)
  			{
! 				NoticeMessage msg = new NoticeMessage(args.Message.Destination, args.Message.Message);
  				msg.From = args.Message.From;
  			
! 				if(Notice != null)
! 					Notice(this, new NoticeMessageEventArgs(msg));
  			}
  		}
***************
*** 681,684 ****
--- 681,686 ----
  			{
  				args.Message.From.Channels.Remove(args.Message.Channel.Name);
+ 
+ 				// TODO: If a user parts all channels remove all records of the user.
  			}
  		

Index: NetworkPump.cs
===================================================================
RCS file: /cvsroot/bobbot/Bob/Core/Irc/NetworkPump.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NetworkPump.cs	23 Dec 2004 22:56:12 -0000	1.2
--- NetworkPump.cs	30 Dec 2004 03:33:28 -0000	1.3
***************
*** 216,220 ****
  							if(subMessages[i].EndsWith("\r"))
  							{
! 								Console.WriteLine(subMessages[i]);
  								if(MessageReceived != null)
  									MessageReceived(m_Network, new MessageReceivedEventArgs(subMessages[i].Trim('\r', '\n', ' ')));
--- 216,220 ----
  							if(subMessages[i].EndsWith("\r"))
  							{
! 								//Console.WriteLine(subMessages[i]);
  								if(MessageReceived != null)
  									MessageReceived(m_Network, new MessageReceivedEventArgs(subMessages[i].Trim('\r', '\n', ' ')));

Index: NetworkUser.cs
===================================================================
RCS file: /cvsroot/bobbot/Bob/Core/Irc/NetworkUser.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetworkUser.cs	9 Dec 2004 19:43:17 -0000	1.1
--- NetworkUser.cs	30 Dec 2004 03:33:28 -0000	1.2
***************
*** 87,91 ****
  		#endregion
  
! 		#region Public methods		
  		public override string ToString()
  		{
--- 87,101 ----
  		#endregion
  
! 		#region Public methods
! 		public void SendMessage(string format, params object[] args)
! 		{
! 			Kernel.Instance.Network.SendPrivateMessage(this.Nickname, format, args);
! 		}
! 
! 		public void SendNotice(string format, params object[] args)
! 		{
! 			Kernel.Instance.Network.SendNotice(this.Nickname, format, args);
! 		}
! 
  		public override string ToString()
  		{