iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set default TrimPrefix to ":"

Browse Source 
Use TrimPrefix instead of if prefix then chomp, saving quite a lot of
duplicated code
This commit is contained in:
Kyle Fuller
2011-09-22 17:02:52 +00:00
parent 523deaf4e3
commit 4b1e7143c3
3 changed files with 25 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Client.cpp
View File

@@ -94,10 +94,7 @@ void CClient::ReadLine(const CString& sData) {
if (sCommand.Equals("PASS")) {
m_bGotPass = true;
CString sAuthLine = sLine.Token(1, true);
if (sAuthLine.Left(1) == ":") {
sAuthLine.LeftChomp();
}
CString sAuthLine = sLine.Token(1, true).TrimPrefix_n();
// [user[/network]:]password
if (sAuthLine.find(":") == CString::npos) {
@@ -116,10 +113,7 @@ void CClient::ReadLine(const CString& sData) {
AuthUser();
return; // Don't forward this msg. ZNC has already registered us.
} else if (sCommand.Equals("NICK")) {
CString sNick = sLine.Token(1);
if (sNick.Left(1) == ":") {
sNick.LeftChomp();
}
CString sNick = sLine.Token(1).TrimPrefix_n();
m_sNick = sNick;
m_bGotNick = true;
@@ -213,11 +207,7 @@ void CClient::ReadLine(const CString& sData) {
return; // If the server understands it, we already enabled namesx / uhnames
} else if (sCommand.Equals("NOTICE")) {
CString sTarget = sLine.Token(1);
CString sMsg = sLine.Token(2, true);
if (sMsg.Left(1) == ":") {
sMsg.LeftChomp();
}
CString sMsg = sLine.Token(2, true).TrimPrefix_n();
if (sTarget.TrimPrefix(m_pUser->GetStatusPrefix())) {
if (!sTarget.Equals("status")) {
@@ -271,11 +261,7 @@ void CClient::ReadLine(const CString& sData) {
}
} else if (sCommand.Equals("PRIVMSG")) {
CString sTarget = sLine.Token(1);
CString sMsg = sLine.Token(2, true);
if (sMsg.Left(1) == ":") {
sMsg.LeftChomp();
}
CString sMsg = sLine.Token(2, true).TrimPrefix_n();
if (sMsg.WildCmp("\001*\001")) {
CString sCTCP = sMsg;
@@ -395,13 +381,9 @@ void CClient::ReadLine(const CString& sData) {
PutStatusNotice("Detached from [" + sChan + "]");
return;
} else if (sCommand.Equals("JOIN")) {
CString sChans = sLine.Token(1);
CString sChans = sLine.Token(1).TrimPrefix_n();
CString sKey = sLine.Token(2);
if (sChans.Left(1) == ":") {
sChans.LeftChomp();
}
VCString vChans;
sChans.Split(",", vChans, false);
sChans.clear();
@@ -431,16 +413,8 @@ void CClient::ReadLine(const CString& sData) {
sLine += " " + sKey;
}
} else if (sCommand.Equals("PART")) {
CString sChan = sLine.Token(1);
CString sMessage = sLine.Token(2, true);
if (sChan.Left(1) == ":") {
// I hate those broken clients, I hate them so much, I really hate them...
sChan.LeftChomp();
}
if (sMessage.Left(1) == ":") {
sMessage.LeftChomp();
}
CString sChan = sLine.Token(1).TrimPrefix_n();
CString sMessage = sLine.Token(2, true).TrimPrefix_n();
NETWORKMODULECALL(OnUserPart(sChan, sMessage), m_pUser, m_pNetwork, this, return);
@@ -459,11 +433,9 @@ void CClient::ReadLine(const CString& sData) {
}
} else if (sCommand.Equals("TOPIC")) {
CString sChan = sLine.Token(1);
CString sTopic = sLine.Token(2, true);
CString sTopic = sLine.Token(2, true).TrimPrefix_n();
if (!sTopic.empty()) {
if (sTopic.Left(1) == ":")
sTopic.LeftChomp();
NETWORKMODULECALL(OnUserTopic(sChan, sTopic), m_pUser, m_pNetwork, this, return);
sLine = "TOPIC " + sChan + " :" + sTopic;
} else {