adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-02 16:02:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

CClient: share the chan matching code

Browse Source
This commit is contained in:
J-P Nurmi
2015-09-08 00:07:05 +02:00
parent 1a3e9ecb86
commit 7916efa997
3 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Client.h
+3
View File
@@ -30,6 +30,7 @@ class CIRCNetwork;
class CIRCSock;
class CClient;
class CMessage;
class CChan;
// !Forward Declarations
class CAuthBase {
@@ -256,6 +257,8 @@ private:
void AddBuffer(const T& Message);
void EchoMessage(const CMessage& Message);
std::set<CChan*> MatchChans(const CString& sPatterns) const;
protected:
bool m_bGotPass;
bool m_bGotNick;
src/Client.cpp
+14 -9
View File
@@ -361,15 +361,7 @@ void CClient::ReadLine(const CString& sData) {
return;
}
VCString vsChans;
sPatterns.Replace(",", " ");
sPatterns.Split(" ", vsChans, false, "", "", true, true);
set<CChan*> sChans;
for (const CString& sChan : vsChans) {
vector<CChan*> vChans = m_pNetwork->FindChans(sChan);
sChans.insert(vChans.begin(), vChans.end());
}
set<CChan*> sChans = MatchChans(sPatterns);
unsigned int uDetached = 0;
for (CChan* pChan : sChans) {
@@ -1062,3 +1054,16 @@ void CClient::EchoMessage(const CMessage& Message)
}
}
}
set<CChan*> CClient::MatchChans(const CString& sPatterns) const
{
VCString vsPatterns;
sPatterns.Replace_n(",", " ").Split(" ", vsPatterns, false, "", "", true, true);
set<CChan*> sChans;
for (const CString& sPattern : vsPatterns) {
vector<CChan*> vChans = m_pNetwork->FindChans(sPattern);
sChans.insert(vChans.begin(), vChans.end());
}
return sChans;
}
src/ClientCommand.cpp
+3 -27
View File
@@ -120,15 +120,7 @@ void CClient::UserCommand(CString& sLine) {
return;
}
VCString vsChans;
sPatterns.Replace(",", " ");
sPatterns.Split(" ", vsChans, false, "", "", true, true);
set<CChan*> sChans;
for (const CString& sChan : vsChans) {
vector<CChan*> vChans = m_pNetwork->FindChans(sChan);
sChans.insert(vChans.begin(), vChans.end());
}
set<CChan*> sChans = MatchChans(sPatterns);
unsigned int uDetached = 0;
for (CChan* pChan : sChans) {
@@ -371,15 +363,7 @@ void CClient::UserCommand(CString& sLine) {
if (sPatterns.empty()) {
PutStatus("Usage: EnableChan <#chans>");
} else {
VCString vsChans;
sPatterns.Replace(",", " ");
sPatterns.Split(" ", vsChans, false, "", "", true, true);
set<CChan*> sChans;
for (const CString& sChan : vsChans) {
vector<CChan*> vChans = m_pNetwork->FindChans(sChan);
sChans.insert(vChans.begin(), vChans.end());
}
set<CChan*> sChans = MatchChans(sPatterns);
unsigned int uEnabled = 0;
for (CChan* pChan : sChans) {
@@ -403,15 +387,7 @@ void CClient::UserCommand(CString& sLine) {
if (sPatterns.empty()) {
PutStatus("Usage: DisableChan <#chans>");
} else {
VCString vsChans;
sPatterns.Replace(",", " ");
sPatterns.Split(" ", vsChans, false, "", "", true, true);
set<CChan*> sChans;
for (const CString& sChan : vsChans) {
vector<CChan*> vChans = m_pNetwork->FindChans(sChan);
sChans.insert(vChans.begin(), vChans.end());
}
set<CChan*> sChans = MatchChans(sPatterns);
unsigned int uDisabled = 0;
for (CChan* pChan : sChans) {