]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/channels.cpp
Add support for blocking tag messages with the deaf mode.
[user/henk/code/inspircd.git] / src / channels.cpp
index 19b1281d5b3bf56e04579404c3f0a7c21d49d807..67f908195de95eb130bdec2bdccd8c46be25154f 100644 (file)
@@ -1,13 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2014, 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006, 2008 Oliver Lupton <oliverlupton@gmail.com>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
 
 #include "inspircd.h"
 #include "listmode.h"
-#include <cstdarg>
-#include "mode.h"
 
 namespace
 {
        ChanModeReference ban(NULL, "ban");
-       ChanModeReference inviteonlymode(NULL, "inviteonly");
-       ChanModeReference keymode(NULL, "key");
-       ChanModeReference limitmode(NULL, "limit");
-       ChanModeReference secretmode(NULL, "secret");
-       ChanModeReference privatemode(NULL, "private");
-       UserModeReference invisiblemode(NULL, "invisible");
 }
 
 Channel::Channel(const std::string &cname, time_t ts)
@@ -48,32 +42,42 @@ Channel::Channel(const std::string &cname, time_t ts)
 
 void Channel::SetMode(ModeHandler* mh, bool on)
 {
-       modes[mh->GetId()] = on;
+       if (mh && mh->GetId() != ModeParser::MODEID_MAX)
+               modes[mh->GetId()] = on;
 }
 
-void Channel::SetTopic(User* u, const std::string& ntopic)
+void Channel::SetTopic(User* u, const std::string& ntopic, time_t topicts, const std::string* setter)
 {
-       this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
-       this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
-       this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
-       this->topicset = ServerInstance->Time();
+       // Send a TOPIC message to the channel only if the new topic text differs
+       if (this->topic != ntopic)
+       {
+               this->topic = ntopic;
+               ClientProtocol::Messages::Topic topicmsg(u, this, this->topic);
+               Write(ServerInstance->GetRFCEvents().topic, topicmsg);
+       }
+
+       // Always update setter and set time
+       if (!setter)
+               setter = ServerInstance->Config->FullHostInTopic ? &u->GetFullHost() : &u->nick;
+       this->setby.assign(*setter, 0, ServerInstance->Config->Limits.GetMaxMask());
+       this->topicset = topicts;
 
        FOREACH_MOD(OnPostTopicChange, (u, this, this->topic));
 }
 
 Membership* Channel::AddUser(User* user)
 {
-       Membership*& memb = userlist[user];
-       if (memb)
+       std::pair<MemberMap::iterator, bool> ret = userlist.insert(std::make_pair(user, insp::aligned_storage<Membership>()));
+       if (!ret.second)
                return NULL;
 
-       memb = new Membership(user, this);
+       Membership* memb = new(ret.first->second) Membership(user, this);
        return memb;
 }
 
 void Channel::DelUser(User* user)
 {
-       UserMembIter it = userlist.find(user);
+       MemberMap::iterator it = userlist.find(user);
        if (it != userlist.end())
                DelUser(it);
 }
@@ -88,23 +92,21 @@ void Channel::CheckDestroy()
        if (res == MOD_RES_DENY)
                return;
 
+       // If the channel isn't in chanlist then it is already in the cull list, don't add it again
        chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
-       /* kill the record */
-       if (iter != ServerInstance->chanlist.end())
-       {
-               FOREACH_MOD(OnChannelDelete, (this));
-               ServerInstance->chanlist.erase(iter);
-       }
+       if ((iter == ServerInstance->chanlist.end()) || (iter->second != this))
+               return;
 
-       ClearInvites();
+       FOREACH_MOD(OnChannelDelete, (this));
+       ServerInstance->chanlist.erase(iter);
        ServerInstance->GlobalCulls.AddItem(this);
 }
 
-void Channel::DelUser(const UserMembIter& membiter)
+void Channel::DelUser(const MemberMap::iterator& membiter)
 {
        Membership* memb = membiter->second;
        memb->cull();
-       delete memb;
+       memb->~Membership();
        userlist.erase(membiter);
 
        // If this channel became empty then it should be removed
@@ -113,7 +115,7 @@ void Channel::DelUser(const UserMembIter& membiter)
 
 Membership* Channel::GetUser(User* user)
 {
-       UserMembIter i = userlist.find(user);
+       MemberMap::iterator i = userlist.find(user);
        if (i == userlist.end())
                return NULL;
        return i->second;
@@ -137,11 +139,19 @@ void Channel::SetDefaultModes()
                        if (mode->IsPrefixMode())
                                continue;
 
-                       if (mode->GetNumParams(true))
+                       if (mode->NeedsParam(true))
+                       {
                                list.GetToken(parameter);
+                               // If the parameter begins with a ':' then it's invalid
+                               if (parameter.c_str()[0] == ':')
+                                       continue;
+                       }
                        else
                                parameter.clear();
 
+                       if ((mode->NeedsParam(true)) && (parameter.empty()))
+                               continue;
+
                        mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
                }
        }
@@ -168,18 +178,20 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
        if (!override)
        {
                unsigned int maxchans = user->GetClass()->maxchans;
+               if (!maxchans)
+                       maxchans = ServerInstance->Config->MaxChans;
                if (user->IsOper())
                {
-                       unsigned int opermaxchans = ConvToInt(user->oper->getConfig("maxchans"));
+                       unsigned int opermaxchans = ConvToNum<unsigned int>(user->oper->getConfig("maxchans"));
                        // If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC
-                       if (!opermaxchans)
+                       if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit"))
                                opermaxchans = ServerInstance->Config->OperMaxChans;
                        if (opermaxchans)
                                maxchans = opermaxchans;
                }
                if (user->chans.size() >= maxchans)
                {
-                       user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s :You are on too many channels", cname.c_str());
+                       user->WriteNumeric(ERR_TOOMANYCHANNELS, cname, "You are on too many channels");
                        return NULL;
                }
        }
@@ -226,62 +238,17 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                                return NULL;
 
                        // If no module returned MOD_RES_DENY or MOD_RES_ALLOW (which is the case
-                       // most of the time) then proceed to check channel modes +k, +i, +l and bans,
-                       // in this order.
+                       // most of the time) then proceed to check channel bans.
+                       //
                        // If a module explicitly allowed the join (by returning MOD_RES_ALLOW),
                        // then this entire section is skipped
                        if (MOD_RESULT == MOD_RES_PASSTHRU)
                        {
-                               std::string ckey = chan->GetModeParameter(keymode);
-                               bool invited = user->IsInvited(chan);
-                               bool can_bypass = ServerInstance->Config->InvBypassModes && invited;
-
-                               if (!ckey.empty())
-                               {
-                                       FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, chan, key));
-                                       if (!MOD_RESULT.check((ckey == key) || can_bypass))
-                                       {
-                                               // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
-                                               user->WriteNumeric(ERR_BADCHANNELKEY, "%s :Cannot join channel (Incorrect channel key)", chan->name.c_str());
-                                               return NULL;
-                                       }
-                               }
-
-                               if (chan->IsModeSet(inviteonlymode))
+                               if (chan->IsBanned(user))
                                {
-                                       FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
-                                       if (!MOD_RESULT.check(invited))
-                                       {
-                                               user->WriteNumeric(ERR_INVITEONLYCHAN, "%s :Cannot join channel (Invite only)", chan->name.c_str());
-                                               return NULL;
-                                       }
-                               }
-
-                               std::string limit = chan->GetModeParameter(limitmode);
-                               if (!limit.empty())
-                               {
-                                       FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
-                                       if (!MOD_RESULT.check((chan->GetUserCounter() < atol(limit.c_str()) || can_bypass)))
-                                       {
-                                               user->WriteNumeric(ERR_CHANNELISFULL, "%s :Cannot join channel (Channel is full)", chan->name.c_str());
-                                               return NULL;
-                                       }
-                               }
-
-                               if (chan->IsBanned(user) && !can_bypass)
-                               {
-                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s :Cannot join channel (You're banned)", chan->name.c_str());
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
                                        return NULL;
                                }
-
-                               /*
-                                * If the user has invites for this channel, remove them now
-                                * after a successful join so they don't build up.
-                                */
-                               if (invited)
-                               {
-                                       user->RemoveInvite(chan);
-                               }
                        }
                }
        }
@@ -292,24 +259,24 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
        return chan;
 }
 
-void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
+Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
 {
        if (IS_SERVER(user))
        {
                ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
-               return;
+               return NULL;
        }
 
        Membership* memb = this->AddUser(user);
        if (!memb)
-               return; // Already on the channel
+               return NULL; // Already on the channel
 
        user->chans.push_front(memb);
 
        if (privs)
        {
-               // If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a
-               // remote user and his own server set the modes), then set them internally now
+               // If the user was granted prefix modes (in the OnUserPreJoin hook, or they're a
+               // remote user and their own server set the modes), then set them internally now
                for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
                {
                        PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
@@ -326,30 +293,11 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
        CUList except_list;
        FOREACH_MOD(OnUserJoin, (memb, bursting, created_by_local, except_list));
 
-       this->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", this->name.c_str());
-
-       /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
-       if ((GetUserCounter() > 1) && (!memb->modes.empty()))
-       {
-               std::string ms = memb->modes;
-               for(unsigned int i=0; i < memb->modes.length(); i++)
-                       ms.append(" ").append(user->nick);
-
-               except_list.insert(user);
-               this->WriteAllExcept(user, !ServerInstance->Config->CycleHostsFromUser, 0, except_list, "MODE %s +%s", this->name.c_str(), ms.c_str());
-       }
-
-       if (IS_LOCAL(user))
-       {
-               if (this->topicset)
-               {
-                       user->WriteNumeric(RPL_TOPIC, "%s :%s", this->name.c_str(), this->topic.c_str());
-                       user->WriteNumeric(RPL_TOPICTIME, "%s %s %lu", this->name.c_str(), this->setby.c_str(), (unsigned long)this->topicset);
-               }
-               this->UserList(user);
-       }
+       ClientProtocol::Events::Join joinevent(memb);
+       this->Write(joinevent, 0, except_list);
 
        FOREACH_MOD(OnPostJoin, (memb));
+       return memb;
 }
 
 bool Channel::IsBanned(User* user)
@@ -361,6 +309,9 @@ bool Channel::IsBanned(User* user)
                return (result == MOD_RES_DENY);
 
        ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+       if (!banlm)
+               return false;
+
        const ListModeBase::ModeList* bans = banlm->GetList(this);
        if (bans)
        {
@@ -389,12 +340,12 @@ bool Channel::CheckBan(User* user, const std::string& mask)
                return false;
 
        const std::string nickIdent = user->nick + "!" + user->ident;
-       std::string prefix = mask.substr(0, at);
+       std::string prefix(mask, 0, at);
        if (InspIRCd::Match(nickIdent, prefix, NULL))
        {
-               std::string suffix = mask.substr(at + 1);
-               if (InspIRCd::Match(user->host, suffix, NULL) ||
-                       InspIRCd::Match(user->dhost, suffix, NULL) ||
+               std::string suffix(mask, at + 1);
+               if (InspIRCd::Match(user->GetRealHost(), suffix, NULL) ||
+                       InspIRCd::Match(user->GetDisplayedHost(), suffix, NULL) ||
                        InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL))
                        return true;
        }
@@ -409,12 +360,18 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
                return rv;
 
        ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+       if (!banlm)
+               return MOD_RES_PASSTHRU;
+
        const ListModeBase::ModeList* bans = banlm->GetList(this);
        if (bans)
        {
                for (ListModeBase::ModeList::const_iterator it = bans->begin(); it != bans->end(); ++it)
                {
-                       if (CheckBan(user, it->mask))
+                       if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
+                               continue;
+
+                       if (CheckBan(user, it->mask.substr(2)))
                                return MOD_RES_DENY;
                }
        }
@@ -425,137 +382,42 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
  * Remove a channel from a users record, remove the reference to the Membership object
  * from the channel and destroy it.
  */
-void Channel::PartUser(User *user, std::string &reason)
+bool Channel::PartUser(User* user, std::string& reason)
 {
-       UserMembIter membiter = userlist.find(user);
-
-       if (membiter != userlist.end())
-       {
-               Membership* memb = membiter->second;
-               CUList except_list;
-               FOREACH_MOD(OnUserPart, (memb, reason, except_list));
-
-               WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
-
-               // Remove this channel from the user's chanlist
-               user->chans.erase(memb);
-               // Remove the Membership from this channel's userlist and destroy it
-               this->DelUser(membiter);
-       }
-}
-
-void Channel::KickUser(User* src, User* victim, const std::string& reason, Membership* srcmemb)
-{
-       UserMembIter victimiter = userlist.find(victim);
-       Membership* memb = ((victimiter != userlist.end()) ? victimiter->second : NULL);
-
-       if (!memb)
-       {
-               src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s :They are not on that channel", victim->nick.c_str(), this->name.c_str());
-               return;
-       }
+       MemberMap::iterator membiter = userlist.find(user);
 
-       // Do the following checks only if the KICK is done by a local user;
-       // each server enforces its own rules.
-       if (IS_LOCAL(src))
-       {
-               // Modules are allowed to explicitly allow or deny kicks done by local users
-               ModResult res;
-               FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
-               if (res == MOD_RES_DENY)
-                       return;
-
-               if (res == MOD_RES_PASSTHRU)
-               {
-                       if (!srcmemb)
-                               srcmemb = GetUser(src);
-                       unsigned int them = srcmemb ? srcmemb->getRank() : 0;
-                       unsigned int req = HALFOP_VALUE;
-                       for (std::string::size_type i = 0; i < memb->modes.length(); i++)
-                       {
-                               ModeHandler* mh = ServerInstance->Modes->FindMode(memb->modes[i], MODETYPE_CHANNEL);
-                               if (mh && mh->GetLevelRequired() > req)
-                                       req = mh->GetLevelRequired();
-                       }
-
-                       if (them < req)
-                       {
-                               src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
-                                       this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
-                               return;
-                       }
-               }
-       }
+       if (membiter == userlist.end())
+               return false;
 
+       Membership* memb = membiter->second;
        CUList except_list;
-       FOREACH_MOD(OnUserKick, (src, memb, reason, except_list));
-
-       WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), victim->nick.c_str(), reason.c_str());
-
-       victim->chans.erase(memb);
-       this->DelUser(victimiter);
-}
-
-void Channel::WriteChannel(User* user, const char* text, ...)
-{
-       std::string textbuffer;
-       VAFORMAT(textbuffer, text, text);
-       this->WriteChannel(user, textbuffer);
-}
-
-void Channel::WriteChannel(User* user, const std::string &text)
-{
-       const std::string message = ":" + user->GetFullHost() + " " + text;
-
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
-       {
-               if (IS_LOCAL(i->first))
-                       i->first->Write(message);
-       }
-}
+       FOREACH_MOD(OnUserPart, (memb, reason, except_list));
 
-void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...)
-{
-       std::string textbuffer;
-       VAFORMAT(textbuffer, text, text);
-       this->WriteChannelWithServ(ServName, textbuffer);
-}
+       ClientProtocol::Messages::Part partmsg(memb, reason);
+       Write(ServerInstance->GetRFCEvents().part, partmsg, 0, except_list);
 
-void Channel::WriteChannelWithServ(const std::string& ServName, const std::string &text)
-{
-       const std::string message = ":" + (ServName.empty() ? ServerInstance->Config->ServerName : ServName) + " " + text;
+       // Remove this channel from the user's chanlist
+       user->chans.erase(memb);
+       // Remove the Membership from this channel's userlist and destroy it
+       this->DelUser(membiter);
 
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
-       {
-               if (IS_LOCAL(i->first))
-                       i->first->Write(message);
-       }
+       return true;
 }
 
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
-void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
+void Channel::KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason)
 {
-       std::string textbuffer;
-       VAFORMAT(textbuffer, text, text);
-       this->WriteAllExceptSender(user, serversource, status, textbuffer);
-}
+       Membership* memb = victimiter->second;
+       CUList except_list;
+       FOREACH_MOD(OnUserKick, (src, memb, reason, except_list));
 
-void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
-{
-       std::string textbuffer;
-       VAFORMAT(textbuffer, text, text);
-       textbuffer = ":" + (serversource ? ServerInstance->Config->ServerName : user->GetFullHost()) + " " + textbuffer;
-       this->RawWriteAllExcept(user, serversource, status, except_list, textbuffer);
-}
+       ClientProtocol::Messages::Kick kickmsg(src, memb, reason);
+       Write(ServerInstance->GetRFCEvents().kick, kickmsg, 0, except_list);
 
-void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
-{
-       const std::string message = ":" + (serversource ? ServerInstance->Config->ServerName : user->GetFullHost()) + " " + text;
-       this->RawWriteAllExcept(user, serversource, status, except_list, message);
+       memb->user->chans.erase(memb);
+       this->DelUser(victimiter);
 }
 
-void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &out)
+void Channel::Write(ClientProtocol::Event& protoev, char status, const CUList& except_list)
 {
        unsigned int minrank = 0;
        if (status)
@@ -564,27 +426,21 @@ void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CULi
                if (mh)
                        minrank = mh->GetPrefixRank();
        }
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
+       for (MemberMap::iterator i = userlist.begin(); i != userlist.end(); i++)
        {
-               if (IS_LOCAL(i->first) && (except_list.find(i->first) == except_list.end()))
+               LocalUser* user = IS_LOCAL(i->first);
+               if ((user) && (!except_list.count(user)))
                {
                        /* User doesn't have the status we're after */
                        if (minrank && i->second->getRank() < minrank)
                                continue;
 
-                       i->first->Write(out);
+                       user->Send(protoev);
                }
        }
 }
 
-void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
-{
-       CUList except_list;
-       except_list.insert(user);
-       this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
-}
-
-const char* Channel::ChanModes(bool showkey)
+const char* Channel::ChanModes(bool showsecret)
 {
        static std::string scratch;
        std::string sparam;
@@ -603,9 +459,9 @@ const char* Channel::ChanModes(bool showkey)
                        if (!pm)
                                continue;
 
-                       if (n == 'k' - 65 && !showkey)
+                       if (pm->IsParameterSecret() && !showsecret)
                        {
-                               sparam += " <key>";
+                               sparam += " <" + pm->name + ">";
                        }
                        else
                        {
@@ -619,64 +475,16 @@ const char* Channel::ChanModes(bool showkey)
        return scratch.c_str();
 }
 
-/* compile a userlist of a channel into a string, each nick seperated by
- * spaces and op, voice etc status shown as @ and +, and send it to 'user'
- */
-void Channel::UserList(User* user, bool has_user)
+void Channel::WriteNotice(const std::string& text, char status)
 {
-       bool has_privs = user->HasPrivPermission("channels/auspex");
-       std::string list;
-       list.push_back(this->IsModeSet(secretmode) ? '@' : this->IsModeSet(privatemode) ? '*' : '=');
-       list.push_back(' ');
-       list.append(this->name).append(" :");
-       std::string::size_type pos = list.size();
-
-       const size_t maxlen = ServerInstance->Config->Limits.MaxLine - 10 - ServerInstance->Config->ServerName.size();
-       std::string prefixlist;
-       std::string nick;
-       for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i)
-       {
-               if ((!has_user) && (i->first->IsModeSet(invisiblemode)) && (!has_privs))
-               {
-                       /*
-                        * user is +i, and source not on the channel, does not show
-                        * nick in NAMES list
-                        */
-                       continue;
-               }
-
-               Membership* memb = i->second;
-
-               prefixlist.clear();
-               char prefix = memb->GetPrefixChar();
-               if (prefix)
-                       prefixlist.push_back(prefix);
-               nick = i->first->nick;
-
-               ModResult res;
-               FIRST_MOD_RESULT(OnNamesListItem, res, (user, memb, prefixlist, nick));
-
-               // See if a module wants us to exclude this user from NAMES
-               if (res == MOD_RES_DENY)
-                       continue;
-
-               if (list.size() + prefixlist.length() + nick.length() + 1 > maxlen)
-               {
-                       /* list overflowed into multiple numerics */
-                       user->WriteNumeric(RPL_NAMREPLY, list);
-
-                       // Erase all nicks, keep the constant part
-                       list.erase(pos);
-               }
-
-               list.append(prefixlist).append(nick).push_back(' ');
-       }
-
-       // Only send the user list numeric if there is at least one user in it
-       if (list.size() != pos)
-               user->WriteNumeric(RPL_NAMREPLY, list);
+       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, this, text, MSG_NOTICE, status);
+       Write(ServerInstance->GetRFCEvents().privmsg, privmsg);
+}
 
-       user->WriteNumeric(RPL_ENDOFNAMES, "%s :End of /NAMES list.", this->name.c_str());
+void Channel::WriteRemoteNotice(const std::string& text, char status)
+{
+       WriteNotice(text, status);
+       ServerInstance->PI->SendMessage(this, status, text, MSG_NOTICE);
 }
 
 /* returns the status character for a given user on a channel, e.g. @ for op,
@@ -713,25 +521,22 @@ unsigned int Membership::getRank()
        return rv;
 }
 
-const char* Membership::GetAllPrefixChars() const
+std::string Membership::GetAllPrefixChars() const
 {
-       static char prefix[64];
-       int ctr = 0;
-
+       std::string ret;
        for (std::string::const_iterator i = modes.begin(); i != modes.end(); ++i)
        {
                PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(*i);
                if (mh && mh->GetPrefix())
-                       prefix[ctr++] = mh->GetPrefix();
+                       ret.push_back(mh->GetPrefix());
        }
-       prefix[ctr] = 0;
 
-       return prefix;
+       return ret;
 }
 
 unsigned int Channel::GetPrefixValue(User* user)
 {
-       UserMembIter m = userlist.find(user);
+       MemberMap::iterator m = userlist.find(user);
        if (m == userlist.end())
                return 0;
        return m->second->getRank();
@@ -757,67 +562,13 @@ bool Membership::SetPrefix(PrefixMode* delta_mh, bool adding)
        return adding;
 }
 
-void Invitation::Create(Channel* c, LocalUser* u, time_t timeout)
-{
-       if ((timeout != 0) && (ServerInstance->Time() >= timeout))
-               // Expired, don't bother
-               return;
-
-       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create chan=%s user=%s", c->name.c_str(), u->uuid.c_str());
-
-       Invitation* inv = Invitation::Find(c, u, false);
-       if (inv)
-       {
-                if ((inv->expiry == 0) || (inv->expiry > timeout))
-                       return;
-               inv->expiry = timeout;
-               ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create changed expiry in existing invitation %p", (void*) inv);
-       }
-       else
-       {
-               inv = new Invitation(c, u, timeout);
-               c->invites.push_front(inv);
-               u->invites.push_front(inv);
-               ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Create created new invitation %p", (void*) inv);
-       }
-}
 
-Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
+void Membership::WriteNotice(const std::string& text) const
 {
-       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find chan=%s user=%s check_expired=%d", c ? c->name.c_str() : "NULL", u ? u->uuid.c_str() : "NULL", check_expired);
-
-       Invitation* result = NULL;
-       for (InviteList::iterator i = u->invites.begin(); i != u->invites.end(); )
-       {
-               Invitation* inv = *i;
-               ++i;
-
-               if ((check_expired) && (inv->expiry != 0) && (inv->expiry <= ServerInstance->Time()))
-               {
-                       /* Expired invite, remove it. */
-                       std::string expiration = InspIRCd::TimeString(inv->expiry);
-                       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find ecountered expired entry: %p expired %s", (void*) inv, expiration.c_str());
-                       delete inv;
-               }
-               else
-               {
-                       /* Is it what we're searching for? */
-                       if (inv->chan == c)
-                       {
-                               result = inv;
-                               break;
-                       }
-               }
-       }
-
-       ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find result=%p", (void*) result);
-       return result;
-}
+       LocalUser* const localuser = IS_LOCAL(user);
+       if (!localuser)
+               return;
 
-Invitation::~Invitation()
-{
-       // Remove this entry from both lists
-       chan->invites.erase(this);
-       user->invites.erase(this);
-       ServerInstance->Logs->Log("INVITEBASE", LOG_DEBUG, "Invitation::~ %p", (void*) this);
+       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, this->chan, text, MSG_NOTICE);
+       localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
 }