Version mode aliases and defaults properly

Uses version from git submodule
Copies and overwrites settings from submodule
Removed all the default config from the source tree
Issue 2734

Change-Id: Iebda026cf9e78a229f50232634527562b4216be9
Reviewed-on: http://gerrit.dmdirc.com/236
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

build-versioning.xml

@@ -3,8 +3,10 @@
     <description>Adds automatic versioning information to DMDirc</description>
 
     <property name="version.config" value="build/classes/com/dmdirc/version.config"/>
-    <property name="defaults.path" value="src/com/dmdirc/config/defaults/"/>
-    <property name="defaults.target" value="build/classes/com/dmdirc/config/defaults/default/defaults"/>
+    <property name="defaults.path" value="modules/defaults/.git/"/>
+    <property name="defaults.output" value="build/classes/com/dmdirc/config/defaults/"/>
+    <property name="defaults.target" value="${defaults.output}default/defaults"/>
+    <property name="modealiases.target" value="${defaults.output}modealiases/generic"/>
 
     <available file=".git" property="is.git"/>
 
@@ -45,13 +47,27 @@ version:
         <echo file="${version.config}" append="true">
 updater:
     channel=${channel}
-    bundleddefaultsversion=${defaults.version}</echo>
+    bundleddefaultsversion=${defaults.version}
+    bundledmodealiasesversion=${modealiases.version}
+</echo>
     </target>
 
-    <target name="-write-identities" depends="-read-identities">
+    <target name="-write-identities" depends="-read-identities, -copy-identities">
         <echo file="${defaults.target}" append="true">
 identity:
-  defaultsversion=${defaults.version}</echo>
+  defaultsversion=${defaults.version}
+</echo>
+        <echo file="${modealiases.target}" append="true">
+identity:
+  modealiasversion=${modealiases.version}
+</echo>
+    </target>
+
+    <target name="-copy-identities">
+        <mkdir dir="${defaults.output}"/>
+        <copy todir="${defaults.output}" overwrite="true">
+            <fileset dir="modules/defaults/"/>
+        </copy>
     </target>
 
     <target name="-read-identities" depends="-read-identities-git"/>
@@ -59,7 +75,11 @@ identity:
     <target name="-read-identities-git" if="is.git">
         <exec dir="." executable="/bin/bash" outputproperty="defaults.version">
             <arg value="-c"/>
-            <arg value="git rev-list --all -n 1 -- ${defaults.path} | xargs git describe --tags"/>
+            <arg value="git --git-dir ${defaults.path} rev-list --all -n 1 -- default | xargs git --git-dir ${defaults.path} describe --tags"/>
+        </exec>
+        <exec dir="." executable="/bin/bash" outputproperty="modealiases.version">
+            <arg value="-c"/>
+            <arg value="git --git-dir ${defaults.path} rev-list --all -n 1 -- modealiases | xargs git --git-dir ${defaults.path} describe --tags"/>
         </exec>
     </target>
 

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

@@ -1,291 +0,0 @@
-# This is the DMDirc default config file. If you wish to make changes to the settings
-# for your copy of DMDirc, you should edit the dmdirc.config file in the main DMDirc
-# profile directory instead. This file will be replaced by the updater.
-
-keysections:
-  identity
-  general
-  notifications
-  ui
-  treeview
-  channel
-  tabcompletion
-  logging
-  server
-  updater
-  popups
-  protocol
-  plugin-addonid
-  icon
-  ssl
-  actions
-  nicklist
-  statusBar
-  temp
-  dialogstate
-  browser
-
-identity:
-  name=DMDirc default settings
-  globaldefault=true
-  order=100000
-
-general:
-  bindip=
-  closechannelsonquit=false
-  closequeriesonquit=false
-  closechannelsondisconnect=false
-  closemessage=DMDirc exiting
-  closequeriesondisconnect=false
-  commandchar=/
-  commandhistory=10
-  cyclemessage=Cycling
-  extendedListModes=false
-  firstRun=true
-  hidequeries=true
-  kickmessage=Bye!
-  logerrors=false
-  partmessage=Using DMDirc
-  password=
-  port=6667
-  quitmessage=Using DMDirc
-  reconnectdelay=5000
-  reconnectmessage=Reconnecting
-  reconnectondisconnect=true
-  reconnectonconnectfailure=true
-  rejoinchannels=true
-  server=irc.quakenet.org
-  showcolourdialog=true
-  showglobalwindow=false
-  showrawwindow=false
-  silencechar=.
-  submitErrors=false
-  ui=swing
-  whotime=60000
-
-notifications:
-  authNotice=server
-  away=server
-  back=server
-  unknownNotice=server
-  connectError=server
-  connectRetry=server
-  selfNickChange=server
-  serverError=all
-  socketClosed=all
-  stonedServer=all
-  privateNotice=all
-  privateCTCP=server
-  privateCTCPreply=lastcommand:ctcp %1$s %4$S
-  wallusers=server
-  wallops=server
-  walldesync=server
-
-  numeric_006=group:map
-  numeric_007=group:map
-  numeric_015=group:map
-  numeric_017=group:map
-
-  numeric_251=group:lusers
-  numeric_252=group:lusers
-  numeric_253=group:lusers
-  numeric_254=group:lusers
-  numeric_255=group:lusers
-
-  numeric_290=server
-  numeric_292=server
-  numeric_294=server
-
-  numeric_301=group:whois
-  numeric_307=group:whois
-  numeric_311=group:whois
-  numeric_312=group:whois
-  numeric_313=group:whois
-  numeric_317=group:whois
-  numeric_318=group:whois
-  numeric_319=group:whois
-  numeric_320=group:whois
-  numeric_330=group:whois
-  numeric_343=group:whois
-
-  numeric_401=lastcommand:(raw )?(whois|(priv)?msg|notice|ctcp|invite) %4$s( .*?)?
-  numeric_404=channel:%4$s lastcommand:(raw priv)?msg %4$s
-  numeric_405=server
-  numeric_421=server
-  numeric_432=lastcommand:(raw )?nick %4$s
-  numeric_433=server
-  numeric_437=lastcommand:(raw )?nick %4$s
-  numeric_438=lastcommand:(raw )?nick %4$s
-  numeric_461=lastcommand:(raw )?%4$s( .*)?
-  numeric_471=server
-  numeric_472=server
-  numeric_473=server
-  numeric_474=server
-  numeric_475=server
-  numeric_479=server
-  numeric_482=channel:%4$s
-  numeric_486=lastcommand:(raw priv)?msg %4$s .*
-  numeric_499=channel:%4$s
-
-  numeric_501=server
-  numeric_524=server
-
-  numeric_671=group:whois
-
-  numeric_705=server
-
-  lusers=server
-  map=window:Network Map
-  whois=lastcommand:(raw )?whois %4$s( %4$s)?
-
-ui:
-  antialias=true
-  awayindicator=true
-  backgroundcolour=0
-  confirmQuit=false
-  foregroundcolour=1
-  frameBufferSize=25000
-  framemanager=com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager
-  framemanagerPosition=left
-  frameManagerSize=150
-  inputbackgroundcolour=false:0
-  inputbuffersize=50
-  inputforegroundcolour=false:1
-  lookandfeel=Native
-  maximisewindows=true
-  mdiBarVisibility=showWhenMaximised
-  nickListAltBackgroundColour=false:f0f0f0
-  nicklistbackgroundcolour=false:0
-  nicklistforegroundcolour=false:1
-  pasteProtectionLimit=true:1
-  quickCopy=false
-  shownickcoloursinnicklist=true
-  shownickcoloursintext=false
-  showversion=true
-  stylelinks=true
-  treeviewActiveBackground=false:f0f0f0
-  treeviewActiveBold=true
-  treeviewActiveForeground=false:1
-  treeviewRolloverColour=false:f0f0f0
-  useOneTouchExpandable=false
-  channelSplitPanePosition=150
-
-treeview:
-  dragSelection=true
-  sortwindows=true
-  sortservers=true
-  backgroundcolour=false:0
-  foregroundcolour=false:0
-
-channel:
-  splitusermodes=false
-  hideduplicatemodes=false
-  sendwho=false
-  showmodeprefix=true
-  topichistorysize=10
-  encoding=UTF-8
-
-tabcompletion:
-  allowempty=false
-  casesensitive=false
-  style=mirc
-
-logging:
-  dateFormat=EEE, d MMM yyyy HH:mm:ss Z
-  programLogging=true
-  debugLogging=true
-  debugLoggingSysOut=true
-
-server:
-  pingtimeout=60000
-  pingtimer=10000
-  pingfrequency=60000
-  proxy.address=
-  proxy.user=
-  proxy.password=
-  proxy.port=1080
-
-updater:
-  autoupdate=false
-  channel=STABLE
-  enable=false
-  frequency=86400
-  lastcheck=0
-
-popups:
-  nick=Query:query %1$s\nWhois:whois %1$s
-  chan-nick=-\nBan:ban %1$s\nKick:kick %1$s
-  umodes=<umodes-op\n<umodes-voice
-
-  umodes-op=Op:mode +o %1$s\nDeop:mode -o %1$s
-  umodes-hop=Half-Op:mode +h %1$s\nDehalf-op:mode -o %1$s
-  umodes-voice=Voice:mode +v %1$s\nDevoice:mode -v %1$s
-  umodes-admin=Make admin:mode +a %1$s\nRemove admin:mode -a %1$s
-  umodes-owner=Make owner:mode +q %1$s\nRemove owner:mode -q %1$s
-
-  CHAN_NICK=<nick\n-\nModes:<umodes\n<chan-nick
-  CHAN_NORMAL=
-  QUERY_NORMAL=<nick
-
-protocol:
-  http=BROWSER
-  https=BROWSER
-  irc=DMDIRC
-
-plugin-addonid:
-  audio=14
-  dcc=23
-  dcop=1
-  dns=10
-  identd=15
-  lagdisplay=2
-  logging=16
-  dcopmediasource=9
-  vlcmediasource=24
-  nickcolour=12
-  nowplaying=8
-  osd=3
-  redirect=4
-  systray=5
-  timeplugin=6
-  urlcatcher=25
-  userlevel=21
-  windowstatus=13
-
-icon:
-  category-addons=dmdirc://com/dmdirc/res/addon.png
-  category-advanced=dmdirc://com/dmdirc/res/cog.png
-  category-connection=dmdirc://com/dmdirc/res/server.png
-  category-gui=dmdirc://com/dmdirc/res/monitor.png
-  category-messages=dmdirc://com/dmdirc/res/feedback.png
-  category-updates=dmdirc://com/dmdirc/res/update.png
-  category-urlhandlers=dmdirc://com/dmdirc/res/urls.png
-
-ssl:
-  cacertpass=changeit
-  checkdate=true
-  checkissuer=true
-  checkhost=true
-
-actions:
-  killswitch=false
-
-nicklist:
-  sortByMode=true
-  sortByCase=false
-
-statusBar:
-  messageDisplayLength=5
-
-temp:
-  noerrorreporting=false
-
-dialogstate:
-  channelsettingsdialog=0
-  actionsmanagerdialog=0
-  serversettingsdialog=0
-  preferences=0
-
-browser:
-  uselaunchdelay=true
-  launchdelay=500

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

@@ -1,292 +0,0 @@
-keysections:
-  identity
-  formatter
-
-identity:
-  name=DMDirc default formats
-  globaldefault=true
-  order=100000
-
-formatter:
-# Type: Timestamp
-#    1: Current timestamp
-  timestamp=%1$tH:%1$tM:%1$tS | 
-
-# Type: Server names and titles
-#    1: User supplied name
-#    2: Server supplied name
-#    3: Port
-#    4: Network
-#    5: Current nickname
-  serverName=%1$s
-  serverTitle=%5$s on %1$s (%4$s)
-
-# Type: Channel Messages with mode
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: Mode
-#    6: Message content
-#    7: Channel name
-  channelModeNotice=5-%1$s%2$s:%5$s%7$s- %6$s
-
-# Type: Channel Message
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: Message content
-#    6: Channel name
-  channelNotice=5-%1$s%2$s:%6$s- %5$s
-  channelMessage=<%1$s%2$s> %5$s
-  channelHighlight=4<%1$s%2$s> %5$s
-  channelAction=6* %1$s%2$s %5$s
-  channelHighlightAction=6* %1$s%2$s %5$s
-  channelSelfMessage=<%1$s%2$s> %5$s
-  channelSelfAction=6* %1$s%2$s %5$s
-  channelSelfExternalMessage=<%1$s%2$s> %5$s
-  channelSelfExternalAction=6* %1$s%2$s %5$s
-  channelTopicChanged=3* %1$s%2$s has changed the topic to '%5$s'.
-  channelTopicRemoved=3* %1$s%2$s has removed the topic on %6$s.
-  channelModeChanged=3* %1$s%2$s sets mode: %5$s.
-  channelSelfModeChanged=3* You set mode: %5$s.
-
-# Type: Channel Message with time
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: Message content
-#    6: Time
-#    7: Channel name
-  channelTopicDiscovered=3* The topic for %7$s is '%5$s'.\n3* Topic was set by %2$s at %6$tR on %6$tA, %6$tB %6$te %6$tY.
-
-# Type: Channel CTCP
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: CTCP type
-#    6: CTCP content
-#    7: Channel name
-  channelCTCP=4-!- CTCP %5$S from %1$s%2$s
-
-# Type: Channel Event with possible reason
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: Reason/message
-#    6: Channel name
-  channelPart=3* %1$s%2$s (%3$s@%4$s) has left %6$s.
-  channelPartReason=3* %1$s%2$s (%3$s@%4$s) has left %6$s (%5$s).
-  channelQuit=2* %1$s%2$s (%3$s@%4$s) has quit IRC.
-  channelQuitReason=2* %1$s%2$s (%3$s@%4$s) has quit IRC (%5$s).
-  channelSelfPart=3* You have left the channel.
-  channelSelfPartReason=3* You have left the channel.
-  channelNickChange=3* %1$s%5$s is now known as %2$s.
-  channelSelfNickChange=3* You are now known as %2$s.
-
-# Type: Channel Event
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: Channel name
-  channelJoin=3* %2$s (%3$s@%4$s) has joined %5$s.
-  channelSelfJoin=3* You are now talking in %5$s.
-  channelUserAway=14-- %1$s%2$s is now away.
-  channelUserBack=14-- %1$s%2$s is now back.
-
-# Type: Channel Event with content
-#    1: User mode prefixes
-#    2: User nickname
-#    3: User ident
-#    4: User host
-#    5: Channel name
-#    6: Content
-# @Deprecated - remove post-0.6
-  channelTopicChange=3* %1$s%2$s has changed the topic to '%6$s'.
-  channelModeChange=3* %1$s%2$s sets mode: %6$s.
-  channelSelfModeChange=3* You set mode: %6$s.
-
-# Type: Binary Channel Event
-#    1: Source user mode prefixes
-#    2: Source user nickname
-#    3: Source user ident
-#    4: Source user host
-#    5: Target user mode prefixes
-#    6: Target user nickname
-#    7: Target user ident
-#    8: Target user host
-#    9: Channel name
-  channelKick=3* %1$s%2$s has kicked %5$s%6$s from %9$s.
-
-# Type: Binary Channel Event with content
-#    1: Source user mode prefixes
-#    2: Source user nickname
-#    3: Source user ident
-#    4: Source user host
-#    5: Target user mode prefixes
-#    6: Target user nickname
-#    7: Target user ident
-#    8: Target user host
-#    9: Content
-#   10: Channel name
-  channelKickReason=3* %1$s%2$s has kicked %5$s%6$s from %10$s (%9$s).
-  channelSplitUserMode_default=3* %1$s%2$s sets mode %9$s on %6$s.
-
-# Type: Channel mode discovery
-#     1: Channel modes
-#     2: Channel name
-  channelNoModes=3* There are no channel modes for %2$s.
-  channelModeDiscovered=3* Channel modes for %2$s are: %1$s.
-
-# Type: Private CTCP
-#    1: User nickname
-#    2: User ident
-#    3: User host
-#    4: CTCP type
-#    5: CTCP content
-  privateCTCP=4-!- CTCP %4$S from %1$s
-  privateCTCPreply=4-!- CTCP %4$S reply from %1$s: %5$s
-
-# Type: Private communications
-#    1: User nickname
-#    2: User ident
-#    3: User host
-#    4: Message content
-  privateNotice=5-%1$s- %4$s
-  queryMessage=<%1$s> %4$s
-  queryAction=6* %1$s %4$s
-  querySelfMessage=<%1$s> %4$s
-  querySelfAction=6* %1$s %4$s
-  queryNickChanged=3* %1$s is now known as %4$s.
-  userModeChanged=3* %1$s sets user mode: %4$s.
-  userModeDiscovered=3* User modes are: %4$s.
-  queryQuitReason=2* %1$s has quit IRC (%4$s).
-  queryMessageHighlight=4<%1$s> %4$s
-  queryActionHighlight=6* %1$s %4$s
-  inviteReceived=2* You have been invited to %4$s by %1$s.
-  walluser=5!%1$s! %4$s
-  wallop=5$%1$s$ %4$s
-  walldesync=5/%1$s/ %4$s
-
-# Type: Private event
-#    1: User nickname
-#    2: User ident
-#    3: User host
-  queryQuit=2* %1$s has quit IRC.
-
-# Type: Outgoing message
-#    1: Target
-#    2: Message
-  selfCTCP=4->- [%1$s] %2$s
-  selfNotice=5>%1$s> %2$s
-  selfMessage=>[%1$s]> %2$s
-
-# Type: Miscellaneous server
-#    1: Server name
-#    2: Miscellaneous argument
-  connectError=2Error connecting: %2$s
-  connectRetry=2Reconnecting in %2$u...
-  serverConnecting=Connecting to %1$s:%2$s...
-
-# Type: Argless
-  back=14You are no longer marked as away.
-  serverDisconnectInProgress=A disconnection attempt is in progress, please wait...
-  serverConnectInProgress=A connection attempt is in progress, please wait...
-
-# Type: Miscellaneous
-#    1: Miscellaneous data
-  authNotice=5-AUTH- %1$s
-  away=14You are now marked as away (%1$s14).
-  channelNoTopic=3* There is no topic set for %1$s.
-  rawCommand=10>>> %1$s
-  unknownCommand=14Unknown command %1$s.
-  socketClosed=2-!- You have been disconnected from the server.
-  stonedServer=2-!- Disconnected from a non-responsive server.
-  motdStart=10%1$s
-  motdLine=10%1$s
-  motdEnd=10%1$s
-  rawIn=<< %1$s
-  rawOut=>> %1$s
-  commandOutput=%1$s
-  commandError=7%1$s
-  actionTooLong=Warning: action too long to be sent
-  tabCompletion=14Multiple possibilities: %1$s
-  serverError=4ERROR: %1$s
-  serverUnknownProtocol=4Unknown protocol '%1$s'. Unable to connect.
-
-# Type: Binary Miscellaneous
-#    1: Miscellaneous data
-#    2: Miscellaneous data
-  selfNickChange=3* You are now known as %2$s.
-
-# Type: Unknown target events
-#    1: Source
-#    2: Target
-#    3: Message
-  unknownNotice=5-[%1$s:%2$s]- %3$s
-
-# Type: Command usage
-#    1: Command char
-#    2: Command name
-#    3: Arguments
-  commandUsage=7Usage: %1$s%2$s %3$s
-
-# Type: Numerical data
-  numeric_006=%4$s
-  numeric_007=%4$s
-  numeric_015=%4$s
-  numeric_017=%4$s
-
-  numeric_251=10%4$s
-  numeric_252=10%4$s %5$s
-  numeric_253=10%4$s %5$s
-  numeric_254=10%4$s %5$s
-  numeric_255=10%4$s
-
-  numeric_290=%4$s
-  numeric_292=%4$s
-  numeric_294=%4$s
-
-  numeric_301=%4$s is away: %5$s
-  numeric_307=%4$s %5$s.
-  numeric_311=-\n%4$s is %5$s@%6$s (%8$s).
-  numeric_312=%4$s is connected to %5$s (%6$s).
-  numeric_313=%4$s %5$s.
-  numeric_317=%4$s has been idle for %5$u; signed on at %6$TT on %6$TF.
-  numeric_318=End of WHOIS info for %4$s.\n-
-  numeric_319=%4$s is on: %5$s
-  numeric_320=%4$s %5$s.
-  numeric_330=%4$s %6$s %5$s.
-  numeric_343=%4$s %6$s %5$s.
-
-  numeric_401=6A7000%4$s: %5$s
-  numeric_404=6A7000%5$s
-  numeric_405=6A7000%4$s: %5$s
-  numeric_421=6A7000%4$s: %5$s
-  numeric_432=6A7000%5$s
-  numeric_433=6A7000%4$s: %5$s
-  numeric_437=6A7000%5$s
-  numeric_438=6A7000%5$s
-  numeric_461=6A7000%4$s: %5$s
-  numeric_471=6A7000%4$s: %5$s
-  numeric_472=6A7000%4$s: %5$s
-  numeric_473=6A7000%4$s: %5$s
-  numeric_474=6A7000%4$s: %5$s
-  numeric_475=6A7000%4$s: %5$s
-  numeric_479=6A7000%4$s: %5$s
-  numeric_482=6A7000%4$s: %5$s
-  numeric_486=6A7000%4$s: %5$s
-  numeric_unreal_486=6A7000%4$s
-  numeric_499=6A7000%4$s: %5$s
-  numeric_501=6A7000%4$s: %5$s
-  numeric_hybrid_501=6A7000%4$s
-  numeric_524=6A7000%4$s: %5$s
-
-  numeric_671=%4$s %5$s.
-
-  numeric_705=%5$s

src/com/dmdirc/config/defaults/modealiases/asuka

@@ -1,21 +0,0 @@
-# Default mode settings for Asuka
-# b,k,l,imnpstrDdcCNu
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Asuka mode aliases
-  ircd=re:asuka|snircd|bircd
-
-server:
-  modeN=No channel notices
-  enablemodeN=true
-  modeu=No quit messages
-  enablemodeu=true
-
-  umodeh=Set host
-  umodeI=Hide idle time
-  umoden=Hide channel list
-  umodeX=Extended operator

src/com/dmdirc/config/defaults/modealiases/bahamut

@@ -1,41 +0,0 @@
-# Default mode settings for Bahamut
-# beI,k,jl,cimMnOprRst
-#
-# http://docs.dal.net/docs/modes.html
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Bahamut mode aliases
-  ircd=bahamut
-
-server:
-  modej=Join throttling
-
-  moder=Registered
-  modeR=Registered users only
-
-  modeL=Appear in /list
-
-  umodea=Services admin
-  umodeA=Server admin
-  umodeb=View oper chatops
-  umodec=Show client connections
-  umoded=Show debug messages
-  umodee=Show blocked DCC sends
-  umodef=Show flood alerts
-  umodeF=Bypass throttling
-  umodeg=View oper globops
-  umodeh=Helpful mode
-  umodeI=Hide server info
-  umodej=Show drone messages
-  umodek=Show kill messages
-  umodeK=Kill messages from U:lined servers
-  umodem=Report spambots
-  umoden=Show routing messages
-  umoder=Registered
-  umodex=Squelsh
-  umodeX=Silent squelsh
-  umodey=Spy mode

src/com/dmdirc/config/defaults/modealiases/bitlbee

@@ -1,10 +0,0 @@
-keysections:
-  identity
-  server
-
-identity:
-  name=Bitlbee mode aliases
-  ircd=bitlbee
-
-server:
-  umodeb=Bot-friendly responses

src/com/dmdirc/config/defaults/modealiases/generic

@@ -1,51 +0,0 @@
-# RFC-specified channel modes
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Generic mode aliases
-  globaldefault=true
-  modealiasversion=2
-
-server:
-# -- 1459 --
-  modeb=Ban
-  modei=Invite only
-  modek=Channel key
-  model=User limit
-  modem=Moderated
-  moden=No external messages
-  modep=Private
-  modes=Secret
-  modet=Only ops can set topic
-
-# -- 2811 --
-  modea=Anonymous chat
-  modee=Exception
-  modeI=Invite
-  modeq=Quiet
-#  moder=Reop users
-
-# Standard user modes, I can't believe they're not in the RFCs. Maybe I missed them.
-  modeo=Op
-  modeh=Half-op
-  modev=Voice
-
-# Defacto standards
-  modec=No formatting
-  modeM=Mute non-registered users
-  modeO=IRCops only
-  modez=SSL users only
-
-# Umodes
-  umodea=Away
-  umoded=Deaf
-  umodei=Invisible
-  umodes=Receive server notices
-  umodew=Receive wallops
-  umodeo=IRC Operator
-  umodeO=Local IRC Operator
-  umodeR=Only registered users may query
-  umodex=Hide hostname

src/com/dmdirc/config/defaults/modealiases/hybrid

@@ -1,34 +0,0 @@
-# Hybrid and oftc-hybrid mode aliases
-# http://www.oftc.net/oftc/ChannelModes
-# http://www.oftc.net/oftc/UserModes
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Hyrbid mode aliases
-  ircd=re:(oftc-)?hybrid
-
-server:
-  modeR=Registered users only
-  modeS=SSL users only
-
-  umodea=Server admin
-  umodeb=Receive bot detection notices
-  umodec=Receive connection notices
-  umodeC=Server
-  umoded=Show debug messages
-  umodeD=Deaf
-  umodef=Show fake mode/nick collisions
-  umodeg=Caller ID mode
-  umodeG=Soft Caller ID mode
-  umodek=Receive kill notices
-  umodel=Show excess connections
-  umoden=Follow nick changes
-  umodeP=Network service
-  umoder=Show reject notices
-  umodeS=God mode
-  umodeu=Show unauthorised connections
-  umodey=Spy mode
-  umodez=Receive wallops

src/com/dmdirc/config/defaults/modealiases/hyperion

@@ -1,84 +0,0 @@
-# Default mode settings for Hyperion
-# bdeIq,k,lfJD,cgijLmnPQrRstz
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Hyperion mode aliases
-  ircd=hyperion
-
-server:
-  moded=Real name ban
-  modeq=Silence
-
-  modef=Forward uninvited
-  modeJ=Join throttling
-  modeD=Auto D:Line clients
-
-  modec=Filter control codes
-  modeg=Allow anybody to invite
-  modej=Juped
-  modeL=Allow large lists
-  modeP=Permanent channel
-  modeQ=No forwarded users
-  moder=Registered users only
-  modeR=Silence unidentified users
-  modez=Reduced moderation
-
-  umodea=See invisible users
-  umodeA=See invisible things
-  umodeb=See bots
-  umodeB=Can change other people's hosts
-  umodec=See client connections
-  umodeC=No CTCPs
-  umoded=Receive debugging info
-  umodeD=Can use DIE command
-  umodee=Identified with nickserv
-  umodeE=Only registered users may query
-  umodef=Full messages
-  umodeF=No flood protection
-  umodeg=Caller ID
-  umodeG=Can KILL globally
-  umodeh=High priority
-  umodeH=Can rehash
-  umodeI=No invites
-  umodej=Immune to auto-d-line
-  umodek=See server kills
-  umodeK=Can KILL/KLINE
-  umodel=See channel creation notices
-  umodeL=Can force LUSERS
-  umodem=Immune from kick/deop
-  umodeM=Can send mass notices
-  umoden=See nick change notices
-  umodeN=Can use any nickname
-  umodep=God mode
-  umodeP=Can use /sethost
-  umodeQ=Immune to forwards
-  umoder=See bot rejections
-  umodeR=Can CONNECT/SQUIT
-  umodeS=Can retrieve info remotely
-  umodet=Can log channels
-  umodeT=Show as staff member
-  umodeu=Can join more channels
-  umodeU=Can remove k-lines
-  umodev=Can see operator privileges
-  umodeV=Can see routing information
-  umodeW=Can send wallops
-  umodex=See servers introduced
-  umodeX=Can use experimental commands
-  umodey=Spy mode
-  umodeY=Receive server connect messages
-  umodez=Receive oper wallops
-  umodeZ=Can send oper wallops
-  umode0=Can see opers
-  umode1=Can see B/E/F/I/Y-lines
-  umode2=Can see D/K-lines
-  umode3=Can see Q/X-lines
-  umode4=Can use /stats S and T
-  umode5=Can see StatsServ info
-  umode6=Don't block messages
-  umode9=Test-line
-  umode*=Can grant modes
-  umode@=Can use any host in /sethost

src/com/dmdirc/config/defaults/modealiases/inspircd

@@ -1,49 +0,0 @@
-# Default mode settings for inspircd
-# CHANMODES=Ibeg,k,FJLfjl,CGKMNOPQRSTVcimnpstuz
-
-keysections:
-  identity
-  server
-
-identity:
-  name=InspIRCd mode aliases
-  ircd=inspircd
-
-server:
-  modeC=No channel CTCPs
-  modeG=No censored words
-  modeJ=No auto-rejoin
-  modeK=No /knock
-  modeL=Overflow redirect
-  modeN=No nick changes
-  modeP=No all-uppercase lines
-  modeQ=No /kick
-  modeS=Strip all colours
-  modeT=No channel notices
-  modeV=No /invite
-  modef=Prevent message and notice floods
-  modej=Prevents join floods
-  modeR=Registered users only
-  moder=Registered channel
-
-  modeg=Censored word
-
-  modeu=Auditorium mode
-  modeF=Flood limit
-
-  modea=Protected
-  modeq=Channel founder
-
-  # BGhHIQrSWn http://wiki.inspircd.org/User_Modes
-  # BHcn http://wiki.inspircd.org/1.2/User_Modes
-  umodeB=Bot
-  umodec=Only users in comchannels may query
-  umodeG=Filter bad works
-  umodeh=HelpOp
-  umodeH=Hide IRCop status
-  umodeI=Hide channels
-  umoden=Server notice mask
-  umodeQ=Invisible IRCop
-  umoder=Registered
-  umodeS=Strip colours in queries
-  umodeW=Can see /WHOIS notices

src/com/dmdirc/config/defaults/modealiases/ircnet

@@ -1,14 +0,0 @@
-# Default mode settings for ircnet
-
-keysections:
-  identity
-  server
-
-identity:
-  name=IRCnet mode aliases
-  ircd=ircnet
-
-server:
-  umoder=Restricted connection
-  moder=Registered
-  modeR=Reop

src/com/dmdirc/config/defaults/modealiases/ircu

@@ -1,25 +0,0 @@
-# Default mode settings for ircu
-# CHANMODES=b,k,l,imnpstrDd
-
-keysections:
-  identity
-  server
-
-identity:
-  name=IRCu mode aliases
-  ircd=re:ircu|asuka|snircd|bircd
-
-server:
-  modeA=Admin password
-  modeC=No channel CTCPs
-  enablemodeC=true
-  modeD=Auditorium mode
-  moded=Auditorium mode
-  enablemoded=false
-  moder=Registered users only
-  modeS=Strip all colours
-  modeT=No multi-target messages
-  modeU=User password
-
-  umodeg=Receive debug information
-  umodek=Services operator

src/com/dmdirc/config/defaults/modealiases/nefarious

@@ -1,33 +0,0 @@
-# 0000797: Missing mode aliases: channel: +CLNQSTZ user: +fghknBIWX [CollectiveIRC]
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Nefarious mode aliases
-  ircd=nefarious
-
-server:
-  modea=Admins only
-  modeC=No channel CTCPs
-  modeL=No channel modes in /list
-  modeN=No channel notices
-  modeQ=No quit/part messages
-  modeS=Strip colours
-  modeT=No multi-target messages
-  modez=Persistant
-  modeZ=SSL users only
-
-  umodea=Server admin
-  umodeB=Bot
-  umodef=Fake host
-  umodeg=Receive debug messages
-  umodeh=Hidden host
-  umodeI=Hide idle time
-  umodek=Network service
-  umoden=Hide channel list
-  umodeS=Sethost
-  umodeW=See WHOIS requests
-  umodex=Hide host
-  umodeX=Xtra oper

src/com/dmdirc/config/defaults/modealiases/oftc

@@ -1,14 +0,0 @@
-# Default mode settings for OFTC
-# b,k,l,imnpstrDdcCNu
-
-keysections:
-  identity
-  server
-
-identity:
-  name=OFTC mode aliases
-  ircd=oftc-hybrid
-
-server:
-  modeP=Protected, Only OPs can invite
-  enablemodeP=true

src/com/dmdirc/config/defaults/modealiases/plexus

@@ -1,19 +0,0 @@
-# Default mode settings for hybrid+plexus
-# eIb,k,l,BMNORScimnpst
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Plexus mode aliases
-  ircd=plexus
-
-server:
-  modeB=Bandwidth saver mode
-  modeS=SSL users only
-  modep=Paranoid mode
-  modeN=No channel notices
-
-  modea=Admin
-  modeq=Owner

src/com/dmdirc/config/defaults/modealiases/ratbox

@@ -1,27 +0,0 @@
-# 0000799: Missing mode aliases: user: +zcekfynbuglZCD [EFNet]
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Ratbox mode aliases
-  ircd=ratbox
-
-server:
-  umodea=Server admin
-  umodeb=Receive bot detection notices
-  umodec=Show client connections
-  umodeC=Show client connections
-  umodeD=Deaf
-#  umodee=??
-  umodef=Show excess connections
-  umodeg=Caller ID mode
-  umodek=Show kills
-  umodel=Receive locops
-  umoden=Show client nick changes
-  umoder=Show reject notices
-  umodeu=Show unauthorised connections
-  umodey=Show WHOIS requests
-  umodez=Receive wallops
-  umodeZ=Monitor operspy notices

src/com/dmdirc/config/defaults/modealiases/snircd

@@ -1,14 +0,0 @@
-# Default mode settings for Snircd
-# b,k,l,imnpstrDducCN
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Snircd mode aliases
-  ircd=snircd
-
-server:
-  umodeP=Paranoid
-  umodeR=Only registered users may query

src/com/dmdirc/config/defaults/modealiases/ultimate

@@ -1,32 +0,0 @@
-# Default mode settings for UltimateIRCd
-
-keysections:
-  identity
-  server
-
-identity:
-  name=UltimateIRCd mode aliases
-  ircd=ultimateircd
-
-server:
-  modea=Admin
-  modeq=Quits appear as parts
-  modeA=Only Administrators can join
-  modeK=No /knock
-  modeN=No /invite
-  modeS=SSL users only
-
-  umodeD=Seen /DCCALLOW warning message
-  umodek=Can see kill notices
-  umoder=Registered nickname
-  umodeS=Services client
-
-  umodec=Can see connect notices
-  umodeg=Can see /GLOBOPS notices
-  umodeh=Help operator
-  umodep=Protected irc operator
-  umodeW=Can see /WHOIS notices
-
-  umodea=Services operator
-  umodeP=Services administrator
-  umodeZ=Services root administrator

src/com/dmdirc/config/defaults/modealiases/unreal

@@ -1,54 +0,0 @@
-# Unreal IRCd mode aliases
-#
-# http://www.unrealircd.com/files/docs/unreal32docs.html#userchannelmodes
-
-keysections:
-  identity
-  server
-
-identity:
-  name=Unreal mode aliases
-  ircd=unreal
-
-server:
-  modeA=Admins only
-  modea=Channel admin
-  modeC=No channel CTCPs
-  modef=Flood protection
-  modeG=G-rated
-  modej=Join throttle
-  modeK=Disable /knock
-  modeL=Limit redirection
-  modeN=No nick changes
-  modeq=Channel owner
-  modeQ=Only servers can kick
-  moder=Registered
-  modeR=Registered users only
-  modeS=Strip colours
-  modeT=No channel notices
-  modeu=Auditorium
-  modeU=Strip all formatting
-  modeV=Disable /invite
-
-  umodeA=Server Admin
-  umodea=Services Admin
-  umodeB=Bot
-  umodec=Strip colours in queries
-  umodeC=Co-Admin
-  umodeD=No private messages
-  umodeG=Filter bad words
-  umodeg=Send/receive globops/locops
-  umodeH=Hide IRCop status
-  umodeh=Help Operator
-  umodeN=Network Administrator
-  umodep=Hide channel list
-  umodeq=Unkickable
-  umoder=Registered
-  umodeS=Network Service
-  umodeT=Block CTCPs
-  umodet=Using a vhost
-  umodeV=WebTV user
-  umodev=Receive DCC Send rejection notices
-  umodeW=Can see /WHOIS notices
-  umodew=Can listen to wallop messages
-  umodez=SSL'd connection

src/com/dmdirc/config/defaults/modealiases/weircd

@@ -1,21 +0,0 @@
-# WeIRCd IRCd mode aliases
-
-keysections:
-  identity
-  server
-
-identity:
-  name=WeIRCd mode aliases
-  ircd=weircd
-
-server:
-  umodec=Receive connection notices
-  umodeh=Set host
-  umoder=Registered
-
-  umodeB=Bot
-  umodeF=Flood exempt
-  umodeS=Network Service
-
-  modec=No colours
-  moder=Registered