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 56cef10b4ed3f8ae533df791a238055a97ee2ec3..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,15 +33,18 @@ class CommandOjoin : public SplitCommand
        bool notice;
        bool op;
        ModeHandler* npmh;
+       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]))
@@ -57,11 +63,7 @@ class CommandOjoin : public SplitCommand
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name);
 
                        if (notice)
-                       {
-                               const std::string msg = user->nick + " joined on official network business.";
-                               channel->WriteNotice(msg);
-                               ServerInstance->PI->SendChannelNotice(channel, 0, msg);
-                       }
+                               channel->WriteRemoteNotice(user->nick + " joined on official network business.");
                }
                else
                {
@@ -73,8 +75,8 @@ class CommandOjoin : public SplitCommand
                        // they're already in the channel
                        Modes::ChangeList changelist;
                        changelist.push_add(npmh, user->nick);
-                       if (op)
-                               changelist.push_add(ServerInstance->Modes->FindMode('o', MODETYPE_CHANNEL), user->nick);
+                       if (op && opmode)
+                               changelist.push_add(*opmode, user->nick);
                        ServerInstance->Modes->Process(ServerInstance->FakeClient, channel, NULL, changelist);
                }
                return CMD_SUCCESS;
@@ -89,10 +91,10 @@ class NetworkPrefix : public PrefixMode
        NetworkPrefix(Module* parent, char NPrefix)
                : PrefixMode(parent, "official-join", 'Y', NETWORK_VALUE, NPrefix)
        {
-               levelrequired = INT_MAX;
+               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?
@@ -121,8 +123,8 @@ class ModuleOjoin : public Module
                if (mycommand.active)
                {
                        privs += np.GetModeChar();
-                       if (mycommand.op)
-                               privs += 'o';
+                       if (mycommand.op && mycommand.opmode)
+                               privs += mycommand.opmode->IsPrefixMode()->GetPrefix();
                        return MOD_RES_ALLOW;
                }
 
@@ -139,7 +141,7 @@ 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.
@@ -150,14 +152,14 @@ class ModuleOjoin : public Module
                return MOD_RES_DENY;
        }
 
-       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);
        }
 };