X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FProcess.pl;h=f21cb02292b20acb0ceb5edf6b3aaeb43ed68032;hb=cb81fea9939f349b36e3b5a0cdc0343a6b781da1;hp=b2f5d61d25ab4a1dcf538b6a838f6bcc15a951f2;hpb=90f02845180c18d9242f335cb9a85dc96478ce07;p=infobot.git

diff --git a/src/Process.pl b/src/Process.pl
index b2f5d61..f21cb02 100644
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -27,7 +27,7 @@ sub process {
     $learnok	= 1 if ($addressed);
     if ($param{'learn'} =~ /^HUNGRY$/i) {
 	$learnok	= 1;
-	$addressed	= 1;
+	$addrchar	= 1;
 	$talkok		= 1;
     }
 
@@ -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;
@@ -104,37 +104,37 @@ sub process {
 	my @array = split / /, $message;
 
 	if ($who =~ /^_default$/i) {
-	    &pSReply("you are too eleet.");
+	    &performStrictReply("you are too eleet.");
 	    return;
 	}
 
 	if (!scalar @array or scalar @array > 2) {
-	    &help("identify");
+	    &help('identify');
 	    return;
 	}
 
 	my $do_nick = $array[1] || $who;
 
 	if (!exists $users{$do_nick}) {
-	    &pSReply("nick $do_nick is not in user list.");
+	    &performStrictReply("nick $do_nick is not in user list.");
 	    return;
 	}
 
 	my $crypt = $users{$do_nick}{PASS};
 	if (!defined $crypt) {
-	    &pSReply("user $do_nick has no passwd set.");
+	    &performStrictReply("user $do_nick has no passwd set.");
 	    return;
 	}
 
 	if (!&ckpasswd($array[0], $crypt)) {
-	    &pSReply("invalid passwd for $do_nick.");
+	    &performStrictReply("invalid passwd for $do_nick.");
 	    return;
 	}
 
 	my $mask = "$who!$user@".&makeHostMask($host);
 	### TODO: prevent adding multiple dupe masks?
 	### TODO: make &addHostMask() CMD?
-	&pSReply("Added $mask for $do_nick...");
+	&performStrictReply("Added $mask for $do_nick...");
 	$users{$do_nick}{HOSTS}{$mask} = 1;
 
 	return;
@@ -146,12 +146,12 @@ sub process {
 	my @array = split ' ', $message;
 
 	if ($who =~ /^_default$/i) {
-	    &pSReply("you are too eleet.");
+	    &performStrictReply("you are too eleet.");
 	    return;
 	}
 
 	if (scalar @array != 1) {
-	    &help("pass");
+	    &help('pass');
 	    return;
 	}
 
@@ -165,18 +165,18 @@ sub process {
 	}
 
 	if (!exists $users{$who} and !$first) {
-	    &pSReply("nick $who is not in user list.");
+	    &performStrictReply("nick $who is not in user list.");
 	    return;
 	}
 
 	if ($first) {
-	    &pSReply("First time user... adding you as Master.");
-	    $users{$who}{FLAGS} = "mrsteon";
+	    &performStrictReply("First time user... adding you as Master.");
+	    $users{$who}{FLAGS} = 'aemnorst';
 	}
 
 	my $crypt = $users{$who}{PASS};
 	if (defined $crypt) {
-	    &pSReply("user $who already has pass set.");
+	    &performStrictReply("user $who already has pass set.");
 	    return;
 	}
 
@@ -187,19 +187,19 @@ sub process {
 
 	if (!scalar keys %{ $users{$who}{HOSTS} }) {
 	    my $mask = "*!$user@".&makeHostMask($host);
-	    &pSReply("Added hostmask '\002$mask\002' to $who");
+	    &performStrictReply("Added hostmask '\002$mask\002' to $who");
 	    $users{$who}{HOSTS}{$mask}	= 1;
 	}
 
 	$crypt			= &mkcrypt($array[0]);
 	$users{$who}{PASS}	= $crypt;
-	&pSReply("new pass for $who, crypt $crypt.");
+	&performStrictReply("new pass for $who, crypt $crypt.");
 
 	return;
     }
 
     # allowOutsiders.
-    if (&IsParam("disallowOutsiders") and $msgType =~ /private/i) {
+    if (&IsParam('disallowOutsiders') and $msgType =~ /private/i) {
 	my $found = 0;
 
 	foreach (keys %channels) {
@@ -229,7 +229,7 @@ sub process {
     # User Processing, for all users.
     if ($addressed) {
 	my $retval;
-	return 'returned from pCH'   if &parseCmdHook("main",$message);
+	return 'SOMETHING parseCmdHook' if &parseCmdHook($message);
 
 	$retval	= &userCommands();
 	return unless (defined $retval);
@@ -262,8 +262,8 @@ sub process {
 	}
 
 	# customized random message.
-	my $tmp = (rand() < 0.5) ? ", $who" : "";
-	&pSReply( &getRandom(keys %{ $lang{'hello'} }) . $tmp );
+	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 && &hasParam("karma")
+	$addressed && &IsChanConfOrWarn('karma')
     ) {
 	# to request factoids such as "g++" or "libstdc++", append "?" to the query.
 	my ($term,$inc) = (lc $1,$2);
@@ -308,17 +308,15 @@ sub process {
 	    return;
 	}
 
-	my $karma = &sqlSelect("stats", "counter",
-		{ nick => $term, type => "karma" }) || 0;
+	my $karma = &sqlSelect('stats', 'counter',
+		{ nick => $term, type => 'karma' }) || 0;
 	if ($inc eq '++') {
 	    $karma++;
 	} else {
 	    $karma--;
 	}
 
-	&sqlReplace("stats", {
-	    nick	=> $term,
-	    type	=> "karma",
+	&sqlSet('stats', {'nick' => $term, type => 'karma', channel => 'PRIVATE'}, {
 	    'time'	=> time(),
 	    counter	=> $karma,
 	} );
@@ -327,20 +325,16 @@ 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) {
-	if ( &parseCmdHook("extra",$message) ) {
-	    return 'DID SOMETHING IN PCH.';
-	}
-
 	my $er = &Modules();
 	if (!defined $er) {
 	    return 'SOMETHING 1';
 	}
 
 	# allow administration of bot via messages (default is DCC CHAT only)
-	if (&IsFlag("A")) {
-	    &loadMyModule( $myModules{'ircdcc'} );
+	if (&IsFlag('A')) {
+	    &loadMyModule('UserDCC');
 	    $er = &userDCC();
 	    if (!defined $er) {
 		return 'SOMETHING 2';
@@ -353,7 +347,7 @@ sub process {
 	}
     }
 
-    if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite|pgsql)/i) {
+    if (&IsParam('factoids') and $param{'DBType'} =~ /^(mysql|sqlite(2)?|pgsql)$/i) {
 	&FactoidStuff();
     } elsif ($param{'DBType'} =~ /^none$/i) {
 	return "NO FACTOIDS.";
@@ -365,3 +359,5 @@ sub process {
 }
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80