X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FProcess.pl;h=36cffd423054a12cfaebfdb9fb5a5c2d1da70a76;hb=66805bb368c301cd369edd41d240eafc3df4a0c1;hp=495c00b65a850c2b3e33e61d9633426a99a0bdef;hpb=0e3df27228cf790fad3c3d9b6496db63c3ece37e;p=infobot.git diff --git a/src/Process.pl b/src/Process.pl index 495c00b..36cffd4 100644 --- a/src/Process.pl +++ b/src/Process.pl @@ -6,7 +6,13 @@ # process the incoming message # -if (&IsParam("useStrict")) { use strict; } +use strict; + +use vars qw($who $msgType $addressed $message $ident $user $host $chan + $learnok $talkok $force_public_reply $noreply $addrchar + $literal $addressedother $userHandle $lobotomized); +use vars qw(%channels %users %param %cache %chanconf %mask %orig %lang + ); sub process { $learnok = 0; # Able to learn? @@ -18,10 +24,23 @@ sub process { return 'addressedother set' if ($addressedother); $talkok = ($param{'addressing'} =~ /^OPTIONAL$/i or $addressed); - $learnok = ($param{'learn'} =~ /^HUNGRY$/i or $addressed); + $learnok = 1 if ($addressed); + if ($param{'learn'} =~ /^HUNGRY$/i) { + $learnok = 1; + $addrchar = 1; + $talkok = 1; + } &shmFlush(); # hack. + # 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") { + &status("Gave $who/$chan +o (+O)\'ness"); + $users{$userHandle}{FLAGS} .= "o"; + } + # check if we have our head intact. if ($lobotomized) { if ($addressed and IsFlag("o") eq "o") { @@ -29,7 +48,7 @@ sub process { &msg($who, "give me an unlobotomy.") if ($delta_time > 60*60); $cache{lobotomy}{$who} = time(); } - return 'LOBOTOMY'; + return 'LOBOTOMY' unless IsFlag("A"); } # talkMethod. @@ -46,32 +65,35 @@ sub process { if ($message =~ /^join(\s+(.*))?\s*$/i) { return 'join: not addr' unless ($addressed); - $2 =~ /^($mask{chan})(,(\S+))?/; - my($thischan, $key) = (lc $1, $3); - my $chankey = lc $thischan; - $chankey .= " $key" if (defined $key); + $2 =~ /^($mask{chan})(\s+(\S+))?/; + my($joinchan, $key) = (lc $1, $3); - if ($thischan eq "") { + if ($joinchan eq "") { &help("join"); return; } + if ($joinchan !~ /^$mask{chan}$/) { + &msg($who, "$joinchan is not a valid channel name."); + return; + } + if (&IsFlag("o") ne "o") { - if (!exists $chanconf{$thischan}) { - &msg($who, "I am not allowed to join $thischan."); + if (!exists $chanconf{$joinchan}) { + &msg($who, "I am not allowed to join $joinchan."); return; } - if (&validChan($thischan)) { - &msg($who,"I'm already on $thischan..."); - return; + if (&validChan($joinchan)) { + &msg($who,"warn: I'm already on $joinchan, joining anyway..."); } } - $cache{join}{$thischan} = $who; # used for on_join self. + $cache{join}{$joinchan} = $who; # used for on_join self. - &joinchan($chankey); - &status("JOIN $chankey <$who>"); - &msg($who, "joining $chankey"); + &status("JOIN $joinchan $key <$who>"); + &msg($who, "joining $joinchan $key"); + &joinchan($joinchan, $key); + &joinNextChan(); # hack. return; } @@ -82,7 +104,7 @@ sub process { my @array = split / /, $message; if ($who =~ /^_default$/i) { - &pSReply("you are too eleet."); + &performStrictReply("you are too eleet."); return; } @@ -94,25 +116,25 @@ sub process { 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 = "*!$user@".&makeHostMask($host); + 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; @@ -121,10 +143,10 @@ sub process { # 'pass' if ($msgType =~ /private/ and $message =~ s/^pass//i) { $message =~ s/^\s+|\s+$//g; - my @array = split / /, $message; + my @array = split ' ', $message; if ($who =~ /^_default$/i) { - &pSReply("you are too eleet."); + &performStrictReply("you are too eleet."); return; } @@ -133,21 +155,28 @@ sub process { return; } - # todo: use &getUser()? - my $first = (scalar keys %users) ? 1 : 0; + # TODO: use &getUser()? + my $first = 1; + foreach (keys %users) { + if ($users{$_}{FLAGS} =~ /n/) { + $first = 0; + last; + } + } + 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; } @@ -158,13 +187,13 @@ sub process { if (!scalar keys %{ $users{$who}{HOSTS} }) { my $mask = "*!$user@".&makeHostMask($host); - &pSReply("added mask $mask 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; } @@ -174,6 +203,8 @@ sub process { my $found = 0; foreach (keys %channels) { + # don't test for $channel{_default} elsewhere !!! + next if (/^\s*$/ || /^_?default$/); next unless (&IsNickInChan($who,$_)); $found++; @@ -198,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); @@ -232,16 +263,14 @@ sub process { # customized random message. my $tmp = (rand() < 0.5) ? ", $who" : ""; - &performStrictReply(&getRandom(keys %{ $lang{'hello'} }) . $tmp); + &performStrictReply( &getRandom(keys %{ $lang{'hello'} }) . $tmp ); return; } # greetings. if ($message =~ /how (the hell )?are (ya|you)( doin\'?g?)?\?*$/) { - my $reply = &getRandom(keys %{ $lang{'howareyou'} }); - &performReply($reply); - + &performReply(&getRandom(keys %{ $lang{'howareyou'} })); return; } @@ -251,11 +280,7 @@ sub process { { return 'praise: no addr' unless ($addressed); - &status("random praise detected"); - - my $tmp = (rand() < 0.5) ? "thanks $who " : ""; - &performStrictReply($tmp.":)"); - + &performReply(&getRandom(keys %{ $lang{'praise'} })); return; } @@ -271,35 +296,32 @@ sub process { ### bot commands... ### - if ($message =~ s/^literal\s+//i) { - &status("literal ask of '$message'."); - $literal = 1; - } - # karma. set... - if ($message =~ /^(\S+)(--|\+\+)\s*$/ and $addressed) { - return '' unless (&hasParam("karma")); - - my($term,$inc) = (lc $1,$2); + if ($msgType =~ /public/i && $message =~ /^(\S+)(--|\+\+)\s*$/ && + $addressed && &IsChanConfOrWarn("karma") + ) { + # to request factoids such as "g++" or "libstdc++", append "?" to the query. + my ($term,$inc) = (lc $1,$2); - if ($msgType !~ /public/i) { - &msg($who, "karma must be done in public!"); - return; - } - - if (lc($term) eq lc($who)) { + if (lc $term eq lc $who) { &msg($who, "please don't karma yourself"); return; } - my $karma = &dbGet("karma", "nick",$term,"karma") || 0; + my $karma = &sqlSelect("stats", "counter", + { nick => $term, type => "karma" }) || 0; if ($inc eq '++') { $karma++; } else { $karma--; } - &dbSet("karma", "nick",$term,"karma",$karma); + &sqlReplace("stats", { + nick => $term, + type => "karma", + 'time' => time(), + counter => $karma, + } ); return; } @@ -307,25 +329,27 @@ sub process { # here's where the external routines get called. # 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'; } - ### FIXME: should this only apply to public messages? - if ($addrchar) { - &DEBUG("floodwho => '$floodwho'."); - delete $flood{$floodwho}{$message}; - &status("short return due to unknown command."); - return 'ADDR CHAR'; + # allow administration of bot via messages (default is DCC CHAT only) + if (&IsFlag("A")) { + &loadMyModule('UserDCC'); + $er = &userDCC(); + if (!defined $er) { + return 'SOMETHING 2'; + } + } + + if (0 and $addrchar) { + &msg($who, "I don't trust people to use the core commands while addressing me in a short-cut way."); + return; } } - if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|pg|postgres|dbm)/i) { + if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite(2)?|pgsql)$/i) { &FactoidStuff(); } elsif ($param{'DBType'} =~ /^none$/i) { return "NO FACTOIDS."; @@ -336,337 +360,4 @@ sub process { } } -sub FactoidStuff { - # inter-infobot. - if ($msgType =~ /private/ and $message =~ s/^:INFOBOT://) { - ### identification. - &status("infobot <$nuh> identified") unless $bots{$nuh}; - $bots{$nuh} = $who; - - ### communication. - - # query. - if ($message =~ /^QUERY (<.*?>) (.*)/) { # query. - my ($target,$item) = ($1,$2); - $item =~ s/[.\?]$//; - - &status(":INFOBOT:QUERY $who: $message"); - - if ($_ = &getFactoid($item)) { - &msg($who, ":INFOBOT:REPLY $target $item =is=> $_"); - } - - return 'INFOBOT QUERY'; - } elsif ($message =~ /^REPLY <(.*?)> (.*)/) { # reply. - my ($target,$item) = ($1,$2); - - &status(":INFOBOT:REPLY $who: $message"); - - my ($lhs,$mhs,$rhs) = $item =~ /^(.*?) =(.*?)=> (.*)/; - - if ($param{'acceptUrl'} !~ /REQUIRE/ or $rhs =~ /(http|ftp|mailto|telnet|file):/) { - &msg($target, "$who knew: $lhs $mhs $rhs"); - - # "are" hack :) - $rhs = " are" if ($mhs eq "are"); - &setFactInfo($lhs, "factoid_value", $rhs); - } - - return 'INFOBOT REPLY'; - } else { - &ERROR(":INFOBOT:UNKNOWN $who: $message"); - return 'INFOBOT UNKNOWN'; - } - } - - # factoid forget. - if ($message =~ s/^forget\s+//i) { - return 'forget: no addr' unless ($addressed); - - my $faqtoid = $message; - if ($faqtoid eq "") { - &help("forget"); - return; - } - - $faqtoid =~ tr/A-Z/a-z/; - my $result = &getFactoid($faqtoid); - - if (defined $result) { - my $author = &getFactInfo($faqtoid, "created_by"); - if (IsFlag("r") ne "r") { - &msg($who, "you don't have access to remove factoids"); - return; - } - - return 'locked factoid' if (&IsLocked($faqtoid) == 1); - - if (&IsParam("factoidDeleteDelay")) { - if ($faqtoid =~ /#DEL#/ and !&IsFlag("o")) { - &msg($who, "cannot delete it ($faqtoid)."); - return; - } - &status("forgot (safe delete): <$who> '$faqtoid' =is=> '$result'"); - ### TODO: check if the "backup" exists and overwrite it - my $check = &getFactoid("$faqtoid #DEL#"); - if (!$check) { - if ($faqtoid !~ /#DEL#/) { - &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#"); - - &setFactInfo($faqtoid, "modified_by", $who); - &setFactInfo($faqtoid, "modified_time", time()); - } else { - &status("not backing up $faqtoid."); - } - } else { - &status("forget: not overwriting backup!"); - } - } else { - &status("forget: <$who> '$faqtoid' =is=> '$result'"); - } - &delFactoid($faqtoid); - - &performReply("i forgot $faqtoid"); - - $count{'Update'}++; - } else { - &performReply("i didn't have anything called '$faqtoid'"); - } - - return; - } - - # factoid unforget/undelete. - if ($message =~ s/^un(forget|delete)\s+//i) { - return 'unforget: no addr' unless ($addressed); - - if (!&IsParam("factoidDeleteDelay")) { - &performReply("safe delete has been disable so what is there to undelete?"); - return; - } - - my $faqtoid = $message; - if ($faqtoid eq "") { - &help("undelete"); - return; - } - - $faqtoid =~ tr/A-Z/a-z/; - my $result = &getFactoid($faqtoid." #DEL#"); - my $check = &getFactoid($faqtoid); - - if (!defined $result) { - &performReply("i didn't have anything ('$faqtoid') to undelete."); - return; - } - - &DEBUG("unforget: check => $check"); - if (defined $check) { - &performReply("cannot undeleted '$faqtoid' because it already exists?"); - return; - } - - &setFactInfo($faqtoid." #DEL#", "factoid_key", $faqtoid); - - ### delete info. modified_ isn't really used. - &setFactInfo($faqtoid, "modified_by", ""); - &setFactInfo($faqtoid, "modified_time", 0); - - &performReply("Successfully recovered '$faqtoid'. Have fun now."); - - $count{'Undelete'}++; - - return; - } - - # factoid locking. - if ($message =~ /^((un)?lock)(\s+(.*))?\s*?$/i) { - return 'lock: no addr 2' unless ($addressed); - - my $function = lc $1; - my $faqtoid = lc $4; - - if ($faqtoid eq "") { - &help($function); - return; - } - - if (&getFactoid($faqtoid) eq "") { - &msg($who, "factoid \002$faqtoid\002 does not exist"); - return; - } - - if ($function eq "lock") { - # strongly requested by #debian on 19991028. -xk - if (1 and $faqtoid !~ /^\Q$who\E$/i and &IsFlag("o") ne "o") { - &msg($who,"sorry, locking cannot be used since it can be abused unneccesarily."); - &status("Replace 1 with 0 in Process.pl#~324 for locking support."); - return; - } - - &CmdLock($faqtoid); - } else { - &CmdUnLock($faqtoid); - } - - return; - } - - # factoid rename. - if ($message =~ s/^rename(\s+|$)//) { - return 'rename: no addr' unless ($addressed); - - if ($message eq "") { - &help("rename"); - return; - } - - if ($message =~ /^'(.*)'\s+'(.*)'$/) { - my($from,$to) = (lc $1, lc $2); - - my $result = &getFactoid($from); - if (defined $result) { - my $author = &getFactInfo($from, "created_by"); - - if (&IsFlag("m") or $author =~ /^\Q$who\E\!/i) { - &msg($who, "It's not yours to modify."); - return; - } - - if ($_ = &getFactoid($to)) { - &performReply("destination factoid already exists."); - return; - } - - &setFactInfo($from,"factoid_key",$to); - - &status("rename: <$who> '$from' is now '$to'"); - &performReply("i renamed '$from' to '$to'"); - } else { - &performReply("i didn't have anything called '$from'"); - } - } else { - &msg($who,"error: wrong format. ask me about 'help rename'."); - } - - return; - } - - # factoid substitution. (X =~ s/A/B/FLAG) - if ($message =~ m|^(.*?)\s+=~\s+s([/,#])(.+?)\2(.*?)\2([a-z]*);?\s*$|) { - my ($faqtoid,$delim,$op,$np,$flags) = (lc $1, $2, $3, $4, $5); - return 'subst: no addr' unless ($addressed); - - # incorrect format. - if ($np =~ /$delim/) { - &msg($who,"looks like you used the delimiter too many times. You may want to use a different delimiter, like ':' or '#'."); - return; - } - - # success. - if (my $result = &getFactoid($faqtoid)) { - return 'subst: locked' if (&IsLocked($faqtoid) == 1); - my $was = $result; - - if (($flags eq "g" && $result =~ s/\Q$op/$np/gi) || $result =~ s/\Q$op/$np/i) { - if (length $result > $param{'maxDataSize'}) { - &performReply("that's too long"); - return; - } - &setFactInfo($faqtoid, "factoid_value", $result); - &status("update: '$faqtoid' =is=> '$result'; was '$was'"); - &performReply("OK"); - } else { - &performReply("that doesn't contain '$op'"); - } - } else { - &performReply("i didn't have anything called '$faqtoid'"); - } - - return; - } - - # Fix up $message for question. - my $question = $message; - for ($question) { - # fix the string. - s/^hey([, ]+)where/where/i; - s/\s+\?$/?/; - s/whois/who is/ig; - s/where can i find/where is/i; - s/how about/where is/i; - s/ da / the /ig; - - # clear the string of useless words. - s/^(stupid )?q(uestion)?:\s+//i; - s/^(does )?(any|ne)(1|one|body) know //i; - - s/^[uh]+m*[,\.]* +//i; - - s/^well([, ]+)//i; - s/^still([, ]+)//i; - s/^(gee|boy|golly|gosh)([, ]+)//i; - s/^(well|and|but|or|yes)([, ]+)//i; - - s/^o+[hk]+(a+y+)?([,. ]+)//i; - s/^g(eez|osh|olly)([,. ]+)//i; - s/^w(ow|hee|o+ho+)([,. ]+)//i; - s/^heya?,?( folks)?([,. ]+)//i; - } - - if ($addressed and $message =~ s/^no([, ]+)(\Q$ident\E\,+)?\s*//i) { - $correction_plausible = 1; - &status("correction is plausible, initial negative and nick deleted ($&)") if ($param{VERBOSITY}); - } else { - $correction_plausible = 0; - } - - my $result = &doQuestion($question); - if (!defined $result or $result eq $noreply) { - return 'result from doQ undef.'; - } - - if (defined $result and $result !~ /^0?$/) { # question. - &status("question: <$who> $message"); - $count{'Question'}++; - } elsif (&IsChanConf("perlMath") > 0 and $addressed) { # perl math. - &loadMyModule("perlMath"); - my $newresult = &perlMath(); - - if (defined $newresult and $newresult ne "") { - $cmdstats{'Maths'}++; - $result = $newresult; - &status("math: <$who> $message => $result"); - } - } - - if ($result !~ /^0?$/) { - &performStrictReply($result); - return; - } - - # why would a friendly bot get passed here? - if (&IsParam("friendlyBots")) { - return if (grep lc($_) eq lc($who), split(/\s+/, $param{'friendlyBots'})); - } - - # do the statement. - if (!defined &doStatement($message)) { - return; - } - - return unless ($addressed); - - if (length $message > 64) { - &status("unparseable-moron: $message"); - &performReply( &getRandom(keys %{ $lang{'moron'} }) ); - $count{'Moron'}++; - return; - } - - &status("unparseable: $message"); - &performReply( &getRandom(keys %{ $lang{'dunno'} }) ); - $count{'Dunno'}++; -} - 1;