X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=0e660d0982e1360f2856c4e9b1e8b17f8c6d7f6d;hb=882084defcc43c876ecb10e30086b63ac074fcad;hp=c9401933571d8191671244450f43e497458190f7;hpb=23e8bba13c55d33ce89d505780da36c9589e300a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index c94019335..0e660d098 100644
--- a/include/users.h
+++ b/include/users.h
@@ -400,19 +400,6 @@ class CoreExport User : public Extensible
 	 */
 	void InvalidateCache();
 
-	/** Create a displayable mode string for this users snomasks
-	 * @return The notice mask character sequence
-	 */
-	const char* FormatNoticeMasks();
-
-	/** Process a snomask modifier string, e.g. +abc-de
-	 * @param sm A sequence of notice mask characters
-	 * @return The cleaned mode sequence which can be output,
-	 * e.g. in the above example if masks c and e are not
-	 * valid, this function will return +ab-d
-	 */
-	std::string ProcessNoticeMasks(const char *sm);
-
 	/** Returns whether this user is currently away or not. If true,
 	 * further information can be found in User::awaymsg and User::awaytime
 	 * @return True if the user is away, false otherwise
@@ -431,12 +418,6 @@ class CoreExport User : public Extensible
 	 */
 	bool IsNoticeMaskSet(unsigned char sm);
 
-	/** Changed a specific notice mask value
-	 * @param sm The server notice mask to change
-	 * @param value An on/off value for this mask
-	 */
-	void SetNoticeMask(unsigned char sm, bool value);
-
 	/** Create a displayable mode string for this users umodes
 	 * @param showparameters The mode string
 	 */
@@ -447,12 +428,17 @@ class CoreExport User : public Extensible
 	 * @return True if the mode is set
 	 */
 	bool IsModeSet(unsigned char m);
+	bool IsModeSet(ModeHandler* mh);
+	bool IsModeSet(ModeHandler& mh) { return IsModeSet(&mh); }
+	bool IsModeSet(UserModeReference& moderef);
 
 	/** Set a specific usermode to on or off
 	 * @param m The user mode
 	 * @param value On or off setting of the mode
 	 */
 	void SetMode(unsigned char m, bool value);
+	void SetMode(ModeHandler* mh, bool value);
+	void SetMode(ModeHandler& mh, bool value) { SetMode(&mh, value); }
 
 	/** Returns true or false for if a user can execute a privilaged oper command.
 	 * This is done by looking up their oper type from User::oper, then referencing
@@ -481,12 +467,6 @@ class CoreExport User : public Extensible
 	 */
 	virtual bool HasModePermission(unsigned char mode, ModeType type);
 
-	/** Creates a wildcard host.
-	 * Takes a buffer to use and fills the given buffer with the host in the format *!*\@hostname
-	 * @return The wildcarded hostname in *!*\@host form
-	 */
-	char* MakeWildHost();
-
 	/** Creates a usermask with real host.
 	 * Takes a buffer to use and fills the given buffer with the hostmask in the format user\@host
 	 * @return the usermask in the format user\@host
@@ -511,7 +491,7 @@ class CoreExport User : public Extensible
 	 * @param newnick The nickname to change to
 	 * @return True if the nickchange was successful.
 	 */
-	inline bool ForceNickChange(const char* newnick) { return ChangeNick(newnick, true); }
+	bool ForceNickChange(const std::string& newnick) { return ChangeNick(newnick, true); }
 
 	/** Oper down.
 	 * This will clear the +o usermode and unset the user's oper type
@@ -604,10 +584,10 @@ class CoreExport User : public Extensible
 	void WriteCommonQuit(const std::string &normal_text, const std::string &oper_text);
 
 	/** Dump text to a user target, splitting it appropriately to fit
-	 * @param LinePrefix text to prefix each complete line with
-	 * @param TextStream the text to send to the user
+	 * @param linePrefix text to prefix each complete line with
+	 * @param textStream the text to send to the user
 	 */
-	void SendText(const std::string &LinePrefix, std::stringstream &TextStream);
+	void SendText(const std::string& linePrefix, std::stringstream& textStream);
 
 	/** Write to the user, routing the line if the user is remote.
 	 */
@@ -752,7 +732,7 @@ class CoreExport LocalUser : public User, public InviteBase
 
 	/** Call this method to find the matching \<connect> for a user, and to check them against it.
 	 */
-	void CheckClass();
+	void CheckClass(bool clone_count = true);
 
 	/** Server address and port that this user is connected to.
 	 */
@@ -824,7 +804,7 @@ class CoreExport LocalUser : public User, public InviteBase
 	InviteList& GetInviteList();
 
 	/** Returns true if a user is invited to a channel.
-	 * @param channel A channel to look up
+	 * @param chan A channel to look up
 	 * @return True if the user is invited to the given channel
 	 */
 	bool IsInvited(Channel* chan) { return (Invitation::Find(chan, this) != NULL); }
@@ -832,7 +812,7 @@ class CoreExport LocalUser : public User, public InviteBase
 	/** Removes a channel from a users invite list.
 	 * This member function is called on successfully joining an invite only channel
 	 * to which the user has previously been invited, to clear the invitation.
-	 * @param channel The channel to remove the invite to
+	 * @param chan The channel to remove the invite to
 	 * @return True if the user was invited to the channel and the invite was erased, false if the user wasn't invited
 	 */
 	bool RemoveInvite(Channel* chan);
@@ -907,3 +887,21 @@ inline FakeUser* IS_SERVER(User* u)
 	return u->usertype == USERTYPE_SERVER ? static_cast<FakeUser*>(u) : NULL;
 }
 
+inline bool User::IsModeSet(ModeHandler* mh)
+{
+	char m = mh->GetModeChar();
+	return (modes[m-65]);
+}
+
+inline bool User::IsModeSet(UserModeReference& moderef)
+{
+	if (!moderef)
+		return false;
+	return IsModeSet(*moderef);
+}
+
+inline void User::SetMode(ModeHandler* mh, bool value)
+{
+	char m = mh->GetModeChar();
+	modes[m-65] = value;
+}