Continue renaming.
This commit is contained in:
1 parent
06aaf41ef0
commit
d5378cca9f
4 files changed
+13
-13
No files matched your search
+1
-1
@@ -129,7 +129,7 @@ sub slog
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Check if we're in the channel.
|
# Check if we're in the channel.
|
||||||
if (!defined $Parser::IRC::botchans{$net}{$chan}) {
|
if (!defined $Proto::IRC::botchans{$net}{$chan}) {
|
||||||
dbug 'WARNING: slog(): Unable to log to IRC: Not in channel.';
|
dbug 'WARNING: slog(): Unable to log to IRC: Not in channel.';
|
||||||
alog 'WARNING: slog(): Unable to log to IRC: Not in channel.';
|
alog 'WARNING: slog(): Unable to log to IRC: Not in channel.';
|
||||||
return;
|
return;
|
||||||
|
|||||||
+9
-9
@@ -266,9 +266,9 @@ sub rchook_add
|
|||||||
my ($cmd, $sub) = @_;
|
my ($cmd, $sub) = @_;
|
||||||
$cmd = uc $cmd;
|
$cmd = uc $cmd;
|
||||||
|
|
||||||
if (defined $Parser::IRC::RAWC{$cmd}) { return; }
|
if (defined $Proto::IRC::RAWC{$cmd}) { return; }
|
||||||
|
|
||||||
$Parser::IRC::RAWC{$cmd} = $sub;
|
$Proto::IRC::RAWC{$cmd} = $sub;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -279,9 +279,9 @@ sub rchook_del
|
|||||||
my ($cmd) = @_;
|
my ($cmd) = @_;
|
||||||
$cmd = uc $cmd;
|
$cmd = uc $cmd;
|
||||||
|
|
||||||
if (!defined $Parser::IRC::RAWC{$cmd}) { return; }
|
if (!defined $Proto::IRC::RAWC{$cmd}) { return; }
|
||||||
|
|
||||||
delete $Parser::IRC::RAWC{$cmd};
|
delete $Proto::IRC::RAWC{$cmd};
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -386,15 +386,15 @@ sub match_user
|
|||||||
my $svr = $ulhp{net}[0];
|
my $svr = $ulhp{net}[0];
|
||||||
if (defined $Auto::SOCKET{$svr}) {
|
if (defined $Auto::SOCKET{$svr}) {
|
||||||
if ($ccnm eq 'CURRENT' and defined $user{chan}) {
|
if ($ccnm eq 'CURRENT' and defined $user{chan}) {
|
||||||
if (defined $Parser::IRC::chanusers{$svr}{$user{chan}}{$user{nick}}) {
|
if (defined $Proto::IRC::chanusers{$svr}{$user{chan}}{$user{nick}}) {
|
||||||
if ($Parser::IRC::chanusers{$svr}{$user{chan}}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
|
if ($Proto::IRC::chanusers{$svr}{$user{chan}}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
foreach my $bcj (keys %{ $Parser::IRC::botchans{$svr} }) {
|
foreach my $bcj (keys %{ $Proto::IRC::botchans{$svr} }) {
|
||||||
if (API::IRC::match_mask($bcj, $ccnm)) {
|
if (API::IRC::match_mask($bcj, $ccnm)) {
|
||||||
if (defined $Parser::IRC::chanusers{$svr}{$bcj}{$user{nick}}) {
|
if (defined $Proto::IRC::chanusers{$svr}{$bcj}{$user{nick}}) {
|
||||||
if ($Parser::IRC::chanusers{$svr}{$bcj}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
|
if ($Proto::IRC::chanusers{$svr}{$bcj}{$user{nick}} =~ m/($ccst)/sm) { return $userkey; } ## no critic qw(RegularExpressions::RequireExtendedFormatting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -32,8 +32,8 @@ hook_add("on_quit", "quit_update_chanusers", sub {
|
|||||||
my %src = %{ $src };
|
my %src = %{ $src };
|
||||||
|
|
||||||
# Delete the user from all channels.
|
# Delete the user from all channels.
|
||||||
foreach my $ccu (keys %{ $Parser::IRC::chanusers{$svr} }) {
|
foreach my $ccu (keys %{ $Proto::IRC::chanusers{$svr} }) {
|
||||||
if (defined $Parser::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Parser::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
|
if (defined $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}) { delete $Proto::IRC::chanusers{$svr}{$ccu}{$src{nick}}; }
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
+1
-1
@@ -220,7 +220,7 @@ sub num438
|
|||||||
|
|
||||||
if (defined $botnick{$svr}{newnick}) {
|
if (defined $botnick{$svr}{newnick}) {
|
||||||
API::Std::timer_add("num438_".$botnick{$svr}{newnick}, 1, $ex[11], sub {
|
API::Std::timer_add("num438_".$botnick{$svr}{newnick}, 1, $ex[11], sub {
|
||||||
API::IRC::nick($Parser::IRC::botnick{$svr}{newnick});
|
API::IRC::nick($Proto::IRC::botnick{$svr}{newnick});
|
||||||
delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
|
delete $botnick{$svr}{newnick} if (defined $botnick{$svr}{newnick});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user