Add is_halfop() and is_owner() and start using them in the new functions.

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

diff --git a/include/channel.h b/include/channel.h
index c7a6ecf3bc7cc70c5d31045b16b358b0b05f7021..bad77396cbfcec5d7670da5235128e5be41e8d93 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -153,7 +153,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 
 #define is_chanop(x)   ((x) && (x)->flags & CHFL_CHANOP)
 #define is_voiced(x)   ((x) && (x)->flags & CHFL_VOICE)
-#define is_chanop_voiced(x) ((x) && (x)->flags & (CHFL_CHANOP|CHFL_VOICE))
 #define can_send_banned(x) ((x) && (x)->flags & (CHFL_BANNED|CHFL_QUIETED))
 
 /* channel modes ONLY */
@@ -176,6 +175,8 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #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 MODE_NOREJOIN  0x512000 /* Block rejoin immediately after kick */
 
 #define CHFL_BAN        0x10000000     /* ban channel flag */
 #define CHFL_EXCEPTION  0x20000000     /* exception to ban channel flag */
@@ -226,6 +227,11 @@ extern int can_join(struct Client *source_p, struct Channel *chptr, char *key);
 
 extern struct membership *find_channel_membership(struct Channel *, struct Client *);
 extern const char *find_channel_status(struct membership *msptr, int combine);
+extern int is_halfop(struct membership *msptr);
+extern int is_owner(struct membership *msptr);
+extern int is_any_op(struct membership *msptr);
+extern int is_chanop_voiced(struct membership *msptr);
+extern int can_kick_deop(struct membership *source, struct membership *target);
 extern void add_user_to_channel(struct Channel *, struct Client *, int flags);
 extern void remove_user_from_channel(struct membership *);
 extern void remove_user_from_channels(struct Client *);
@@ -242,6 +248,8 @@ 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);