Merge pull request #37 from khawajaumarfarooq/master
Fixed to HandleKick and HandleNick
This commit is contained in:
Drew DeVault
commit
9c4fe64189
|
|
@ -2,29 +2,29 @@
|
|||
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)));
|
||||
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)
|
||||
|
|
@ -50,99 +50,99 @@ namespace ChatSharp.Handlers
|
|||
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 (message.Parameters[1] == client.User.Nick) // 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]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using ChatSharp.Events;
|
||||
using System.Linq;
|
||||
using System;
|
||||
|
||||
namespace ChatSharp.Handlers
|
||||
{
|
||||
|
|
@ -61,15 +62,30 @@ namespace ChatSharp.Handlers
|
|||
|
||||
public static void HandleNick(IrcClient client, IrcMessage message)
|
||||
{
|
||||
var u = new IrcUser(message.Prefix);
|
||||
if (client.User.Nick == u.Nick)
|
||||
var ircUser = new IrcUser(message.Prefix);
|
||||
|
||||
var oldNick = ircUser.Nick;
|
||||
var users = client
|
||||
.Channels
|
||||
.SelectMany(c => c.Users.Where(u => u.Nick.Equals(ircUser.Nick, StringComparison.OrdinalIgnoreCase)));
|
||||
|
||||
foreach (var user in users)
|
||||
{
|
||||
if (user != null)
|
||||
{
|
||||
user.Nick = message.Parameters[0];
|
||||
}
|
||||
}
|
||||
|
||||
if (client.User.Nick.Equals(ircUser.Nick, System.StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
client.User.Nick = message.Parameters[0];
|
||||
}
|
||||
|
||||
client.OnNickChanged(new NickChangedEventArgs
|
||||
{
|
||||
User = u,
|
||||
OldNick = u.Nick,
|
||||
User = ircUser,
|
||||
OldNick = oldNick,
|
||||
NewNick = message.Parameters[0]
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue