Add InspIRCd::GetChans(), remove ChannelCount()

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 04d2114dc188057882dd17af082cf5751b838847..1c13ac4efcf3fe7e5dedcb3ba0a882d1bd9dd016 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -40,9 +40,8 @@ bool User::IsNoticeMaskSet(unsigned char sm)
 
 bool User::IsModeSet(unsigned char m)
 {
-       if (!isalpha(m))
-               return false;
-       return (modes[m-65]);
+       ModeHandler* mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER);
+       return (mh && modes[mh->GetId()]);
 }
 
 const char* User::FormatModes(bool showparameters)
@@ -53,11 +52,11 @@ const char* User::FormatModes(bool showparameters)
 
        for (unsigned char n = 0; n < 64; n++)
        {
-               if (modes[n])
+               ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+               if (mh && IsModeSet(mh))
                {
                        data.push_back(n + 65);
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
-                       if (showparameters && mh && mh->GetNumParams(true))
+                       if (showparameters && mh->GetNumParams(true))
                        {
                                std::string p = mh->GetUserParameter(this);
                                if (p.length())
@@ -614,7 +613,7 @@ void User::InvalidateCache()
        cached_fullrealhost.clear();
 }
 
-bool User::ChangeNick(const std::string& newnick, bool force)
+bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
 {
        if (quitting)
        {
@@ -638,6 +637,7 @@ bool User::ChangeNick(const std::string& newnick, bool force)
        {
                // case change, don't need to check Q:lines and such
                // and, if it's identical including case, we can leave right now
+               // We also don't update the nick TS if it's a case change, either
                if (newnick == nick)
                        return true;
        }
@@ -711,6 +711,8 @@ bool User::ChangeNick(const std::string& newnick, bool force)
                                return false;
                        }
                }
+
+               age = newts ? newts : ServerInstance->Time();
        }
 
        if (this->registered == REG_ALL)
@@ -818,7 +820,7 @@ void User::Write(const char *text, ...)
 
 void LocalUser::Write(const std::string& text)
 {
-       if (!ServerInstance->SE->BoundsCheckFd(&eh))
+       if (!SocketEngine::BoundsCheckFd(&eh))
                return;
 
        if (text.length() > ServerInstance->Config->Limits.MaxLine - 2)
@@ -1074,9 +1076,6 @@ void User::SendText(const std::string& linePrefix, std::stringstream& textStream
  */
 bool User::SharesChannelWith(User *other)
 {
-       if ((this->registered != REG_ALL) || (other->registered != REG_ALL))
-               return false;
-
        /* Outer loop */
        for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
        {
@@ -1122,7 +1121,7 @@ bool User::ChangeDisplayedHost(const std::string& shost)
 
        FOREACH_MOD(OnChangeHost, (this,shost));
 
-       this->dhost.assign(shost, 0, 64);
+       this->dhost.assign(shost, 0, ServerInstance->Config->Limits.MaxHost);
        this->InvalidateCache();
 
        if (IS_LOCAL(this))