As we have an enum for type, why not ..use it?

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

diff --git a/include/channels.h b/include/channels.h
index bf025ec560f8ff693589a28dfb77115d67f7daed..9c231008a3ce28cb8a9bfb079c1bc7120a5610af 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -41,10 +41,10 @@ class HostItem : public classbase
        time_t set_time;
        /** Who added the item
         */
-       char set_by[64];
+       std::string set_by;
        /** The actual item data
         */
-       char data[MAXBUF];
+       std::string data;
 
        HostItem() { /* stub */ }
        virtual ~HostItem() { /* stub */ }
@@ -134,15 +134,15 @@ class CoreExport Channel : public Extensible
 
        /** The channel's name.
         */
-       char name[CHANMAX];
+       std::string name; /* CHANMAX */
 
        /** Modes for the channel.
-        * This is not a null terminated string! It is a hash where
+        * This is not a null terminated string! It is a bitset where
         * each item in it represents if a mode is set. For example
         * for mode +A, index 0. Use modechar-65 to calculate which
         * field to check.
         */
-       char modes[64];
+       std::bitset<64> modes;
 
        /** User lists.
         * There are four user lists, one for 
@@ -180,7 +180,7 @@ class CoreExport Channel : public Extensible
        /** Channel topic.
         * If this is an empty string, no channel topic is set.
         */
-       char topic[MAXTOPIC];
+       std::string topic; /* MAXTOPIC */
 
        /** Creation time.
         * This is a timestamp (TS) value.
@@ -195,17 +195,7 @@ class CoreExport Channel : public Extensible
        /** The last user to set the topic.
         * If this member is an empty string, no topic was ever set.
         */
-       char setby[128];
-
-       /** Contains the channel user limit.
-        * If this value is zero, there is no limit in place.
-        */
-       short int limit;
-       
-       /** Contains the channel key.
-        * If this value is an empty string, there is no channel key in place.
-        */
-       char key[32];
+       std::string setby; /* 128 */
 
        /** The list of all bans set on the channel.
         */
@@ -242,6 +232,13 @@ class CoreExport Channel : public Extensible
          */
        std::string GetModeParameter(char mode);
 
+       /** Sets the channel topic.
+        * @param u The user setting the topic
+        * @param t The topic to set it to. Non-const, as it may be modified by a hook.
+        * @param forceset If set to true then all access checks will be bypassed.
+        */
+       int SetTopic(User *u, std::string &t, bool forceset = false);
+
        /** Obtain the channel "user counter"
         * This returns the channel reference counter, which is initialized
         * to 0 when the channel is created and incremented/decremented
@@ -344,16 +341,16 @@ class CoreExport Channel : public Extensible
         * @return The number of users left on the channel. If this is zero
         * when the method returns, you MUST delete the Channel immediately!
         */
-       long ServerKickUser(User* user, const char* reason, bool triggerevents);
+       long ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername = NULL);
 
        /** Part a user from this channel with the given reason.
         * If the reason field is NULL, no reason will be sent.
         * @param user The user who is parting (must be on this channel)
-        * @param reason The (optional) part reason
+        * @param reason The part reason
         * @return The number of users left on the channel. If this is zero
         * when the method returns, you MUST delete the Channel immediately!
         */
-       long PartUser(User *user, const char* reason = NULL);
+       long PartUser(User *user, std::string &reason);
 
        /* Join a user to a channel. May be a channel that doesnt exist yet.
         * @param user The user to join to the channel.
@@ -535,6 +532,10 @@ class CoreExport Channel : public Extensible
         */
        bool IsExtBanned(User *u, char type);
 
+       /** Overloaded version to check whether a particular string is extbanned
+        */
+       bool IsExtBanned(const std::string &str, char type);
+
        /** Clears the cached max bans value
         */
        void ResetMaxBans();