Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push to Prowl #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+81 −15
Open

Push to Prowl #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 81 additions & 15 deletions znc/colloquy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CDevice {
return true;
}

bool Push(const CString& sNick, const CString& sMessage, const CString& sChannel, bool bHilite, int iBadge) {
bool Push(const CString& sNick, const CString& sMessage, const CString& sChannel, bool bHilite, int iBadge, const CString& sProwlKey) {
if (m_sToken.empty()) {
DEBUG("---- Push(\"" + sNick + "\", \"" + sMessage + "\", \"" + sChannel + "\", " + CString(bHilite) + ", " + CString(iBadge) + ")");
return false;
Expand Down Expand Up @@ -115,15 +115,49 @@ class CDevice {
DEBUG(sPayload);
DEBUG("----------------------------------------------------------------------------");

CSocket *pSock = new CSocket(&m_Parent);
pSock->Connect(m_sHost, m_uPort, true);
pSock->Write(sPayload);
pSock->Close(Csock::CLT_AFTERWRITE);
m_Parent.AddSocket(pSock);

CSocket *pSock = new CSocket(&m_Parent);
pSock->Connect(m_sHost, m_uPort, true);
pSock->Write(sPayload);
pSock->Close(Csock::CLT_AFTERWRITE);
m_Parent.AddSocket(pSock);

// Prowl part...
if (!sProwlKey.empty()) {

CString s;

s += "GET /publicapi/add";
s += "?apikey=" + sProwlKey;
s += "&priority=1";
s += "&application=IRC";
s += "&event=AA" + UCollEscape(sNick);
s += "&description=" + UCollEscape(sMessage+sPayload);
if (!sChannel.empty()) {
s += UCollEscape(" [" + sChannel + "]");
}

s += " HTTP/1.0\r\n";
s += "Connection: close\r\n";
s += "Host: prowl.weks.net\r\n";
s += "User-Agent: ZNC\r\n";
s += "\r\n";

CSocket *p = new CSocket(&m_Parent);
p->Connect("prowl.weks.net", 443, true); // connect to host at port 443 using SSL
p->Write(s);
p->Close(Csock::CLT_AFTERWRITE); // discard the response...
m_Parent.AddSocket(p);

}

return true;
}

static CString UCollEscape(const CString& sStr)
{
return sStr.Escape_n(CString::EASCII, CString::EURL);
}

CString CollEscape(const CString& sStr) const {
CString sRet(sStr);
// @todo improve this and eventually support unicode
Expand Down Expand Up @@ -287,11 +321,14 @@ class CColloquyMod : public CModule {
bool m_bSkipMessageContent;
bool m_bAwayOnlyPush;
bool m_bIgnoreNetworkServices;
bool m_bProwl;
CString m_sProwlKey;
CString sProwlKey;
public:
MODCONSTRUCTOR(CColloquyMod) {
// init vars
m_bAttachedPush = true;
m_bSkipMessageContent = false;
m_bSkipMessageContent = false;
m_bAwayOnlyPush = false;
m_bIgnoreNetworkServices = false;
m_idleAfterMinutes=0;
Expand Down Expand Up @@ -324,6 +361,9 @@ class CColloquyMod : public CModule {
SCString sArgSet;

//Loading stored stuff
m_sProwlKey.clear();
sProwlKey.clear();
m_bProwl=false;
for(MCString::iterator it = BeginNV(); it != EndNV(); it++)
{
if(it->first == "u:idle") {
Expand All @@ -342,9 +382,14 @@ class CColloquyMod : public CModule {
m_nightHoursEnd = it->second.ToInt();
} else if (it->first == "u:debug") {
m_debug = it->second.ToInt();
} else if (it->first == "u:prowlkey") {
m_sProwlKey = it->second;
} else if (it->first == "u:prowl") {
m_bProwl = it->second.ToBool();
}
}

if (m_bProwl) {sProwlKey = m_sProwlKey;} else {sProwlKey.clear();}
sArgs.Split("-",sArgSet);
for ( SCString::iterator it = sArgSet.begin(); it != sArgSet.end(); it++ ) {
CString sArg(*it);
Expand Down Expand Up @@ -470,22 +515,22 @@ class CColloquyMod : public CModule {
}

virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) {
Push(Nick.GetNick(), sMessage, "", false, 1);
Push(Nick.GetNick(), sMessage, "", false, 1, sProwlKey);
return CONTINUE;
}

virtual EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) {
Push(Nick.GetNick(), sMessage, Channel.GetName(), true, 1);
Push(Nick.GetNick(), sMessage, Channel.GetName(), true, 1, sProwlKey);
return CONTINUE;
}

virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) {
Push(Nick.GetNick(), sMessage, "", false, 1);
Push(Nick.GetNick(), sMessage, "", false, 1, sProwlKey);
return CONTINUE;
}

virtual EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) {
Push(Nick.GetNick(), sMessage, Channel.GetName(), true, 1);
Push(Nick.GetNick(), sMessage, Channel.GetName(), true, 1, sProwlKey);
return CONTINUE;
}

Expand Down Expand Up @@ -542,6 +587,10 @@ class CColloquyMod : public CModule {
PutModule(" Don't send notifications after nighthours start and before nighthours end.");
PutModule("Command: SET ignorenetworkservices 0|1");
PutModule(" Enable this to stop receiving notifications from IRC services.");
PutModule("Command: SET prowl <boolean>");
PutModule(" Enable or disable push to prowl.");
PutModule("Command: SET prowlkey <prowl_api_key>");
PutModule(" Set your prowl API key.");
} else if (sCommand.Equals("LIST")) {
if (m_mspDevices.empty()) {
PutModule("You have no saved devices...");
Expand Down Expand Up @@ -609,6 +658,14 @@ class CColloquyMod : public CModule {
m_nightHoursStart=hoursToInt(sCommand.Token(2));
m_nightHoursEnd=hoursToInt(sCommand.Token(3));
PutModule("Night Hours: "+intToHours(m_nightHoursStart)+" - "+intToHours(m_nightHoursEnd));
} else if (sKey == "prowlkey") {
m_sProwlKey=sCommand.Token(2);
if (m_bProwl) {sProwlKey = m_sProwlKey;} else {sProwlKey.clear();}
PutModule("Prowl key set to '"+m_sProwlKey+"'");
} else if (sKey == "prowl") {
m_bProwl=sCommand.Token(2).ToBool();
if (m_bProwl) {sProwlKey = m_sProwlKey;} else {sProwlKey.clear();}
PutModule("Prowl push set to '"+CString(m_bProwl)+"'");
} else {
PutModule("Unknown setting. Try HELP.");
}
Expand All @@ -622,6 +679,8 @@ class CColloquyMod : public CModule {
SetNV("u:debug", CString(m_debug), false);
SetNV("u:nighthoursstart", CString(m_nightHoursStart), false);
SetNV("u:nighthoursend", CString(m_nightHoursEnd), false);
SetNV("u:prowlkey", m_sProwlKey, false);
SetNV("u:prowl", CString(m_bProwl), false);
} else if (sCommand.Token(0).Equals("STATUS")) {
CTable Table;
Table.AddColumn("Option");
Expand Down Expand Up @@ -654,6 +713,13 @@ class CColloquyMod : public CModule {
Table.SetCell("Option","Ignore network services");
Table.SetCell("Value",CString(m_bIgnoreNetworkServices));

Table.AddRow();
Table.SetCell("Option","Prowl key");
Table.SetCell("Value",m_sProwlKey);
Table.AddRow();
Table.SetCell("Option","Prowl push (0 = no push, 1 = push)");
Table.SetCell("Value",CString(m_bProwl));

PutModule(" Current Status");
PutModule(Table);
/*
Expand Down Expand Up @@ -706,7 +772,7 @@ class CColloquyMod : public CModule {
));
}

bool Push(const CString& sNick, const CString& sMessage, const CString& sChannel, bool bHilite, int iBadge) {
bool Push(const CString& sNick, const CString& sMessage, const CString& sChannel, bool bHilite, int iBadge, const CString& sProwlKeyWrap) {
if (iBadge != 0 && !m_bAttachedPush && m_pUser->IsUserAttached()) {
return false;
}
Expand Down Expand Up @@ -810,7 +876,7 @@ class CColloquyMod : public CModule {
if (m_debug) {
PutModule("debug: idleTest Pass... "+CString(m_lastActivity) + " < " + CString(time(NULL)-m_idleAfterMinutes*60)+" | #" +sChannel + " "+sMessage);
}
if (!pDevice->Push(sNick, sPushMessage, sChannel, bHilite, iBadge)) {
if (!pDevice->Push(sNick, sPushMessage, sChannel, bHilite, iBadge, sProwlKeyWrap)) {
bRet = false;
}
}
Expand All @@ -821,7 +887,7 @@ class CColloquyMod : public CModule {
virtual void OnClientLogin() {
// Clear all badges on a client login
// this could be easily modded to only clear them for the connecting client
Push("","","",false,0);
Push("","","",false,0,"");
}

virtual void OnClientDisconnect() {
Expand Down