-#define MODE_CHANOP 0x0001 /* +o USER */
-#define MODE_VOICE 0x0002 /* +v USER */
-#define MODE_PRIVATE 0x0004 /* +p */
-#define MODE_SECRET 0x0008 /* +s */
-#define MODE_MODERATED 0x0010 /* +m */
-#define MODE_TOPICLIMIT 0x0020 /* +t */
-#define MODE_INVITEONLY 0x0040 /* +i */
-#define MODE_NOPRIVMSGS 0x0080 /* +n */
-#define MODE_KEY 0x0100 /* +k KEY */
-#define MODE_BAN 0x0200 /* +b BAN */
-#define MODE_LIMIT 0x0400 /* +l LIMIT */
-#define MODE_DELAYJOINS 0x0800 /* +D */
-#define MODE_REGONLY 0x1000 /* ircu +r, Bahamut +R */
-#define MODE_NOCOLORS 0x2000 /* +c */
-#define MODE_NOCTCPS 0x4000 /* +C */
-#define MODE_REGISTERED 0x8000 /* Bahamut +r */
-#define MODE_REMOVE 0x80000000
-
-#define FLAGS_OPER 0x0001 /* Operator +O */
-#define FLAGS_LOCOP 0x0002 /* Local operator +o */
-#define FLAGS_INVISIBLE 0x0004 /* invisible +i */
-#define FLAGS_WALLOP 0x0008 /* receives wallops +w */
-#define FLAGS_SERVNOTICE 0x0010 /* receives server notices +s */
-#define FLAGS_DEAF 0x0020 /* deaf +d */
-#define FLAGS_SERVICE 0x0040 /* cannot be kicked, killed or deoped +k */
-#define FLAGS_GLOBAL 0x0080 /* receives global messages +g */
-#define FLAGS_HELPER 0x0100 /* (network?) helper +h */
-#define FLAGS_PERSISTENT 0x0200 /* for reserved nicks, this isn't just one-shot */
-#define FLAGS_GAGGED 0x0400 /* for gagged users */
-#define FLAGS_AWAY 0x0800 /* for away users */
-#define FLAGS_STAMPED 0x1000 /* for users who have been stamped */
-#define FLAGS_HIDDEN_HOST 0x2000 /* user's host is masked by their account */
-#define FLAGS_REGNICK 0x4000 /* user owns their current nick */
+#define MODE_CHANOP 0x0001 /* +o USER */
+#define MODE_VOICE 0x0002 /* +v USER */
+#define MODE_PRIVATE 0x0004 /* +p */
+#define MODE_SECRET 0x0008 /* +s */
+#define MODE_MODERATED 0x0010 /* +m */
+#define MODE_TOPICLIMIT 0x0020 /* +t */
+#define MODE_INVITEONLY 0x0040 /* +i */
+#define MODE_NOPRIVMSGS 0x0080 /* +n */
+#define MODE_KEY 0x0100 /* +k KEY */
+#define MODE_BAN 0x0200 /* +b BAN */
+#define MODE_LIMIT 0x0400 /* +l LIMIT */
+#define MODE_DELAYJOINS 0x0800 /* +D */
+#define MODE_REGONLY 0x1000 /* ircu +r, Bahamut +R */
+#define MODE_NOCOLORS 0x2000 /* +c */
+#define MODE_NOCTCPS 0x4000 /* +C */
+#define MODE_REGISTERED 0x8000 /* Bahamut +r */
+#define MODE_APASS 0x10000 /* +A adminpass */
+#define MODE_UPASS 0x20000 /* +U userpass */
+#define MODE_NONOTICES 0x40000 /* +N */
+#define MODE_NOAMSGS 0x80000 /* +M */
+#define MODE_ALTCHAN 0x100000 /* +F */
+#define MODE_ACCESS 0x200000 /* +a */
+#define MODE_NOFLOOD 0x400000 /* +f */
+#define MODE_AUDITORIUM 0x800000 /* +u */
+#define MODE_SSLCHAN 0x1000000 /* +S */
+#define MODE_REMOVE 0x80000000
+
+#define FLAGS_OPER 0x0001 /* +o global operator */
+#define FLAGS_INVISIBLE 0x0004 /* +i invisible */
+#define FLAGS_WALLOP 0x0008 /* +w receives wallops */
+#define FLAGS_DEAF 0x0020 /* +d deaf */
+#define FLAGS_SERVICE 0x0040 /* +k cannot be kicked, killed or deoped */
+#define FLAGS_GLOBAL 0x0080 /* +g receives global messages */
+#define FLAGS_NOCHAN 0x0100 /* +n hide channels in whois */
+#define FLAGS_PERSISTENT 0x0200 /* for reserved nicks, this isn't just one-shot */
+#define FLAGS_GAGGED 0x0400 /* for gagged users */
+#define FLAGS_AWAY 0x0800 /* for away users */
+#define FLAGS_STAMPED 0x1000 /* for users who have been stamped */
+#define FLAGS_HIDDEN_HOST 0x2000 /* +x user's host is masked by their account */
+#define FLAGS_REGNICK 0x4000 /* +r user owns their current nick */
+#define FLAGS_REGISTERING 0x8000 /* user has issued account register command, is waiting for email cookie */
+#define FLAGS_DUMMY 0x10000 /* user is not announced to other servers */
+#define FLAGS_NOIDLE 0x20000 /* +I hide idle time in whois */
+#define FLAGS_NETSERV 0x40000 /* +S */
+#define FLAGS_SECURITYSERV 0x80000 /* +D */
+#define FLAGS_XTRAOP 0x100000 /* +X */
+#define FLAGS_HIDDENOPER 0x200000 /* +H */
+#define FLAGS_SERVERNOTICE 0x400000 /* +s */
+#define FLAGS_SEENOIDLE 0x800000 /* +t */