X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FProcess.pl;h=f23143b4d006b4ba978258342ee7f2fc5680dc05;hb=2d050e260224ba7bdaf92ee1f9b2cffdc2c9f006;hp=1d444718ffe890ef8f1d5b38a4cc7a14d2bd3162;hpb=3f2d9c0c3c7b3483ff1cd3fbb8aa3e41f9d1aa4c;p=infobot.git diff --git a/src/Process.pl b/src/Process.pl index 1d44471..f23143b 100644 --- a/src/Process.pl +++ b/src/Process.pl @@ -12,6 +12,7 @@ sub process { $learnok = 0; # Able to learn? $talkok = 0; # Able to yap? $force_public_reply = 0; + $literal = 0; return 'X' if $who eq $ident; # self-message. return 'addressedother set' if ($addressedother); @@ -24,7 +25,9 @@ sub process { # check if we have our head intact. if ($lobotomized) { if ($addressed and IsFlag("o") eq "o") { - &msg($who, "give me an unlobotomy."); + 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'; } @@ -39,18 +42,13 @@ sub process { } } - # ignore. - if ($ignore) { - return 'IGNORE'; - } - # join, must be done before outsider checking. if ($message =~ /^join(\s+(.*))?\s*$/i) { return 'join: not addr' unless ($addressed); $2 =~ /^($mask{chan})(,(\S+))?/; my($thischan, $key) = (lc $1, $3); - my $chankey = $thischan; + my $chankey = lc $thischan; $chankey .= " $key" if (defined $key); if ($thischan eq "") { @@ -58,20 +56,18 @@ sub process { return; } - # Thanks to Eden Li (tile) for the channel key patch - my @chans = split(/[\s\t]+/, $param{'join_channels'}); - if (!grep /^$thischan$/i, @chans) { - if (&IsFlag("o") ne "o") { + if (&IsFlag("o") ne "o") { + if (!exists $chanconf{$thischan}) { &msg($who, "I am not allowed to join $thischan."); return; } - } - if (&validChan($thischan) and &IsFlag("o") ne "o") { - &msg($who,"I'm already on $thischan..."); - return; + if (&validChan($thischan)) { + &msg($who,"warn: I'm already on $thischan, joining anyway..."); +# return; + } } - $joinverb{$thischan} = $who; # used for on_join self. + $cache{join}{$thischan} = $who; # used for on_join self. &joinchan($chankey); &status("JOIN $chankey <$who>"); @@ -80,6 +76,106 @@ sub process { return; } + # 'identify' + if ($msgType =~ /private/ and $message =~ s/^identify//i) { + $message =~ s/^\s+|\s+$//g; + my @array = split / /, $message; + + if ($who =~ /^_default$/i) { + &pSReply("you are too eleet."); + return; + } + + if (!scalar @array or scalar @array > 2) { + &help("identify"); + return; + } + + my $do_nick = $array[1] || $who; + + if (!exists $users{$do_nick}) { + &pSReply("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."); + return; + } + + if (!&ckpasswd($array[0], $crypt)) { + &pSReply("invalid passwd for $do_nick."); + return; + } + + my $mask = "*!$user@".&makeHostMask($host); + ### TODO: prevent adding multiple dupe masks? + ### TODO: make &addHostMask() CMD? + &pSReply("Added $mask for $do_nick..."); + $users{$do_nick}{HOSTS}{$mask} = 1; + + return; + } + + # 'pass' + if ($msgType =~ /private/ and $message =~ s/^pass//i) { + $message =~ s/^\s+|\s+$//g; + my @array = split ' ', $message; + + if ($who =~ /^_default$/i) { + &pSReply("you are too eleet."); + return; + } + + if (scalar @array != 1) { + &help("pass"); + return; + } + + # 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."); + return; + } + + if ($first) { + &pSReply("First time user... adding you as Master."); + $users{$who}{FLAGS} = "mrsteon"; + } + + my $crypt = $users{$who}{PASS}; + if (defined $crypt) { + &pSReply("user $who already has pass set."); + return; + } + + if (!defined $host) { + &WARN("pass: host == NULL."); + return; + } + + if (!scalar keys %{ $users{$who}{HOSTS} }) { + my $mask = "*!$user@".&makeHostMask($host); + &pSReply("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."); + + return; + } + # allowOutsiders. if (&IsParam("disallowOutsiders") and $msgType =~ /private/i) { my $found = 0; @@ -97,10 +193,23 @@ sub process { } } + # override msgType. + if ($msgType =~ /public/ and $message =~ s/^\+//) { + &status("Process: '+' flag detected; changing reply to public"); + $msgType = 'public'; + $who = $chan; # major hack to fix &msg(). + $force_public_reply++; + # notice is still NOTICE but to whole channel => good. + } + # User Processing, for all users. if ($addressed) { - return '$noreply from pCH' if &parseCmdHook("main",$message); - return '$noreply from userC' if &userCommands() eq $noreply; + my $retval; + return 'returned from pCH' if &parseCmdHook("main",$message); + + $retval = &userCommands(); + return unless (defined $retval); + return if ($retval eq $noreply); } ### @@ -108,7 +217,7 @@ sub process { ### # confused? is this for infobot communications? - foreach (keys %{$lang{'confused'}}) { + foreach (keys %{ $lang{'confused'} }) { my $y = $_; next unless ($message =~ /^\Q$y\E\s*/); @@ -130,14 +239,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'}}); - + my $reply = &getRandom(keys %{ $lang{'howareyou'} }); + &performReply($reply); return; @@ -159,26 +268,16 @@ sub process { # thanks. if ($message =~ /^than(ks?|x)( you)?( \S+)?/i) { - &DEBUG("thanks: talkok => '$talkok', addressed => '$addressed'."); return 'thank: no addr' unless ($message =~ /$ident/ or $talkok); - &performReply( &getRandom(keys %{$lang{'welcome'}}) ); + &performReply( &getRandom(keys %{ $lang{'welcome'} }) ); return; } - ### ### bot commands... ### - # override msgType. - if ($msgType =~ /public/ and $message =~ s/^\+//) { - &status("found '+' flag; setting msgType to public."); - $force_public_reply++; - $msgType = 'public'; - } - - # karma. set... if ($message =~ /^(\S+)(--|\+\+)\s*$/ and $addressed) { return '' unless (&hasParam("karma")); @@ -190,19 +289,22 @@ sub process { 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 = &dbGet("stats", "counter", "nick='$term' and type='karma'") || 0; if ($inc eq '++') { $karma++; } else { $karma--; } - &dbSet("karma", "nick",$term,"karma",$karma); + &dbSet("stats", + { nick => $term, type => "karma" }, + { counter => $karma } + ); return; } @@ -215,17 +317,13 @@ sub process { } my $er = &Modules(); - if ($er =~ /\S/) { - &performStrictReply($er) if ($er ne $noreply); + 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'; + 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; } } @@ -283,7 +381,6 @@ sub FactoidStuff { } } - # factoid forget. if ($message =~ s/^forget\s+//i) { return 'forget: no addr' unless ($addressed); @@ -298,25 +395,59 @@ sub FactoidStuff { my $result = &getFactoid($faqtoid); if (defined $result) { - my $author = &getFactInfo($faqtoid, "created_by"); - if (IsFlag("r") ne "r" && $author =~ /^\Q$who\E\!/i) { - &msg($who, "you don't have access to remove that factoid"); + my $author = &getFactInfo($faqtoid, "created_by"); + my $count = &getFactInfo($faqtoid, "requested_count") || 0; + my $limit = &getChanConfDefault("factoidPreventForgetLimit", + 0, $chan); + + &DEBUG("forget: limit = $limit"); + &DEBUG("forget: count = $count"); + + 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")) { + # factoidPreventForgetLimit: + if ($limit and $count > $limit and (&IsFlag("o") ne "o")) { + &msg($who, "will not delete '$faqtoid', count > limit ($count > $limit)"); + return; + } + + if (&IsParam("factoidDeleteDelay") or &IsChanConf("factoidDeleteDelay")) { + if ($faqtoid =~ / #DEL#$/ and !&IsFlag("o")) { + &msg($who, "cannot delete it ($faqtoid)."); + return; + } + &status("forgot (safe delete): <$who> '$faqtoid' =is=> '$result'"); - &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#"); + ### TODO: check if the "backup" exists and overwrite it + my $check = &getFactoid("$faqtoid #DEL#"); + + if (!defined $check or $check =~ /^\s*$/) { + if ($faqtoid !~ / #DEL#$/) { + my $new = $faqtoid." #DEL#"; + &DEBUG("Process: backing up $faqtoid to '$new'."); + + # this looks weird but does it work? + &setFactInfo($faqtoid, "factoid_key", $new); + &setFactInfo($new, "modified_by", $who); + &setFactInfo($new, "modified_time", time()); + + } else { + &status("not backing up $faqtoid."); + } + + } else { + &status("forget: not overwriting backup!"); + } - ### delete info. modified_ isn't really used. - &setFactInfo($faqtoid, "modified_by", $who); - &setFactInfo($faqtoid, "modified_time", time()); } else { &status("forget: <$who> '$faqtoid' =is=> '$result'"); - &delFactoid($faqtoid); } + &delFactoid($faqtoid); &performReply("i forgot $faqtoid"); @@ -332,7 +463,10 @@ sub FactoidStuff { if ($message =~ s/^un(forget|delete)\s+//i) { return 'unforget: no addr' unless ($addressed); - if (!&IsParam("factoidDeleteDelay")) { + my $i = 0; + $i++ if (&IsParam("factoidDeleteDelay")); + $i++ if (&IsChanConf("factoidDeleteDelay")); + if (!$i) { &performReply("safe delete has been disable so what is there to undelete?"); return; } @@ -382,19 +516,19 @@ sub FactoidStuff { return; } - # 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; - } - 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); @@ -418,9 +552,10 @@ sub FactoidStuff { my $result = &getFactoid($from); if (defined $result) { my $author = &getFactInfo($from, "created_by"); - if (&IsFlag("m") and $author =~ /^\Q$who\E\!/i) { + + if (&IsFlag("m") or $author =~ /^\Q$who\E\!/i) { &msg($who, "It's not yours to modify."); - return $noreply; + return; } if ($_ = &getFactoid($to)) { @@ -476,11 +611,12 @@ sub FactoidStuff { return; } - # Fix up $message for question. - for ($message) { + 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; @@ -510,50 +646,54 @@ sub FactoidStuff { $correction_plausible = 0; } - my $result = &doQuestion($message); - - return 'result is $noreply' if ($result eq $noreply); + my $result = &doQuestion($question); + if (!defined $result or $result eq $noreply) { + return 'result from doQ undef.'; + } - if (defined $result and $result ne "") { # question. + if (defined $result and $result !~ /^0?$/) { # question. &status("question: <$who> $message"); $count{'Question'}++; - } elsif (&IsParam("perlMath") and $addressed) { # perl math. + } 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 ne "") { + if ($result !~ /^0?$/) { &performStrictReply($result); return; - } else { - # 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 ($_ = &doStatement($message)) { - return; - } + # why would a friendly bot get passed here? + if (&IsParam("friendlyBots")) { + return if (grep lc($_) eq lc($who), split(/\s+/, $param{'friendlyBots'})); + } - return unless ($addressed); + # do the statement. + if (!defined &doStatement($message)) { + return; + } - if (length $message > 64) { - &status("unparseable-moron: $message"); - &performReply( &getRandom(keys %{$lang{'moron'}}) ); - $count{'Moron'}++; - return; - } + return unless ($addressed); - &status("unparseable: $message"); - &performReply( &getRandom(keys %{$lang{'dunno'}}) ); - $count{'Dunno'}++; + if (length $message > 64) { + &status("unparseable-moron: $message"); +# &performReply( &getRandom(keys %{ $lang{'moron'} }) ); + $count{'Moron'}++; + + &performReply("You are moron #".$count{'Moron'}."!"); + return; } + + &status("unparseable: $message"); + &performReply( &getRandom(keys %{ $lang{'dunno'} }) ); + $count{'Dunno'}++; } 1;