From 917638dfdf31e26ae9115dabb5c2fe528866c549 Mon Sep 17 00:00:00 2001 From: William Heimbigner Date: Mon, 8 Oct 2007 13:28:23 +0000 Subject: added a db command, improved the user set flags command, added linked channels, added a showhilights command, eliminated flooding of alerts, fixed nickspam check, added something to watch chancounts. --- config-default/channels.xml | 127 +++++++++++++++++++++++++++++++++++++------- config-default/commands.xml | 75 ++++++++++++++++++++++---- config-default/users.xml | 11 +++- 3 files changed, 183 insertions(+), 30 deletions(-) (limited to 'config-default') diff --git a/config-default/channels.xml b/config-default/channels.xml index 7633dbb..c79d99b 100644 --- a/config-default/channels.xml +++ b/config-default/channels.xml @@ -1,11 +1,16 @@ - + + + + ST47 + alindeman + seanw a b c @@ -17,13 +22,17 @@ + ST47 WildPikachu nalioth quux denny - Fieldy numist + Fieldy + savetheWorld + tomaw PhilKC + rob ##linux-ops @@ -35,14 +44,19 @@ WildPikachu quux denny - Fieldy numist PhilKC - + + ##linux-ops + + + + + njan numist quux HentaiXP @@ -51,6 +65,7 @@ JonathanD Cpudan80 AndrewB + pinpoint @@ -58,6 +73,47 @@ + + + + + + + tomaw + Dave2 + ST47 + Dave2 + tomaw + njan + Dave2 + AndrewB + AndrewB + denny + Dave2 + tomaw + ompaul + kloeri + PhilKC + Dave2 + + + #freenode-adb + + + + + + + + + flyingparchment + seanw + ST47 + + + #wikimedia-ops + + Shadow_mil @@ -68,6 +124,8 @@ Mbimmler + Majorly + Fabexplosive #wikimedia-ops @@ -76,6 +134,7 @@ White_cat + Majorly #wikimedia-ops @@ -90,18 +149,23 @@ - + + Cbrown1023 + Cbrown1023 Sean_William - ST47 + Majorly + TheLetterE + Golbez + Mbimmler Karlprof + Martinp23 Pilotguy Eagle-101 - Mbimmler skenmy Ral315 tomaw @@ -116,6 +180,15 @@ SWATJester njan mike42 + Pilotguy + + + #wikimedia-ops + + + + + TheFearow #wikimedia-ops @@ -123,18 +196,38 @@ - White_Cat Cometstyles + Majorly + Worby + kmccoy + Golbez + KFP + wimt + werdan7 + Animum AppleBoy Soms - ST47 Martinp23 Cbrown1023 + TheLetterE + KFP #wikimedia-ops + + + TheLetterE + werdan7 + + + #wikimedia-ops + + + + + vishwin60 @@ -148,8 +241,8 @@ Eagle-101 Mbimmler Pilotguy - ST47 skenmy + AndrewB #wikimedia-ops @@ -157,20 +250,19 @@ - ST47 + Golbez #wikimedia-ops - - - 15:45 + + - requested by ChanServ + ^requested by ChanServ tinyurl\.com/ypvk4n blah .* @@ -181,8 +273,6 @@ ^... DDOS COUNTDOWN.* dnsbl.dronebl.org rbl.efnet.org - 10:30 - 5:3 ([^ ]{4,} +)\1{5,} goatse\.cz 3:20 @@ -193,12 +283,13 @@ i=magical 5:3 150:20 - .* + .* RED ARMY OF LOL \.com/sms.exe (?i)^sure are a ?lot of .*fags? in here AfterDeath + ST47 alindeman seanw diff --git a/config-default/commands.xml b/config-default/commands.xml index eedf584..3ab49e9 100644 --- a/config-default/commands.xml +++ b/config-default/commands.xml @@ -4,6 +4,11 @@ $conn->privmsg($event->{to}->[0], "help is at http://meta.wikimedia.org/wiki/User:WHeimbigner/AntiSpamMeta"); ]]> + + privmsg($event->{to}->[0], "db is at http://antispammeta.net/query.html"); + ]]> + privmsg($event->{to}->[0], "Hiya $nick"); ]]> - + {person}->{$nick}->{flags}); } else { + if ($flags eq '') { + if (defined($::users->{person}->{$nick}->{flags})) { + $conn->privmsg($event->{to}->[0], "Flags for $nick: $::users->{person}->{$nick}->{flags}"); + } else { + $conn->privmsg($event->{to}->[0], "$nick has no flags"); + } +# delete($::users->{person}->{$nick}->{flags}); + } else { $::users->{person}->{$nick}->{flags} = $flags; + ASM::XML->writeUsers(); + $conn->privmsg($event->{to}->[0], "Flags for $nick set to $flags"); } - ASM::XML->writeUsers(); - $conn->privmsg($event->{to}->[0], "Flags for $nick set to $flags"); ]]> @@ -41,7 +53,7 @@ $conn->privmsg($event->{to}->[0], "Byebye $nick"); ]]> - + getLink(lc $chan); + if ( lc $link ne lc $chan ) { + $conn->privmsg($event->{to}->[0], "Error: $chan is linked to $link - use $link instead."); + return; + } if ($level eq '') { $level = 'low'; } unless (defined($::channels->{channel}->{$chan}->{msgs})) { $::channels->{channel}->{$chan}->{msgs} = {}; @@ -83,6 +100,11 @@ getLink(lc $chan); + if ( lc $link ne lc $chan ) { + $conn->privmsg($event->{to}->[0], "Error: $chan is linked to $link - use $link instead."); + return; + } foreach my $risk ( keys %::RISKS ) { next unless defined($::channels->{channel}->{$chan}->{msgs}->{$risk}); my @ppl = @{$::channels->{channel}->{$chan}->{msgs}->{$risk}}; @@ -90,7 +112,25 @@ $::channels->{channel}->{$chan}->{msgs}->{$risk} = \@ppl; } ASM::XML->writeChannels(); - $conn->privmsg($event->{to}->[0], "no moar msgs for $nick"); + $conn->privmsg($event->{to}->[0], "$nick removed from targets for $chan"); + ]]> + + + {channel}})) { + foreach my $level (keys(%{$::channels->{channel}->{$chan}->{hilights}})) { + if (grep(/^${nick}$/i, @{$::channels->{channel}->{$chan}->{hilights}->{$level}})) { + push @channels, $chan . " ($level)"; + } + } + } + if (! @channels) { + $conn->privmsg($event->{to}->[0], "$nick isn't on any hilights"); + } else { + $conn->privmsg($event->{to}->[0], "$nick is hilighted for " . join(', ', @channels)); + } ]]> @@ -99,6 +139,11 @@ my $nick = $2; my $level= $3; if ($level eq '') { $level = 'low'; } + my $link = ASM::Util->getLink(lc $chan); + if ( lc $link ne lc $chan ) { + $conn->privmsg($event->{to}->[0], "Error: $chan is linked to $link - use $link instead."); + return; + } unless (defined($::channels->{channel}->{$chan}->{hilights})) { $::channels->{channel}->{$chan}->{hilights} = {}; } @@ -116,6 +161,11 @@ getLink(lc $chan); + if ( lc $link ne lc $chan ) { + $conn->privmsg($event->{to}->[0], "Error: $chan is linked to $link - use $link instead."); + return; + } foreach my $risk ( keys %::RISKS ) { next unless defined($::channels->{channel}->{$chan}->{hilights}->{$risk}); my @ppl = @{$::channels->{channel}->{$chan}->{hilights}->{$risk}}; @@ -123,7 +173,7 @@ $::channels->{channel}->{$chan}->{hilights}->{$risk} = \@ppl; } ASM::XML->writeChannels(); - $conn->privmsg($event->{to}->[0], "kthxbai $nick"); + $conn->privmsg($event->{to}->[0], "Removing hilights for $nick in $chan"); ]]> @@ -189,10 +239,13 @@ $conn->privmsg($event->{to}->[0], $x . " exempted"); ]]> - + commaAndify(ASM::Util->getAlert($event->{to}->[0], 'opalert', 'hilights')); - $conn->privmsg($_, "[$event->{to}->[0]] - $event->{nick} wants op attention ($1) $hilite") foreach ASM::Util->getAlert($event->{to}->[0], 'opalert', 'msgs'); + my $tgt = $event->{to}->[0]; + $tgt = $1 if (defined($1)); + my $msg = $2; + my $hilite=ASM::Util->commaAndify(ASM::Util->getAlert($tgt, 'opalert', 'hilights')); + $conn->privmsg($_, "[$tgt] - $event->{nick} wants op attention ($msg) $hilite") foreach ASM::Util->getAlert($tgt, 'opalert', 'msgs'); ]]> diff --git a/config-default/users.xml b/config-default/users.xml index 0c59b57..88fbd66 100644 --- a/config-default/users.xml +++ b/config-default/users.xml @@ -1,12 +1,21 @@ + + + + + + + + - + + -- cgit v1.2.3