Removed the d flag for almost everyone, changed all commands that require the 'd' flag to require 'a' instead, except for ;ev and ;sl, and modified ;user flags to not allow the d flag to be assigned

3 files changed, 27 insertions, 21 deletions

diff --git a/config-default/channels.xml b/config-default/channels.xml
index c4257ce..66a9040 100644
--- a/config-default/channels.xml
+++ b/config-default/channels.xml
@@ -1,10 +1,10 @@
 <channels>
+  <channel id="##Thehelpfulone" op="no" />
   <channel id="##asb-meta" link="##asb-testing">
     <hilights></hilights>
   </channel>
   <channel id="##asb-nexus" op="when">
-    <hilights>
-    </hilights>
+    <hilights></hilights>
     <msgs></msgs>
   </channel>
   <channel id="##asb-test" op="no">
@@ -71,7 +71,9 @@
     </msgs>
   </channel>
   <channel id="##thehelpfulone" op="no">
-    <hilights></hilights>
+    <hilights>
+      <debug>thehelpfulone</debug>
+    </hilights>
     <msgs>
       <debug>##thehelpfulone</debug>
       <disable>##asb-nexus</disable>
@@ -81,6 +83,7 @@
     <hilights></hilights>
   </channel>
   <channel id="##wikimedia-ops" op="no">
+    <hilights></hilights>
     <msgs></msgs>
   </channel>
   <channel id="##windows" op="no">
@@ -161,6 +164,7 @@
   <channel id="#mediawiki" op="no" silence="yes">
     <hilights>
       <debug>flyingparchment</debug>
+      <debug>WaRpAtH</debug>
       <disable>seanw</disable>
       <disable>ST47</disable>
     </hilights>
@@ -206,7 +210,6 @@
     </hilights>
     <msgs>
       <debug>#wikimedia-ops</debug>
-      <low>#wikimedia-ops</low>
     </msgs>
   </channel>
   <channel id="#wikimedia-tech" op="no" silence="yes">
diff --git a/config-default/commands.xml b/config-default/commands.xml
index 2e8df3d..efe65e1 100644
--- a/config-default/commands.xml
+++ b/config-default/commands.xml
@@ -31,7 +31,7 @@
     $conn->privmsg($event->{to}->[0], "$result results found.");
   ]]>
   </command>
-  <command cmd="^;user add (\S+) ?(\S*)$" flag="d">
+  <command cmd="^;user add (\S+) ?(\S*)$" flag="a">
   <![CDATA[
     my $nick = lc $1;
     my $host = $2;
@@ -41,10 +41,14 @@
     $conn->privmsg($event->{to}->[0], "Hiya $nick");
   ]]>
   </command>
-  <command cmd="^;user flags (\S+) ?(?: (\S+))?$" flag="d">
+  <command cmd="^;user flags (\S+) ?(?: (\S+))?$" flag="a">
   <![CDATA[
     my $nick = lc $1;
     my $flags = $2;
+    if ($flags =~ /d/) {
+      $conn->privmsg($event->{to}->[0], "The d flag may not be assigned over IRC. Edit the configuration manually.");
+      return;
+    }
     if ((!defined($flags)) || ($flags eq '')) {
       if (defined($::users->{person}->{$nick}->{flags})) {
         $conn->privmsg($event->{to}->[0], "Flags for $nick: $::users->{person}->{$nick}->{flags}");
@@ -59,7 +63,7 @@
     }
   ]]>
   </command>
-  <command cmd="^;user del (\S+)$" flag="d">
+  <command cmd="^;user del (\S+)$" flag="a">
   <![CDATA[
     my $nick = lc $1;
     delete($::users->{person}->{$nick});
diff --git a/config-default/users.xml b/config-default/users.xml
index 283e722..d524123 100644
--- a/config-default/users.xml
+++ b/config-default/users.xml
@@ -1,27 +1,26 @@
 <people>
   <person id="afterdeath" flags="hodat" host="IDENTIFY" />
-  <person id="alindeman" flags="hodat" host="freenode/senior-staff-emeritus/alindeman" />
   <person id="danielb" flags="h" host="IDENTIFY" />
-  <person id="dave2" flags="hodat" host="freenode/staff/dave2" />
+  <person id="dave2" flags="oath" host="freenode/staff/dave2" />
   <person id="denny" flags="ha" host="freenode/staff/denny" />
-  <person id="dlange" flags="hodat" host="freenode/staff/dlange" />
-  <person id="dmcdevit" flags="hoat" host="IDENTIFY" />
+  <person id="dlange" flags="oath" host="freenode/staff/dlange" />
+  <person id="dmcdevit" flags="oath" host="IDENTIFY" />
   <person id="errantego" flags="t" host="unaffiliated/errantego" />
   <person id="gary" flags="hoa" host="freenode/staff/colchester-lug.gary" />
   <person id="gdonato" flags="oath" host="IDENTIFY" />
-  <person id="jonathand" flags="hodat" host="freenode/staff/jonathand" />
+  <person id="jonathand" flags="oath" host="freenode/staff/jonathand" />
   <person id="martinp23" flags="oath" host="IDENTIFY" />
   <person id="pctony" />
   <person id="pricechild" host="freenode/staff/ubuntu.member.pricechild" />
-  <person id="richih" flags="hodat" host="freenode/staff/richih" />
-  <person id="seanw" flags="hodat" host="freenode/staff-emeritus/wikimedia.sean-whitton" />
-  <person id="st47" flags="someguythatfiddleswiththebot" host="IDENTIFY" />
+  <person id="richih" flags="oath" host="freenode/staff/richih" />
+  <person id="seanw" flags="oath" host="freenode/staff-emeritus/wikimedia.sean-whitton" />
+  <person id="st47" flags="oath" host="IDENTIFY" />
   <person id="thehelpfulone" flags="oath" host="wikimedia/Thehelpfulone" />
   <person id="tho|away" flags="oath" host="IDENTIFY" />
-  <person id="tomaw" flags="hodat" host="freenode/staff/tomaw" />
-  <person id="troubled" flags="hodat" host="IDENTIFY" />
-  <person id="vorian" flags="hodat" host="freenode/staff/vorian" />
-  <person id="werdan7" flags="oat" host="IDENTIFY" />
-  <person id="wildpikachu" flags="hodat" host="about/linux/staff/wildpikachu" />
-  <person id="wimt" flags="hodat" host="IDENTIFY" />
+  <person id="tomaw" flags="oathd" host="freenode/staff/tomaw" />
+  <person id="troubled" flags="oath" host="IDENTIFY" />
+  <person id="vorian" flags="oath" host="freenode/staff/vorian" />
+  <person id="werdan7" flags="oath" host="IDENTIFY" />
+  <person id="wildpikachu" flags="oath" host="about/linux/staff/wildpikachu" />
+  <person id="wimt" flags="oath" host="IDENTIFY" />
 </people>