Move CheckKick event to Channel and make os_forbid use it instead of kicking users in the join event, which does bad things

1 files changed, 6 insertions, 0 deletions

diff --git a/include/channels.h b/include/channels.h
index 25bd95097..15b66e928 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -278,6 +278,12 @@ class CoreExport Channel : public Base, public Extensible
 	 */
 	bool Unban(User *u, bool full = false);
 
+	/** Check whether a user is permitted to be on this channel
+	 * @param u The user
+	 * @return true if they are allowed, false if they aren't and were kicked
+	 */
+	bool CheckKick(User *user);
+
 	/** Finds a channel
 	 * @param name The channel to find
 	 * @return The channel, if found