1 files changed, 45 insertions, 7 deletions

diff --git a/include/membership.h b/include/membership.h
index 436a9371c..44eaf1eb6 100644
--- a/include/membership.h
+++ b/include/membership.h
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -17,10 +18,9 @@
  */
 
 
-#ifndef MEMBERSHIP_H
-#define MEMBERSHIP_H
+#pragma once
 
-class CoreExport Membership : public Extensible
+class CoreExport Membership : public Extensible, public intrusive_list_node<Membership>
 {
  public:
 	User* const user;
@@ -33,12 +33,39 @@ class CoreExport Membership : public Extensible
 		return modes.find(m) != std::string::npos;
 	}
 	unsigned int getRank();
+
+	/** Add a prefix character to a user.
+	 * Only the core should call this method, usually from
+	 * within the mode parser or when the first user joins
+	 * the channel (to grant the default privs to them)
+	 * @param mh The mode handler of the prefix mode to associate
+	 * @param adding True if adding the prefix, false when removing
+	 * @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;
+
+	/** Return all prefix chars this member has.
+	 * @return A list of all prefix characters. The prefixes will always
+	 * be in rank order, greatest first, as certain IRC clients require
+	 * this when multiple prefixes are used names lists.
+	 */
+	const char* GetAllPrefixChars() const;
 };
 
-class CoreExport InviteBase
+template <typename T>
+class InviteBase
 {
  protected:
-	InviteList invites;
+	intrusive_list<Invitation, T> invites;
 
  public:
 	void ClearInvites();
@@ -46,7 +73,7 @@ class CoreExport InviteBase
 	friend class Invitation;
 };
 
-class 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) {}
 
@@ -60,4 +87,15 @@ class Invitation : public classbase
 	static Invitation* Find(Channel* c, LocalUser* u, bool check_expired = true);
 };
 
-#endif
+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;
+	}
+}