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 df6008ea9aebc860ada62048a3cab124bce5472e..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 */
@@ -228,7 +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 *);