X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=e864a8289c75e0f8d6be6b174fc7f33f4c65524c;hb=bd1471bc08be28bc2554d35fdaeb078338b14266;hp=d9884297f8eb09a1884dea3c6b1aed2b13de36e6;hpb=04ece67c3d8534f74a3d75ec77378cb57a9c044e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index d9884297f..e864a8289 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -39,7 +39,9 @@ class ModuleDelayJoin : public Module
 	DelayJoinMode djm;
  public:
 	LocalIntExt unjoined;
-	ModuleDelayJoin() : djm(this), unjoined("delayjoin", this)
+	ModuleDelayJoin()
+		: djm(this)
+		, unjoined("delayjoin", ExtensionItem::EXT_MEMBERSHIP, this)
 	{
 	}
 
@@ -67,7 +69,7 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe
 		 * they remain permanently invisible on this channel!
 		 */
 		const Channel::MemberMap& users = channel->GetUsers();
-		for (UserMembCIter n = users.begin(); n != users.end(); ++n)
+		for (Channel::MemberMap::const_iterator n = users.begin(); n != users.end(); ++n)
 			creator->OnText(n->first, channel, TYPE_CHANNEL, "", 0, empty);
 	}
 	channel->SetMode(this, adding);
@@ -95,7 +97,7 @@ ModResult ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::
 static void populate(CUList& except, Membership* memb)
 {
 	const Channel::MemberMap& users = memb->chan->GetUsers();
-	for (UserMembCIter i = users.begin(); i != users.end(); ++i)
+	for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
 	{
 		if (i->first == memb->user || !IS_LOCAL(i->first))
 			continue;
@@ -138,10 +140,6 @@ void ModuleDelayJoin::OnBuildNeighborList(User* source, IncludeChanList& include
 
 void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list)
 {
-	/* Server origin */
-	if (!user)
-		return;
-
 	if (target_type != TYPE_CHANNEL)
 		return;
 
@@ -165,7 +163,11 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std:
 /* make the user visible if he receives any mode change */
 ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding)
 {
-	if (!user || !channel || param.empty())
+	if (!channel || param.empty())
+		return MOD_RES_PASSTHRU;
+
+	// If not a prefix mode then we got nothing to do here
+	if (!mh->IsPrefixMode())
 		return MOD_RES_PASSTHRU;
 
 	User* dest;