}
if (&validChan($thischan)) {
- &msg($who,"I'm already on $thischan...");
- return;
+ &msg($who,"warn: I'm already on $thischan, joining anyway...");
+# return;
}
}
$cache{join}{$thischan} = $who; # used for on_join self.
# '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.");
}
# todo: use &getUser()?
- my $first = (scalar keys %users) ? 1 : 0;
+ 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.");
+ &pSReply("First time user... adding you as Master.");
$users{$who}{FLAGS} = "mrsteon";
}
if (!scalar keys %{ $users{$who}{HOSTS} }) {
my $mask = "*!$user@".&makeHostMask($host);
- &pSReply("added mask $mask to $who.");
+ &pSReply("Added hostmask '\002$mask\002' to $who");
$users{$who}{HOSTS}{$mask} = 1;
}
}
}
+ # 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) {
my $retval;
if ($message =~ /^than(ks?|x)( you)?( \S+)?/i) {
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';
- }
-
- 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"));
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;
}
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;
}
}
}
}
-
# factoid forget.
if ($message =~ s/^forget\s+//i) {
return 'forget: no addr' unless ($addressed);
my $result = &getFactoid($faqtoid);
if (defined $result) {
- my $author = &getFactInfo($faqtoid, "created_by");
+ 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'");
### TODO: check if the "backup" exists and overwrite it
my $check = &getFactoid("$faqtoid #DEL#");
- if (!$check) {
- &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#");
- &setFactInfo($faqtoid, "modified_by", $who);
- &setFactInfo($faqtoid, "modified_time", time());
+ 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!");
}
+
} else {
&status("forget: <$who> '$faqtoid' =is=> '$result'");
}
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;
}
return;
}
- &DEBUG("unforget: check => $check");
if (defined $check) {
&performReply("cannot undeleted '$faqtoid' because it already exists?");
return;
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;
$correction_plausible = 0;
}
- my $result = &doQuestion($message);
+ my $result = &doQuestion($question);
if (!defined $result or $result eq $noreply) {
return 'result from doQ undef.';
}
my $newresult = &perlMath();
if (defined $newresult and $newresult ne "") {
+ $cmdstats{'Maths'}++;
$result = $newresult;
&status("math: <$who> $message => $result");
}
if (length $message > 64) {
&status("unparseable-moron: $message");
- &performReply( &getRandom(keys %{$lang{'moron'}}) );
+# &performReply( &getRandom(keys %{ $lang{'moron'} }) );
$count{'Moron'}++;
+
+ &performReply("You are moron #".$count{'Moron'}."!");
return;
}
&status("unparseable: $message");
- &performReply( &getRandom(keys %{$lang{'dunno'}}) );
+ &performReply( &getRandom(keys %{ $lang{'dunno'} }) );
$count{'Dunno'}++;
}
projects / infobot.git / blobdiff