GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-23 04:19:27 +01:00
Code Issues Projects Releases Wiki Activity

BanList: overwrite timeout when updating ban/mute

Browse Source
This commit is contained in:
Pragmatic Software 2020-06-12 19:53:43 -07:00
parent 9efe5ad9ab
commit 1f3a12fcf6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PBot/BanList.pm
View File

@ -524,6 +524,14 @@ sub nick_to_banmask {
}
}
if ($mask !~ /!/) {
$mask .= '!*@*';
} elsif ($mask !~ /@/) {
$mask =~ s/\*?$/*@*/;
} else {
$mask =~ s/\@$/@*/;
}
return $mask;
}
@ -544,8 +552,10 @@ sub ban_user_timed {
};
if ($mode eq 'b') {
$self->{banlist}->remove($channel, $mask, 'timeout');
$self->{banlist}->add($channel, $mask, $data);
} elsif ($mode eq $self->{pbot}->{registry}->get_value('banlist', 'mute_mode_char')) {
$self->{quietlist}->remove($channel, $mask, 'timeout');
$self->{quietlist}->add($channel, $mask, $data);
}
@ -583,7 +593,7 @@ sub checkban {
$result .= "by $data->{owner} " if defined $data->{owner};
$result .= "for $data->{reason} " if defined $data->{reason};
if ($data->{timeout} > 0) {
if (exists $data->{timeout} and $data->{timeout} > 0) {
my $duration = concise duration($data->{timeout} - gettimeofday);
$result .= "($duration remaining)";
}