ben
/
chatsharp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Standardize on LF line endings

This commit is contained in:
Drew DeVault 2015-07-07 13:16:52 -06:00
parent 9c4fe64189
commit bf74106ed8
37 changed files with 274 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChatSharp/ChannelCollection.cs
View File

@ -1,8 +1,8 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq;
namespace ChatSharp
{
public class ChannelCollection : IEnumerable<IrcChannel>

2
ChatSharp/ClientSettings.cs
View File

@ -1,4 +1,4 @@
namespace ChatSharp
namespace ChatSharp
{
public class ClientSettings
{

4
ChatSharp/Events/ChannelEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class ChannelEventArgs : EventArgs

2
ChatSharp/Events/ChannelTopicEventArgs.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
namespace ChatSharp.Events
{

4
ChatSharp/Events/ChannelUserEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class ChannelUserEventArgs : EventArgs

4
ChatSharp/Events/ErronousNickEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class ErronousNickEventArgs : EventArgs

4
ChatSharp/Events/IrcNoticeEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class IrcNoticeEventArgs : EventArgs

4
ChatSharp/Events/ModeChangeEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class ModeChangeEventArgs : EventArgs

2
ChatSharp/Events/NickChangedEventArgs.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
namespace ChatSharp.Events
{

4
ChatSharp/Events/PrivateMessageEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class PrivateMessageEventArgs : EventArgs

4
ChatSharp/Events/RawMessageEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class RawMessageEventArgs : EventArgs

4
ChatSharp/Events/ServerMOTDEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class ServerMOTDEventArgs : EventArgs

2
ChatSharp/Events/SocketErrorEventArgs.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net.Sockets;
namespace ChatSharp.Events

4
ChatSharp/Events/SupportsEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class SupportsEventArgs : EventArgs

4
ChatSharp/Events/WhoIsEventArgs.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp.Events
{
public class WhoIsReceivedEventArgs : EventArgs

296
ChatSharp/Handlers/ChannelHandlers.cs
View File

@ -1,148 +1,148 @@
using ChatSharp.Events;
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace ChatSharp.Handlers
{
internal static class ChannelHandlers
{
public static void HandleJoin(IrcClient client, IrcMessage message)
{
IrcChannel channel = null;
if (client.User.Nick == new IrcUser(message.Prefix).Nick)
{
// We've joined this channel
channel = new IrcChannel(client, message.Parameters[0]);
client.Channels.Add(channel);
}
else
{
// Someone has joined a channel we're already in
channel = client.Channels[message.Parameters[0]];
channel.Users.Add(new IrcUser(message.Prefix));
}
if (channel != null)
client.OnUserJoinedChannel(new ChannelUserEventArgs(channel, new IrcUser(message.Prefix)));
}
public static void HandleGetTopic(IrcClient client, IrcMessage message)
{
IrcChannel channel = null;
string topic;
if (client.Channels.Contains(message.Parameters[1]))
{
channel = client.Channels[message.Parameters[1]];
topic = message.Parameters[2];
channel.Topic = topic;
}
else
{
channel = new IrcChannel(client, message.Parameters[1]);
topic = message.Parameters[2];
}
client.OnChannelTopicReceived(new ChannelTopicEventArgs(channel, topic));
}
public static void HandleGetEmptyTopic(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[1]];
var topic = message.Parameters[2];
client.OnChannelTopicReceived(new ChannelTopicEventArgs(channel, topic));
}
public static void HandlePart(IrcClient client, IrcMessage message)
{
if (!client.Channels.Contains(message.Parameters[0]))
return; // we already parted the channel, ignore
if (client.User.Match(message.Prefix)) // We've parted this channel
client.Channels.Remove(client.Channels[message.Parameters[0]]);
else // Someone has parted a channel we're already in
{
var user = new IrcUser(message.Prefix).Nick;
var channel = client.Channels[message.Parameters[0]];
if (channel.Users.Contains(user))
channel.Users.Remove(user);
foreach (var mode in channel.UsersByMode)
{
if (mode.Value.Contains(user))
mode.Value.Remove(user);
}
client.OnUserPartedChannel(new ChannelUserEventArgs(client.Channels[message.Parameters[0]], new IrcUser(message.Prefix)));
}
}
public static void HandleUserListPart(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[2]];
var users = message.Parameters[3].Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries);
foreach (var user in users)
{
if (string.IsNullOrWhiteSpace(user)) continue;
var mode = client.ServerInfo.GetModeForPrefix(user[0]);
if (mode == null)
channel.Users.Add(new IrcUser(user));
else
{
channel.Users.Add(new IrcUser(user.Substring(1)));
if (!channel.UsersByMode.ContainsKey(mode.Value))
channel.UsersByMode.Add(mode.Value, new UserCollection());
channel.UsersByMode[mode.Value].Add(new IrcUser(user.Substring(1)));
}
}
}
public static void HandleUserListEnd(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[1]];
client.OnChannelListRecieved(new ChannelEventArgs(channel));
if (client.Settings.ModeOnJoin)
{
try
{
client.GetMode(channel.Name, c => Console.WriteLine(c.Mode));
}
catch { }
}
if (client.Settings.WhoIsOnJoin)
{
Task.Factory.StartNew(() => WhoIsChannel(channel, client, 0));
}
}
private static void WhoIsChannel(IrcChannel channel, IrcClient client, int index)
{
// Note: joins and parts that happen during this will cause strange behavior here
Thread.Sleep(client.Settings.JoinWhoIsDelay * 1000);
var user = channel.Users[index];
client.WhoIs(user.Nick, (whois) =>
{
user.User = whois.User.User;
user.Hostname = whois.User.Hostname;
user.RealName = whois.User.RealName;
Task.Factory.StartNew(() => WhoIsChannel(channel, client, index + 1));
});
}
public static void HandleKick(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[0]];
var kicked = channel.Users[message.Parameters[1]];
if (string.Equals(message.Parameters[1], client.User.Nick, StringComparison.OrdinalIgnoreCase)) // We've been kicked
client.Channels.Remove(client.Channels[message.Parameters[0]]);
else
{
if (channel.Users.Contains(message.Parameters[1]))
channel.Users.Remove(message.Parameters[1]);
foreach (var mode in channel.UsersByMode.Where(mode => mode.Value.Contains(message.Parameters[1])))
{
mode.Value.Remove(message.Parameters[1]);
}
}
client.OnUserKicked(new KickEventArgs(channel, new IrcUser(message.Prefix),
kicked, message.Parameters[2]));
}
}
}
using ChatSharp.Events;
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace ChatSharp.Handlers
{
internal static class ChannelHandlers
{
public static void HandleJoin(IrcClient client, IrcMessage message)
{
IrcChannel channel = null;
if (client.User.Nick == new IrcUser(message.Prefix).Nick)
{
// We've joined this channel
channel = new IrcChannel(client, message.Parameters[0]);
client.Channels.Add(channel);
}
else
{
// Someone has joined a channel we're already in
channel = client.Channels[message.Parameters[0]];
channel.Users.Add(new IrcUser(message.Prefix));
}
if (channel != null)
client.OnUserJoinedChannel(new ChannelUserEventArgs(channel, new IrcUser(message.Prefix)));
}
public static void HandleGetTopic(IrcClient client, IrcMessage message)
{
IrcChannel channel = null;
string topic;
if (client.Channels.Contains(message.Parameters[1]))
{
channel = client.Channels[message.Parameters[1]];
topic = message.Parameters[2];
channel.Topic = topic;
}
else
{
channel = new IrcChannel(client, message.Parameters[1]);
topic = message.Parameters[2];
}
client.OnChannelTopicReceived(new ChannelTopicEventArgs(channel, topic));
}
public static void HandleGetEmptyTopic(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[1]];
var topic = message.Parameters[2];
client.OnChannelTopicReceived(new ChannelTopicEventArgs(channel, topic));
}
public static void HandlePart(IrcClient client, IrcMessage message)
{
if (!client.Channels.Contains(message.Parameters[0]))
return; // we already parted the channel, ignore
if (client.User.Match(message.Prefix)) // We've parted this channel
client.Channels.Remove(client.Channels[message.Parameters[0]]);
else // Someone has parted a channel we're already in
{
var user = new IrcUser(message.Prefix).Nick;
var channel = client.Channels[message.Parameters[0]];
if (channel.Users.Contains(user))
channel.Users.Remove(user);
foreach (var mode in channel.UsersByMode)
{
if (mode.Value.Contains(user))
mode.Value.Remove(user);
}
client.OnUserPartedChannel(new ChannelUserEventArgs(client.Channels[message.Parameters[0]], new IrcUser(message.Prefix)));
}
}
public static void HandleUserListPart(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[2]];
var users = message.Parameters[3].Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries);
foreach (var user in users)
{
if (string.IsNullOrWhiteSpace(user)) continue;
var mode = client.ServerInfo.GetModeForPrefix(user[0]);
if (mode == null)
channel.Users.Add(new IrcUser(user));
else
{
channel.Users.Add(new IrcUser(user.Substring(1)));
if (!channel.UsersByMode.ContainsKey(mode.Value))
channel.UsersByMode.Add(mode.Value, new UserCollection());
channel.UsersByMode[mode.Value].Add(new IrcUser(user.Substring(1)));
}
}
}
public static void HandleUserListEnd(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[1]];
client.OnChannelListRecieved(new ChannelEventArgs(channel));
if (client.Settings.ModeOnJoin)
{
try
{
client.GetMode(channel.Name, c => Console.WriteLine(c.Mode));
}
catch { }
}
if (client.Settings.WhoIsOnJoin)
{
Task.Factory.StartNew(() => WhoIsChannel(channel, client, 0));
}
}
private static void WhoIsChannel(IrcChannel channel, IrcClient client, int index)
{
// Note: joins and parts that happen during this will cause strange behavior here
Thread.Sleep(client.Settings.JoinWhoIsDelay * 1000);
var user = channel.Users[index];
client.WhoIs(user.Nick, (whois) =>
{
user.User = whois.User.User;
user.Hostname = whois.User.Hostname;
user.RealName = whois.User.RealName;
Task.Factory.StartNew(() => WhoIsChannel(channel, client, index + 1));
});
}
public static void HandleKick(IrcClient client, IrcMessage message)
{
var channel = client.Channels[message.Parameters[0]];
var kicked = channel.Users[message.Parameters[1]];
if (string.Equals(message.Parameters[1], client.User.Nick, StringComparison.OrdinalIgnoreCase)) // We've been kicked
client.Channels.Remove(client.Channels[message.Parameters[0]]);
else
{
if (channel.Users.Contains(message.Parameters[1]))
channel.Users.Remove(message.Parameters[1]);
foreach (var mode in channel.UsersByMode.Where(mode => mode.Value.Contains(message.Parameters[1])))
{
mode.Value.Remove(message.Parameters[1]);
}
}
client.OnUserKicked(new KickEventArgs(channel, new IrcUser(message.Prefix),
kicked, message.Parameters[2]));
}
}
}

2
ChatSharp/Handlers/ListingHandlers.cs
View File

@ -1,4 +1,4 @@
namespace ChatSharp.Handlers
namespace ChatSharp.Handlers
{
internal static class ListingHandlers
{

2
ChatSharp/Handlers/MOTDHandlers.cs
View File

@ -1,4 +1,4 @@
using ChatSharp.Events;
using ChatSharp.Events;
using System;
namespace ChatSharp.Handlers

2
ChatSharp/Handlers/MessageHandlers.cs
View File

@ -1,4 +1,4 @@
using ChatSharp.Events;
using ChatSharp.Events;
using System.Linq;
using System;

6
ChatSharp/Handlers/ServerHandlers.cs
View File

@ -1,6 +1,6 @@
using ChatSharp.Events;
using System.Linq;
using ChatSharp.Events;
using System.Linq;
namespace ChatSharp.Handlers
{
internal static class ServerHandlers

6
ChatSharp/Handlers/UserHandlers.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Linq;
using System;
using System.Linq;
namespace ChatSharp.Handlers
{
public static class UserHandlers

12
ChatSharp/IrcChannel.cs
View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using System.Collections.Generic;
namespace ChatSharp
{
public class IrcChannel
@ -67,10 +67,10 @@ namespace ChatSharp
Client.ChangeMode(Name, change);
}
public void SetTopic(string topic)
{
Client.SetTopic(Name, topic);
Topic = topic;
public void SetTopic(string topic)
{
Client.SetTopic(Name, topic);
Topic = topic;
}
}
}

12
ChatSharp/IrcClient.Commands.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Linq;
using System;
using System.Linq;
namespace ChatSharp
{
public partial class IrcClient
@ -59,9 +59,9 @@ namespace ChatSharp
SendRawMessage("TOPIC {0} :{1}", channel, topic);
}
public void GetTopic(string channel)
{
SendRawMessage("TOPIC {0}", channel);
public void GetTopic(string channel)
{
SendRawMessage("TOPIC {0}", channel);
}
public void KickUser(string channel, string user)

64
ChatSharp/IrcClient.cs
View File

@ -1,12 +1,12 @@
using ChatSharp.Events;
using ChatSharp.Handlers;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Net.Security;
using System.Net.Sockets;
using System.Text;
using ChatSharp.Events;
using ChatSharp.Handlers;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Net.Security;
using System.Net.Sockets;
using System.Text;
using System.Timers;
namespace ChatSharp
@ -65,14 +65,14 @@ namespace ChatSharp
}
public Stream NetworkStream { get; set; }
public bool UseSSL { get; private set; }
public bool UseSSL { get; private set; }
public bool IgnoreInvalidSSL { get; set; }
public Encoding Encoding { get; set; }
public IrcUser User { get; set; }
public ChannelCollection Channels { get; private set; }
public ClientSettings Settings { get; set; }
public RequestManager RequestManager { get; set; }
public ServerInfo ServerInfo { get; set; }
public ServerInfo ServerInfo { get; set; }
public string PrivmsgPrefix { get; set; }
public IrcClient(string serverAddress, IrcUser user, bool useSSL = false)
@ -89,7 +89,7 @@ namespace ChatSharp
MessageHandlers.RegisterDefaultHandlers(this);
RequestManager = new RequestManager();
UseSSL = useSSL;
WriteQueue = new ConcurrentQueue<string>();
WriteQueue = new ConcurrentQueue<string>();
PrivmsgPrefix = "";
}
@ -115,7 +115,7 @@ namespace ChatSharp
SendRawMessage(nextMessage);
}
};
checkQueue.Start();
checkQueue.Start();
Socket.BeginConnect(ServerHostname, ServerPort, ConnectComplete, null);
}
@ -146,9 +146,9 @@ namespace ChatSharp
NetworkStream = new NetworkStream(Socket);
if (UseSSL)
{
if (IgnoreInvalidSSL)
if (IgnoreInvalidSSL)
NetworkStream = new SslStream(NetworkStream, false, (sender, certificate, chain, policyErrors) => true);
else
else
NetworkStream = new SslStream(NetworkStream);
((SslStream)NetworkStream).AuthenticateAsClient(ServerHostname);
}
@ -349,11 +349,11 @@ namespace ChatSharp
protected internal virtual void OnChannelListRecieved(ChannelEventArgs e)
{
if (ChannelListRecieved != null) ChannelListRecieved(this, e);
}
}
public event EventHandler<ChannelTopicEventArgs> ChannelTopicReceived;
protected internal virtual void OnChannelTopicReceived(ChannelTopicEventArgs e)
{
if (ChannelTopicReceived != null) ChannelTopicReceived(this, e);
protected internal virtual void OnChannelTopicReceived(ChannelTopicEventArgs e)
{
if (ChannelTopicReceived != null) ChannelTopicReceived(this, e);
}
public event EventHandler<EventArgs> ConnectionComplete;
protected internal virtual void OnConnectionComplete(EventArgs e)
@ -368,19 +368,19 @@ namespace ChatSharp
public event EventHandler<KickEventArgs> UserKicked;
protected internal virtual void OnUserKicked(KickEventArgs e)
{
if (UserKicked != null) UserKicked(this, e);
}
public event EventHandler<WhoIsReceivedEventArgs> WhoIsReceived;
protected internal virtual void OnWhoIsReceived(WhoIsReceivedEventArgs e)
{
if (WhoIsReceived != null) WhoIsReceived(this, e);
}
public event EventHandler<NickChangedEventArgs> NickChanged;
protected internal virtual void OnNickChanged(NickChangedEventArgs e)
{
if (NickChanged != null) NickChanged(this, e);
if (UserKicked != null) UserKicked(this, e);
}
public event EventHandler<WhoIsReceivedEventArgs> WhoIsReceived;
protected internal virtual void OnWhoIsReceived(WhoIsReceivedEventArgs e)
{
if (WhoIsReceived != null) WhoIsReceived(this, e);
}
public event EventHandler<NickChangedEventArgs> NickChanged;
protected internal virtual void OnNickChanged(NickChangedEventArgs e)
{
if (NickChanged != null) NickChanged(this, e);
}
}
}

6
ChatSharp/IrcMessage.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
namespace ChatSharp
{
public class IrcMessage

4
ChatSharp/IrcProtocolException.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp
{
public class IrcProtocolException : Exception

6
ChatSharp/IrcUser.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Linq;
using System;
using System.Linq;
namespace ChatSharp
{
public class IrcUser : IEquatable<IrcUser>

4
ChatSharp/Mask.cs
View File

@ -1,5 +1,5 @@
using System;
using System;
namespace ChatSharp
{
public class Mask

6
ChatSharp/MaskCollection.cs
View File

@ -1,7 +1,7 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq;
namespace ChatSharp
{
public class MaskCollection : IEnumerable<Mask>

2
ChatSharp/PrivateMessage.cs
View File

@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
namespace ChatSharp
{

2
ChatSharp/Properties/AssemblyInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following

6
ChatSharp/RequestManager.cs
View File

@ -1,7 +1,7 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq;
namespace ChatSharp
{
public class RequestManager

2
ChatSharp/ServerInfo.cs
View File

@ -1,4 +1,4 @@
namespace ChatSharp
namespace ChatSharp
{
public class ServerInfo
{

6
ChatSharp/UserCollection.cs
View File

@ -1,7 +1,7 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq;
namespace ChatSharp
{
public class UserCollection : IEnumerable<IrcUser>

2
ChatSharp/WhoIs.cs
View File

@ -1,4 +1,4 @@
namespace ChatSharp
namespace ChatSharp
{
public class WhoIs
{

44
TestChatSharp/Program.cs
View File

@ -1,7 +1,7 @@
using ChatSharp;
using System;
using System.Linq;
using ChatSharp;
using System;
using System.Linq;
namespace TestChatSharp
{
class Program
@ -31,29 +31,29 @@ namespace TestChatSharp
var parts = e.PrivateMessage.Message.Split(' ');
client.ChangeMode(parts[1], parts[2]);
}
else if (e.PrivateMessage.Message.StartsWith(".topic "))
{
string messageArgs = e.PrivateMessage.Message.Substring(7);
if (messageArgs.Contains(" "))
{
string channel = messageArgs.Substring(0, messageArgs.IndexOf(" "));
string topic = messageArgs.Substring(messageArgs.IndexOf(" ") + 1);
client.Channels[channel].SetTopic(topic);
}
else
{
string channel = messageArgs.Substring(messageArgs.IndexOf("#"));
client.GetTopic(channel);
}
else if (e.PrivateMessage.Message.StartsWith(".topic "))
{
string messageArgs = e.PrivateMessage.Message.Substring(7);
if (messageArgs.Contains(" "))
{
string channel = messageArgs.Substring(0, messageArgs.IndexOf(" "));
string topic = messageArgs.Substring(messageArgs.IndexOf(" ") + 1);
client.Channels[channel].SetTopic(topic);
}
else
{
string channel = messageArgs.Substring(messageArgs.IndexOf("#"));
client.GetTopic(channel);
}
}
};
client.ChannelMessageRecieved += (s, e) =>
{
Console.WriteLine("<{0}> {1}", e.PrivateMessage.User.Nick, e.PrivateMessage.Message);
};
client.ChannelTopicReceived += (s, e) =>
{
Console.WriteLine("Received topic for channel {0}: {1}", e.Channel.Name, e.Topic);
};
client.ChannelTopicReceived += (s, e) =>
{
Console.WriteLine("Received topic for channel {0}: {1}", e.Channel.Name, e.Topic);
};
client.ConnectAsync();
while (true) ;

2
TestChatSharp/Properties/AssemblyInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following