sydney/Autobot
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed on_nick, on_quit, on_part, and on_kick source hashrefs to include server, removing svr.

Browse Source
This commit is contained in:
Matthew Barksdale committed 2011-03-02 17:37:27 -05:00
1 parent 4e0384d645
commit 0e46850a65
4 files changed
+22 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/Core/IRC.pm
+3 -3
View File
@@ -28,12 +28,12 @@ hook_add("on_uprivmsg", "ctcp_version_reply", sub {
# QUIT hook; delete user from chanusers.
hook_add("on_quit", "quit_update_chanusers", sub {
my (($svr, $src, undef)) = @_;
my (($src, undef)) = @_;
my %src = %{ $src };
# Delete the user from all channels.
foreach my $ccu (keys %{ $Proto::IRC::chanusers{$svr} }) {
if (defined $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
foreach my $ccu (keys %{ $Proto::IRC::chanusers{$src{svr}}}) {
if (defined $Proto::IRC::chanusers{$src{svr}}{$ccu}{$src{nick}}) { delete $Proto::IRC::chanusers{$src{svr}}{$ccu}{$src{nick}}; }
}
return 1;
lib/Proto/IRC.pm
+12 -5
View File
@@ -386,7 +386,9 @@ sub cjoin {
# Parse: KICK
sub kick {
my ($svr, @ex) = @_;
my %src = API::IRC::usrc(substr($ex[0], 1));
$src{svr} = $svr;
# Update chanusers.
delete $chanusers{$svr}{$ex[2]}{$ex[3]} if defined $chanusers{$svr}{$ex[2]}{$ex[3]};
@@ -422,7 +424,7 @@ sub kick {
else {
# We weren't. Update chanusers and trigger on_kick.
if (defined $chanusers{$svr}{$ex[2]}{$ex[3]}) { delete $chanusers{$svr}{$ex[2]}{$ex[3]}; }
API::Std::event_run("on_kick", ($svr, \%src, $ex[2], $ex[3], $msg));
API::Std::event_run("on_kick", (\%src, $ex[2], $ex[3], $msg));
}
return 1;
@@ -523,7 +525,8 @@ sub nick {
$nex =~ s/^://gxsm;
my %src = API::IRC::usrc(substr($uex, 1));
$src{svr} = $svr;
# Check if this is coming from ourselves.
if ($src{nick} eq $botinfo{$svr}{nick}) {
# It is. Update bot nick hash.
@@ -538,7 +541,7 @@ sub nick {
delete $chanusers{$svr}{$chk}{$src{nick}};
}
}
API::Std::event_run("on_nick", ($svr, \%src, $nex));
API::Std::event_run("on_nick", (\%src, $nex));
}
return 1;
@@ -567,7 +570,9 @@ sub notice {
# Parse: PART
sub part {
my ($svr, @ex) = @_;
my %src = API::IRC::usrc(substr($ex[0], 1));
$src{svr} = $svr;
# Delete them from chanusers.
delete $chanusers{$svr}{$ex[2]}{$src{nick}} if defined $chanusers{$svr}{$ex[2]}{$src{nick}};
@@ -584,7 +589,7 @@ sub part {
}
# Trigger on_part.
API::Std::event_run("on_part", ($svr, \%src, $ex[2], $msg));
API::Std::event_run("on_part", (\%src, $ex[2], $msg));
return 1;
}
@@ -719,7 +724,9 @@ sub privmsg {
# Parse: QUIT
sub quit {
my ($svr, @ex) = @_;
my %src = API::IRC::usrc(substr($ex[0], 1));
$src{svr} = $svr;
# Set $msg to the quit message.
my $msg = 0;
@@ -733,7 +740,7 @@ sub quit {
}
# Trigger on_quit.
API::Std::event_run("on_quit", ($svr, \%src, $msg));
API::Std::event_run("on_quit", (\%src, $msg));
return 1;
}