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

Resolve #818: "Got ZNC?" is a little weird real name

Browse Source
This commit is contained in:
J-P Nurmi
2015-09-20 11:38:59 +02:00
parent f29363752b
commit 6ad7cdb4a2
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/IRCNetwork.h
+1 -1
View File
@@ -175,7 +175,7 @@ public:
const CString& GetNick(const bool bAllowDefault = true) const;
const CString& GetAltNick(const bool bAllowDefault = true) const;
const CString& GetIdent(const bool bAllowDefault = true) const;
const CString& GetRealName() const;
CString GetRealName() const;
const CString& GetBindHost() const;
const CString& GetEncoding() const;
CString GetQuitMsg() const;
include/znc/User.h
+1 -1
View File
@@ -156,7 +156,7 @@ public:
const CString& GetNick(bool bAllowDefault = true) const;
const CString& GetAltNick(bool bAllowDefault = true) const;
const CString& GetIdent(bool bAllowDefault = true) const;
const CString& GetRealName() const;
CString GetRealName() const;
const CString& GetBindHost() const;
const CString& GetDCCBindHost() const;
const CString& GetPass() const;
src/IRCNetwork.cpp
+1 -1
View File
@@ -1347,7 +1347,7 @@ const CString& CIRCNetwork::GetIdent(const bool bAllowDefault) const {
return m_sIdent;
}
const CString& CIRCNetwork::GetRealName() const {
CString CIRCNetwork::GetRealName() const {
if (m_sRealName.empty()) {
return m_pUser->GetRealName();
}
src/User.cpp
+6 -3
View File
@@ -60,7 +60,7 @@ CUser::CUser(const CString& sUserName)
m_sNick(m_sCleanUserName),
m_sAltNick(""),
m_sIdent(m_sCleanUserName),
m_sRealName(sUserName),
m_sRealName(""),
m_sBindHost(""),
m_sDCCBindHost(""),
m_sPass(""),
@@ -884,7 +884,9 @@ CConfig CUser::ToConfig() const {
config.AddKeyValuePair("Nick", GetNick());
config.AddKeyValuePair("AltNick", GetAltNick());
config.AddKeyValuePair("Ident", GetIdent());
config.AddKeyValuePair("RealName", GetRealName());
if (!m_sRealName.empty()) {
config.AddKeyValuePair("RealName", GetRealName());
}
config.AddKeyValuePair("BindHost", GetBindHost());
config.AddKeyValuePair("DCCBindHost", GetDCCBindHost());
config.AddKeyValuePair("QuitMsg", GetQuitMsg());
@@ -1247,12 +1249,13 @@ vector<CClient*> CUser::GetAllClients() const {
return vClients;
}
const CString& CUser::GetUserName() const { return m_sUserName; }
const CString& CUser::GetCleanUserName() const { return m_sCleanUserName; }
const CString& CUser::GetNick(bool bAllowDefault) const { return (bAllowDefault && m_sNick.empty()) ? GetCleanUserName() : m_sNick; }
const CString& CUser::GetAltNick(bool bAllowDefault) const { return (bAllowDefault && m_sAltNick.empty()) ? GetCleanUserName() : m_sAltNick; }
const CString& CUser::GetIdent(bool bAllowDefault) const { return (bAllowDefault && m_sIdent.empty()) ? GetCleanUserName() : m_sIdent; }
const CString& CUser::GetRealName() const { return m_sRealName.empty() ? m_sUserName : m_sRealName; }
CString CUser::GetRealName() const { return (!m_sRealName.Trim_n().empty()) ? m_sRealName : CZNC::GetTag(false); }
const CString& CUser::GetBindHost() const { return m_sBindHost; }
const CString& CUser::GetDCCBindHost() const { return m_sDCCBindHost; }
const CString& CUser::GetPass() const { return m_sPass; }
src/znc.cpp
+4 -2
View File
@@ -702,8 +702,10 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
}
CUtils::GetInput("Ident", sAnswer, sUser);
vsLines.push_back("\tIdent = " + sAnswer);
CUtils::GetInput("Real name", sAnswer, "Got ZNC?");
vsLines.push_back("\tRealName = " + sAnswer);
CUtils::GetInput("Real name", sAnswer, "", "optional");
if (!sAnswer.empty()) {
vsLines.push_back("\tRealName = " + sAnswer);
}
CUtils::GetInput("Bind host", sAnswer, "", "optional");
if (!sAnswer.empty()) {
vsLines.push_back("\tBindHost = " + sAnswer);