From c59e4d1bee5f6c5c7bb850658b00c672d43226b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@0x90.dk>
Date: Thu, 29 May 2014 17:56:48 +0200
Subject: [PATCH] Add JoinAfterCloaked setting to q.cpp

This patch adds a new setting to the Q module, JoinAfterCloaked, that
allows the user to specify whether ZNC should postpone joining channels
before the user is cloaked.

Fixes #286
---
 modules/q.cpp | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/modules/q.cpp b/modules/q.cpp
index c4a26265..3b0d8dbd 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -40,15 +40,17 @@ public:
 		}
 
 		CString sTmp;
-		m_bUseCloakedHost = (sTmp = GetNV("UseCloakedHost")).empty() ? true : sTmp.ToBool();
-		m_bUseChallenge   = (sTmp = GetNV("UseChallenge")).empty()  ? true : sTmp.ToBool();
-		m_bRequestPerms   = GetNV("RequestPerms").ToBool();
-		m_bJoinOnInvite   = (sTmp = GetNV("JoinOnInvite")).empty() ? true : sTmp.ToBool();
+		m_bUseCloakedHost   = (sTmp = GetNV("UseCloakedHost")).empty() ? true : sTmp.ToBool();
+		m_bUseChallenge     = (sTmp = GetNV("UseChallenge")).empty()  ? true : sTmp.ToBool();
+		m_bRequestPerms     = GetNV("RequestPerms").ToBool();
+		m_bJoinOnInvite     = (sTmp = GetNV("JoinOnInvite")).empty() ? true : sTmp.ToBool();
+		m_bJoinAfterCloaked = (sTmp = GetNV("JoinAfterCloaked")).empty() ? true : sTmp.ToBool();
 
 		// Make sure NVs are stored in config. Note: SetUseCloakedHost() is called further down.
 		SetUseChallenge(m_bUseChallenge);
 		SetRequestPerms(m_bRequestPerms);
 		SetJoinOnInvite(m_bJoinOnInvite);
+		SetJoinAfterCloaked(m_bJoinAfterCloaked);
 
 		OnIRCDisconnected(); // reset module's state
 
@@ -67,6 +69,8 @@ public:
 						"with /msg *q Set UseCloakedHost true/false.");
 				m_bUseCloakedHost = true;
 				SetUseCloakedHost(m_bUseCloakedHost);
+				m_bJoinAfterCloaked = true;
+				SetJoinAfterCloaked(m_bJoinAfterCloaked);
 			} else if (m_bUseChallenge) {
 				Cloak();
 			}
@@ -149,6 +153,10 @@ public:
 			Table2.SetCell("Setting", "JoinOnInvite");
 			Table2.SetCell("Type", "Boolean");
 			Table2.SetCell("Description", "Whether to join channels when Q invites you.");
+			Table2.AddRow();
+			Table2.SetCell("Setting", "JoinAfterCloaked");
+			Table2.SetCell("Type", "Boolean");
+			Table2.SetCell("Description", "Whether to delay joining channels until after you are cloaked.");
 			PutModule(Table2);
 
 			PutModule("This module takes 2 optional parameters: <username> <password>");
@@ -177,6 +185,9 @@ public:
 			} else if (sSetting == "joinoninvite") {
 				SetJoinOnInvite(sValue.ToBool());
 				PutModule("JoinOnInvite set");
+			} else if (sSetting == "joinaftercloaked") {
+				SetJoinAfterCloaked(sValue.ToBool());
+				PutModule("JoinAfterCloaked set");
 			} else
 				PutModule("Unknown setting: " + sSetting);
 
@@ -202,6 +213,9 @@ public:
 			Table.AddRow();
 			Table.SetCell("Setting", "JoinOnInvite");
 			Table.SetCell("Value", CString(m_bJoinOnInvite));
+			Table.AddRow();
+			Table.SetCell("Setting", "JoinAfterCloaked");
+			Table.SetCell("Value", CString(m_bJoinAfterCloaked));
 			PutModule(Table);
 
 		} else if (sCommand == "status") {
@@ -255,6 +269,13 @@ public:
 		return HandleMessage(Nick, sMessage);
 	}
 
+	virtual EModRet OnJoining(CChan& Channel) {
+		if (m_bJoinAfterCloaked && !m_bCloaked)
+			return HALT;
+
+		return CONTINUE;
+	}
+
 	virtual void OnJoin(const CNick& Nick, CChan& Channel) {
 		if (m_bRequestPerms && IsSelf(Nick))
 			HandleNeed(Channel, "ov");
@@ -297,6 +318,7 @@ public:
 				SetUseChallenge(WebSock.GetParam("usechallenge").ToBool());
 				SetRequestPerms(WebSock.GetParam("requestperms").ToBool());
 				SetJoinOnInvite(WebSock.GetParam("joinoninvite").ToBool());
+				SetJoinAfterCloaked(WebSock.GetParam("joinaftercloaked").ToBool());
 			}
 
 			Tmpl["Username"] = m_sUsername;
@@ -325,6 +347,12 @@ public:
 			o4["Tooltip"] = "Whether to join channels when Q invites you.";
 			o4["Checked"] = CString(m_bJoinOnInvite);
 
+			CTemplate& o5 = Tmpl.AddRow("OptionLoop");
+			o5["Name"] = "joinaftercloaked";
+			o5["DisplayName"] = "JoinAfterCloaked";
+			o5["Tooltip"] = "Whether to delay joining channels until after you are cloaked.";
+			o5["Checked"] = CString(m_bJoinAfterCloaked);
+
 			if (bSubmitted) {
 				WebSock.GetSession()->AddSuccess("Changes have been saved!");
 			}
@@ -558,6 +586,7 @@ private:
 	bool    m_bUseChallenge;
 	bool    m_bRequestPerms;
 	bool    m_bJoinOnInvite;
+	bool    m_bJoinAfterCloaked;
 
 	void SetUsername(const CString& sUsername) {
 		m_sUsername = sUsername;
@@ -591,6 +620,11 @@ private:
 		m_bJoinOnInvite = bJoinOnInvite;
 		SetNV("JoinOnInvite", CString(bJoinOnInvite));
 	}
+
+	void SetJoinAfterCloaked(const bool bJoinAfterCloaked) {
+		m_bJoinAfterCloaked = bJoinAfterCloaked;
+		SetNV("JoinAfterCloaked", CString(bJoinAfterCloaked));
+	}
 };
 
 template<> void TModInfo<CQModule>(CModInfo& Info) {