X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FDynaConfig.pl;h=f4ba9c3f207fd3d489a62a3672921fa5b480e471;hb=fac42dc0ecb4cd1e715dcf428887b2768b1d5e5b;hp=d284165099bee1ca60116c62e03d6994005aa106;hpb=db6d3b9745f9db69dd6c2312a68c820c1712c9e8;p=infobot.git diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl index d284165..f4ba9c3 100644 --- a/src/DynaConfig.pl +++ b/src/DynaConfig.pl @@ -6,7 +6,14 @@ # NOTE: Merged from User.pl # -#use strict; +use strict; + +use vars qw(%chanconf %cache %bans %channels %nuh %users %ignore + %talkWho %dcc %mask); +use vars qw($utime_userfile $ucount_userfile $utime_chanfile $who + $ucount_chanfile $userHandle $chan $msgType $talkchannel + $ident $bot_state_dir $talkWho $flag_quit $wtime_userfile + $wcount_userfile $wtime_chanfile $nuh $message); ##### ##### USERFILE CONFIGURATION READER/WRITER @@ -25,7 +32,7 @@ sub readUserFile { my $s2 = -s "$f~"; if ($s2 > $s1*3) { - &DEBUG("rUF: backup file bigger than current file. FIXME"); + &FIXME("rUF: backup file bigger than current file."); } } @@ -127,7 +134,7 @@ sub writeUserFile { return; } - my $time = scalar(localtime); + my $time = scalar(gmtime); print OUT "#v1: blootbot -- $ident -- written $time\n\n"; @@ -153,6 +160,8 @@ sub writeUserFile { print OUT "--$what\t\t$_\n"; } + } elsif ($_ eq 'FLAGS') { + print OUT "--$_\t\t" . join('', sort split('', $val)) . "\n"; } else { print OUT "--$_\t\t$val\n"; } @@ -232,7 +241,7 @@ sub readChanFile { my $s2 = -s "$f~"; if ($s2 > $s1*3) { - &DEBUG("rCF: backup file bigger than current file. FIXME"); + &FIXME("rCF: backup file bigger than current file."); } } @@ -249,7 +258,8 @@ sub readChanFile { while () { chop; - next if /^$/; + next if /^\s*$/; + next if /^\// or /^\;/; # / or ; are comment lines. if (/^(\S+)\s*$/) { $chan = $1; @@ -261,12 +271,10 @@ sub readChanFile { $chanconf{$chan}{$1} = 1; } elsif (/^[\s\t]+\-(\S+)$/) { # bool, false. - &DEBUG("deprecated support of negative options.") unless ($cache{negative}); # although this is supported in run-time configuration. - $cache{negative} = 1; -# $chanconf{$chan}{$1} = 0; + $chanconf{$chan}{$1} = 0; - } elsif (/^[\s\t]+(\S+)[\ss\t]+(.*)$/) {# what = val. + } elsif (/^[\s\t]+(\S+)[\s\t]+(.*)$/) {# what = val. $chanconf{$chan}{$1} = $2; } else { @@ -279,15 +287,14 @@ sub readChanFile { ### TODO: check against valid params. foreach $chan (keys %chanconf) { foreach (keys %{ $chanconf{$chan} }) { - next unless (/^[+-]/); + next unless /^[+-]/; + &WARN("invalid param: chanconf{$chan}{$_}; removing."); delete $chanconf{$chan}{$_}; undef $chanconf{$chan}{$_}; } } - delete $cache{negative}; - &status("CHANFILE: Loaded: ".(scalar(keys %chanconf)-1)." chans"); } @@ -302,7 +309,7 @@ sub writeChanFile { return; } - my $time = scalar(localtime); + my $time = scalar(gmtime); print OUT "#v1: blootbot -- $ident -- written $time\n\n"; if ($flag_quit) { @@ -320,6 +327,7 @@ sub writeChanFile { next if ($chan eq "_default"); next unless (exists $chanconf{$chan}{$opt}); next unless ($val eq $chanconf{$chan}{$opt}); + push(@chans,$chan); delete $chanconf{$chan}{$opt}; } @@ -395,6 +403,8 @@ sub writeChanFile { ##### USER COMMANDS. ##### +# TODO: support multiple flags. +# TODO: return all flags for opers sub IsFlag { my $flags = shift; my ($ret, $f, $o) = ""; @@ -415,7 +425,7 @@ sub IsFlag { sub verifyUser { my ($nick, $lnuh) = @_; - my ($user,$m); + my ($user, $m); if ($userHandle = $dcc{'CHATvrfy'}{$who}) { &VERB("vUser: cached auth for $who.",2); @@ -494,6 +504,7 @@ sub hasFlag { } } +# expire is time in minutes sub ignoreAdd { my($mask,$chan,$expire,$comment) = @_; @@ -503,7 +514,7 @@ sub ignoreAdd { my $count ||= 0; if ($expire > 0) { - $expire = $expire*60 + time(); + $expire = ($expire*60) + time(); } else { $expire = 0; } @@ -513,8 +524,12 @@ sub ignoreAdd { $ignore{$chan}{$mask} = [$expire, time(), $who, $comment]; - # todo: improve this. - &status("ignore: Added $mask for $chan to expire $expire, by $who, for $comment"); + # TODO: improve this. + if ($expire == 0) { + &status("ignore: Added $mask for $chan to NEVER expire, by $who, for $comment"); + } else { + &status("ignore: Added $mask for $chan to expire $expire mins, by $who, for $comment"); + } if ($exist) { $utime_userfile = time(); @@ -680,91 +695,90 @@ sub chanSet { if ($cmd eq "+chan") { if (exists $chanconf{$chan}) { - &pSReply("chan $chan already exists."); + &performStrictReply("chan $chan already exists."); return; } $chanconf{$chan}{_time_added} = time(); - $chanconf{$what}{autojoin} = 1; + $chanconf{$chan}{autojoin} = $conn->nick(); - &pSReply("Joining $chan..."); + &performStrictReply("Joining $chan..."); &joinchan($chan); return; } if (!exists $chanconf{$chan}) { - &pSReply("no such channel $chan"); + &performStrictReply("no such channel $chan"); return; } my $update = 0; - ### ".chanset +blah" - ### ".chanset +blah 10" -- error. if (defined $what and $what =~ s/^([+-])(\S+)/$2/) { - my $state = ($1 eq "+") ? 1 : 0; + ### ".chanset +blah" + ### ".chanset +blah 10" -- error. + + my $set = ($1 eq "+") ? 1 : 0; my $was = $chanconf{$chan}{$what}; - if ($state) { # add/set. + if ($set) { # add/set. if (defined $was and $was eq "1") { - &pSReply("setting $what for $chan already 1."); + &performStrictReply("setting $what for $chan already 1."); return; } - $was = ($was) ? "; was '$was'" : ""; $val = 1; } else { # delete/unset. if (!defined $was) { - &pSReply("setting $what for $chan is not set."); - return; - } - - if ($was eq "0") { - &pSReply("setting $what for $chan already 0."); + &performStrictReply("setting $what for $chan is not set."); return; } - $was = ($was) ? "; was '$was'" : ""; $val = 0; } + # alter for cosmetic (print out) reasons only. + $was = (defined $was) ? "; was '$was'" : ""; + if ($val eq "0") { - &pSReply("Unsetting $what for $chan$was."); + &performStrictReply("Unsetting $what for $chan$was."); delete $chanconf{$chan}{$what}; } else { - &pSReply("Setting $what for $chan to '$val'$was."); + &performStrictReply("Setting $what for $chan to '$val'$was."); $chanconf{$chan}{$what} = $val; } $update++; - ### ".chanset blah testing" } elsif (defined $val) { + ### ".chanset blah testing" + my $was = $chanconf{$chan}{$what}; if (defined $was and $was eq $val) { - &pSReply("setting $what for $chan already '$val'."); + &performStrictReply("setting $what for $chan already '$val'."); return; } $was = ($was) ? "; was '$was'" : ""; - &pSReply("Setting $what for $chan to '$val'$was."); + &performStrictReply("Setting $what for $chan to '$val'$was."); $chanconf{$chan}{$what} = $val; $update++; - ### ".chanset" - ### ".chanset blah" } else { # read only. + ### ".chanset" + ### ".chanset blah" + if (!defined $what) { &WARN("chanset/DC: what == undefine."); return; } if (exists $chanconf{$chan}{$what}) { - &pSReply("$what for $chan is '$chanconf{$chan}{$what}'"); + &performStrictReply("$what for $chan is '$chanconf{$chan}{$what}'"); } else { - &pSReply("$what for $chan is not set."); + &performStrictReply("$what for $chan is not set."); } } @@ -777,25 +791,30 @@ sub chanSet { } sub rehashConfVars { - # this is an attempt to fix where an option is loaded but the module - # has not loaded. it also can be used for other things. + # this is an attempt to fix where an option is enabled but the module + # has been not loaded. it also can be used for other things. foreach (keys %{ $cache{confvars} }) { my $i = $cache{confvars}{$_}; &DEBUG("rehashConfVars: _ => $_"); if (/^news$/ and $i) { - &loadMyModule("news"); + &loadMyModule('News'); delete $cache{confvars}{$_}; } if (/^uptime$/ and $i) { - &loadMyModule("uptime"); + &loadMyModule('Uptime'); delete $cache{confvars}{$_}; } if (/^rootwarn$/i and $i) { - &loadMyModule($_); + &loadMyModule('RootWarn'); + delete $cache{confvars}{$_}; + } + + if (/^onjoin$/i and $i) { + &loadMyModule('OnJoin'); delete $cache{confvars}{$_}; } } @@ -805,29 +824,21 @@ sub rehashConfVars { delete $cache{confvars}; } -my @regFlagsChan = ( - "autojoin", - "freshmeat", - "limitcheckInterval", - "limitcheckPlus", - "allowConv", - "allowDNS", -### TODO: finish off this list. -); - my @regFlagsUser = ( - "m", # master - "n", # owner - "o", # op -); # todo... + # possible chars to include in FLAG + "A", # bot administration over /msg + # default is only via DCC CHAT + "O", # dynamic ops (as on channel). (automatic +o) + "T", # add topics. + "a", # ask/request factoid. + "m", # modify factoid. (includes renaming) + "n", # bot owner, can "reload" + "o", # master of bot (automatic +amrt) + # can search on factoid strings shorter than 2 chars + # can tell bot to join new channels + # can [un]lock factoids + "r", # remove factoid. + "t", # teach/add factoid. +); 1; - -##### -# Userflags -# +r - ability to remove factoids -# +t - ability to teach factoids -# +m - ability to modify factoids -# +n - bot owner -# +o - authorised user of bot (like +m on eggdrop) -#####