Somewhat early spring cleaning!
This commit is contained in:
1 parent
a153045bc3
commit
1bbcc6feec
1 file changed
+14
-14
+14
-14
@@ -6,8 +6,8 @@ use strict;
|
|||||||
use warnings;
|
use warnings;
|
||||||
use feature qw(switch);
|
use feature qw(switch);
|
||||||
use Exporter;
|
use Exporter;
|
||||||
|
use base qw(Exporter);
|
||||||
|
|
||||||
our @ISA = qw(Exporter);
|
|
||||||
our @EXPORT_OK = qw(ban cjoin cpart cmode umode kick privmsg notice quit nick names
|
our @EXPORT_OK = qw(ban cjoin cpart cmode umode kick privmsg notice quit nick names
|
||||||
topic who usrc match_mask);
|
topic who usrc match_mask);
|
||||||
|
|
||||||
@@ -24,12 +24,12 @@ sub ban {
|
|||||||
given ($cbt) {
|
given ($cbt) {
|
||||||
when (1) { $mask = '*!*@'.$user->{host}; }
|
when (1) { $mask = '*!*@'.$user->{host}; }
|
||||||
when (2) { $mask = $user->{nick}.'!*@*'; }
|
when (2) { $mask = $user->{nick}.'!*@*'; }
|
||||||
when (3) { $mask = '*!'.$user->{user}.'@'.$user->{host}; }
|
when (3) { $mask = q{*!}.$user->{user}.q{@}.$user->{host}; }
|
||||||
when (4) { $mask = $user->{nick}.'!*'.$user->{user}.'@'.$user->{host}; }
|
when (4) { $mask = $user->{nick}.q{!*}.$user->{user}.q{@}.$user->{host}; }
|
||||||
when (5) {
|
when (5) {
|
||||||
my @hd = split m/[\.]/, $user->{host};
|
my @hd = split m/[\.]/, $user->{host};
|
||||||
shift @hd;
|
shift @hd;
|
||||||
$mask = '*!*@*.'.join ' ', @hd;
|
$mask = '*!*@*.'.join q{ }, @hd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ sub ban {
|
|||||||
sub cjoin {
|
sub cjoin {
|
||||||
my ($svr, $chan, $key) = @_;
|
my ($svr, $chan, $key) = @_;
|
||||||
|
|
||||||
Auto::socksnd($svr, "JOIN ".((defined $key) ? "$chan $key" : "$chan"));
|
Auto::socksnd($svr, 'JOIN '.((defined $key) ? "$chan $key" : $chan));
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -82,7 +82,7 @@ sub cmode {
|
|||||||
sub umode {
|
sub umode {
|
||||||
my ($svr, $modes) = @_;
|
my ($svr, $modes) = @_;
|
||||||
|
|
||||||
Auto::socksnd($svr, "MODE ".$Proto::IRC::botinfo{$svr}{nick}." $modes");
|
Auto::socksnd($svr, 'MODE '.$Proto::IRC::botinfo{$svr}{nick}." $modes");
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -198,8 +198,8 @@ sub who {
|
|||||||
sub usrc {
|
sub usrc {
|
||||||
my ($ex) = @_;
|
my ($ex) = @_;
|
||||||
|
|
||||||
my @si = split('!', $ex);
|
my @si = split m/[!]/xsm, $ex;
|
||||||
my @sii = split('@', $si[1]);
|
my @sii = split m/[@]/xsm, $si[1];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
nick => $si[0],
|
nick => $si[0],
|
||||||
@@ -213,17 +213,17 @@ sub match_mask {
|
|||||||
my ($mu, $mh) = @_;
|
my ($mu, $mh) = @_;
|
||||||
|
|
||||||
# Prepare the regex.
|
# Prepare the regex.
|
||||||
$mh =~ s/\./\\\./g;
|
$mh =~ s/\./\\\./gxsm;
|
||||||
$mh =~ s/\?/\./g;
|
$mh =~ s/\?/\./gxsm;
|
||||||
$mh =~ s/\*/\.\*/g;
|
$mh =~ s/\*/\.\*/gxsm;
|
||||||
$mh = '^'.$mh.'$';
|
$mh = q{^}.$mh.q{$};
|
||||||
|
|
||||||
# Let's grep the user's mask.
|
# Let's grep the user's mask.
|
||||||
if (grep(/$mh/, $mu)) {
|
if ($mu =~ m/$mh/xsm) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user