all debian stuff should really start with d

[infobot.git] / src / CommandStubs.pl

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 0a37f7ca514693cfff9a47a1476f331ef5c5345b..4f0e121d49c50bd37673bcf5ff67ba89d283974e 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -183,8 +183,8 @@ sub parseCmdHook {
 &addCmdHook("extra", 'd?find', ('CODEREF' => 'Debian::DebianFind',
        'Forker' => 1, 'Identifier' => 'debian',
        'Cmdstats' => 'Debian Search', 'Help' => "find" ) );
-&addCmdHook("extra", 'insult', ('CODEREF' => 'Insult::Insult',
-       'Forker' => 1, 'Identifier' => 'insult', 'Help' => "insult" ) );
+#&addCmdHook("extra", 'insult', ('CODEREF' => 'Insult::Insult',
+#      'Forker' => 1, 'Identifier' => 'insult', 'Help' => "insult" ) );
 &addCmdHook("extra", 'kernel', ('CODEREF' => 'Kernel::Kernel',
        'Forker' => 1, 'Identifier' => 'kernel',
        'Cmdstats' => 'Kernel', 'NoArgs' => 1) );
@@ -278,7 +278,7 @@ sub Modules {
        return;
     }
 
-    my $debiancmd       = 'conflicts?|depends?|desc|file|info|provides?';
+    my $debiancmd       = 'conflicts?|depends?|desc|file|d?info|provides?';
     $debiancmd         .= '|recommends?|suggests?|maint|maintainer';
 
     if ($message =~ /^($debiancmd)(\s+(.*))?$/i) {
@@ -308,10 +308,8 @@ sub Modules {
     my $itc;
     $itc = &getChanConf("ircTextCounters");
     $itc = &findChanConf("ircTextCounters") unless ($itc);
-    if ($itc) {
-       &do_text_counters($itc);
-       return;
-    }
+    return if ($itc && &do_text_counters($itc) == 1);
+    # end of text counters.
 
     # list{keys|values}. xk++. Idea taken from #linuxwarez@EFNET
     if ($message =~ /^list(\S+)(\s+(.*))?$/i) {
@@ -543,7 +541,7 @@ sub seen {
            $reply .= " (".&Time2String(time() - $userstats{lc $seen[0]}{'Join'}).")";
        }
 
-       if (&IsParam("seenStats")) {
+       if (&IsChanConf("seenStats") > 0) {
            my $i;
            $i = $userstats{lc $seen[0]}{'Count'};
            $reply .= ".  Has said a total of \002$i\002 messages" if (defined $i);
@@ -820,7 +818,7 @@ sub do_text_counters {
 
     if ($message =~ /^_stats(\s+(\S+))$/i) {
        &textstats_main($2);
-       return;
+       return 1;
     }
 
     my ($type,$arg);
@@ -828,7 +826,7 @@ sub do_text_counters {
        $type = $1;
        $arg  = $3;
     } else {
-       return;
+       return 0;
     }
 
     # even more uglier with channel/time arguments.
@@ -882,7 +880,7 @@ sub do_text_counters {
 
        if (!defined $x) {      # !defined.
            &pSReply("$arg has not said $type yet.");
-           return;
+           return 1;
        }
 
        # defined.
@@ -910,10 +908,7 @@ sub do_text_counters {
        &pSReply("\002$arg\002 has said \037$type\037 \002$x\002 times (\002$pct1\002 %)$xtra");
     }
 
-    if ($@) {
-       &DEBUG("regex failed: $@");
-       return;
-    }
+    return 1;
 }
 
 sub textstats_main {