single quote stuff, fix karma to non-chan specific.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1346 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/Process.pl b/src/Process.pl
index d2f1e5e9b8bd0c4d1126b3d86af3519d63776424..2eeeda4f149f7193d8afa49100451e0cd5ca95e2 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -36,19 +36,19 @@ sub process {
     # hack to support channel +o as "+o" in bot user file.
     # requires +O in user file.
     # is $who arg lowercase?
-    if (exists $channels{$chan}{o}{ $orig{who} } && &IsFlag("O") eq "O") {
+    if (exists $channels{$chan}{o}{ $orig{who} } && &IsFlag('O') eq 'O') {
        &status("Gave $who/$chan +o (+O)\'ness");
-       $users{$userHandle}{FLAGS} .= "o";
+       $users{$userHandle}{FLAGS} .= 'o';
     }
 
     # check if we have our head intact.
     if ($lobotomized) {
-       if ($addressed and IsFlag("o") eq "o") {
+       if ($addressed and IsFlag('o') eq 'o') {
            my $delta_time      = time() - ($cache{lobotomy}{$who} || 0);
            &msg($who, "give me an unlobotomy.") if ($delta_time > 60*60);
            $cache{lobotomy}{$who} = time();
        }
-       return 'LOBOTOMY' unless IsFlag("A");
+       return 'LOBOTOMY' unless IsFlag('A');
     }
 
     # talkMethod.
@@ -68,8 +68,8 @@ sub process {
        $2 =~ /^($mask{chan})(\s+(\S+))?/;
        my($joinchan, $key) = (lc $1, $3);
 
-       if ($joinchan eq "") {
-           &help("join");
+       if ($joinchan eq '') {
+           &help('join');
            return;
        }
 
@@ -78,7 +78,7 @@ sub process {
            return;
        }
 
-       if (&IsFlag("o") ne "o") {
+       if (&IsFlag('o') ne 'o') {
            if (!exists $chanconf{$joinchan}) {
                &msg($who, "I am not allowed to join $joinchan.");
                return;
@@ -109,7 +109,7 @@ sub process {
        }
 
        if (!scalar @array or scalar @array > 2) {
-           &help("identify");
+           &help('identify');
            return;
        }
 
@@ -151,7 +151,7 @@ sub process {
        }
 
        if (scalar @array != 1) {
-           &help("pass");
+           &help('pass');
            return;
        }
 
@@ -171,7 +171,7 @@ sub process {
 
        if ($first) {
            &performStrictReply("First time user... adding you as Master.");
-           $users{$who}{FLAGS} = "aemnorst";
+           $users{$who}{FLAGS} = 'aemnorst';
        }
 
        my $crypt = $users{$who}{PASS};
@@ -199,7 +199,7 @@ sub process {
     }
 
     # allowOutsiders.
-    if (&IsParam("disallowOutsiders") and $msgType =~ /private/i) {
+    if (&IsParam('disallowOutsiders') and $msgType =~ /private/i) {
        my $found = 0;
 
        foreach (keys %channels) {
@@ -262,7 +262,7 @@ sub process {
        }
 
        # customized random message.
-       my $tmp = (rand() < 0.5) ? ", $who" : "";
+       my $tmp = (rand() < 0.5) ? ", $who" : '';
        &performStrictReply( &getRandom(keys %{ $lang{'hello'} }) . $tmp );
        return;
     }
@@ -298,7 +298,7 @@ sub process {
 
     # karma. set...
     if ($msgType =~ /public/i && $message =~ /^(\S+)(--|\+\+)\s*$/ &&
-       $addressed && &IsChanConfOrWarn("karma")
+       $addressed && &IsChanConfOrWarn('karma')
     ) {
        # to request factoids such as "g++" or "libstdc++", append "?" to the query.
        my ($term,$inc) = (lc $1,$2);
@@ -308,15 +308,15 @@ sub process {
            return;
        }
 
-       my $karma = &sqlSelect("stats", "counter",
-               { nick => $term, type => "karma", channel => $chan }) || 0;
+       my $karma = &sqlSelect('stats', 'counter',
+               { nick => $term, type => 'karma' }) || 0;
        if ($inc eq '++') {
            $karma++;
        } else {
            $karma--;
        }
 
-       &sqlSet("stats", {'nick' => $term, type => "karma", channel => $chan}, {
+       &sqlSet('stats', {'nick' => $term, type => 'karma', channel => 'PRIVATE'}, {
            'time'      => time(),
            counter     => $karma,
        } );
@@ -325,7 +325,7 @@ sub process {
     }
 
     # here's where the external routines get called.
-    # if they return anything but null, that's the "answer".
+    # if they return anything but null, that's the 'answer'.
     if ($addressed) {
        my $er = &Modules();
        if (!defined $er) {
@@ -333,7 +333,7 @@ sub process {
        }
 
        # allow administration of bot via messages (default is DCC CHAT only)
-       if (&IsFlag("A")) {
+       if (&IsFlag('A')) {
            &loadMyModule('UserDCC');
            $er = &userDCC();
            if (!defined $er) {
@@ -347,7 +347,7 @@ sub process {
        }
     }
 
-    if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite(2)?|pgsql)$/i) {
+    if (&IsParam('factoids') and $param{'DBType'} =~ /^(mysql|sqlite(2)?|pgsql)$/i) {
        &FactoidStuff();
     } elsif ($param{'DBType'} =~ /^none$/i) {
        return "NO FACTOIDS.";

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index ae28666534ae3340974522011716f54c8c9e482c..7be8132e2529ac84e496ce93b6e0d30dc0ed9ce6 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -19,9 +19,9 @@ sub chaninfo {
     my $chan = lc shift(@_);
     my $mode;
 
-    if ($chan eq "") {         # all channels.
+    if ($chan eq '') {         # all channels.
        my $i           = keys %channels;
-       my $reply       = "I'm on \002$i\002 ".&fixPlural("channel",$i);
+       my $reply       = "I'm on \002$i\002 ".&fixPlural('channel',$i);
        my $tucount     = 0;    # total user count.
        my $uucount     = 0;    # unique user count.
        my %chans;
@@ -60,10 +60,10 @@ sub chaninfo {
 
        my $chans = scalar(keys %channels);
        &performStrictReply(
-           "i've cached \002$tucount\002 ". &fixPlural("user",$tucount).
-           ", \002$uucount\002 unique ". &fixPlural("user",$uucount).
+           "i've cached \002$tucount\002 ". &fixPlural('user',$tucount).
+           ", \002$uucount\002 unique ". &fixPlural('user',$uucount).
            ", distributed over \002$chans\002 ".
-           &fixPlural("channel", $chans)."."
+           &fixPlural('channel', $chans)."."
        );
        &ircCheck();
 
@@ -86,7 +86,7 @@ sub chaninfo {
        push(@array, "\002$int\002 ". &fixPlural($_,$int));
     }
     my $reply = "On \002$chan\002, there ".
-               &fixPlural("has",scalar(@array)). " been ".
+               &fixPlural('has',scalar(@array)). " been ".
                &IJoin(@array);
 
     # Step 1b: check channel inconstencies.
@@ -110,13 +110,13 @@ sub chaninfo {
     # Step 2:
     undef @array;
     my $type;
-    foreach ("v","o","") {
+    foreach ('v','o','') {
        my $int = scalar(keys %{ $channels{$chan}{$_} });
        next unless ($int);
 
-       $type = "Voice" if ($_ eq "v");
-       $type = "Opped" if ($_ eq "o");
-       $type = "Total" if ($_ eq "");
+       $type = 'Voice' if ($_ eq 'v');
+       $type = 'Opped' if ($_ eq 'o');
+       $type = 'Total' if ($_ eq '');
 
        push(@array,"\002$int\002 $type");
     }
@@ -170,7 +170,7 @@ sub cmdstats {
 # Factoid extension info. xk++
 sub factinfo {
     my $faqtoid = lc shift(@_);
-    my $query   = "";
+    my $query   = '';
 
     if ($faqtoid =~ /^\-(\S+)(\s+(.*))$/) {
        &msg($who,"error: individual factoid info queries not supported as yet.");
@@ -187,15 +187,15 @@ sub factinfo {
 sub factstats {
     my $type = shift(@_);
 
-    &Forker("Factoids", sub {
+    &Forker('Factoids', sub {
        &performStrictReply( &CmdFactStats($type) );
     } );
 }
 
 sub karma {
     my $target = lc( shift || $who );
-    my $karma  = &sqlSelect("stats", "counter",
-       { nick => $target, type => "karma", channel => $chan }) || 0;
+    my $karma  = &sqlSelect('stats', 'counter',
+       { nick => $target, type => 'karma'}) || 0;
 
     if ($karma != 0) {
        &performStrictReply("$target has karma of $karma");
@@ -252,7 +252,7 @@ sub tell {
 
     &status("tell: target = $target, query = $query");
 
-    # "intrusive".
+    # 'intrusive'.
 #    if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) {
 #      &msg($who, "No, $target is not in any of my chans.");
 #      return;
@@ -274,7 +274,7 @@ sub tell {
     # no such factoid.
     if (!defined $result || $result =~ /^0?$/) {
        $who            = $target;
-       $msgType        = "private";
+       $msgType        = 'private';
 
        # support command redirection.
        # recursive cmdHooks aswell :)
@@ -319,12 +319,12 @@ sub countryStats {
        return;
     }
 
-    if ($chan eq "") {
+    if ($chan eq '') {
        $chan = $_[0];
     }
 
-    if ($chan eq "") {
-       &help("countrystats");
+    if ($chan eq '') {
+       &help('countrystats');
        return;
     }
 
@@ -367,7 +367,7 @@ sub do_countrystats {
     }
 
     # TODO: move this into a scheduler
-    $msgType   = "private";
+    $msgType   = 'private';
     &performStrictReply( &formListReply(0, "Country Stats ", @list) );
 
     delete $cache{countryStats};
@@ -382,13 +382,13 @@ sub userCommands {
     # conversion: ascii.
     if ($message =~ /^(asci*|chr) (\d+)$/) {
        &DEBUG("ascii/chr called ...");
-       return unless (&IsChanConfOrWarn("allowConv"));
+       return unless (&IsChanConfOrWarn('allowConv'));
 
        &DEBUG("ascii/chr called");
 
        $arg    = $2;
        $result = chr($arg);
-       $result = "NULL"        if ($arg == 0);
+       $result = 'NULL'        if ($arg == 0);
 
        &performReply( sprintf("ascii %s is '%s'", $arg, $result) );
 
@@ -397,12 +397,12 @@ sub userCommands {
 
     # conversion: ord.
     if ($message =~ /^ord(\s+(.*))$/) {
-       return unless (&IsChanConfOrWarn("allowConv"));
+       return unless (&IsChanConfOrWarn('allowConv'));
 
        $arg = $2;
 
        if (!defined $arg or length $arg != 1) {
-           &help("ord");
+           &help('ord');
            return;
        }
 
@@ -421,11 +421,11 @@ sub userCommands {
 
     # hex.
     if ($message =~ /^hex(\s+(.*))?$/i) {
-       return unless (&IsChanConfOrWarn("allowConv"));
+       return unless (&IsChanConfOrWarn('allowConv'));
        my $arg = $2;
 
        if (!defined $arg) {
-           &help("hex");
+           &help('hex');
            return;
        }
 
@@ -457,15 +457,15 @@ sub userCommands {
 
     # cycle.
     if ($message =~ /^(cycle)(\s+(\S+))?$/i) {
-       return unless (&hasFlag("o"));
+       return unless (&hasFlag('o'));
        my $chan = lc $3;
 
-       if ($chan eq "") {
+       if ($chan eq '') {
            if ($msgType =~ /public/) {
                $chan = $talkchannel;
                &DEBUG("cycle: setting chan to '$chan'.");
            } else {
-               &help("cycle");
+               &help('cycle');
                return;
            }
        }
@@ -477,7 +477,7 @@ sub userCommands {
 
        &msg($chan, "I'm coming back. (courtesy of $who)");
        &part($chan);
-###    &ScheduleThis(5, "getNickInUse") if (@_);
+###    &ScheduleThis(5, 'getNickInUse') if (@_);
        &status("Schedule rejoin in 5secs to $chan by $who.");
        $conn->schedule(5, sub { &joinchan($chan); });
 
@@ -486,7 +486,7 @@ sub userCommands {
 
     # reload.
     if ($message =~ /^reload$/i) {
-       return unless (&hasFlag("n"));
+       return unless (&hasFlag('n'));
 
        &status("USER reload $who");
        &performStrictReply("reloading...");
@@ -497,21 +497,21 @@ sub userCommands {
 
     # redir.
     if ($message =~ /^redir(\s+(.*))?/i) {
-       return unless (&hasFlag("o"));
+       return unless (&hasFlag('o'));
        my $factoid = $2;
 
        if (!defined $factoid) {
-           &help("redir");
+           &help('redir');
            return;
        }
 
        my $val  = &getFactInfo($factoid, "factoid_value");
-       if (!defined $val or $val eq "") {
+       if (!defined $val or $val eq '') {
            &msg($who, "error: '$factoid' does not exist.");
            return;
        }
        &DEBUG("val => '$val'.");
-       my @list = &searchTable("factoids", "factoid_key",
+       my @list = &searchTable('factoids', "factoid_key",
                                        "factoid_value", "^$val\$");
 
        if (scalar @list == 1) {
@@ -556,8 +556,8 @@ sub userCommands {
            return;
        }
        my $num = $1 % 26;
-       my $upper="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-       my $lower="abcdefghijklmnopqrstuvwxyz";
+       my $upper='ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+       my $lower='abcdefghijklmnopqrstuvwxyz';
        my $to=substr($upper,$num).substr($upper,0,$num).substr($lower,$num).substr($lower,0,$num);
        eval "\$reply =~ tr/$upper$lower/$to/;";
 
@@ -669,7 +669,7 @@ sub userCommands {
        my $startString = scalar(gmtime $^T);
        my $upString    = &Time2String(time() - $^T);
        my ($puser,$psystem,$cuser,$csystem) = times;
-       my $factoids    = &countKeys("factoids");
+       my $factoids    = &countKeys('factoids');
        my $forks = 0;
        foreach (keys %forked) {
            $forks += scalar keys %{ $forked{$_} };
@@ -683,20 +683,20 @@ sub userCommands {
        &performStrictReply(
        "Since $startString, there have been".
          " \002$count{'Update'}\002 ".
-               &fixPlural("modification", $count{'Update'}).
+               &fixPlural('modification', $count{'Update'}).
          ", \002$count{'Question'}\002 ".
-               &fixPlural("question",$count{'Question'}).
+               &fixPlural('question',$count{'Question'}).
          ", \002$count{'Dunno'}\002 ".
-               &fixPlural("dunno",$count{'Dunno'}).
+               &fixPlural('dunno',$count{'Dunno'}).
          ", \002$count{'Moron'}\002 ".
-               &fixPlural("moron",$count{'Moron'}).
+               &fixPlural('moron',$count{'Moron'}).
          " and \002$count{'Commands'}\002 ".
-               &fixPlural("command",$count{'Commands'}).
+               &fixPlural('command',$count{'Commands'}).
          ".  I have been awake for $upString this session, and ".
          "currently reference \002$factoids\002 factoids.  ".
          "I'm using about \002$memusage\002 ".
          "kB of memory. With \002$forks\002 active ".
-               &fixPlural("fork",$forks).
+               &fixPlural('fork',$forks).
          ". Process time user/system $puser/$psystem child $cuser/$csystem"
        );
 
@@ -704,9 +704,9 @@ sub userCommands {
     }
 
     # wantNick. xk++
-    # FIXME does not try to get nick "back", just switches nicks
+    # FIXME does not try to get nick 'back', just switches nicks
     if ($message =~ /^wantNick\s(.*)?$/i) {
-       return unless (&hasFlag("o"));
+       return unless (&hasFlag('o'));
        my $wantnick = lc $1;
        my $mynick = $conn->nick();
 
@@ -729,7 +729,7 @@ sub userCommands {
            my $str = "someone is using nick $wantnick; GHOSTing";
            &status($str);
            &msg($who, $str);
-           &msg("NickServ", "GHOST $wantnick $param{'nickServ_pass'}");
+           &msg('NickServ', "GHOST $wantnick $param{'nickServ_pass'}");
 
            $conn->schedule(5, sub {
                &status("going to change nick from $mynick to $wantnick after GHOST.");
@@ -742,7 +742,7 @@ sub userCommands {
        return;
     }
 
-    return "CONTINUE";
+    return 'CONTINUE';
 }
 
 1;