X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fchannels.h;h=be84ac8009736510e031fa892a34c4cd51d1a6ed;hb=30fc51c6ddca487a1b89da9ab0ab59da003aee36;hp=ba2018e97a456065d6eb16203d0aaeeab3c8622e;hpb=0556720b559d7ec5d8badacf0ac9b11e9c864847;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/channels.h b/include/channels.h
index ba2018e97..be84ac800 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -34,28 +34,32 @@
  * This class represents a channel, and contains its name, modes, topic, topic set time,
  * etc, and an instance of the BanList type.
  */
-class CoreExport Channel : public Extensible, public InviteBase<Channel>
+class CoreExport Channel : public Extensible
 {
+ public:
+	/** A map of Memberships on a channel keyed by User pointers
+	 */
+ 	typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
+
+ private:
 	/** Set default modes for the channel on creation
 	 */
 	void SetDefaultModes();
 
 	/** Modes for the channel.
-	 * 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.
+	 * It is a bitset where each item in it represents if a mode is set.
+	 * To see if a mode is set, inspect modes[mh->modeid]
 	 */
-	std::bitset<64> modes;
+	std::bitset<ModeParser::MODEID_MAX> modes;
 
 	/** Remove the given membership from the channel's internal map of
 	 * memberships and destroy the Membership object.
 	 * This function does not remove the channel from User::chanlist.
 	 * Since the parameter is an iterator to the target, the complexity
 	 * of this function is constant.
-	 * @param membiter The UserMembIter to remove, must be valid
+	 * @param membiter The MemberMap iterator to remove, must be valid
 	 */
-	void DelUser(const UserMembIter& membiter);
+	void DelUser(const MemberMap::iterator& membiter);
 
  public:
 	/** Creates a channel record and initialises it with default values
@@ -86,7 +90,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 
 	/** User list.
 	 */
-	UserMembList userlist;
+	MemberMap userlist;
 
 	/** Channel topic.
 	 * If this is an empty string, no channel topic is set.
@@ -113,7 +117,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	  * @param mode The mode character you wish to query
 	  * @return True if the custom mode is set, false if otherwise
 	  */
-	inline bool IsModeSet(ModeHandler* mode) { return modes[mode->GetModeChar()-'A']; }
+	bool IsModeSet(ModeHandler* mode) { return ((mode->GetId() != ModeParser::MODEID_MAX) && (modes[mode->GetId()])); }
 	bool IsModeSet(ModeHandler& mode) { return IsModeSet(&mode); }
 	bool IsModeSet(ChanModeReference& mode);
 
@@ -168,7 +172,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 *
 	 * @return This function returns pointer to a map of User pointers (CUList*).
 	 */
-	const UserMembList* GetUsers() const { return &userlist; }
+	const MemberMap& GetUsers() const { return userlist; }
 
 	/** Returns true if the user given is on the given channel.
 	 * @param user The user to look for
@@ -180,11 +184,22 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 
 	/** Make src kick user from this channel with the given reason.
 	 * @param src The source of the kick
-	 * @param user The user being kicked (must be on this channel)
+	 * @param victimiter Iterator to the user being kicked, must be valid
+	 * @param reason The reason for the kick
+	 */
+	void KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason);
+
+	/** Make src kick user from this channel with the given reason.
+	 * @param src The source of the kick
+	 * @param user The user being kicked
 	 * @param reason The reason for the kick
-	 * @param srcmemb The membership of the user who does the kick, can be NULL
 	 */
-	void KickUser(User* src, User* user, const std::string& reason, Membership* srcmemb = NULL);
+	void KickUser(User* src, User* user, const std::string& reason)
+	{
+		MemberMap::iterator it = userlist.find(user);
+		if (it != userlist.end())
+			KickUser(src, it, reason);
+	}
 
 	/** Part a user from this channel with the given reason.
 	 * If the reason field is NULL, no reason will be sent.
@@ -209,8 +224,9 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 * @param privs Priviliges (prefix mode letters) to give to this user, may be NULL
 	 * @param bursting True if this join is the result of a netburst (passed to modules in the OnUserJoin hook)
 	 * @param created_by_local True if this channel was just created by a local user (passed to modules in the OnUserJoin hook)
+	 * @return A newly created Membership object, or NULL if the user was already inside the channel or if the user is a server user
 	 */
-	void ForceJoin(User* user, const std::string* privs = NULL, bool bursting = false, bool created_by_local = false);
+	Membership* ForceJoin(User* user, const std::string* privs = NULL, bool bursting = false, bool created_by_local = false);
 
 	/** Write to a channel, from a user, using va_args for text
 	 * @param user User whos details to prefix the line with
@@ -289,11 +305,6 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 */
 	const char* ChanModes(bool showkey);
 
-	/** Spool the NAMES list for this channel to the given user
-	 * @param user The user to spool the NAMES list to
-	 */
-	void UserList(User *user);
-
 	/** Get the value of a users prefix on this channel.
 	 * @param user The user to look up
 	 * @return The module or core-defined value of the users prefix.