Merge pull request #881 from Kriechi/improve-stickychan

improve stickychan
znc · Mar 7, 2015 · 4549197 · 4549197
2 parents 0179e85 + 8f3f5b4
commit 4549197
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/modules/stickychan.cpp b/modules/stickychan.cpp
@@ -53,14 +53,28 @@ class CStickyChan : public CModule
 		return CONTINUE;
 	}
 
+	virtual void OnMode(const CNick& pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) override {
+		if (uMode == CChan::M_Key) {
+			if (bAdded) {
+				// We ignore channel key "*" because of some broken nets.
+				if (sArg != "*")
+				{
+					SetNV(Channel.GetName(), sArg, true);
+				}
+			} else {
+				SetNV(Channel.GetName(), "", true);
+			}
+		}
+	}
+
 	void OnStickCommand(const CString& sCommand)
 	{
 		CString sChannel = sCommand.Token(1).AsLower();
 		if (sChannel.empty()) {
 			PutModule("Usage: Stick <#channel> [key]");
 			return;
 		}
-		SetNV(sChannel, sCommand.Token(2));
+		SetNV(sChannel, sCommand.Token(2), true);
 		PutModule("Stuck " + sChannel);
 	}
 
@@ -70,9 +84,7 @@ class CStickyChan : public CModule
 			PutModule("Usage: Unstick <#channel>");
 			return;
 		}
-		MCString::iterator it = FindNV(sChannel);
-		if (it != EndNV())
-			DelNV(it);
+		DelNV(sChannel, true);
 		PutModule("Unstuck " + sChannel);
 	}
 

diff --git a/src/Chan.cpp b/src/Chan.cpp
@@ -374,7 +374,7 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) {
 			// This is called when we join (ZNC requests the channel modes
 			// on join) *and* when someone changes the channel keys.
 			// We ignore channel key "*" because of some broken nets.
-			if (uMode == 'k' && !bNoChange && bAdd && sArg != "*") {
+			if (uMode == M_Key && !bNoChange && bAdd && sArg != "*") {
 				SetKey(sArg);
 			}
 		}