X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ojoin.cpp;h=8bc264622da870e16d9ac1fbb2710a4d8f6ce450;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=467f8c5c6cd91550fb15faa0916bba1ff3b2f408;hpb=6597fe5d4fd2c1cc474fa35a0db21fec480ff47f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 467f8c5c6..8bc264622 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
- *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   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>
@@ -33,11 +33,14 @@ 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'; syntax = "<channel>";
+		flags_needed = 'o';
+		syntax = "<channel>";
 		active = false;
 	}
 
@@ -72,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;
@@ -120,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;
 		}
 
@@ -156,7 +159,7 @@ class ModuleOjoin : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the OJOIN command, allows an oper to join a channel and be immune to kicks", 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);
 	}
 };