Merge pull request #206 from dgw/rip-airgram

Airgram has vanished from the face of the Internet
This commit is contained in:
John Reese 2016-09-24 11:35:39 -07:00 committed by GitHub
commit 2922c91255
2 changed files with 5 additions and 42 deletions

View File

@ -18,7 +18,6 @@ conditions. ZNC Push current supports the following services:
* [Prowl][] * [Prowl][]
* [Supertoasty][] * [Supertoasty][]
* [PushBullet][] * [PushBullet][]
* [Airgram][]
* [Faast][] * [Faast][]
* [Nexmo][] * [Nexmo][]
* [Pushalot][] * [Pushalot][]
@ -125,7 +124,7 @@ and looking in your profile or settings:
/msg *push set username foo /msg *push set username foo
/msg *push set secret ... /msg *push set secret ...
If you're using Boxcar or Airgram, you need to use the following command to send a subscription request If you're using Boxcar, you need to use the following command to send a subscription request
to your account, before ZNC Push can start working: to your account, before ZNC Push can start working:
/msg *push subscribe /msg *push subscribe
@ -247,7 +246,6 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
* `prowl` * `prowl`
* `supertoasty` * `supertoasty`
* `pushbullet` * `pushbullet`
* `airgram`
* `nexmo` * `nexmo`
* `pushjet` * `pushjet`
* `telegram` * `telegram`
@ -257,7 +255,7 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
User account that should receive push notifications. User account that should receive push notifications.
This option must be set when using Boxcar, or Pushover. For Airgram authenticated services and Nexmo, this is the service/api key. This option must be set when using Boxcar or Pushover. For Nexmo, this is the service/api key.
When using the custom URL service, if this option is set it will enable HTTP basic When using the custom URL service, if this option is set it will enable HTTP basic
authentication and be used as username. authentication and be used as username.
@ -266,7 +264,7 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
Authentication token for push notifications. Authentication token for push notifications.
This option must be set when using Notify My Android, Pushover, Prowl, Supertoasty, Airgram authenticated services, PushBullet, Nexmo, Pushjet, or Telegram. This option must be set when using Notify My Android, Pushover, Prowl, Supertoasty, PushBullet, Nexmo, Pushjet, or Telegram.
When using the custom URL service, if this option is set it will enable HTTP basic When using the custom URL service, if this option is set it will enable HTTP basic
authentication and be used as password. authentication and be used as password.
@ -283,8 +281,6 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
When using Nexmo, this option allows you to specify the SMS destination When using Nexmo, this option allows you to specify the SMS destination
number. The number must be in international format. number. The number must be in international format.
When using Airgram, this is the email address of the end user.
When using Telegram, this is the id of the chat that receives the message. When using Telegram, this is the id of the chat that receives the message.
@ -533,7 +529,6 @@ from me and not from my employer. See the `LICENSE` file for details.
[Prowl]: http://www.prowlapp.com [Prowl]: http://www.prowlapp.com
[Supertoasty]: http://www.supertoasty.com [Supertoasty]: http://www.supertoasty.com
[PushBullet]: https://www.pushbullet.com/ [PushBullet]: https://www.pushbullet.com/
[Airgram]: http://airgramapp.com/
[Faast]: http://faast.io/ [Faast]: http://faast.io/
[Nexmo]: https://www.nexmo.com [Nexmo]: https://www.nexmo.com
[Pushalot]: https://pushalot.com/ [Pushalot]: https://pushalot.com/

View File

@ -605,26 +605,7 @@ class CPushMod : public CModule
} }
else if (service == "airgram") else if (service == "airgram")
{ {
if (options["target"] == "") PutModule("Error: Airgram service shut down. Please configure another notification provider.");
{
PutModule("Error: target (email) not set");
return;
}
service_host = "api.airgramapp.com";
if (options["username"] != "" && options["secret"] != "")
{
service_url = "/1/send";
service_auth = options["username"] + CString(":") + options["secret"];
}
else
{
service_url = "/1/send_as_guest";
}
params["email"] = options["target"];
params["msg"] = message_content;
} }
else if (service == "slack") else if (service == "slack")
{ {
@ -1417,10 +1398,6 @@ class CPushMod : public CModule
{ {
PutModule("Note: URL requires setting the 'message_uri' option with the full URL"); PutModule("Note: URL requires setting the 'message_uri' option with the full URL");
} }
else if (value == "airgram")
{
PutModule("Note: Airgram requires setting the 'target' with the email address of the recipient");
}
else if (value == "faast") else if (value == "faast")
{ {
PutModule("Note: Faast requires setting the secret to your apikey"); PutModule("Note: Faast requires setting the secret to your apikey");
@ -1756,16 +1733,7 @@ class CPushMod : public CModule
} }
else if (service == "airgram") else if (service == "airgram")
{ {
if (options["username"] == "" || options["secret"] == "" || options["target"] == "") PutModule("Error: Airgram service shut down. Please configure a different notification provider.");
{
PutModule("Error: target, username, and secret must be set");
return;
}
service_host = "api.airgramapp.com";
service_url = "/1/subscribe";
service_auth = options["username"] + CString(":") + options["secret"];
params["email"] = options["target"];
} }
else else
{ {