m_spanningtree Rewrite PING logic to use Timers

[user/henk/code/inspircd.git] / include / users.h

diff --git a/include/users.h b/include/users.h
index ed1abd37f4fdb071f436bcf0acd98e1caacad14a..ceee4396bece7ef01ffe2479dfc139a5a73ebe06 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -248,6 +248,9 @@ class CoreExport User : public Extensible
        std::bitset<ModeParser::MODEID_MAX> modes;
 
  public:
+       /** List of Memberships for this user
+        */
+       typedef insp::intrusive_list<Membership> ChanList;
 
        /** Hostname of connection.
         * This should be valid as per RFC1035.
@@ -302,7 +305,7 @@ class CoreExport User : public Extensible
 
        /** Channels this user is on
         */
-       UserChanList chans;
+       ChanList chans;
 
        /** The server the user is connected to.
         */
@@ -462,15 +465,6 @@ class CoreExport User : public Extensible
         */
        void Oper(OperInfo* info);
 
-       /** Force a nickname change.
-        * If the nickname change fails (for example, because the nick in question
-        * already exists) this function will return false, and you must then either
-        * output an error message, or quit the user for nickname collision.
-        * @param newnick The nickname to change to
-        * @return True if the nickchange was successful.
-        */
-       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
         */
@@ -541,12 +535,6 @@ class CoreExport User : public Extensible
         */
        void WriteCommon(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
-       /** Write to all users that can see this user (not including this user in the list), appending CR/LF
-        * @param text The format string for text to send to the users
-        * @param ... POD-type format arguments
-        */
-       void WriteCommonExcept(const char* text, ...) CUSTOM_PRINTF(2, 3);
-
        /** Write a quit message to all common users, as in User::WriteCommonExcept but with a specific
         * quit message for opers only.
         * @param normal_text Normal user quit message
@@ -603,11 +591,10 @@ class CoreExport User : public Extensible
        bool ChangeName(const std::string& gecos);
 
        /** Change a user's nick
-        * @param newnick The new nick
-        * @param force True if the change is being forced (should not be blocked by modes like +N)
+        * @param newnick The new nick. If equal to the users uuid, the nick change always succeeds.
         * @return True if the change succeeded
         */
-       bool ChangeNick(const std::string& newnick, bool force = false, time_t newts = 0);
+       bool ChangeNick(const std::string& newnick, time_t newts = 0);
 
        /** Remove this user from all channels they are on, and delete any that are now empty.
         * This is used by QUIT, and will not send part messages!
@@ -638,7 +625,7 @@ class CoreExport UserIOHandler : public StreamSocket
 
 typedef unsigned int already_sent_t;
 
-class CoreExport LocalUser : public User, public InviteBase<LocalUser>, public intrusive_list_node<LocalUser>
+class CoreExport LocalUser : public User, public InviteBase<LocalUser>, public insp::intrusive_list_node<LocalUser>
 {
  public:
        LocalUser(int fd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);