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 4939ff96da8dbe25226835fad66c5aa680f550b8..93001a3ca0a3417d091b66a48f025fc5ff429ab3 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -175,6 +175,8 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #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 */
@@ -241,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 *);