.chanset #debian +babeflish
.chanset #debian -babeflish
-chanunset #debian babelflish
- yet another minor bug, use !msgType for dcc chat aswell.
- selfflood proteciton for /msg
- like 4/sec or 1k/sec
- msgcount, msgbyte, msgtime
- pubcount, pubbyte, pubtime
- fixed other bugs.... weeeeeeee....
git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@442
c11ca15a-4712-0410-83d8-
924469b57eb5
}
foreach (keys %{"hooks_$hashname"}) {
}
foreach (keys %{"hooks_$hashname"}) {
+ # rename to something else!
my $ident = $_;
next unless ($cmd =~ /^$ident$/i);
my $ident = $_;
next unless ($cmd =~ /^$ident$/i);
# check if CODEREF exists.
if (!defined &{ $hash{'CODEREF'} }) {
&WARN("coderef $hash{'CODEREF'} don't exist.");
# check if CODEREF exists.
if (!defined &{ $hash{'CODEREF'} }) {
&WARN("coderef $hash{'CODEREF'} don't exist.");
+ if (defined $who) {
+ &msg($who, "coderef does not exist for $ident.");
+ }
+
- $chanconf{$chan}{$what} = $val;
- &pSReply("Setting $what for $chan to '$val'$was.");
+ if ($val eq "0") {
+ &pSReply("Unsetting $what for $chan$was.");
+ delete $chanconf{$chan}{$what};
+ } else {
+ &pSReply("Setting $what for $chan to '$val'$was.");
+ $chanconf{$chan}{$what} = $val;
+ }
+
$update++;
### ".chanset blah testing"
$update++;
### ".chanset blah testing"
&status("</$talkchannel> $msg");
if (&whatInterface() =~ /IRC/) {
&status("</$talkchannel> $msg");
if (&whatInterface() =~ /IRC/) {
- $msg = "zero" if ($msg =~ /^0+$/);
+ $msg = "zero" if ($msg =~ /^0+$/);
+ my $t = time();
+
+ if ($t == $pubtime) {
+ $pubcount++;
+ $pubsize += length $msg;
+
+ if ($pubcount % 4 and $pubcount) {
+ sleep 1;
+ } elsif ($pubsize > 1500) {
+ sleep 1;
+ $pubsize -= 1500;
+ }
+
+ } else {
+ $pubcount = 0;
+ $pubtime = $t;
+ $pubsize = length $msg;
+ }
$conn->privmsg($talkchannel, $msg);
}
$conn->privmsg($talkchannel, $msg);
}
}
&status(">$nick< $msg");
}
&status(">$nick< $msg");
- $conn->privmsg($nick, $msg) if (&whatInterface() =~ /IRC/);
+
+ if (&whatInterface() =~ /IRC/) {
+ my $t = time();
+
+ if ($t == $msgtime) {
+ $msgcount++;
+ $msgsize += length $msg;
+
+ if ($msgcount % 4 and $msgcount) {
+ sleep 1;
+ } elsif ($msgsize > 1000) {
+ sleep 1;
+ $msgsize -= 1000;
+ }
+
+ } else {
+ $msgcount = 0;
+ $msgtime = $t;
+ $msgsize = length $msg;
+ }
+
+ $conn->privmsg($nick, $msg);
+ }
}
# Usage: &action(nick || chan, txt);
}
# Usage: &action(nick || chan, txt);
### TODO: incomplete.
### .* wait (\d+) second/) {
### TODO: incomplete.
### .* wait (\d+) second/) {
- &status("on_ttf: X1 $msg") if (defined $msg);
+ &status("on_ttf: X1 $why") if (defined $why);
my $sleep = 5;
&status("targettoofast: going to sleep for $sleep...");
sleep $sleep;
my $sleep = 5;
&status("targettoofast: going to sleep for $sleep...");
sleep $sleep;
&status("ChanLimit: setting for first time or from netsplit, for $chan");
}
&status("ChanLimit: setting for first time or from netsplit, for $chan");
}
- if (exists $cache{chanlimitChange_$chan}) {
- if (time() - $cache{chanlimitChange_$chan} < 60) {
+ if (exists $cache{ "chanlimitChange_$chan" }) {
+ if (time() - $cache{ "chanlimitChange_$chan" } < 60) {
&DEBUG("not going to change chanlimit!");
return;
}
&DEBUG("not going to change chanlimit!");
return;
}
- delete $cache{chanlimitChange_$chan};
+ delete $cache{ "chanlimitChange_$chan" };
}
&rawout("MODE $chan +l $newlimit");
}
&rawout("MODE $chan +l $newlimit");
- $cache{chanlimitChange_$chan} = time();
+ $cache{ "chanlimitChange_$chan" } = time();
if (defined $what and $what =~ s/^($::mask{chan})\s*//) {
# todo: check if the channel exists aswell.
$chan = $1;
if (defined $what and $what =~ s/^($::mask{chan})\s*//) {
# todo: check if the channel exists aswell.
$chan = $1;
+
+ if (!&::IsNickInChan($::who, $chan)) {
+ &::notice($::who, "sorry but you're not on $chan.");
+ return;
+ }
}
if (!defined $chan) {
my @chans = &::GetNickInChans($::who);
if (scalar @chans > 1) {
}
if (!defined $chan) {
my @chans = &::GetNickInChans($::who);
if (scalar @chans > 1) {
- &::msg($::who, "error: I dunno which channel you are referring to since you're on more than one. Try 'news #chan ...' instead");
+ &::notice($::who, "error: I dunno which channel you are referring to since you're on more than one. Try 'news #chan ...' instead");
return;
}
if (scalar @chans == 0) {
return;
}
if (scalar @chans == 0) {
- &::msg($::who, "error: I couldn't find you on any chan. This must be a bug!");
+ &::notice($::who, "error: I couldn't find you on any chan. This must be a bug!");
} elsif ($what =~ /^(un)?notify$/i) {
my $state = ($1) ? 0 : 1;
} elsif ($what =~ /^(un)?notify$/i) {
my $state = ($1) ? 0 : 1;
- &::DEBUG("chan => $chan");
- &::DEBUG("::chan => $::chan");
# todo: don't notify even if "news" is called.
if (!&::IsChanConf("newsNotifyAll")) {
# todo: don't notify even if "news" is called.
if (!&::IsChanConf("newsNotifyAll")) {
- &::msg($::who, "not available for this channel or disabled altogether.");
+ &::DEBUG("chan => $chan, ::chan => $::chan.");
+ &::notice($::who, "not available for this channel or disabled altogether.");
return;
}
my $t = $::newsuser{$chan}{$::who};
if ($state) { # state = 1
if (defined $t and ($t == 0 or $t == -1)) {
return;
}
my $t = $::newsuser{$chan}{$::who};
if ($state) { # state = 1
if (defined $t and ($t == 0 or $t == -1)) {
- &::msg($::who, "enabled notify.");
+ &::notice($::who, "enabled notify.");
delete $::newsuser{$chan}{$::who};
return;
}
delete $::newsuser{$chan}{$::who};
return;
}
- &::msg($::who, "already enabled.");
+ &::notice($::who, "already enabled.");
} else { # state = 0
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
} else { # state = 0
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
- &::msg($::who, "notify already disabled");
+ &::notice($::who, "notify already disabled");
return;
}
$::newsuser{$chan}{$::who} = -1;
return;
}
$::newsuser{$chan}{$::who} = -1;
- &::msg($::who, "notify is now disabled.");
+ &::notice($::who, "notify is now disabled.");
}
} else {
&::DEBUG("could not parse '$what'.");
}
} else {
&::DEBUG("could not parse '$what'.");
- &::msg($::who, "unknown command: $what");
+ &::notice($::who, "unknown command: $what");
}
if (length $str > 64) {
}
if (length $str > 64) {
- &::msg($::who, "That's not really an item (>64chars)");
+ &::notice($::who, "That's not really an item (>64chars)");
return;
}
if (exists $::news{$chan}{$str}{Time}) {
return;
}
if (exists $::news{$chan}{$str}{Time}) {
- &::msg($::who, "'$str' for $chan already exists!");
+ &::notice($::who, "'$str' for $chan already exists!");
my $agestr = &::Time2String($::news{$chan}{$str}{Expire} - time() );
my $item = &newsS2N($str);
my $agestr = &::Time2String($::news{$chan}{$str}{Expire} - time() );
my $item = &newsS2N($str);
- &::msg($::who, "Added '\037$str\037' at [".localtime(time).
+ &::notice($::who, "Added '\037$str\037' at [".localtime(time).
"] by \002$::who\002 for item #\002$item\002.");
"] by \002$::who\002 for item #\002$item\002.");
- &::msg($::who, "Now do 'news text $item <your_description>'");
- &::msg($::who, "This item will expire at \002".
+ &::notice($::who, "Now do 'news text $item <your_description>'");
+ &::notice($::who, "This item will expire at \002".
localtime($::news{$chan}{$str}{Expire})."\002 [$agestr from now] "
);
localtime($::news{$chan}{$str}{Expire})."\002 [$agestr from now] "
);
if ($what =~ /^\d+$/) {
my $count = scalar keys %{ $::news{$chan} };
if (!$count) {
if ($what =~ /^\d+$/) {
my $count = scalar keys %{ $::news{$chan} };
if (!$count) {
- &::msg($::who, "No news for $chan.");
+ &::notice($::who, "No news for $chan.");
return;
}
if ($what > $count or $what < 0) {
return;
}
if ($what > $count or $what < 0) {
- &::msg($::who, "$what is out of range (max $count)");
+ &::notice($::who, "$what is out of range (max $count)");
- &::msg($::who, "could not find $what.");
+ &::notice($::who, "could not find $what.");
return;
}
if (scalar @found > 1) {
return;
}
if (scalar @found > 1) {
- &::msg($::who, "too many matches for $what.");
+ &::notice($::who, "too many matches for $what.");
if (!$auth) {
# todo: show when it'll expire.
if (!$auth) {
# todo: show when it'll expire.
- &::msg($::who, "Sorry, you cannot remove items; just let them expire on their own.");
+ &::notice($::who, "Sorry, you cannot remove items; just let them expire on their own.");
- &::msg($::who, "ok, deleted '$what' from \002$chan\002...");
+ &::notice($::who, "ok, deleted '$what' from \002$chan\002...");
delete $::news{$chan}{$what};
} else {
delete $::news{$chan}{$what};
} else {
- &::msg($::who, "error: not found $what in news for $chan.");
+ &::notice($::who, "error: not found $what in news for $chan.");
}
}
sub list {
if (!scalar keys %{ $::news{$chan} }) {
}
}
sub list {
if (!scalar keys %{ $::news{$chan} }) {
- &::msg($::who, "No News for \002$chan\002.");
+ &::notice($::who, "No News for \002$chan\002.");
}
my $count = scalar keys %{ $::news{$chan} };
}
my $count = scalar keys %{ $::news{$chan} };
- &::msg($::who, "|==== News for \002$chan\002: ($count items)");
+ &::notice($::who, "|==== News for \002$chan\002: ($count items)");
my $newest = 0;
foreach (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$_}{Time};
$newest = $t if ($t > $newest);
}
my $timestr = &::Time2String(time() - $newest);
my $newest = 0;
foreach (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$_}{Time};
$newest = $t if ($t > $newest);
}
my $timestr = &::Time2String(time() - $newest);
- &::msg($::who, "|= Last updated $timestr ago.");
- &::msg($::who, " \037Num\037 \037Item ".(" "x40)." \037");
+ &::notice($::who, "|= Last updated $timestr ago.");
+ &::notice($::who, " \037Num\037 \037Item ".(" "x40)." \037");
my $i = 1;
foreach ( &getNewsAll() ) {
my $i = 1;
foreach ( &getNewsAll() ) {
}
# todo: show request stats aswell.
}
# todo: show request stats aswell.
- &::msg($::who, sprintf("\002[\002%2d\002]\002 %s",
+ &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
- &::msg($::who, "|= End of News.");
- &::msg($::who, "use 'news read <#>' or 'news read <keyword>'");
+ &::notice($::who, "|= End of News.");
+ &::notice($::who, "use 'news read <#>' or 'news read <keyword>'");
}
if (!scalar keys %{ $::news{$chan} }) {
}
if (!scalar keys %{ $::news{$chan} }) {
- &::msg($::who, "No News for \002$chan\002.");
+ &::notice($::who, "No News for \002$chan\002.");
return;
}
my $item = &getNewsItem($str);
if (!defined $item or !scalar keys %{ $::news{$chan}{$item} }) {
return;
}
my $item = &getNewsItem($str);
if (!defined $item or !scalar keys %{ $::news{$chan}{$item} }) {
- &::msg($::who, "No news item called '$str'");
+ &::notice($::who, "No news item called '$str'");
return;
}
if (!exists $::news{$chan}{$item}{Text}) {
return;
}
if (!exists $::news{$chan}{$item}{Text}) {
- &::msg($::who, "Someone forgot to add info to this news item");
+ &::notice($::who, "Someone forgot to add info to this news item");
- &::msg($::who, "+- News \002$chan\002 #$num: \037$item\037");
- &::msg($::who, "| Added by $a at $t");
- &::msg($::who, "| Requested $rcount times, last by $rwho");
- &::msg($::who, $text);
+ &::notice($::who, "+- News \002$chan\002 #$num: \037$item\037");
+ &::notice($::who, "| Added by $a at $t");
+ &::notice($::who, "| Requested $rcount times, last by $rwho");
+ &::notice($::who, $text);
$::news{$chan}{$item}{'Request_By'} = $::who;
$::news{$chan}{$item}{'Request_Time'} = time();
$::news{$chan}{$item}{'Request_By'} = $::who;
$::news{$chan}{$item}{'Request_Time'} = time();
my ($delim, $op, $np, $flags) = ($1,$2,$3,$4);
if ($flags !~ /^(g)?$/) {
my ($delim, $op, $np, $flags) = ($1,$2,$3,$4);
if ($flags !~ /^(g)?$/) {
- &::msg($::who, "error: Invalid flags to regex.");
+ &::notice($::who, "error: Invalid flags to regex.");
- &::msg($::who, "warning: regex not found in news.");
+ &::notice($::who, "warning: regex not found in news.");
return;
}
if ($mod_news ne $news) { # news item.
if (exists $::news{$chan}{$mod_news}) {
return;
}
if ($mod_news ne $news) { # news item.
if (exists $::news{$chan}{$mod_news}) {
- &::msg($::who, "item '$mod_news' already exists.");
+ &::notice($::who, "item '$mod_news' already exists.");
- &::msg($::who, "Moving item '$news' to '$mod_news' with SAR s/$op/$np/.");
+ &::notice($::who, "Moving item '$news' to '$mod_news' with SAR s/$op/$np/.");
foreach (keys %{ $::news{$chan}{$news} }) {
$::news{$chan}{$mod_news}{$_} = $::news{$chan}{$news}{$_};
delete $::news{$chan}{$news}{$_};
foreach (keys %{ $::news{$chan}{$news} }) {
$::news{$chan}{$mod_news}{$_} = $::news{$chan}{$news}{$_};
delete $::news{$chan}{$news}{$_};
}
if ($mod_nnews ne $nnews) { # news Text/Description.
}
if ($mod_nnews ne $nnews) { # news Text/Description.
- &::msg($::who, "Changing text for '$news' SAR s/$op/$np/.");
+ &::notice($::who, "Changing text for '$news' SAR s/$op/$np/.");
if ($mod_news ne $news) {
$::news{$chan}{$mod_news}{Text} = $mod_nnews;
} else {
if ($mod_news ne $news) {
$::news{$chan}{$mod_news}{Text} = $mod_nnews;
} else {
- &::msg($::who, "error: that regex failed ;(");
+ &::notice($::who, "error: that regex failed ;(");
- &::msg($::who, "error: Invalid regex. Try s/1/2/, s#3#4#...");
+ &::notice($::who, "error: Invalid regex. Try s/1/2/, s#3#4#...");
&::DEBUG("news => '$news'");
if (!defined $news) {
&::DEBUG("news => '$news'");
if (!defined $news) {
- &::msg($::who, "Could not find item '$item' substring or # in news list.");
+ &::notice($::who, "Could not find item '$item' substring or # in news list.");
- &::msg($::who, "Invalid set. Try: @elements");
+ &::notice($::who, "Invalid set. Try: @elements");
}
if (!exists $::news{$chan}{$news}) {
}
if (!exists $::news{$chan}{$news}) {
- &::msg($::who, "news '$news' does not exist");
+ &::notice($::who, "news '$news' does not exist");
- &::msg($::who, "Set never expire for \002$item\002." );
+ &::notice($::who, "Set never expire for \002$item\002." );
} elsif ($time < -1) {
&::DEBUG("time should never be negative ($time).");
return;
} else {
} elsif ($time < -1) {
&::DEBUG("time should never be negative ($time).");
return;
} else {
- &::msg($::who, "Set expire for \002$item\002, to ".
+ &::notice($::who, "Set expire for \002$item\002, to ".
localtime($time) ." [".&::Time2String($time - time())."]" );
if (time() > $time) {
localtime($time) ." [".&::Time2String($time - time())."]" );
if (time() > $time) {
if (!$auth) {
# todo: show when it'll expire.
if (!$auth) {
# todo: show when it'll expire.
- &::msg($::who, "Sorry, you cannot set items. (author $author owns it)");
+ &::notice($::who, "Sorry, you cannot set items. (author $author owns it)");
&::DEBUG("old => $old.");
}
$::news{$chan}{$news}{$what} = $value;
&::DEBUG("old => $old.");
}
$::news{$chan}{$news}{$what} = $value;
- &::msg($::who, "Setting [$chan]/{$news}/<$what> to '$value'.");
+ &::notice($::who, "Setting [$chan]/{$news}/<$what> to '$value'.");
# todo: if chan = undefined, guess.
if (!exists $::news{$chan}) {
# todo: if chan = undefined, guess.
if (!exists $::news{$chan}) {
- &::msg($::who, "invalid chan $chan");
+ &::notice($::who, "invalid chan $chan");
return;
}
my $t = $::newsuser{$chan}{$::who};
if (defined $t and ($t == 0 or $t == -1)) {
if ($flag) {
return;
}
my $t = $::newsuser{$chan}{$::who};
if (defined $t and ($t == 0 or $t == -1)) {
if ($flag) {
- &::msg($::who, "if you want to read news, try /msg $::ident news or /msg $::ident news notify");
+ &::notice($::who, "if you want to read news, try /msg $::ident news or /msg $::ident news notify");
} else {
&::DEBUG("not displaying any new news for $::who");
} else {
&::DEBUG("not displaying any new news for $::who");
}
my $x = &::IsChanConf("newsNotifyAll");
}
my $x = &::IsChanConf("newsNotifyAll");
if (!defined $t) {
&::DEBUG("something went really wrong.");
if (!defined $t) {
&::DEBUG("something went really wrong.");
- &::msg($::who, "something went really wrong.");
+ &::DEBUG("chan => $chan, ::chan => $::chan");
+ &::notice($::who, "something went really wrong.");
# !scalar @new, $flag
if (!scalar @new and $flag) {
# !scalar @new, $flag
if (!scalar @new and $flag) {
- &::msg($::who, "no new news for $chan.");
+ &::notice($::who, "no new news for $chan.");
my $reply = "There are unread news in $chan ($unread unread, $total total). /msg $::ident news latest.";
$reply .= " If you don't want further news notification, /msg $::ident news unnotify" if ($unread == $total);
my $reply = "There are unread news in $chan ($unread unread, $total total). /msg $::ident news latest.";
$reply .= " If you don't want further news notification, /msg $::ident news unnotify" if ($unread == $total);
- &::msg($::who, $reply);
+ &::notice($::who, $reply);
return;
}
# scalar @new, $flag
if (scalar @new) {
return;
}
# scalar @new, $flag
if (scalar @new) {
- &::msg($::who, "+==== New news for \002$chan\002 ($unread new; $total total):");
+ &::notice($::who, "+==== New news for \002$chan\002 ($unread new; $total total):");
- if ($::newsuser{$chan}{$::who}) {
- my $timestr = &::Time2String( time() - $::newsuser{$chan}{$::who} );
- &::msg($::who, "|= Last time read $timestr ago");
+ my $t = $::newsuser{$chan}{$::who};
+ if (defined $t and $t > 1) {
+ my $timestr = &::Time2String( time() - $t );
+ &::notice($::who, "|= Last time read $timestr ago");
next unless (defined $news);
my $age = time() - $::news{$chan}{$news}{Time};
next unless (defined $news);
my $age = time() - $::news{$chan}{$news}{Time};
- &::msg($::who, sprintf("\002[\002%2d\002]\002 %s",
+ &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
$i, $news) );
# $i, $_, &::Time2String($age) ) );
}
$i, $news) );
# $i, $_, &::Time2String($age) ) );
}
- &::msg($::who, "|= to read, do 'news read <#>' or 'news read <keyword>'");
+ &::notice($::who, "|= to read, do 'news read <#>' or 'news read <keyword>'");
# lame hack to prevent dupes if we just ignore it.
my $x = $::newsuser{$chan}{$::who};
# lame hack to prevent dupes if we just ignore it.
my $x = $::newsuser{$chan}{$::who};
if (scalar @items > 1) {
&::DEBUG("Multiple matches, not guessing.");
if (scalar @items > 1) {
&::DEBUG("Multiple matches, not guessing.");
- &::msg($::who, "Multiple matches, not guessing.");
+ &::notice($::who, "Multiple matches, not guessing.");
if ($chan =~ tr/A-Z/a-z/) {
if ($chan =~ tr/A-Z/a-z/) {
- &WARN("IsChanConf: lowercased chan.");
+ &WARN("IsChanConf: lowercased chan. ($old)");
}
### TODO: VERBOSITY on how chanconf returned 1 or 0 or -1.
my %chan = &getChanConfList($param);
}
### TODO: VERBOSITY on how chanconf returned 1 or 0 or -1.
my %chan = &getChanConfList($param);
- if (!defined $msgType or $msgType eq "") {
+ my $nomatch = 0;
+ if (!defined $msgType) {
+ $nomatch++;
+ } else {
+ $nomatch++ if ($msgType eq "");
+ $nomatch++ unless ($msgType =~ /^(public|private)$/i);
+ }
+
+### debug purposes only.
+# &DEBUG("param => $param, msgType => $msgType.");
+# foreach (keys %chan) {
+# &DEBUG(" $_ => $chan{$_}");
+# }
+
+ if ($nomatch) {
- &DEBUG("ICC: !msgType: $chan{$chan} (_default/$param)") if ($debug);
+ &DEBUG("ICC: other: $chan{$chan} (_default/$param)") if ($debug);
} elsif ($chan{_default}) {
} elsif ($chan{_default}) {
- &DEBUG("ICC: !msgType: $chan{_default} (_default/$param)") if ($debug);
+ &DEBUG("ICC: other: $chan{_default} (_default/$param)") if ($debug);
- &DEBUG("ICC: !msgType: 0 ($param)") if ($debug);
+ &DEBUG("ICC: other: 0 ($param)") if ($debug);
}
return $chan{$chan} || $chan{_default} || 0;
}
return $chan{$chan} || $chan{_default} || 0;
return $chan{$chan} || $chan{_default} || 0;
}
return $chan{$chan} || $chan{_default} || 0;
}
-### debug purposes only.
-# &DEBUG("param => $param, msgType => $msgType.");
-# foreach (keys %chan) {
-# &DEBUG(" $_ => $chan{$_}");
-# }
-
&DEBUG("ICC: no-match: 0/$param (msgType = $msgType)");
return 0;
&DEBUG("ICC: no-match: 0/$param (msgType = $msgType)");
return 0;
&WARN("c ne chan ($c[0] ne $chan)");
}
&WARN("c ne chan ($c[0] ne $chan)");
}
- return $chanconf{$c[0] || "_default"}{$param};
+ return $chanconf{$c[0]}{$param} || $chanconf{"_default"}{$param};