This commit is contained in:
Ben Harris 2019-02-05 17:56:52 -05:00
parent c2a9c53ac8
commit f085b631a1
7 changed files with 49 additions and 49 deletions

View File

@ -128,7 +128,7 @@ namespace ChatSharp.Handlers
public static void HandleUserListEnd(IrcClient client, IrcMessage message) public static void HandleUserListEnd(IrcClient client, IrcMessage message)
{ {
var channel = client.Channels[message.Parameters[1]]; var channel = client.Channels[message.Parameters[1]];
client.OnChannelListRecieved(new ChannelEventArgs(channel)); client.OnChannelListReceived(new ChannelEventArgs(channel));
if (client.Settings.ModeOnJoin) if (client.Settings.ModeOnJoin)
{ {
try try

View File

@ -18,12 +18,12 @@ namespace ChatSharp.Handlers
throw new IrcProtocolException("372 MOTD message is incorrectly formatted."); throw new IrcProtocolException("372 MOTD message is incorrectly formatted.");
var part = message.Parameters[1].Substring(2); var part = message.Parameters[1].Substring(2);
MOTD += part + Environment.NewLine; MOTD += part + Environment.NewLine;
client.OnMOTDPartRecieved(new ServerMOTDEventArgs(part)); client.OnMOTDPartReceived(new ServerMOTDEventArgs(part));
} }
public static void HandleEndOfMOTD(IrcClient client, IrcMessage message) public static void HandleEndOfMOTD(IrcClient client, IrcMessage message)
{ {
client.OnMOTDRecieved(new ServerMOTDEventArgs(MOTD)); client.OnMOTDReceived(new ServerMOTDEventArgs(MOTD));
client.OnConnectionComplete(new EventArgs()); client.OnConnectionComplete(new EventArgs());
// Verify our identity // Verify our identity
VerifyOurIdentity(client); VerifyOurIdentity(client);
@ -32,7 +32,7 @@ namespace ChatSharp.Handlers
public static void HandleMOTDNotFound(IrcClient client, IrcMessage message) public static void HandleMOTDNotFound(IrcClient client, IrcMessage message)
{ {
client.OnMOTDRecieved(new ServerMOTDEventArgs(MOTD)); client.OnMOTDReceived(new ServerMOTDEventArgs(MOTD));
client.OnConnectionComplete(new EventArgs()); client.OnConnectionComplete(new EventArgs());
VerifyOurIdentity(client); VerifyOurIdentity(client);

View File

@ -119,17 +119,17 @@ namespace ChatSharp.Handlers
public static void HandleNotice(IrcClient client, IrcMessage message) public static void HandleNotice(IrcClient client, IrcMessage message)
{ {
client.OnNoticeRecieved(new IrcNoticeEventArgs(message)); client.OnNoticeReceived(new IrcNoticeEventArgs(message));
} }
public static void HandlePrivmsg(IrcClient client, IrcMessage message) public static void HandlePrivmsg(IrcClient client, IrcMessage message)
{ {
var eventArgs = new PrivateMessageEventArgs(client, message, client.ServerInfo); var eventArgs = new PrivateMessageEventArgs(client, message, client.ServerInfo);
client.OnPrivateMessageRecieved(eventArgs); client.OnPrivateMessageReceived(eventArgs);
if (eventArgs.PrivateMessage.IsChannelMessage) if (eventArgs.PrivateMessage.IsChannelMessage)
client.OnChannelMessageRecieved(eventArgs); client.OnChannelMessageReceived(eventArgs);
else else
client.OnUserMessageRecieved(eventArgs); client.OnUserMessageReceived(eventArgs);
} }
public static void HandleErronousNick(IrcClient client, IrcMessage message) public static void HandleErronousNick(IrcClient client, IrcMessage message)

View File

@ -96,7 +96,7 @@ namespace ChatSharp.Handlers
} }
} }
} }
client.OnServerInfoRecieved(new SupportsEventArgs(client.ServerInfo)); client.OnServerInfoReceived(new SupportsEventArgs(client.ServerInfo));
} }
public static void HandleMyInfo(IrcClient client, IrcMessage message) public static void HandleMyInfo(IrcClient client, IrcMessage message)

View File

@ -116,7 +116,7 @@ namespace ChatSharp
/// <summary> /// <summary>
/// Information about the server we are connected to. Servers may not send us this information, /// Information about the server we are connected to. Servers may not send us this information,
/// but it's required for ChatSharp to function, so by default this is a guess. Handle /// but it's required for ChatSharp to function, so by default this is a guess. Handle
/// IrcClient.ServerInfoRecieved if you'd like to know when it's populated with real information. /// IrcClient.ServerInfoReceived if you'd like to know when it's populated with real information.
/// </summary> /// </summary>
public ServerInfo ServerInfo { get; set; } public ServerInfo ServerInfo { get; set; }
/// <summary> /// <summary>
@ -253,7 +253,7 @@ namespace ChatSharp
((SslStream)NetworkStream).AuthenticateAsClient(ServerHostname); ((SslStream)NetworkStream).AuthenticateAsClient(ServerHostname);
} }
NetworkStream.BeginRead(ReadBuffer, ReadBufferIndex, ReadBuffer.Length, DataRecieved, null); NetworkStream.BeginRead(ReadBuffer, ReadBufferIndex, ReadBuffer.Length, DataReceived, null);
// Begin capability negotiation // Begin capability negotiation
SendRawMessage("CAP LS 302"); SendRawMessage("CAP LS 302");
// Write login info // Write login info
@ -274,7 +274,7 @@ namespace ChatSharp
} }
} }
private void DataRecieved(IAsyncResult result) private void DataReceived(IAsyncResult result)
{ {
if (NetworkStream == null) if (NetworkStream == null)
{ {
@ -312,12 +312,12 @@ namespace ChatSharp
Array.Copy(ReadBuffer, messageLength, ReadBuffer, 0, length - messageLength); Array.Copy(ReadBuffer, messageLength, ReadBuffer, 0, length - messageLength);
length -= messageLength; length -= messageLength;
} }
NetworkStream.BeginRead(ReadBuffer, ReadBufferIndex, ReadBuffer.Length - ReadBufferIndex, DataRecieved, null); NetworkStream.BeginRead(ReadBuffer, ReadBufferIndex, ReadBuffer.Length - ReadBufferIndex, DataReceived, null);
} }
private void HandleMessage(string rawMessage) private void HandleMessage(string rawMessage)
{ {
OnRawMessageRecieved(new RawMessageEventArgs(rawMessage, false)); OnRawMessageReceived(new RawMessageEventArgs(rawMessage, false));
var message = new IrcMessage(rawMessage); var message = new IrcMessage(rawMessage);
if (Handlers.ContainsKey(message.Command.ToUpper())) if (Handlers.ContainsKey(message.Command.ToUpper()))
Handlers[message.Command.ToUpper()](this, message); Handlers[message.Command.ToUpper()](this, message);
@ -430,60 +430,60 @@ namespace ChatSharp
if (RawMessageSent != null) RawMessageSent(this, e); if (RawMessageSent != null) RawMessageSent(this, e);
} }
/// <summary> /// <summary>
/// Occurs when a raw message recieved. /// Occurs when a raw message received.
/// </summary> /// </summary>
public event EventHandler<RawMessageEventArgs> RawMessageRecieved; public event EventHandler<RawMessageEventArgs> RawMessageReceived;
internal void OnRawMessageRecieved(RawMessageEventArgs e) internal void OnRawMessageReceived(RawMessageEventArgs e)
{ {
if (RawMessageRecieved != null) RawMessageRecieved(this, e); if (RawMessageReceived != null) RawMessageReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when a notice recieved. /// Occurs when a notice received.
/// </summary> /// </summary>
public event EventHandler<IrcNoticeEventArgs> NoticeRecieved; public event EventHandler<IrcNoticeEventArgs> NoticeReceived;
internal void OnNoticeRecieved(IrcNoticeEventArgs e) internal void OnNoticeReceived(IrcNoticeEventArgs e)
{ {
if (NoticeRecieved != null) NoticeRecieved(this, e); if (NoticeReceived != null) NoticeReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when the server has sent us part of the MOTD. /// Occurs when the server has sent us part of the MOTD.
/// </summary> /// </summary>
public event EventHandler<ServerMOTDEventArgs> MOTDPartRecieved; public event EventHandler<ServerMOTDEventArgs> MOTDPartReceived;
internal void OnMOTDPartRecieved(ServerMOTDEventArgs e) internal void OnMOTDPartReceived(ServerMOTDEventArgs e)
{ {
if (MOTDPartRecieved != null) MOTDPartRecieved(this, e); if (MOTDPartReceived != null) MOTDPartReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when the entire server MOTD has been recieved. /// Occurs when the entire server MOTD has been received.
/// </summary> /// </summary>
public event EventHandler<ServerMOTDEventArgs> MOTDRecieved; public event EventHandler<ServerMOTDEventArgs> MOTDReceived;
internal void OnMOTDRecieved(ServerMOTDEventArgs e) internal void OnMOTDReceived(ServerMOTDEventArgs e)
{ {
if (MOTDRecieved != null) MOTDRecieved(this, e); if (MOTDReceived != null) MOTDReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when a private message recieved. This can be a channel OR a user message. /// Occurs when a private message received. This can be a channel OR a user message.
/// </summary> /// </summary>
public event EventHandler<PrivateMessageEventArgs> PrivateMessageRecieved; public event EventHandler<PrivateMessageEventArgs> PrivateMessageReceived;
internal void OnPrivateMessageRecieved(PrivateMessageEventArgs e) internal void OnPrivateMessageReceived(PrivateMessageEventArgs e)
{ {
if (PrivateMessageRecieved != null) PrivateMessageRecieved(this, e); if (PrivateMessageReceived != null) PrivateMessageReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when a message is recieved in an IRC channel. /// Occurs when a message is received in an IRC channel.
/// </summary> /// </summary>
public event EventHandler<PrivateMessageEventArgs> ChannelMessageRecieved; public event EventHandler<PrivateMessageEventArgs> ChannelMessageReceived;
internal void OnChannelMessageRecieved(PrivateMessageEventArgs e) internal void OnChannelMessageReceived(PrivateMessageEventArgs e)
{ {
if (ChannelMessageRecieved != null) ChannelMessageRecieved(this, e); if (ChannelMessageReceived != null) ChannelMessageReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when a message is recieved from a user. /// Occurs when a message is received from a user.
/// </summary> /// </summary>
public event EventHandler<PrivateMessageEventArgs> UserMessageRecieved; public event EventHandler<PrivateMessageEventArgs> UserMessageReceived;
internal void OnUserMessageRecieved(PrivateMessageEventArgs e) internal void OnUserMessageReceived(PrivateMessageEventArgs e)
{ {
if (UserMessageRecieved != null) UserMessageRecieved(this, e); if (UserMessageReceived != null) UserMessageReceived(this, e);
} }
/// <summary> /// <summary>
/// Raised if the nick you've chosen is in use. By default, ChatSharp will pick a /// Raised if the nick you've chosen is in use. By default, ChatSharp will pick a
@ -521,10 +521,10 @@ namespace ChatSharp
/// <summary> /// <summary>
/// Occurs when we have received the list of users present in a channel. /// Occurs when we have received the list of users present in a channel.
/// </summary> /// </summary>
public event EventHandler<ChannelEventArgs> ChannelListRecieved; public event EventHandler<ChannelEventArgs> ChannelListReceived;
internal void OnChannelListRecieved(ChannelEventArgs e) internal void OnChannelListReceived(ChannelEventArgs e)
{ {
if (ChannelListRecieved != null) ChannelListRecieved(this, e); if (ChannelListReceived != null) ChannelListReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when we have received the topic of a channel. /// Occurs when we have received the topic of a channel.
@ -545,10 +545,10 @@ namespace ChatSharp
/// <summary> /// <summary>
/// Occurs when we receive server info (such as max nick length). /// Occurs when we receive server info (such as max nick length).
/// </summary> /// </summary>
public event EventHandler<SupportsEventArgs> ServerInfoRecieved; public event EventHandler<SupportsEventArgs> ServerInfoReceived;
internal void OnServerInfoRecieved(SupportsEventArgs e) internal void OnServerInfoReceived(SupportsEventArgs e)
{ {
if (ServerInfoRecieved != null) ServerInfoRecieved(this, e); if (ServerInfoReceived != null) ServerInfoReceived(this, e);
} }
/// <summary> /// <summary>
/// Occurs when a user is kicked. /// Occurs when a user is kicked.

View File

@ -58,7 +58,7 @@ namespace ChatSharp
/// <summary> /// <summary>
/// ChatSharp makes some assumptions about what the server supports in order to function properly. /// ChatSharp makes some assumptions about what the server supports in order to function properly.
/// If it has not recieved a 005 message giving it accurate information, this value will be true. /// If it has not received a 005 message giving it accurate information, this value will be true.
/// </summary> /// </summary>
public bool IsGuess { get; internal set; } public bool IsGuess { get; internal set; }
/// <summary> /// <summary>

View File

@ -12,7 +12,7 @@ var client = new IrcClient("irc.freenode.net", new IrcUser("ChatSharp", "ChatSha
client.ConnectionComplete += (s, e) => client.JoinChannel("#botwar"); client.ConnectionComplete += (s, e) => client.JoinChannel("#botwar");
client.ChannelMessageRecieved += (s, e) => client.ChannelMessageReceived += (s, e) =>
{ {
var channel = client.Channels[e.PrivateMessage.Source]; var channel = client.Channels[e.PrivateMessage.Source];