case

[infobot.git] / src / IRC / Irc.pl

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index e923d8f98b16d5f131e1716790a55280d4458af8..0afd7d7690aafed8f93e3684173a3fe3049c63ff 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -23,7 +23,6 @@ use vars qw(@ircServers);
 #use open ':std';
 
 $nickserv      = 0;
-$postprocess;
 my $maxlinelen = 400;
 
 sub ircloop {
@@ -217,8 +216,7 @@ sub say {
        undef $postprocess;
     } elsif ($postprocess = &getChanConf('postprocess', $talkchannel)) {
        &DEBUG("say: $postprocess $msg");
-       &parseCmdHook("main", $postprocess . ' ' . $msg);
-       &parseCmdHook("extra", $postprocess . ' ' . $msg);
+       &parseCmdHook($postprocess . ' ' . $msg);
        undef $postprocess;
        return;
     }
@@ -235,8 +233,8 @@ sub say {
        $pubcount++;
        $pubsize += length $msg;
 
-       my $i = &getChanConfDefault("sendPublicLimitLines", 3);
-       my $j = &getChanConfDefault("sendPublicLimitBytes", 1000);
+       my $i = &getChanConfDefault("sendPublicLimitLines", 3, $chan);
+       my $j = &getChanConfDefault("sendPublicLimitBytes", 1000, $chan);
 
        if ( ($pubcount % $i) == 0 and $pubcount) {
            sleep 1;
@@ -276,8 +274,8 @@ sub msg {
        $msgcount++;
        $msgsize += length $msg;
 
-       my $i = &getChanConfDefault("sendPrivateLimitLines", 3);
-       my $j = &getChanConfDefault("sendPrivateLimitBytes", 1000);
+       my $i = &getChanConfDefault("sendPrivateLimitLines", 3, $chan);
+       my $j = &getChanConfDefault("sendPrivateLimitBytes", 1000, $chan);
        if ( ($msgcount % $i) == 0 and $msgcount) {
            sleep 1;
        } elsif ($msgsize > $j) {
@@ -328,8 +326,8 @@ sub notice {
        $notcount++;
        $notsize += length $txt;
 
-       my $i = &getChanConfDefault("sendNoticeLimitLines", 3);
-       my $j = &getChanConfDefault("sendNoticeLimitBytes", 1000);
+       my $i = &getChanConfDefault("sendNoticeLimitLines", 3, $chan);
+       my $j = &getChanConfDefault("sendNoticeLimitBytes", 1000, $chan);
 
        if ( ($notcount % $i) == 0 and $notcount) {
            sleep 1;