Fix issue 456: standard IRC commands in nicklist

git-svn-id: http://svn.dmdirc.com/trunk@3118 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/actions/CoreActionComponent.java

@@ -84,7 +84,7 @@ public enum CoreActionComponent implements ActionComponent {
     /** Returns the channel umodes for the server. */
     SERVER_CHANNELUMODES {
         /** {@inheritDoc} */
-        public Object get(final Object argument) { return ((Server) argument).getParser().getUserModeString(); }
+        public Object get(final Object argument) { return ((Server) argument).getParser().getPrefixModes(); }
         /** {@inheritDoc} */
         public Class appliesTo() { return Server.class; }
         /** {@inheritDoc} */

src/com/dmdirc/actions/defaults/umodes/ov

@@ -23,5 +23,5 @@ condition 0:
 metadata:
   description=Automatically sets the popup.umodes setting when connecting to a server, so that the correct user modes appear in the nicklist popup.
   author=Chris <chris@dmdirc.com>
-  version=1
+  version=2
   component=umodes

src/com/dmdirc/actions/defaults/umodes/qaohv

@@ -0,0 +1,20 @@
+# This is a DMDirc configuration file.
+# Written on: Mon Dec 17 23:32:19 GMT 2007
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  condition 0
+
+triggers:
+  SERVER_CONNECTED
+
+response:
+  /.set --server popup umodes <umodes-op\n<umodes-hop\n<umodes-voice\n-\n<umodes-admin\n<umodes-owner
+
+condition 0:
+  argument=0
+  component=SERVER_CHANNELUMODES
+  target=qaohv
+  comparison=STRING_EQUALS

src/com/dmdirc/actions/defaults/umodes/qaov

@@ -0,0 +1,20 @@
+# This is a DMDirc configuration file.
+# Written on: Mon Dec 17 23:32:19 GMT 2007
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  condition 0
+
+triggers:
+  SERVER_CONNECTED
+
+response:
+  /.set --server popup umodes <umodes-op\n<umodes-voice\n-\n<umodes-admin\n<umodes-owner
+
+condition 0:
+  argument=0
+  component=SERVER_CHANNELUMODES
+  target=qaov
+  comparison=STRING_EQUALS

src/com/dmdirc/config/defaults/default/defaults

@@ -143,6 +143,8 @@ popups.umodes=<umodes-op\n<umodes-voice
 popups.umodes-op=Op:mode +o %1$s\nDeop:mode -o %1$s
 popups.umodes-hop=Half-Op:mode +h %1$s\nDehalf-op:mode -o %1$s
 popups.umodes-voice=Voice:mode +v %1$s\nDevoice:mode -v %1$s
+popups.umodes-admin=Make admin:mode +a %1$s\nRemove admin:mode -a %1$s
+popups.umodes-owner=Make owner:mode +q %1$s\nRemove owner:mode -q %1$s
 
 popups.CHAN_NICKLIST=<nick\n-\nModes:<umodes\n<chan-nick
 popups.CHAN_CHAN=