Add support for blocking tag messages with the deaf mode.

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 760b5c4bda8299a526b7b14bc906d63e6ab70b1e..67f908195de95eb130bdec2bdccd8c46be25154f 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -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
@@ -176,6 +178,8 @@ 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 = ConvToNum<unsigned int>(user->oper->getConfig("maxchans"));
@@ -242,7 +246,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
                        {
                                if (chan->IsBanned(user))
                                {
-                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You're banned)");
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
                                        return NULL;
                                }
                        }
@@ -271,8 +275,8 @@ Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursti
 
        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);
@@ -471,12 +475,18 @@ const char* Channel::ChanModes(bool showsecret)
        return scratch.c_str();
 }
 
-void Channel::WriteNotice(const std::string& text)
+void Channel::WriteNotice(const std::string& text, char status)
 {
-       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, this, text, MSG_NOTICE);
+       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, this, text, MSG_NOTICE, status);
        Write(ServerInstance->GetRFCEvents().privmsg, privmsg);
 }
 
+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,
  * % for halfop etc. If the user has several modes set, the highest mode
  * the user has must be returned.