From d07473ba85ec8ab030162e68244575f2c87e0389 Mon Sep 17 00:00:00 2001 From: William Heimbigner Date: Thu, 26 Jan 2012 08:26:14 +0000 Subject: Delete everything having to do with chanops priviledges, no one has ever used it --- config-default/channels.xml | 156 ++++++++++++++++++++++---------------------- meta.pl | 4 +- modules/actions.pl | 57 ---------------- modules/event.pl | 6 -- modules/inspect.pl | 13 ---- 5 files changed, 79 insertions(+), 157 deletions(-) delete mode 100644 modules/actions.pl diff --git a/config-default/channels.xml b/config-default/channels.xml index f364adf..780ae18 100644 --- a/config-default/channels.xml +++ b/config-default/channels.xml @@ -1,37 +1,37 @@ - + - + - + - + tomaw - + - + #hamradio-ops - + - + ST47 nalioth @@ -54,7 +54,7 @@ ##linux-ops - + WildPikachu denny @@ -65,15 +65,15 @@ ##linux-ops - + - + - + thehelpfulone @@ -89,11 +89,11 @@ - + - + jpalmer Corey @@ -118,7 +118,7 @@ - + #ubuntu-ops-monitor @@ -127,7 +127,7 @@ - + tomaw @@ -139,7 +139,7 @@ #ubuntu-ops-monitor - + tomaw Dave2 @@ -166,10 +166,10 @@ - + - + NeddySeagoon a3li @@ -181,21 +181,21 @@ #ubuntu-ops-monitor - + - + - + - + Thehelpfulone tomaw @@ -204,10 +204,10 @@ - + - + flyingparchment roberthl @@ -218,21 +218,21 @@ #wikimedia-ops - + tomaw - + - + - + @@ -246,7 +246,7 @@ #st47 - + nhandler LjL @@ -262,7 +262,7 @@ - + @@ -270,7 +270,7 @@ - + tomaw AfterDeath @@ -283,7 +283,7 @@ - + Martinp23 PeterSymonds @@ -300,7 +300,7 @@ #wikimedia-ops - + killiondude matanya @@ -313,7 +313,7 @@ #wikimedia-ops - + Cbrown1023 Thehelpfulone @@ -335,7 +335,7 @@ Thehelpfulone - + PeterSymonds jeremyb @@ -354,13 +354,13 @@ #wikimedia-ops - + #wikimedia-ops - + Golbez Prodego @@ -408,7 +408,7 @@ #wikimedia-ops - + TheFearow @@ -416,7 +416,7 @@ #wikimedia-ops - + Werdan7 wimt @@ -463,7 +463,7 @@ #wikimedia-ops - + werdan7 GDonato @@ -499,7 +499,7 @@ #wikimedia-ops - + #wikimedia-ops @@ -509,46 +509,46 @@ - - 15:45 + + 15:45 - 5:3 - (?i)w(.?)w\1w\1?.\1?a\1n\1o\1n\1t\1a\1l\1k\1?.\1?c\1o\1m - ^requested by ChanServ - blah - (?i).*!.=aaaah@.*!hehehe - .* - .* - .* - ^DCC (SEND|S?CHAT) |\bDCC (SEND|S?CHAT) "?[A-Za-z0-9]+"? \d+ \d+ \d+ - DCC SEND - DCC SEND - \bDCC SEND - debugantispambotdebug - dnsbl.dronebl.org - rbl.efnetrbl.org - ([^ ]{4,} +)\1{5,} - 5:20 - ^startkeylogger$|^stopkeylogger$ - \bstartkeylogger\b|\bstopkeylogger\b - http://\S+\.on\.nimp\.org - contentisuseless - 4:4 - 60:10 - .* - identify.*/msg .* identify <password> - ^This nickname is registered - dnsbl.proxybl.org - RED ARMY OF LOL - \.com/sms.exe - (suck.*dick) - (?i)^sure are a ?lot of .*fags? in here - dnsbl.sorbs.net - dnsbl.njabl.org - dnsbl.ahbl.org + 5:3 + (?i)w(.?)w\1w\1?.\1?a\1n\1o\1n\1t\1a\1l\1k\1?.\1?c\1o\1m + ^requested by ChanServ + blah + (?i).*!.=aaaah@.*!hehehe + .* + .* + .* + ^DCC (SEND|S?CHAT) |\bDCC (SEND|S?CHAT) "?[A-Za-z0-9]+"? \d+ \d+ \d+ + DCC SEND + DCC SEND + \bDCC SEND + debugantispambotdebug + dnsbl.dronebl.org + rbl.efnetrbl.org + ([^ ]{4,} +)\1{5,} + 5:20 + ^startkeylogger$|^stopkeylogger$ + \bstartkeylogger\b|\bstopkeylogger\b + http://\S+\.on\.nimp\.org + contentisuseless + 4:4 + 60:10 + .* + identify.*/msg .* identify <password> + ^This nickname is registered + dnsbl.proxybl.org + RED ARMY OF LOL + \.com/sms.exe + (suck.*dick) + (?i)^sure are a ?lot of .*fags? in here + dnsbl.sorbs.net + dnsbl.njabl.org + dnsbl.ahbl.org ST47 pctony diff --git a/meta.pl b/meta.pl index f78a9bf..94e9aef 100755 --- a/meta.pl +++ b/meta.pl @@ -20,7 +20,7 @@ $::pass = ''; @::joinrate=(); #I really need to stop doing this shit BEGIN { -my @modules = qw/Util Xml Inspect Event Services Log Command Classes Actions Mysql OperQueue/; +my @modules = qw/Util Xml Inspect Event Services Log Command Classes Mysql/; require 'modules/' . lc $_ . '.pl' foreach @modules; } @@ -52,11 +52,9 @@ sub init { $conn->debug($debug); $::inspector = ASM::Inspect->new(); $::services = ASM::Services->new(); - $::oq = ASM::OperQueue->new(); $::commander = ASM::Commander->new(); $::event = ASM::Event->new($conn, $::inspector); $::classes = ASM::Classes->new(); - $::actions = ASM::Actions->new(); my @eline=io('exempt.txt')->getlines; chomp @eline; foreach my $item (@eline) { diff --git a/modules/actions.pl b/modules/actions.pl deleted file mode 100644 index 08bf1be..0000000 --- a/modules/actions.pl +++ /dev/null @@ -1,57 +0,0 @@ -package ASM::Actions; -use strict; -use warnings; - -sub new -{ - my $module = shift; - my $self = {}; - my $tbl = { - "ban" => \&ban, - "kban" => \&kban, - "kick" => \&kick, - "none" => \&none, - "quiet" => \&quiet, - }; - $self->{ftbl} = $tbl; - bless($self); - return $self; -} - -sub do -{ - my $self = shift; - my $item = shift; - return $self->{ftbl}->{$item}->(@_); -} - -sub ban { - my ($conn, $event, $chan) = @_; - $::oq->o_send( $conn, "mode $chan +b *!*\@$event->{host}" ); - return "mode $chan -b *!*\@$event->{host}"; -} - -sub kban { - my ($conn, $event, $chan) = @_; - $::oq->o_send($conn, "mode $chan +b *!*\@$event->{host}"); - $::oq->o_send($conn, "kick $chan $event->{nick} :Spamming"); - return "mode $chan -b *!*\@$event->{host}"; -} - -sub kick { - my ($conn, $event, $chan) = @_; - $::oq->o_send($conn, "kick $chan $event->{nick} :Spamming"); - return ""; -} - -sub none { - return ""; -} - -sub quiet { - my ($conn, $event, $chan) = @_; - $::oq->o_send( $conn, "mode $chan +b %*!*\@$event->{host}" ); - return "mode $chan -b %*!*\@$event->{host}"; -} - -1; diff --git a/modules/event.pl b/modules/event.pl index ab4fb1a..95df7f4 100644 --- a/modules/event.pl +++ b/modules/event.pl @@ -335,12 +335,6 @@ sub on_mode my @ex = @{$line}; if ( $ex[0] eq '+o' ) { $::sc{$chan}{users}{lc $ex[1]}{op}=1; - if (lc $ex[1] eq lc $::settings->{nick}) { - $::oq->doQueue($conn, $chan); - if ( $::channels->{channel}->{$chan}->{op} eq "when" ) { - $conn->schedule(600, sub {$conn->mode($chan, "-o $::settings->{nick}");}); - } - } } elsif ( $ex[0] eq '-o' ) { $::sc{$chan}{users}{lc $ex[1]}{op}=0; diff --git a/modules/inspect.pl b/modules/inspect.pl index f8e50b8..72a5438 100644 --- a/modules/inspect.pl +++ b/modules/inspect.pl @@ -71,19 +71,6 @@ sub inspect { "\x02$event->{nick}\x02 - ${nicereason}; ping "; $txtz = $txtz . ASM::Util->commaAndify(ASM::Util->getAlert(lc $chan, $dct{$id}{risk}, 'hilights')) if (ASM::Util->getAlert(lc $chan, $dct{$id}{risk}, 'hilights')); $txtz = $txtz . ' !att-' . $chan . '-' . $dct{$id}{risk}; - if (ASM::Util->cs(lc $chan)->{op} ne 'no') { - if ($event->{type} eq 'topic') { #restore old topic - my $oldtopic = $::sc{lc $event->{to}->[0]}{topic}{text}; - $::oq->o_send( $conn, "topic $chan :$oldtopic"); - $::oq->o_send( $conn, "mode $chan +t"); - } -# eval '$unmode = Actions::' . $dct{$id}{action} . '($conn, $event, $chan);'; - $unmode = $::actions->do($dct{$id}{action}, $conn, $event, $chan); - my $lconn=$conn; my $lunmode = $unmode; - if ((int($dct{$id}{time}) ne 0) && ($unmode ne '')) { - $conn->schedule(int($dct{$id}{time}), sub { $::oq->o_send($lconn,$lunmode); }); - } - } unless (defined($::ignored{$chan}) && ($::ignored{$chan} >= $::RISKS{$dct{$id}{risk}})) { my @tgts = ASM::Util->getAlert($chan, $dct{$id}{risk}, 'msgs'); foreach my $tgt (@tgts) { #unfortunately wikipedia has way too many ops, and it breaks things -- cgit v1.2.3