Add clang-format configuration.

For now, it uses tabs like before, to make the diff easier to read/check.
One of following commits will switch it to spaces.
This commit is contained in:
Alexey Sokolov
2015-12-06 22:36:35 +00:00
parent 02f8749a8b
commit 33b0627d75
132 changed files with 12743 additions and 8904 deletions
+68 -58
View File
@@ -19,44 +19,61 @@
#include <time.h>
#define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %awaytime%"
#define SIMPLE_AWAY_DEFAULT_TIME 60
#define SIMPLE_AWAY_DEFAULT_TIME 60
class CSimpleAway;
class CSimpleAwayJob : public CTimer {
public:
CSimpleAwayJob(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription)
: CTimer(pModule, uInterval, uCycles, sLabel, sDescription) {}
public:
CSimpleAwayJob(CModule* pModule, unsigned int uInterval,
unsigned int uCycles, const CString& sLabel,
const CString& sDescription)
: CTimer(pModule, uInterval, uCycles, sLabel, sDescription) {}
virtual ~CSimpleAwayJob() {}
protected:
protected:
void RunJob() override;
};
class CSimpleAway : public CModule {
private:
CString m_sReason;
private:
CString m_sReason;
unsigned int m_iAwayWait;
unsigned int m_iMinClients;
bool m_bClientSetAway;
bool m_bWeSetAway;
bool m_bClientSetAway;
bool m_bWeSetAway;
public:
public:
MODCONSTRUCTOR(CSimpleAway) {
m_sReason = SIMPLE_AWAY_DEFAULT_REASON;
m_iAwayWait = SIMPLE_AWAY_DEFAULT_TIME;
m_iMinClients = 1;
m_sReason = SIMPLE_AWAY_DEFAULT_REASON;
m_iAwayWait = SIMPLE_AWAY_DEFAULT_TIME;
m_iMinClients = 1;
m_bClientSetAway = false;
m_bWeSetAway = false;
m_bWeSetAway = false;
AddHelpCommand();
AddCommand("Reason", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnReasonCommand), "[<text>]", "Prints or sets the away reason (%awaytime% is replaced with the time you were set away, supports substitutions using ExpandString)");
AddCommand("Timer", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnTimerCommand), "", "Prints the current time to wait before setting you away");
AddCommand("SetTimer", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnSetTimerCommand), "<seconds>", "Sets the time to wait before setting you away");
AddCommand("DisableTimer", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnDisableTimerCommand), "", "Disables the wait time before setting you away");
AddCommand("MinClients", static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnMinClientsCommand), "", "Get or set the minimum number of clients before going away");
AddCommand("Reason", static_cast<CModCommand::ModCmdFunc>(
&CSimpleAway::OnReasonCommand),
"[<text>]",
"Prints or sets the away reason (%awaytime% is replaced "
"with the time you were set away, supports substitutions "
"using ExpandString)");
AddCommand(
"Timer",
static_cast<CModCommand::ModCmdFunc>(&CSimpleAway::OnTimerCommand),
"", "Prints the current time to wait before setting you away");
AddCommand("SetTimer", static_cast<CModCommand::ModCmdFunc>(
&CSimpleAway::OnSetTimerCommand),
"<seconds>",
"Sets the time to wait before setting you away");
AddCommand("DisableTimer", static_cast<CModCommand::ModCmdFunc>(
&CSimpleAway::OnDisableTimerCommand),
"", "Disables the wait time before setting you away");
AddCommand(
"MinClients", static_cast<CModCommand::ModCmdFunc>(
&CSimpleAway::OnMinClientsCommand),
"", "Get or set the minimum number of clients before going away");
}
virtual ~CSimpleAway() {}
@@ -74,8 +91,7 @@ public:
sReasonArg = sArgs.Token(2, true);
} else {
CString sAwayWait = GetNV("awaywait");
if (!sAwayWait.empty())
SetAwayWait(sAwayWait.ToUInt(), false);
if (!sAwayWait.empty()) SetAwayWait(sAwayWait.ToUInt(), false);
sReasonArg = sArgs;
}
@@ -84,14 +100,12 @@ public:
SetReason(sReasonArg);
} else {
CString sSavedReason = GetNV("reason");
if (!sSavedReason.empty())
SetReason(sSavedReason, false);
if (!sSavedReason.empty()) SetReason(sSavedReason, false);
}
// MinClients
CString sMinClients = GetNV("minclients");
if (!sMinClients.empty())
SetMinClients(sMinClients.ToUInt(), false);
if (!sMinClients.empty()) SetMinClients(sMinClients.ToUInt(), false);
// Set away on load, required if loaded via webadmin
if (GetNetwork()->IsIRCConnected() && MinClientsConnected())
@@ -108,14 +122,12 @@ public:
}
void OnClientLogin() override {
if (MinClientsConnected())
SetBack();
if (MinClientsConnected()) SetBack();
}
void OnClientDisconnect() override {
/* There might still be other clients */
if (!MinClientsConnected())
SetAway();
if (!MinClientsConnected()) SetAway();
}
void OnReasonCommand(const CString& sLine) {
@@ -131,8 +143,8 @@ public:
}
void OnTimerCommand(const CString& sLine) {
PutModule("Current timer setting: "
+ CString(m_iAwayWait) + " seconds");
PutModule("Current timer setting: " + CString(m_iAwayWait) +
" seconds");
}
void OnSetTimerCommand(const CString& sLine) {
@@ -141,8 +153,7 @@ public:
if (m_iAwayWait == 0)
PutModule("Timer disabled");
else
PutModule("Timer set to "
+ CString(m_iAwayWait) + " seconds");
PutModule("Timer set to " + CString(m_iAwayWait) + " seconds");
}
void OnDisableTimerCommand(const CString& sLine) {
@@ -159,9 +170,8 @@ public:
}
}
EModRet OnUserRaw(CString &sLine) override {
if (!sLine.Token(0).Equals("AWAY"))
return CONTINUE;
EModRet OnUserRaw(CString& sLine) override {
if (!sLine.Token(0).Equals("AWAY")) return CONTINUE;
// If a client set us away, we don't touch that away message
const CString sArg = sLine.Token(1, true).Trim_n(" ");
@@ -178,8 +188,8 @@ public:
void SetAway(bool bTimer = true) {
if (bTimer) {
RemTimer("simple_away");
AddTimer(new CSimpleAwayJob(this, m_iAwayWait, 1,
"simple_away", "Sets you away after detach"));
AddTimer(new CSimpleAwayJob(this, m_iAwayWait, 1, "simple_away",
"Sets you away after detach"));
} else {
if (!m_bClientSetAway) {
PutIRC("AWAY :" + ExpandReason());
@@ -196,54 +206,54 @@ public:
}
}
private:
bool MinClientsConnected()
{
private:
bool MinClientsConnected() {
return GetNetwork()->GetClients().size() >= m_iMinClients;
}
CString ExpandReason() {
CString sReason = m_sReason;
if (sReason.empty())
sReason = SIMPLE_AWAY_DEFAULT_REASON;
if (sReason.empty()) sReason = SIMPLE_AWAY_DEFAULT_REASON;
time_t iTime = time(nullptr);
CString sTime = CUtils::CTime(iTime, GetUser()->GetTimezone());
sReason.Replace("%awaytime%", sTime);
sReason = ExpandString(sReason);
sReason.Replace("%s", sTime); // Backwards compatibility with previous syntax, where %s was substituted with sTime. ZNC <= 1.6.x
sReason.Replace("%s", sTime); // Backwards compatibility with previous
// syntax, where %s was substituted with
// sTime. ZNC <= 1.6.x
return sReason;
}
/* Settings */
/* Settings */
void SetReason(CString& sReason, bool bSave = true) {
if (bSave)
SetNV("reason", sReason);
if (bSave) SetNV("reason", sReason);
m_sReason = sReason;
}
void SetAwayWait(unsigned int iAwayWait, bool bSave = true) {
if (bSave)
SetNV("awaywait", CString(iAwayWait));
if (bSave) SetNV("awaywait", CString(iAwayWait));
m_iAwayWait = iAwayWait;
}
void SetMinClients(unsigned int iMinClients, bool bSave = true) {
if (bSave)
SetNV("minclients", CString(iMinClients));
if (bSave) SetNV("minclients", CString(iMinClients));
m_iMinClients = iMinClients;
}
};
void CSimpleAwayJob::RunJob() {
((CSimpleAway*)GetModule())->SetAway(false);
}
void CSimpleAwayJob::RunJob() { ((CSimpleAway*)GetModule())->SetAway(false); }
template<> void TModInfo<CSimpleAway>(CModInfo& Info) {
template <>
void TModInfo<CSimpleAway>(CModInfo& Info) {
Info.SetWikiPage("simple_away");
Info.SetHasArgs(true);
Info.SetArgsHelpText("You might enter up to 3 arguments, like -notimer awaymessage or -timer 5 awaymessage.");
Info.SetArgsHelpText(
"You might enter up to 3 arguments, like -notimer awaymessage or "
"-timer 5 awaymessage.");
}
NETWORKMODULEDEFS(CSimpleAway, "This module will automatically set you away on IRC while you are disconnected from the bouncer.")
NETWORKMODULEDEFS(CSimpleAway,
"This module will automatically set you away on IRC while "
"you are disconnected from the bouncer.")