Move GetPrefixChar() from Channel to Membership

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

diff --git a/include/membership.h b/include/membership.h
index b0924bef72fe5f6f75d066a627bcb52e3849727b..c6b0bf14ae52b2418ab01b7e0c89c001646702c3 100644 (file)
--- a/include/membership.h
+++ b/include/membership.h
@@ -43,12 +43,22 @@ class CoreExport Membership : public Extensible, public intrusive_list_node<Memb
         * @return True if a change was made
         */
        bool SetPrefix(PrefixMode* mh, bool adding);
+
+       /** Get the highest prefix this user has on the channel
+        * @return A character containing the highest prefix.
+        * If the user has no prefix, 0 is returned. If the user has multiple prefixes,
+        * the highest is returned. If you do not recognise the prefix character you
+        * can get, you can deal with it in a 'proportional' manner compared to known
+        * prefixes, using GetPrefixValue().
+        */
+       char GetPrefixChar() const;
 };
 
-class CoreExport InviteBase
+template <typename T>
+class InviteBase
 {
  protected:
-       InviteList invites;
+       intrusive_list<Invitation, T> invites;
 
  public:
        void ClearInvites();
@@ -56,7 +66,7 @@ class CoreExport InviteBase
        friend class Invitation;
 };
 
-class CoreExport Invitation : public classbase
+class CoreExport Invitation : public intrusive_list_node<Invitation, Channel>, public intrusive_list_node<Invitation, LocalUser>
 {
        Invitation(Channel* c, LocalUser* u, time_t timeout) : user(u), chan(c), expiry(timeout) {}
 
@@ -69,3 +79,16 @@ class CoreExport Invitation : public classbase
        static void Create(Channel* c, LocalUser* u, time_t timeout);
        static Invitation* Find(Channel* c, LocalUser* u, bool check_expired = true);
 };
+
+typedef intrusive_list<Invitation, LocalUser> InviteList;
+
+template<typename T>
+inline void InviteBase<T>::ClearInvites()
+{
+       for (typename intrusive_list<Invitation, T>::iterator i = invites.begin(); i != invites.end(); )
+       {
+               Invitation* inv = *i;
+               ++i;
+               delete inv;
+       }
+}