From 48694a2b7f728acb01e9dc0d6d3ca28c7f09ede9 Mon Sep 17 00:00:00 2001 From: William Heimbigner Date: Mon, 22 Dec 2008 01:42:37 +0000 Subject: Committing stuff because it's been way too long. --- config-default/channels.xml | 225 +++++++++++++++++++++++--------------------- config-default/commands.xml | 6 +- config-default/users.xml | 36 +++---- modules/classes.pl | 5 + modules/command.pl | 5 +- modules/services.pl | 4 +- 6 files changed, 149 insertions(+), 132 deletions(-) diff --git a/config-default/channels.xml b/config-default/channels.xml index 114c673..3e10196 100644 --- a/config-default/channels.xml +++ b/config-default/channels.xml @@ -20,18 +20,29 @@ ##asb-testing + + + tomaw + + + ST47 - WildPikachu nalioth - quux denny numist Fieldy - savetheWorld tomaw + WildPikachu PhilKC + vorian + DLange + pinPoint + njan + njan + DLange + linagee rob @@ -51,6 +62,13 @@ ##linux-ops + + + + ##thehelpfulone + ##asb-nexus + + @@ -58,7 +76,8 @@ - + + ST47 njan numist quux @@ -69,15 +88,21 @@ Cpudan80 AndrewB pinpoint + theacolyte tomaw + theacolyte - + + + pctony + + + - @@ -85,11 +110,12 @@ tomaw Dave2 + Martinp23 + SeJo + pctony ST47 - tomaw njan AndrewB - AndrewB denny Gary JonathanD @@ -97,11 +123,8 @@ DLange vorian PriceChild - tomaw ompaul - kloeri PhilKC - tomaw #freenode-adb @@ -114,10 +137,18 @@ NeddySeagoon + tomaw - + + + tomaw + DLange + RichiH + + + flyingparchment seanw @@ -127,25 +158,20 @@ #wikimedia-ops - - - Shadow_mil - newmanbe - - - - PriceChild ST47 + PriceChild tomaw - + Mbimmler Martinp23 + Warpath + Rjd0060 Majorly Fabexplosive @@ -153,16 +179,17 @@ #wikimedia-ops - + White_cat Majorly + Rjd0060 #wikimedia-ops - + Lcarsdata @@ -178,48 +205,50 @@ ##wikimedia-ops - - + + + + + - Cbrown1023 - Sean_William - Majorly + cbrown1023 + bumm13_ + Cyrius + Cyrius + DanielB + Dmcdevit TheLetterE + Fabexplosive + FastLizard4 Golbez + James_F + JohnReaves + Krimpet + Lucifer_Cat + Luna-San + Uberpenguin Mbimmler - AndrewB - wimt + Mike42 + Mike_H + nixeagle + Prodego + quanticle + Ceiling_Cat + Rjd0060 + seanw + skenmy Snowolf - Mitchell + ST47 + tawker + Thehelpfulone werdan7 - Karlprof - Martinp23 - Pilotguy - Pilotguy - Eagle-101 - skenmy - Ral315 - tomaw - Fabexplosive - Krimpet - AndrewB - stylus - Martinp23 - Daniel-Bryant - amidaniel - Gracenotes - SWATJester - njan - mike42 - Pilotguy - kloeri - Cometstyles + wimt #wikimedia-ops - + TheFearow @@ -227,35 +256,45 @@ #wikimedia-ops - + - Cometstyles - Majorly - Worby - kmccoy + agkwiki + animum + bumm13 + Cbrown1023 + Cobi + DanielB + Dmcdevit + TheLetterE Golbez + James_F + JohnReaves KFP - wimt - werdan7 - Animum - Deskana - Martinp23 + Kmccoy + Krimpet + Luna-Santin + Mike42 + Rudha-an + nixeagle + Prodego + Not_the_NSA + Rjd0060 + seanw + smoddy Snowolf - Mitchell - AppleBoy - Soms - Martinp23 - Cbrown1023 - TheLetterE - KFP - Snowolf + Tawker + Werdan7 + wimt + Ryanpostlethwait + Thehelpfulone + NotASpy + |X| #wikimedia-ops - ##wikimedia-ops - + TheLetterE werdan7 @@ -268,33 +307,7 @@ #wikimedia-ops - - - - - - - vishwin60 - - - #wikimedia-ops - - - - - Mitchell - Snowolf - Eagle-101 - Mbimmler - Pilotguy - skenmy - AndrewB - - - #wikimedia-ops - - - + Golbez TheLetterE @@ -313,12 +326,13 @@ ^requested by ChanServ blah .* + .* ^DCC (SEND|S?CHAT) |\bDCC (SEND|S?CHAT) "?[A-Za-z0-9]+"? \d+ \d+ \d+ DCC SEND DCC SEND \bDCC SEND ^... DDOS COUNTDOWN.* - rbl.efnetrbl.org + dnsbl.dronebl.org ([^ ]{4,} +)\1{5,} goatse\.cz 5:20 @@ -331,14 +345,15 @@ 4:4 150:20 .* + http:\/\/www\.pennergame\.de\/change_please\/(\d+)\/ RED ARMY OF LOL \.com/sms.exe (?i)^sure are a ?lot of .*fags? in here - AfterDeath ST47 - alindeman - seanw + pctony + SeJo + Thehelpfulone dave2 RichiH troubled diff --git a/config-default/commands.xml b/config-default/commands.xml index 3595281..0bc7f8e 100644 --- a/config-default/commands.xml +++ b/config-default/commands.xml @@ -41,7 +41,7 @@ $conn->privmsg($event->{to}->[0], "Hiya $nick"); ]]> - + getLink(lc $chan); if ( lc $link ne lc $chan ) { @@ -253,7 +253,7 @@ $conn->privmsg($event->{to}->[0], $x . " exempted"); ]]> - + {to}->[0]; $tgt = $1 if (defined($1)); diff --git a/config-default/users.xml b/config-default/users.xml index 580d1a6..e4a9e9a 100644 --- a/config-default/users.xml +++ b/config-default/users.xml @@ -1,33 +1,27 @@ - - - - + + - + - - - - - - - - + + + + - - - - + + + + - - + + + - - + diff --git a/modules/classes.pl b/modules/classes.pl index f2372f2..bdde77f 100644 --- a/modules/classes.pl +++ b/modules/classes.pl @@ -86,6 +86,11 @@ sub dnsbl } if ((@dnsbl) && (defined($::dnsbl->{query}->{$chk->{content}}->{response}->{$strip}))) { $::lastlookup=$::dnsbl->{query}->{$chk->{content}}->{response}->{$strip}->{content}; + print "chk->content: $chk->{content}\n"; + print "strip: $strip\n"; + print "result: " . $::dnsbl->{query}->{$chk->{content}}->{response}->{$strip}->{content} . "\n"; + print "just part of that: "; + print Dumper( $::dnsbl->{query}->{$chk->{content}} ); # lol really icky hax return 1; } diff --git a/modules/command.pl b/modules/command.pl index 27cc5a9..07ef31e 100644 --- a/modules/command.pl +++ b/modules/command.pl @@ -19,9 +19,12 @@ sub command my $cmd = $args; my $d1; my $nick = lc $event->{nick}; - return 0 unless (ASM::Util->speak($event->{to}->[0])); +# return 0 unless (ASM::Util->speak($event->{to}->[0])); foreach my $command ( @{$::commands->{command}} ) { + unless (ASM::Util->speak($event->{to}->[0])) { + next unless (defined($command->{nohush}) && ($command->{nohush} eq "nohush")); + } if (defined($command->{flag})) { next unless defined($::users->{person}->{$nick}); next unless defined($::users->{person}->{$nick}->{flags}); diff --git a/modules/services.pl b/modules/services.pl index e80923a..3ec9436 100644 --- a/modules/services.pl +++ b/modules/services.pl @@ -14,11 +14,11 @@ sub doServices { if ($event->{from} eq 'NickServ!NickServ@services.') { print "NickServ: $event->{args}->[0]\n"; - if ( $event->{args}->[0] eq 'This nickname is owned by someone else' ) + if ( $event->{args}->[0] eq 'This nickname is registered' ) { $conn->privmsg( 'NickServ', "identify $::settings->{pass}" ); } - elsif ( $event->{args}->[0] eq 'Password accepted - you are now recognized' ) + elsif ( $event->{args}->[0] =~ /^You are now identified/ ) { $conn->join($_) foreach ( @{$::settings->{autojoins}} ); } -- cgit v1.2.3