Forward port various channel and /list updates

[ircu2.10.12-pk.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index 18d6d9fec7994dd0842ee894b9482e4fda53b0ea..545748f1d5fe978589135f5bd56ef9992b044446 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -119,9 +119,9 @@ struct Client;
                                     (MODE_PRIVATE | MODE_SECRET)) == 0)
 #define is_listed(x)            ((x)->mode.mode & MODE_LISTED)
 
+#define IsGlobalChannel(name)   (*(name) == '#')
 #define IsLocalChannel(name)    (*(name) == '&')
-#define IsChannelName(name)     (*(name) == '#' || \
-                                IsLocalChannel(name))
+#define IsChannelName(name)     (IsGlobalChannel(name) || IsLocalChannel(name))
 
 typedef enum ChannelGetType {
   CGT_NO_CREATE,
@@ -134,6 +134,11 @@ typedef enum ChannelGetType {
 #define MODE_ADD       0x40000000
 #define MODE_DEL       0x20000000
 
+/* used in ListingArgs.flags */
+
+#define LISTARG_TOPICLIMITS     0x0001
+#define LISTARG_SHOWSECRET      0x0002
+
 /*
  * Maximum acceptable lag time in seconds: A channel younger than
  * this is not protected against hacking admins.
@@ -247,7 +252,7 @@ struct ListingArgs {
   time_t min_time;
   unsigned int max_users;
   unsigned int min_users;
-  unsigned int topic_limits;
+  unsigned int flags;
   time_t max_topic_time;
   time_t min_topic_time;
   struct Channel *chptr;