Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / modules / m_ojoin.cpp

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index e4314873bcb073998cb14d0013dde61e5e9569ce..8bc264622da870e16d9ac1fbb2710a4d8f6ce450 100644 (file)
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -1,7 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Taros <taros34@hotmail.com>
+ *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -30,14 +33,18 @@ class CommandOjoin : public SplitCommand
        bool notice;
        bool op;
        ModeHandler* npmh;
-       CommandOjoin(Module* parent) :
-               SplitCommand(parent, "OJOIN", 1)
+       ChanModeReference opmode;
+       CommandOjoin(Module* parent, ModeHandler& mode)
+               : SplitCommand(parent, "OJOIN", 1)
+               , npmh(&mode)
+               , opmode(parent, "op")
        {
-               flags_needed = 'o'; Penalty = 0; syntax = "<channel>";
+               flags_needed = 'o';
+               syntax = "<channel>";
                active = false;
        }
 
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
                // Make sure the channel name is allowable.
                if (!ServerInstance->IsChannel(parameters[0]))
@@ -56,27 +63,21 @@ class CommandOjoin : public SplitCommand
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name);
 
                        if (notice)
-                       {
-                               channel = ServerInstance->FindChan(parameters[0]);
-                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s joined on official network business.",
-                                       parameters[0].c_str(), user->nick.c_str());
-                               ServerInstance->PI->SendChannelNotice(channel, 0, user->nick + " joined on official network business.");
-                       }
+                               channel->WriteRemoteNotice(user->nick + " joined on official network business.");
                }
                else
                {
+                       channel = ServerInstance->FindChan(parameters[0]);
+                       if (!channel)
+                               return CMD_FAILURE;
+
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN in "+parameters[0]);
                        // they're already in the channel
-                       std::vector<std::string> modes;
-                       modes.push_back(parameters[0]);
-                       modes.push_back(std::string("+") + npmh->GetModeChar());
-                       if (op)
-                       {
-                               modes[1].push_back('o');
-                               modes.push_back(user->nick);
-                       }
-                       modes.push_back(user->nick);
-                       ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+                       Modes::ChangeList changelist;
+                       changelist.push_add(npmh, user->nick);
+                       if (op && opmode)
+                               changelist.push_add(*opmode, user->nick);
+                       ServerInstance->Modes->Process(ServerInstance->FakeClient, channel, NULL, changelist);
                }
                return CMD_SUCCESS;
        }
@@ -88,14 +89,12 @@ class NetworkPrefix : public PrefixMode
 {
  public:
        NetworkPrefix(Module* parent, char NPrefix)
-               : PrefixMode(parent, "official-join", 'Y')
+               : PrefixMode(parent, "official-join", 'Y', NETWORK_VALUE, NPrefix)
        {
-               prefix = NPrefix;
-               levelrequired = INT_MAX;
-               prefixrank = NETWORK_VALUE;
+               ranktoset = ranktounset = UINT_MAX;
        }
 
-       ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
+       ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding) CXX11_OVERRIDE
        {
                User* theuser = ServerInstance->FindNick(parameter);
                // remove own privs?
@@ -108,37 +107,24 @@ class NetworkPrefix : public PrefixMode
 
 class ModuleOjoin : public Module
 {
-       NetworkPrefix* np;
+       NetworkPrefix np;
        CommandOjoin mycommand;
 
  public:
 
        ModuleOjoin()
-               : np(NULL), mycommand(this)
+               : np(this, ServerInstance->Config->ConfValue("ojoin")->getString("prefix").c_str()[0])
+               , mycommand(this, np)
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               std::string npre = ServerInstance->Config->ConfValue("ojoin")->getString("prefix");
-               char NPrefix = npre.empty() ? 0 : npre[0];
-               if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
-                       throw ModuleException("Looks like the prefix you picked for m_ojoin is already in use. Pick another.");
-
-               /* Initialise module variables */
-               np = new NetworkPrefix(this, NPrefix);
-               mycommand.npmh = np;
-
-               ServerInstance->Modules->AddService(*np);
-       }
-
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
                if (mycommand.active)
                {
-                       privs += np->GetModeChar();
-                       if (mycommand.op)
-                               privs += 'o';
+                       privs += np.GetModeChar();
+                       if (mycommand.op && mycommand.opmode)
+                               privs += mycommand.opmode->IsPrefixMode()->GetPrefix();
                        return MOD_RES_ALLOW;
                }
 
@@ -155,30 +141,25 @@ class ModuleOjoin : public Module
        ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
        {
                // Don't do anything if they're not +Y
-               if (!memb->hasMode(np->GetModeChar()))
+               if (!memb->HasMode(&np))
                        return MOD_RES_PASSTHRU;
 
                // Let them do whatever they want to themselves.
                if (source == memb->user)
                        return MOD_RES_PASSTHRU;
 
-               source->WriteNumeric(ERR_RESTRICTED, memb->chan->name+" :Can't kick "+memb->user->nick+" as they're on official network business.");
+               source->WriteNumeric(ERR_RESTRICTED, memb->chan->name, "Can't kick "+memb->user->nick+" as they're on official network business.");
                return MOD_RES_DENY;
        }
 
-       ~ModuleOjoin()
-       {
-               delete np;
-       }
-
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST);
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Network Business Join", VF_VENDOR);
+               return Version("Adds the /OJOIN command which allows server operators to join a channel and receive the server operator-only Y (official-join) channel prefix mode.", VF_VENDOR);
        }
 };