Automated merge with ssh://hg@bitbucket.org/uranium/shadowircd/

[irc/rqf/shadowircd.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index c6a5de91b4f1e557e9a740459e4d71457b5c7308..93001a3ca0a3417d091b66a48f025fc5ff429ab3 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -88,7 +88,6 @@ struct membership
        unsigned int flags;
 
        unsigned long bants;
-       unsigned long override_ts;
 };
 
 #define BANLEN 195
@@ -115,7 +114,6 @@ struct ChModeChange
        int caps;
        int nocaps;
        int mems;
-       int override;
        struct Client *client;
 };
 
@@ -173,11 +171,12 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define MODE_FREEINVITE 0x0800  /* allow free use of /invite */
 #define MODE_FREETARGET 0x1000  /* can be forwarded to without authorization */
 #define MODE_DISFORWARD 0x2000  /* disable channel forwarding */
-#define MODE_NOOPERKICK 0x4000  /* disallow kicking opers aka immune */
 #define MODE_NOCTCP     0x8000  /* Block CTCPs directed to this channel */
 #define MODE_NONOTICE  0x16000 /* Block notices directed to this channel */
 #define MODE_NOACTION  0x32000 /* Block CTCP ACTION directed to this channel */
 #define MODE_NOKICK    0x64000 /* Disable /kick on this channel */
+#define MODE_NONICK    0x128000 /* Disable /nick for anyone on this channel */
+#define MODE_NOCAPS    0x256000 /* Block messages in all capital letters */
 
 #define CHFL_BAN        0x10000000     /* ban channel flag */
 #define CHFL_EXCEPTION  0x20000000     /* exception to ban channel flag */
@@ -196,8 +195,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 
 /* channel visible */
 #define ShowChannel(v,c)        (PubChannel(c) || IsMember((v),(c)))
-/* user visible in channel */
-#define ShowInChannel(v,t,c)    ((PubChannel(c) && !IsInvisible(t)) || IsMember((v),(c)))
 
 #define IsMember(who, chan) ((who && who->user && \
                 find_channel_membership(chan, who)) ? 1 : 0)
@@ -246,8 +243,12 @@ extern void del_invite(struct Channel *chptr, struct Client *who);
 
 const char *channel_modes(struct Channel *chptr, struct Client *who);
 
+extern int has_common_channel(struct Client *client1, struct Client *client2);
+
 extern struct Channel *find_bannickchange_channel(struct Client *client_p);
 
+extern struct Channel *find_nonickchange_channel(struct Client *client_p);
+
 extern void check_spambot_warning(struct Client *source_p, const char *name);
 
 extern void check_splitmode(void *);