Merge pull request #551 from SaberUK/master+unused-configure

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

diff --git a/include/listmode.h b/include/listmode.h
index 40c28f67f076d1a87b109b05dd92ba020304107f..149f4157867526393f1258bf104c622934cbee51 100644 (file)
--- a/include/listmode.h
+++ b/include/listmode.h
@@ -16,21 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #pragma once
 
 /** The base class for list modes, should be inherited.
  */
-class ListModeBase : public ModeHandler
+class CoreExport ListModeBase : public ModeHandler
 {
  public:
        /** An item in a listmode's list
         */
-       class ListItem
+       struct ListItem
        {
-       public:
-               std::string nick;
+               std::string setter;
                std::string mask;
-               std::string time;
+               time_t time;
+               ListItem(const std::string& Mask, const std::string& Setter, time_t Time)
+                       : setter(Setter), mask(Mask), time(Time) { }
        };
 
        /** Items stored in the channel's list
@@ -38,18 +40,44 @@ class ListModeBase : public ModeHandler
        typedef std::list<ListItem> ModeList;
 
  private:
+       class ChanData
+       {
+       public:
+               ModeList list;
+               int maxitems;
+
+               ChanData() : maxitems(-1) { }
+       };
+
        /** The number of items a listmode's list may contain
         */
-       class ListLimit
+       struct ListLimit
        {
-       public:
                std::string mask;
                unsigned int limit;
+               ListLimit(const std::string& Mask, unsigned int Limit) : mask(Mask), limit(Limit) { }
+               bool operator==(const ListLimit& other) const { return (this->mask == other.mask && this->limit == other.limit); }
        };
 
        /** Max items per channel by name
         */
-       typedef std::list<ListLimit> limitlist;
+       typedef std::vector<ListLimit> limitlist;
+
+       /** Finds the limit of modes that can be placed on the given channel name according to the config
+        * @param channame The channel name to find the limit for
+        * @return The maximum number of modes of this type that we allow to be set on the given channel name
+        */
+       unsigned int FindLimit(const std::string& channame);
+
+       /** Returns the limit on the given channel for this mode.
+        * If the limit is cached then the cached value is returned,
+        * otherwise the limit is determined using FindLimit() and cached
+        * for later queries before it is returned
+        * @param channame The channel name to find the limit for
+        * @param cd The ChanData associated with channel channame
+        * @return The maximum number of modes of this type that we allow to be set on the given channel
+        */
+       unsigned int GetLimitInternal(const std::string& channame, ChanData* cd);
 
  protected:
        /** Numeric to use when outputting the list
@@ -74,7 +102,7 @@ class ListModeBase : public ModeHandler
 
        /** Storage key
         */
-       SimpleExtItem<ModeList> extItem;
+       SimpleExtItem<ChanData> extItem;
 
  public:
        /** Constructor.
@@ -116,14 +144,13 @@ class ListModeBase : public ModeHandler
        virtual void DisplayEmptyList(User* user, Channel* channel);
 
        /** Remove all instances of the mode from a channel.
-        * See mode.h
+        * Populates the given modestack with modes that remove every instance of
+        * this mode from the channel.
+        * See mode.h for more details.
         * @param channel The channel to remove all instances of the mode from
+        * @param stack The mode stack to add the mode change to
         */
-       virtual void RemoveMode(Channel* channel, irc::modestacker* stack);
-
-       /** Listmodes don't get set on users, no-op
-       */
-       virtual void RemoveMode(User*, irc::modestacker* stack);
+       virtual void RemoveMode(Channel* channel, irc::modestacker& stack);
 
        /** Perform a rehash of this mode's configuration data
         */
@@ -182,5 +209,9 @@ class ListModeBase : public ModeHandler
 
 inline ListModeBase::ModeList* ListModeBase::GetList(Channel* channel)
 {
-       return extItem.get(channel);
+       ChanData* cd = extItem.get(channel);
+       if (!cd)
+               return NULL;
+
+       return &cd->list;
 }