X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=5ab791eeeca31bf343d59753d97a77e432a89aa8;hb=7b7e82bec5ab5a39d88896fc7433125fd0c684de;hp=aa11a2b82ac5b2adb52452cc17691002c5899f67;hpb=03a623a284b6c9f2f11f549c55333c45c4d91eab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index aa11a2b82..5ab791eee 100644
--- a/include/users.h
+++ b/include/users.h
@@ -241,11 +241,11 @@ class CoreExport User : public Extensible
 
 	/** The user's mode list.
 	 * Much love to the STL for giving us an easy to use bitset, saving us RAM.
-	 * if (modes[modeletter-65]) is set, then the mode is
-	 * set, for example, to work out if mode +s is set, we check the field
-	 * User::modes['s'-65] != 0.
+	 * if (modes[modeid]) is set, then the mode is set.
+	 * For example, to work out if mode +i is set, we check the field
+	 * User::modes[invisiblemode->modeid] == true.
 	 */
-	std::bitset<64> modes;
+	std::bitset<ModeParser::MODEID_MAX> modes;
 
  public:
 
@@ -306,7 +306,7 @@ class CoreExport User : public Extensible
 
 	/** The server the user is connected to.
 	 */
-	const std::string server;
+	Server* server;
 
 	/** The user's away message.
 	 * If this string is empty, the user is not marked as away.
@@ -328,10 +328,6 @@ class CoreExport User : public Extensible
 	 */
 	unsigned int registered:3;
 
-	/** Whether or not to send an snotice about this user's quitting
-	 */
-	unsigned int quietquit:1;
-
 	/** If this is set to true, then all socket operations for the user
 	 * are dropped into the bit-bucket.
 	 * This value is set by QuitUser, and is not needed seperately from that call.
@@ -361,7 +357,7 @@ class CoreExport User : public Extensible
 	/** Constructor
 	 * @throw CoreException if the UID allocated to the user already exists
 	 */
-	User(const std::string &uid, const std::string& srv, int objtype);
+	User(const std::string& uid, Server* srv, int objtype);
 
 	/** Returns the full displayed host of the user
 	 * This member function returns the hostname of the user as seen by other users
@@ -473,7 +469,7 @@ class CoreExport User : public Extensible
 	 * @param newnick The nickname to change to
 	 * @return True if the nickchange was successful.
 	 */
-	bool ForceNickChange(const std::string& newnick) { return ChangeNick(newnick, true); }
+	bool ForceNickChange(const std::string& newnick, time_t newts = 0) { return ChangeNick(newnick, true, newts); }
 
 	/** Oper down.
 	 * This will clear the +o usermode and unset the user's oper type
@@ -505,10 +501,16 @@ class CoreExport User : public Extensible
 	 */
 	void WriteServ(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
+	/** Sends a command to this user.
+	 * @param command The command to be sent.
+	 * @param text The message to send.
+	 */
+	void WriteCommand(const char* command, const std::string& text);
+
 	/** Sends a server notice to this user.
 	 * @param text The contents of the message to send.
 	 */
-	void WriteNotice(const std::string& text);
+	void WriteNotice(const std::string& text) { this->WriteCommand("NOTICE", ":" + text); }
 
 	void WriteNumeric(unsigned int numeric, const char* text, ...) CUSTOM_PRINTF(3, 4);
 
@@ -618,7 +620,7 @@ class CoreExport User : public Extensible
 	 * @param force True if the change is being forced (should not be blocked by modes like +N)
 	 * @return True if the change succeeded
 	 */
-	bool ChangeNick(const std::string& newnick, bool force = false);
+	bool ChangeNick(const std::string& newnick, bool force = false, time_t newts = 0);
 
 	/** Send a command to all local users from this user
 	 * The command given must be able to send text with the
@@ -659,7 +661,7 @@ class CoreExport UserIOHandler : public StreamSocket
 
 typedef unsigned int already_sent_t;
 
-class CoreExport LocalUser : public User, public InviteBase
+class CoreExport LocalUser : public User, public InviteBase<LocalUser>, public intrusive_list_node<LocalUser>
 {
  public:
 	LocalUser(int fd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
@@ -667,10 +669,6 @@ class CoreExport LocalUser : public User, public InviteBase
 
 	UserIOHandler eh;
 
-	/** Position in UserManager::local_users
-	 */
-	LocalUserList::iterator localuseriter;
-
 	/** Stats counter for bytes inbound
 	 */
 	unsigned int bytes_in;
@@ -822,7 +820,7 @@ class CoreExport LocalUser : public User, public InviteBase
 class CoreExport RemoteUser : public User
 {
  public:
-	RemoteUser(const std::string& uid, const std::string& srv) : User(uid, srv, USERTYPE_REMOTE)
+	RemoteUser(const std::string& uid, Server* srv) : User(uid, srv, USERTYPE_REMOTE)
 	{
 	}
 	virtual void SendText(const std::string& line);
@@ -831,9 +829,15 @@ class CoreExport RemoteUser : public User
 class CoreExport FakeUser : public User
 {
  public:
-	FakeUser(const std::string &uid, const std::string& srv) : User(uid, srv, USERTYPE_SERVER)
+	FakeUser(const std::string& uid, Server* srv) : User(uid, srv, USERTYPE_SERVER)
+	{
+		nick = srv->GetName();
+	}
+
+	FakeUser(const std::string& uid, const std::string& sname, const std::string& sdesc)
+		: User(uid, new Server(sname, sdesc), USERTYPE_SERVER)
 	{
-		nick = srv;
+		nick = sname;
 	}
 
 	virtual CullResult cull();
@@ -861,8 +865,7 @@ inline FakeUser* IS_SERVER(User* u)
 
 inline bool User::IsModeSet(ModeHandler* mh)
 {
-	char m = mh->GetModeChar();
-	return (modes[m-65]);
+	return (modes[mh->GetId()]);
 }
 
 inline bool User::IsModeSet(UserModeReference& moderef)
@@ -874,6 +877,5 @@ inline bool User::IsModeSet(UserModeReference& moderef)
 
 inline void User::SetMode(ModeHandler* mh, bool value)
 {
-	char m = mh->GetModeChar();
-	modes[m-65] = value;
+	modes[mh->GetId()] = value;
 }