Update all wiki links to point to the new wiki. This was done automatically with...

[user/henk/code/inspircd.git] / include / channels.h

diff --git a/include/channels.h b/include/channels.h
index 748f6c24b9dcb043f9d37efd6ead2a6e2704c908..afcdee41f08fe14822fb44016fe338792d0e597b 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -98,7 +98,7 @@ typedef std::vector<prefixtype> pfxcontainer;
 typedef std::map<User*, std::vector<prefixtype> > prefixlist;
 
 /** Holds all relevent information for a channel.
- * This class represents a channel, and contains its name, modes, time created, topic, topic set time,
+ * This class represents a channel, and contains its name, modes, topic, topic set time,
  * etc, and an instance of the BanList type.
  */
 class CoreExport Channel : public Extensible
@@ -145,21 +145,21 @@ class CoreExport Channel : public Extensible
        std::bitset<64> modes;
 
        /** User lists.
-        * There are four user lists, one for 
+        * There are four user lists, one for
         * all the users, one for the ops, one for
         * the halfops and another for the voices.
         */
        CUList internal_userlist;
 
        /** Opped users.
-        * There are four user lists, one for 
+        * There are four user lists, one for
         * all the users, one for the ops, one for
         * the halfops and another for the voices.
         */
        CUList internal_op_userlist;
 
        /** Halfopped users.
-        * There are four user lists, one for 
+        * There are four user lists, one for
         * all the users, one for the ops, one for
         * the halfops and another for the voices.
         */
@@ -182,11 +182,6 @@ class CoreExport Channel : public Extensible
         */
        std::string topic; /* MAXTOPIC */
 
-       /** Creation time.
-        * This is a timestamp (TS) value.
-        */
-       time_t created;
-
        /** Time topic was set.
         * If no topic was ever set, this will be equal to Channel::created
         */
@@ -200,7 +195,7 @@ class CoreExport Channel : public Extensible
        /** The list of all bans set on the channel.
         */
        BanList bans;
-       
+
        /** Sets or unsets a custom mode in the channels info
         * @param mode The mode character to set or unset
         * @param mode_on True if you want to set the mode or false if you want to remove it
@@ -213,7 +208,7 @@ class CoreExport Channel : public Extensible
         * @param mode_on True if you want to set the mode or false if you want to remove it
         */
        void SetModeParam(char mode,const char* parameter,bool mode_on);
- 
+
        /** Returns true if a mode is set on a channel
          * @param mode The mode character you wish to query
          * @return True if the custom mode is set, false if otherwise
@@ -529,12 +524,14 @@ class CoreExport Channel : public Extensible
         * a given user for this channel.
         * @param u The user to match bans against
         * @param type The type of extban to check
+        * @returns 1 = exempt, 0 = no match, -1 = banned
         */
-       bool IsExtBanned(User *u, char type);
+       int GetExtBanStatus(User *u, char type);
 
        /** Overloaded version to check whether a particular string is extbanned
+        * @returns 1 = exempt, 0 = no match, -1 = banned
         */
-       bool IsExtBanned(const std::string &str, char type);
+       int GetExtBanStatus(const std::string &str, char type);
 
        /** Clears the cached max bans value
         */
@@ -545,4 +542,18 @@ class CoreExport Channel : public Extensible
        virtual ~Channel() { /* stub */ }
 };
 
+static inline int banmatch_reduce(int v1, int v2)
+{
+       int a1 = abs(v1);
+       int a2 = abs(v2);
+       if (a1 > a2)
+               return v1;
+       else if (a2 > a1)
+               return v2;
+       else if (v1 > v2)
+               return v1;
+       // otherwise v2 > v1 or equal
+       return v2;
+}
+
 #endif