X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fchannels.h;h=be872b7fe7bb55dca3cda73d5e466835a4e4294a;hb=754f0130893bacb2b69a32c3de9ed1b3da9659cd;hp=95c516a057db9173c2b73f7f788712e545864031;hpb=04ece67c3d8534f74a3d75ec77378cb57a9c044e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/channels.h b/include/channels.h
index 95c516a05..be872b7fe 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -34,12 +34,12 @@
  * 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*, Membership*> MemberMap;
+ 	typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
 
  private:
 	/** Set default modes for the channel on creation
@@ -57,9 +57,9 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 * 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
@@ -138,8 +138,11 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	/** Sets the channel topic.
 	 * @param user The user setting the topic.
 	 * @param topic The topic to set it to.
+	 * @param topicts Timestamp of the new topic.
+	 * @param setter Setter string, may be used when the original setter is no longer online.
+	 * If omitted or NULL, the setter string is obtained from the user.
 	 */
-	void SetTopic(User* user, const std::string& topic);
+	void SetTopic(User* user, const std::string& topic, time_t topicts, const std::string* setter = NULL);
 
 	/** Obtain the channel "user counter"
 	 * This returns the number of users on this channel
@@ -187,7 +190,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 * @param victimiter Iterator to the user being kicked, must be valid
 	 * @param reason The reason for the kick
 	 */
-	void KickUser(User* src, const UserMembIter& victimiter, const std::string& reason);
+	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
@@ -196,7 +199,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 */
 	void KickUser(User* src, User* user, const std::string& reason)
 	{
-		UserMembIter it = userlist.find(user);
+		MemberMap::iterator it = userlist.find(user);
 		if (it != userlist.end())
 			KickUser(src, it, reason);
 	}
@@ -205,8 +208,9 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	 * If the reason field is NULL, no reason will be sent.
 	 * @param user The user who is parting (must be on this channel)
 	 * @param reason The part reason
+	 * @return True if the user was on the channel and left, false if they weren't and nothing happened
 	 */
-	void PartUser(User *user, std::string &reason);
+	bool PartUser(User* user, std::string& reason);
 
 	/** Join a local user to a channel, with or without permission checks. May be a channel that doesn't exist yet.
 	 * @param user The user to join to the channel.
@@ -305,12 +309,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
-	 * @param isinside If true, the user is inside the channel, if not then false
-	 */
-	void UserList(User* user, bool isinside = true);
-
 	/** 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.
@@ -337,6 +335,11 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
 	/** Get the status of an "action" type extban
 	 */
 	ModResult GetExtBanStatus(User *u, char type);
+
+	/** Write a NOTICE to all local users on the channel
+	 * @param text Text to send
+	 */
+	void WriteNotice(const std::string& text);
 };
 
 inline bool Channel::HasUser(User* user)