3
0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-24 11:42:35 +01:00

Improve unban command to find all matching bans given a nick argument

Instead of only taking a hostmask argument, `unban` will now determine
if the argument is a nick, and if so it will then find all bans that
match various hostmasks used by that nick and unban them all.
This commit is contained in:
Pragmatic Software 2015-08-19 22:26:28 -07:00
parent f5b23532ae
commit eb8a49cc74

View File

@ -117,12 +117,31 @@ sub ban_user {
sub unban_user { sub unban_user {
my $self = shift; my $self = shift;
my ($mask, $channel) = @_; my ($mask, $channel) = @_;
$self->{pbot}->{logger}->log("Unbanning $channel $mask\n");
if($self->{unban_timeout}->find_index($channel, $mask)) { my $bans;
$self->{unban_timeout}->hash->{$channel}->{$mask}{timeout} = gettimeofday + 7200; # try again in 2 hours if unban doesn't immediately succeed
$self->{unban_timeout}->save; if ($mask !~ m/[!@]/) {
my ($message_account, $hostmask) = $self->{pbot}->{messagehistory}->{database}->find_message_account_by_nick($mask);
if (defined $hostmask) {
$bans = $self->{pbot}->{bantracker}->get_baninfo($hostmask, $channel);
}
}
if (not defined $bans) {
my $baninfo = {};
$baninfo->{banmask} = $mask;
push @$bans, $baninfo;
}
foreach my $baninfo (@$bans) {
$self->{pbot}->{logger}->log("Unbanning $channel $baninfo->{banmask}\n");
if($self->{unban_timeout}->find_index($channel, $baninfo->{banmask})) {
$self->{unban_timeout}->hash->{$channel}->{$baninfo->{banmask}}{timeout} = gettimeofday + 7200; # try again in 2 hours if unban doesn't immediately succeed
$self->{unban_timeout}->save;
}
$self->add_op_command($channel, "mode $channel -b $baninfo->{banmask}");
} }
$self->add_op_command($channel, "mode $channel -b $mask");
$self->gain_ops($channel); $self->gain_ops($channel);
} }