message: run privmsg_user hook on both source and target

[solanum.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index a25f191e0a7a2511530a3e01c20836b1a520ce8d..a9c0752995bbd800eb80a170f7b4007865c4d3eb 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -193,7 +193,7 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define IsMember(who, chan) ((who && who->user && \
                 find_channel_membership(chan, who)) ? 1 : 0)
 
-#define IsChannelName(name) ((name) && (*(name) == '#' || *(name) == '&'))
+#define IsChannelName(name) ((name) && (IsChanPrefix(*(name))))
 
 /* extban function results */
 #define EXTBAN_INVALID -1  /* invalid mask, false even if negated */
@@ -215,10 +215,12 @@ extern int can_send(struct Channel *chptr, struct Client *who,
                    struct membership *);
 extern bool flood_attack_channel(int p_or_n, struct Client *source_p,
                                struct Channel *chptr, char *chname);
+struct matchset;
 extern int is_banned(struct Channel *chptr, struct Client *who,
-                   struct membership *msptr, const char *, const char *, const char **);
+                     struct membership *msptr, const struct matchset *ms,
+                     const char **);
 extern int is_quieted(struct Channel *chptr, struct Client *who,
-                    struct membership *msptr, const char *, const char *);
+                    struct membership *msptr, const struct matchset *ms);
 extern int can_join(struct Client *source_p, struct Channel *chptr,
                    const char *key, const char **forward);
 
@@ -264,7 +266,7 @@ extern void set_channel_mlock(struct Client *client_p, struct Client *source_p,
 
 extern struct ChannelMode chmode_table[256];
 
-extern int add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
+extern bool add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
        const char *forward, rb_dlink_list * list, long mode_type);
 
 extern struct Ban * del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list,