X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmembership.h;h=44eaf1eb6c2d39f404b8c144b6b047ec40c7c722;hb=b15cffc167391fc8af6cab52061d4b591ec5bbf8;hp=b0924bef72fe5f6f75d066a627bcb52e3849727b;hpb=932e8d13f81c7c94a89dc3702f6d45bc185f5dcf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/membership.h b/include/membership.h
index b0924bef7..44eaf1eb6 100644
--- a/include/membership.h
+++ b/include/membership.h
@@ -43,12 +43,29 @@ 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;
+
+	/** 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();
@@ -56,7 +73,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 +86,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;
+	}
+}