Move OnJoinChannel event to trigger after the user has completely joined and document it more about what you should and shouldnt do in it

1 files changed, 6 insertions, 6 deletions

diff --git a/src/messages.cpp b/src/messages.cpp
index ce92841e6..fcaeffa43 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -128,18 +128,18 @@ void Join::SJoin(MessageSource &source, const Anope::string &chan, time_t ts, co
 		User *u = it->second;
 
 		/* Add the user to the channel */
-		ChanUserContainer *cc = c->JoinUser(u);
+		c->JoinUser(u, keep_their_modes ? &status : NULL);
 
-		/* Update their status internally on the channel */
-		if (keep_their_modes)
-			cc->status = status;
+		/* Check if the user is allowed to join */
+		if (c->CheckKick(u))
+			continue;
 
 		/* Set whatever modes the user should have, and remove any that
 		 * they aren't allowed to have (secureops etc).
 		 */
 		c->SetCorrectModes(u, true);
-
-		c->CheckKick(u);
+		
+		FOREACH_MOD(OnJoinChannel, (u, c));
 	}
 
 	/* Channel is done syncing */