Remove now needless User::ForceNickChange()

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

diff --git a/include/users.h b/include/users.h
index 6a61b2bc1b5015eca081fa3caf774e7f92d20b0b..4029daa5346bccd899d44853a5c44cc6f9971fd7 100644 (file)
--- 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:
 
@@ -462,15 +462,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) { return ChangeNick(newnick, true); }
-
        /** Oper down.
         * This will clear the +o usermode and unset the user's oper type
         */
@@ -501,10 +492,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);
 
@@ -523,19 +520,6 @@ class CoreExport User : public Extensible
         */
        void WriteFrom(User *user, const char* text, ...) CUSTOM_PRINTF(3, 4);
 
-       /** Write text to the user provided in the first parameter, appending CR/LF, and prepending THIS user's :nick!user\@host.
-        * @param dest The user to route the message to
-        * @param data A std::string to send to the user
-        */
-       void WriteTo(User *dest, const std::string &data);
-
-       /** Write text to the user provided in the first parameter, appending CR/LF, and prepending THIS user's :nick!user\@host.
-        * @param dest The user to route the message to
-        * @param data The format string for text to send to the user
-        * @param ... POD-type format arguments
-        */
-       void WriteTo(User *dest, const char *data, ...) CUSTOM_PRINTF(3, 4);
-
        /** Write to all users that can see this user (including this user in the list if include_self is true), appending CR/LF
         * @param line A std::string to send to the users
         * @param include_self Should the message be sent back to the author?
@@ -548,12 +532,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
@@ -611,20 +589,9 @@ class CoreExport User : public Extensible
 
        /** 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)
         * @return True if the change succeeded
         */
-       bool ChangeNick(const std::string& newnick, bool force = false);
-
-       /** Send a command to all local users from this user
-        * The command given must be able to send text with the
-        * first parameter as a servermask (e.g. $*), so basically
-        * you should use PRIVMSG or NOTICE.
-        * @param command the command to send
-        * @param text The text format string to send
-        * @param ... Format arguments
-        */
-       void SendAll(const char* command, const char* text, ...) CUSTOM_PRINTF(3, 4);
+       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!
@@ -859,8 +826,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)
@@ -872,6 +838,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;
 }