#define UMODE_DEAF 0x0080
#define UMODE_NOFORWARD 0x0100 /* don't forward */
#define UMODE_REGONLYMSG 0x0200 /* only allow logged in users to msg */
-#define UMODE_NOCTCP 0x0400 /* block CTCPs except for ACTION */
+#define UMODE_NOCTCP 0x0400 /* block CTCPs except for ACTION */
+#define UMODE_NOINVITE 0x0800 /* block invites */
+#define UMODE_BOT 0x8000 /* mark as a bot in whois */
+#define UMODE_SCALLERID 0x40000 /* soft caller id */
/* user information flags, only settable by remote mode or local oper */
#define UMODE_OPER 0x1000 /* Operator */
#define UMODE_ADMIN 0x2000 /* Admin on server */
#define UMODE_SSLCLIENT 0x4000 /* using SSL */
+#define UMODE_OVERRIDE 0x20000 /* able to override */
+
+#define IsOverride(x) ((x)->umodes & UMODE_OVERRIDE)
/* overflow flags */
/* EARLIER FLAGS ARE IN s_newconf.h */
#define IsNoForward(x) ((x)->umodes & UMODE_NOFORWARD)
#define IsSetRegOnlyMsg(x) ((x)->umodes & UMODE_REGONLYMSG)
#define IsSetNoCTCP(x) ((x)->umodes & UMODE_NOCTCP)
+#define IsSetNoInvite(x) ((x)->umodes & UMODE_NOINVITE)
+#define IsSetBot(x) ((x)->umodes & UMODE_BOT)
+#define IsSetSCallerId(x) ((x)->umodes & UMODE_SCALLERID)
#define SetGotId(x) ((x)->flags |= FLAGS_GOTID)
#define IsGotId(x) (((x)->flags & FLAGS_GOTID) != 0)