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

Merge pull request #1150 from jreese/simple-away

Browse Source 
Fix #1133: Add MinClients option to simple_away
This commit is contained in:
Alexey Sokolov
2015-10-20 07:37:50 +01:00
parent 933aa6db0c 8d7ea21998
commit 3856e7ba2f
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/simple_away.cpp
View File

@@ -39,6 +39,7 @@ class CSimpleAway : public CModule {
private:
CString m_sReason;
unsigned int m_iAwayWait;
unsigned int m_iMinClients;
bool m_bClientSetAway;
bool m_bWeSetAway;
@@ -46,6 +47,7 @@ public:
MODCONSTRUCTOR(CSimpleAway) {
m_sReason = SIMPLE_AWAY_DEFAULT_REASON;
m_iAwayWait = SIMPLE_AWAY_DEFAULT_TIME;
m_iMinClients = 1;
m_bClientSetAway = false;
m_bWeSetAway = false;
@@ -54,6 +56,7 @@ public:
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() {}
@@ -85,27 +88,33 @@ public:
SetReason(sSavedReason, false);
}
// MinClients
CString sMinClients = GetNV("minclients");
if (!sMinClients.empty())
SetMinClients(sMinClients.ToUInt(), false);
// Set away on load, required if loaded via webadmin
if (GetNetwork()->IsIRCConnected() && !GetNetwork()->IsUserAttached())
if (GetNetwork()->IsIRCConnected() && MinClientsConnected())
SetAway(false);
return true;
}
void OnIRCConnected() override {
if (GetNetwork()->IsUserAttached())
if (MinClientsConnected())
SetBack();
else
SetAway(false);
}
void OnClientLogin() override {
SetBack();
if (MinClientsConnected())
SetBack();
}
void OnClientDisconnect() override {
/* There might still be other clients */
if (!GetNetwork()->IsUserAttached())
if (!MinClientsConnected())
SetAway();
}
@@ -141,6 +150,15 @@ public:
PutModule("Timer disabled");
}
void OnMinClientsCommand(const CString& sLine) {
if (sLine.Token(1).empty()) {
PutModule("Current MinClients setting: " + CString(m_iMinClients));
} else {
SetMinClients(sLine.Token(1).ToUInt());
PutModule("MinClients set to " + CString(m_iMinClients));
}
}
EModRet OnUserRaw(CString &sLine) override {
if (!sLine.Token(0).Equals("AWAY"))
return CONTINUE;
@@ -179,6 +197,11 @@ public:
}
private:
bool MinClientsConnected()
{
return GetNetwork()->GetClients().size() >= m_iMinClients;
}
CString ExpandReason() {
CString sReason = m_sReason;
if (sReason.empty())
@@ -206,6 +229,11 @@ private:
m_iAwayWait = iAwayWait;
}
void SetMinClients(unsigned int iMinClients, bool bSave = true) {
if (bSave)
SetNV("minclients", CString(iMinClients));
m_iMinClients = iMinClients;
}
};
void CSimpleAwayJob::RunJob() {