X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=505c43b9e621fcc570707989af43e97095cfb2ab;hb=01c23b31f7d0ea87052cd22814af826ecb11f0f3;hp=19d78ec23c37314d2b24f0cddbc98edb7c93c396;hpb=b31f343eacdf248aebd6869f2190a3464fd5d555;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index 19d78ec23..505c43b9e 100644
--- a/include/users.h
+++ b/include/users.h
@@ -18,19 +18,6 @@
 #include "dns.h"
 #include "mode.h"
 
-/** Channel status for a user
- */
-enum ChanStatus {
-	/** Op */
-	STATUS_OP     = 4,
-	/** Halfop */
-	STATUS_HOP    = 2,
-	/** Voice */
-	STATUS_VOICE  = 1,
-	/** None */
-	STATUS_NORMAL = 0
-};
-
 /** connect class types
  */
 enum ClassTypes {
@@ -208,7 +195,7 @@ typedef std::vector<ConnectClass*> ClassVector;
 
 /** Typedef for the list of user-channel records for a user
  */
-typedef std::map<Channel*, char> UserChanList;
+typedef std::set<Channel*> UserChanList;
 
 /** Shorthand for an iterator into a UserChanList
  */
@@ -218,27 +205,6 @@ typedef UserChanList::iterator UCListIter;
  */
 class User;
 
-/** Visibility data for a user.
- * If a user has a non-null instance of this class in their User,
- * then it is used to determine if this user is visible to other users
- * or not.
- */
-class CoreExport VisData
-{
- public:
-	/** Create a visdata
-	 */
-	VisData();
-	/** Destroy a visdata
-	 */
-	virtual ~VisData();
-	/** Is this user visible to some other user?
-	 * @param user The other user to compare to
-	 * @return true True if the user is visible to the other user, false if not
-	 */
-	virtual bool VisibleTo(User* user);
-};
-
 /** Holds all information about a user
  * This class stores all information about a user connected to the irc server. Everything about a
  * connection is stored here primarily, from the user's socket ID (file descriptor) through to the
@@ -289,21 +255,14 @@ class CoreExport User : public EventHandler
 	std::bitset<64> AllowedChanModes;
 
  public:
-	/** Pointer to creator.
-	 * This is required to make use of core functions
-	 * from within the User class.
-	 */
-	InspIRCd* ServerInstance;
+	static LocalIntExt NICKForced;
+	static LocalStringExt OperQuit;
 
 	/** Contains a pointer to the connect class a user is on from - this will be NULL for remote connections.
 	 * The pointer is guarenteed to *always* be valid. :)
 	 */
 	ConnectClass *MyClass;
 
-	/** User visibility state, see definition of VisData.
-	 */
-	VisData* Visibility;
-
 	/** Hostname of connection.
 	 * This should be valid as per RFC1035.
 	 */
@@ -457,14 +416,6 @@ class CoreExport User : public EventHandler
 	 */
 	std::string sendq;
 
-	/** Message user will quit with. Not to be set externally.
-	 */
-	std::string quitmsg;
-
-	/** Quit message shown to opers - not to be set externally.
-	 */
-	std::string operquitmsg;
-
 	/** Whether or not to send an snotice about this user's quitting
 	 */
 	bool quietquit;
@@ -952,16 +903,6 @@ class CoreExport User : public EventHandler
 	 */
 	void ShowRULES();
 
-	/** Set oper-specific quit message shown to opers only when the user quits
-	 * (overrides any sent by QuitUser)
-	 */
-	void SetOperQuit(const std::string &oquit);
-
-	/** Get oper-specific quit message shown only to opers when the user quits.
-	 * (overrides any sent by QuitUser)
-	 */
-	const std::string& GetOperQuit();
-
 	/** Increases a user's command penalty by a set amount.
 	 */
 	void IncreasePenalty(int increase);
@@ -1020,7 +961,4 @@ class CoreExport UserResolver : public Resolver
 	void OnError(ResolverError e, const std::string &errormessage);
 };
 
-/* Configuration callbacks */
-//class ServerConfig;
-
 #endif