From a126f339c762cca3ee95e9779c73f673a5206c95 Mon Sep 17 00:00:00 2001 From: dms Date: Fri, 2 Feb 2001 13:36:59 +0000 Subject: [PATCH] temporary ignores can be removed automatically once expired git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@306 c11ca15a-4712-0410-83d8-924469b57eb5 --- src/IRC/IrcHooks.pl | 5 ++--- src/IRC/Schedulers.pl | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl index a1ad9fb..2c93f49 100644 --- a/src/IRC/IrcHooks.pl +++ b/src/IRC/IrcHooks.pl @@ -212,8 +212,6 @@ sub on_dcc_close { &delForked($forker); } - &DEBUG("dcc_close: nick => '$nick'."); - if (exists $dcc{'SEND'}{$nick} and -f "$param{tempDir}/$nick.txt") { &status("${b_green}DCC SEND$ob close from $b_cyan$nick$ob"); @@ -224,6 +222,7 @@ sub on_dcc_close { } elsif (exists $dcc{'CHAT'}{$nick} and $dcc{'CHAT'}{$nick} eq $sock) { &status("${b_green}DCC CHAT$ob close from $b_cyan$nick$ob"); delete $dcc{'CHAT'}{$nick}; + delete $dcc{'CHATvrfy'}{$nick}; } else { &status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob (2)"); } @@ -242,7 +241,7 @@ sub on_dcc_open { &status("${b_green}DCC lGET$ob established with $b_cyan$nick$ob"); } elsif ($type eq 'CHAT') { &status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob $b_yellow($ob$nuh{$nick}$b_yellow)$ob"); - $userHandle = &verifyUser($nick, $nuh{lc $nick}); + &verifyUser($nick, $nuh{lc $nick}); my $crypto = $users{$userHandle}{PASS}; $dcc{'CHAT'}{$nick} = $sock; diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index b518f7c..ad502a6 100644 --- a/src/IRC/Schedulers.pl +++ b/src/IRC/Schedulers.pl @@ -508,14 +508,13 @@ sub ignoreCheck { my $chan = $_; foreach (keys %{ $ignore{$chan} }) { - my @array = \@{ $ignore{$chan}{$_} }; + my @array = @{ $ignore{$chan}{$_} }; foreach (@array) { &DEBUG("ignore: => $_"); } - next; - next unless ($time > $ignore{$_}); + next unless ($array[0] and $time > $array[0]); delete $ignore{$chan}{$_}; &status("ignore: $_/$chan has expired."); -- 2.39.2