X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=444cbbc395db258153b04a03ad0f4a150591365c;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=3a574d485d07c7642828ee2a106c5cacc17237ff;hpb=70501004436bb9de15b845e865054e2ca7004f5f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 3a574d485..444cbbc39 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -25,7 +25,6 @@
 
 class DelayJoinMode : public ModeHandler
 {
- private:
 	CUList empty;
  public:
 	DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL)
@@ -43,29 +42,28 @@ class ModuleDelayJoin : public Module
 	LocalIntExt unjoined;
 	ModuleDelayJoin() : djm(this), unjoined("delayjoin", this)
 	{
-		if (!ServerInstance->Modes->AddMode(&djm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode };
-		ServerInstance->Modules->Attach(eventlist, this, 7);
 	}
-	~ModuleDelayJoin();
-	Version GetVersion();
-	void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick);
-	void OnUserJoin(Membership*, bool, bool, CUList&);
+
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(djm);
+		ServerInstance->Modules->AddService(unjoined);
+	}
+	Version GetVersion() CXX11_OVERRIDE;
+	void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick) CXX11_OVERRIDE;
+	void OnUserJoin(Membership*, bool, bool, CUList&) CXX11_OVERRIDE;
 	void CleanUser(User* user);
-	void OnUserPart(Membership*, std::string &partmessage, CUList&);
-	void OnUserKick(User* source, Membership*, const std::string &reason, CUList&);
-	void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception);
-	void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list);
-	ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string &param, bool adding, int pcnt);
+	void OnUserPart(Membership*, std::string &partmessage, CUList&) CXX11_OVERRIDE;
+	void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) CXX11_OVERRIDE;
+	void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception) CXX11_OVERRIDE;
+	void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) CXX11_OVERRIDE;
+	ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string &param, bool adding, int pcnt) CXX11_OVERRIDE;
 };
 
-/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */
-
 ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* no change */
-	if (channel->IsModeSet('D') == adding)
+	if (channel->IsModeSet(this) == adding)
 		return MODEACTION_DENY;
 
 	if (!adding)
@@ -78,14 +76,10 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe
 		for (UserMembCIter n = names->begin(); n != names->end(); ++n)
 			creator->OnText(n->first, channel, TYPE_CHANNEL, "", 0, empty);
 	}
-	channel->SetMode('D', adding);
+	channel->SetMode(this, adding);
 	return MODEACTION_ALLOW;
 }
 
-ModuleDelayJoin::~ModuleDelayJoin()
-{
-}
-
 Version ModuleDelayJoin::GetVersion()
 {
 	return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR);
@@ -115,7 +109,7 @@ static void populate(CUList& except, Membership* memb)
 
 void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except)
 {
-	if (memb->chan->IsModeSet('D'))
+	if (memb->chan->IsModeSet(djm))
 	{
 		unjoined.set(memb, 1);
 		populate(except, memb);
@@ -194,4 +188,3 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mo
 }
 
 MODULE_INIT(ModuleDelayJoin)
-