new commands, users, hilights, rules, bugfixes, and all sorts of other good stuff

1 files changed, 78 insertions, 43 deletions

diff --git a/config-default/channels.xml b/config-default/channels.xml
index e738bfa..9b85be3 100644
--- a/config-default/channels.xml
+++ b/config-default/channels.xml
@@ -1,24 +1,4 @@
 <channels>
-  <channel id="#wikimedia-commons" op="no">
-    <hilights>
-      <debug>White_cat</debug>
-    </hilights>
-    <msgs>
-      <debug>#wikimedia-ops</debug>
-    </msgs>
-  </channel>
-  <channel id="##windows" op="no">
-    <hilights>
-      <low>numist</low>
-      <low>quux</low>
-      <low>HentaiXP</low>
-      <low>TechSalvager</low>
-      <low>xyr</low>
-      <low>njan</low>
-      <low>JonathanD</low>
-      <low>Cpudan80</low>
-    </hilights>
-  </channel>
   <channel id="##asb-meta" op="no" />
   <channel id="##asb-nexus" op="when" />
   <channel id="##asb-testing" op="when">
@@ -36,7 +16,7 @@
     <hilights>
       <low>WildPikachu</low>
       <low>nalioth</low>
-      <low>xyr</low>
+      <low>seanw</low>
       <low>quux</low>
       <low>denny</low>
       <low>Fieldy</low>
@@ -47,63 +27,112 @@
       <debug>##linux-ops</debug>
       <low>WildPikachu</low>
     </msgs>
-    <event id="no_ahbl" action="none" class="re" reason="placeholder" risk="debug" time="0" type="join" override="ahbl,no_ahbl">.*</event>
   </channel>
   <channel id="##linux-ops" op="no">
     <hilights>
       <opalert>WildPikachu</opalert>
-      <opalert>xyr</opalert>
+      <opalert>seanw</opalert>
       <opalert>quux</opalert>
       <opalert>denny</opalert>
       <opalert>Fieldy</opalert>
       <opalert>numist</opalert>
       <opalert>PhilKC</opalert>
     </hilights>
-    <msgs>
-      <opalert>##linux-ops</opalert>
-    </msgs>
+    <msgs opalert="##linux-ops" />
+  </channel>
+  <channel id="##windows" op="no">
+    <hilights>
+      <low>numist</low>
+      <low>quux</low>
+      <low>HentaiXP</low>
+      <low>TechSalvager</low>
+      <low>seanw</low>
+      <low>njan</low>
+      <low>JonathanD</low>
+      <low>Cpudan80</low>
+    </hilights>
   </channel>
   <channel id="#baadf00d" op="yes">
     <hilights></hilights>
     <msgs></msgs>
   </channel>
-  <channel id="#wikipedia-en-roads-us" op="yes">
+  <channel id="#religion" op="yes">
     <hilights>
-      <debug>vishwin60</debug>
+      <debug>Shadow_mil</debug>
+      <debug>newmanbe</debug>
+    </hilights>
+  </channel>
+  <channel id="#wikimedia-commons" op="no">
+    <hilights>
+      <debug>White_cat</debug>
     </hilights>
     <msgs>
       <debug>#wikimedia-ops</debug>
     </msgs>
   </channel>
-  <channel id="#religion" op="yes">
+  <channel id="#wikimedia-commons-social" op="no">
     <hilights>
-      <debug>Shadow_mil</debug>
-      <debug>newmanbe</debug>
+      <low>Lcarsdata</low>
     </hilights>
+    <msgs>
+      <debug>#wikimedia-ops</debug>
+    </msgs>
   </channel>
   <channel id="#wikimedia-ops" op="no">
     <hilights></hilights>
     <msgs></msgs>
   </channel>
-  <channel id="#wikipedia" op="when">
+  <channel id="#wikipedia" op="no">
+    <event id="autorem_2" action="fmod_wiki" class="re" override="autoremove" reason="on chanserv autoremove" risk="info" time="0" type="raw">^mode \S+ \+b (.*)$</event>
+    <event id="part_fags" action="ban" class="re" reason="parted with 'Fags!'" risk="low" time="0" type="part">.*Fags! Fags! Fags!.*</event>
     <hilights>
-      <low>AppleBoy</low>
-      <low>xyr</low>
+      <low>seanw</low>
+      <low>Pilotguy</low>
+      <low>Eagle-101</low>
+      <low>Mbimmler</low>
+      <low>skenmy</low>
+      <low>Ral315</low>
+      <low>Karlprof</low>
+      <low>tomaw</low>
       <low>Fabexplosive</low>
-      <low>Crazytales2</low>
+      <low>Krimpet</low>
+      <low>ST47</low>
+      <low>AndrewB</low>
+      <low>stylus</low>
     </hilights>
     <msgs>
       <debug>#wikimedia-ops</debug>
     </msgs>
-    <event id="autorem_2" action="fmod_wiki" class="re" reason="on chanserv autoremove" risk="info" time="0" type="raw" override="autoremove">^mode \S+ \+b (.*)$</event>
-    <event id="part_fags" action="ban" class="re" reason="parted with 'Fags!'" risk="low" time="0" type="part">.*Fags! Fags! Fags!.*</event>
   </channel>
   <channel id="#wikipedia-en" op="no">
     <hilights>
+      <debug>White_Cat</debug>
       <low>AppleBoy</low>
       <low>Soms</low>
-      <low>xyr</low>
-      <debug>White_Cat</debug>
+      <low>Pilotguy</low>
+      <low>ST47</low>
+      <low>seanw</low>
+    </hilights>
+    <msgs>
+      <debug>#wikimedia-ops</debug>
+    </msgs>
+  </channel>
+  <channel id="#wikipedia-en-roads-us" op="yes">
+    <hilights>
+      <debug>vishwin60</debug>
+    </hilights>
+    <msgs>
+      <debug>#wikimedia-ops</debug>
+    </msgs>
+  </channel>
+  <channel id="#wikipedia-overflow" op="no">
+    <hilights>
+      <low>seanw</low>
+      <low>Eagle-101</low>
+      <low>Mbimmler</low>
+      <low>Pilotguy</low>
+      <low>ST47</low>
+      <low>skenmy</low>
     </hilights>
     <msgs>
       <debug>#wikimedia-ops</debug>
@@ -113,31 +142,37 @@
     <event id="flood-15to45" action="none" class="floodqueue" reason="flooding 15 to 45" risk="low" time="0" type="public">15:45</event>
   </channel>
   <channel id="master">
-    <event id="ahbl" action="ban" class="dnsbl" reason="in ircbl.ahbl.org" risk="info" time="0" type="join">ircbl.ahbl.org</event>
     <event id="autoremove" action="none" class="re" reason="on chanserv autoremove" risk="info" time="0" type="part">requested by ChanServ</event>
     <event id="badurl1" action="ban" class="re" reason="sending spam url" risk="medium" time="0" type="public">tinyurl\.com/ypvk4n</event>
     <event id="ctcp-dcc" action="ban" class="re" reason="ctcp-dcc" risk="high" time="0" type="cdcc">.*</event>
     <event id="dcc" action="ban" class="re" override="dcc-medium" reason="using the DC.C SE.ND exploit" risk="high" time="0" type="public">^DCC SEND |\bDCC SEND &quot;?[A-Za-z0-9]+&quot;? \d+ \d+ \d+</event>
     <event id="dcc-medium" action="ban" class="re" reason="using the DC.C SE.ND exploit" risk="medium" time="0" type="public">DCC SEND </event>
     <event id="dcc-topic" action="ban" class="re" reason="setting a bad topic" risk="medium" time="0" type="topic">\bDCC SEND </event>
+    <event id="ddos_countdown" action="none" class="re" reasion="doing the ddos countdown thing" risk="medium" time="0" type="public">^... DDOS COUNTDOWN ...$</event>
     <event id="dosrequest" action="none" class="re" reason="requesting a DoS" risk="medium" time="0" type="public">via paypal if you DoS somone for</event>
+    <event id="dronebl" action="ban" class="dnsbl" override="ahbl" reason="in dnsbl.dronebl.org" risk="info" time="0" type="join">dnsbl.dronebl.org</event>
+    <event id="efnet_rbl" action="none" class="dnsbl" reason="in rbl.efnet.org" risk="info" time="0" type="join">rbl.efnet.org</event>
     <event id="exoticforum" action="ban" class="re" reason="link spam" risk="low" time="0" type="public">http://exotics\.ezbbforum\.com</event>
     <event id="flood-10to30" action="none" class="floodqueue" reason="flooding (10 messages per 30 seconds)" risk="low" time="0" type="public">10:30</event>
     <event id="flood-5to3" action="quiet" class="floodqueue" reason="flooding (5 messages per 3 seconds)" risk="low" time="10" type="public">5:3</event>
-    <event id="massflood" action="ban" class="splitflood" reason="distributed flooding" risk="medium" time="0" type="public,part,caction">5:3</event>
     <event id="genspam1" action="none" class="re" reason="generic spamming" risk="debug" time="0" type="public">([^ ]{4,} +)\1{5,}</event>
+    <event id="goatse" action="ban" class="re" reason="posting goatse link" risk="low" time="0" type="public">goatse\.cz</event>
     <event id="joinflood-3to20" action="none" class="floodqueue" reason="join flood (3 joins in 20 seconds)" risk="medium" time="0" type="join">3:20</event>
     <event id="keylogger" action="ban" class="re" override="keylogger-medium" reason="using the norton start-key-logger exploit" risk="high" time="0" type="public">^startkeylogger$|^stopkeylogger$</event>
     <event id="keylogger-medium" action="ban" class="re" reason="using the norton start-key-logger exploit" risk="medium" time="0" type="public">\bstartkeylogger\b|\bstopkeylogger\b</event>
     <event id="last_measure_regex" action="kban" class="re" reason="posting what appears to be a last measure link" risk="medium" time="0" type="public">http://\S+\.on\.nimp\.org</event>
     <event id="lesbian" action="ban" class="re" reason="bad nick match (lesbian..)" risk="medium" time="0" type="join">^lesbian..$</event>
+    <event id="magical" action="none" class="ident" reason="typical w00t ident" risk="info" time="0" type="join">i=magical</event>
+    <event id="massflood" action="ban" class="splitflood" reason="distributed flooding" risk="medium" time="0" type="public,part,caction">5:3</event>
+    <event id="massflood2" action="ban" class="splitflood" reason="distributed flooding" risk="medium" time="0" type="caction">5:3</event>
     <event id="nick_cupid" action="ban" class="re" reason="bad nick match (cupid..)" risk="medium" time="0" type="join">^cupid..$</event>
     <event id="nick_mudkip" action="ban" class="re" reason="bad nick match (mudkip..)" risk="medium" time="0" type="join">MUDKIP..</event>
     <event id="nickspam" action="ban" class="nickspam" reason="nickspamming" risk="high" time="0" type="public">150:20</event>
     <event id="notice" action="ban" class="re" reason="sending a notice to the channel" risk="high" time="0" type="notice">.*</event>
-    <event id="sms_spam" action="none" class="re" reason="spam link / virus" risk="low" time="0" type="public">\.com/sms.exe</event>
-    <event id="dronebl" action="ban" class="dnsbl" reason="in dnsbl.dronebl.org" risk="info" time="0" type="join" override="ahbl">dnsbl.dronebl.org</event>
     <event id="redarmyoflol" action="ban" class="re" reason="parting with 'red army of lol'" risk="low" time="0" type="part">RED ARMY OF LOL</event>
+    <event id="sms_spam" action="none" class="re" reason="spam link / virus" risk="low" time="0" type="public">\.com/sms.exe</event>
+    <event id="weirdspam_1" action="none" class="re" reason="wwe mass murderer nonsense" risk="medium" time="0" type="public">hello sir, my name is Chris Benoit and I am a WWE MASS MURDERER.</event>
+    <event id="wikifags2" action="none" class="re" nocase="nocase" reason="saying 'sure are a lot of wikifag'..." risk="low" time="0" type="public">sure are a ?lot of wikifag</event>
     <hilights>
       <debug>AfterDeath</debug>
     </hilights>