Replace hardcoded mode letters passed to IsModeSet() and GetModeParameter() with...

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 09b4e8dc98929c0c2f07e17b9d5856af3c3ecf57..8c59e68939d68a1c20f8727bf86b8e5959f78515 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -44,11 +44,6 @@ Channel::Channel(const std::string &cname, time_t ts)
        modes.reset();
 }
 
-void Channel::SetMode(char mode,bool mode_on)
-{
-       modes[mode-65] = mode_on;
-}
-
 void Channel::SetMode(ModeHandler* mh, bool on)
 {
        modes[mh->GetModeChar() - 65] = on;
@@ -333,16 +328,16 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 
 void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
 {
-       Membership* memb = this->AddUser(user);
-       if (!memb)
-               return; // Already on the channel
-
        if (IS_SERVER(user))
        {
                ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
                return;
        }
 
+       Membership* memb = this->AddUser(user);
+       if (!memb)
+               return; // Already on the channel
+
        user->chans.insert(this);
 
        if (privs)