Add swap command to autoattach module #1582
Conversation
This allows you do swap the position of two rules in execution order To make this work well, we needed to change how settings for the module are stored. This includes a function and check to migrate existing rules over.
| @@ -116,22 +118,36 @@ class CChanAttach : public CModule { | |||
| } | |||
| } | |||
|
|
|||
| void HandleSwap(const CString& sLine) { | |||
| u_int iA = sLine.Token(1).ToUInt(); | |||
There was a problem hiding this comment.
Where does this typedef come from?
There was a problem hiding this comment.
At least on my machine it is part of the system headers. I was looking at how one of the other modules handled numeric input and copied it from there.
modules/autoattach.cpp
Outdated
| void HandleList(const CString& sLine) { | ||
| int Index; |
There was a problem hiding this comment.
iIndex? please follow the style around...
There was a problem hiding this comment.
Will push a fix for this and other some of the other issues soon.
modules/autoattach.cpp
Outdated
| } | ||
|
|
||
| delete Index; |
There was a problem hiding this comment.
Sorry, my C++ is really rusty. Will push with fix soon.
modules/autoattach.cpp
Outdated
|
|
||
| Add(bNegated, sChan, sSearch, sHost); | ||
| } | ||
| Save(); |
There was a problem hiding this comment.
Because I apparently can't read and misunderstood was some of what the original code was doing. Push coming soon.
modules/autoattach.cpp
Outdated
| } | ||
|
|
||
|
|
||
| for (VCString::const_iterator rit = rules.begin(); rit != rules.end(); |
test/integration/tests/modules.cpp
Outdated
| client.Write("PRIVMSG *autoattach :Add * test *"); | ||
| client.ReadUntil("Added to list"); | ||
| client.Write("PRIVMSG *autoattach :Swap 1 2") | ||
| client.ReadUntil("Rules Swapped"); |
There was a problem hiding this comment.
I can show you much easier implementation which will still pass this test:
AddCommand("Swap", "", "",
[=](const CString& sLine) { PutModule("Rules Swapped"); });Can you code here the exact issue which you were facing without this new functionality in place? That's the point of having a test.
There was a problem hiding this comment.
Okay, I am working on expanding this, but the thing I'm not sure how to test is the client correctly not attaching when the ignore rule is in place.
modules/autoattach.cpp
Outdated
| return false; | ||
| } else { | ||
| std::iter_swap(m_vMatches.begin() + (Start - 1), | ||
| m_vMatches.begin() + (End - 1)); |
There was a problem hiding this comment.
std::swap(matches[start], maches[end]);?
modules/autoattach.cpp
Outdated
| return true; | ||
| } | ||
|
|
||
| bool Swap(int Start, int End) { |
There was a problem hiding this comment.
Something is wrong with naming of the variables. Where is the prefix?
…/znc into autoattach-improvements
This allows you do swap the position of two rules in the order
To make this work well, we needed to change how settings for the mofule
are stored. This includes a function and check to migrate existing rules over.