SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237 from raimue/message-escape 

Add new option message_escape
This commit is contained in:
John Reese 2018-03-29 13:41:41 -07:00 committed by GitHub
parent ca66f397ba 8291d4ee92
commit d2cf0d3a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -311,6 +311,16 @@ to something similar to "http://domain/#channel/2011-03-09 14:25:09", or
When using Nexmo, this value is where the SMS is "from". In most cases, you must use a valid number in international format. When using Nexmo, this value is where the SMS is "from". In most cases, you must use a valid number in international format.
* `message_escape` Default: ` `
If set, keyword values will be escaped in this format before they are expanded in
`message_content`. Possible values are all that ZNC supports, most useful here will be
`HTML` or `URL`.
Note that the resulting string in `message_content` after keyword expansion will not be
escaped. If you need to escape characters for a service, you have to set the escaped
string to `message_content`.
* `message_uri` Default: ` ` * `message_uri` Default: ` `
URI that will be sent with the push notification. This could be a web address or a URI that will be sent with the push notification. This could be a web address or a

7
doc/telegram.md
View File

@ -16,5 +16,12 @@ module by following the above steps.
* set secret to the **api key**: <code>/msg *push set secret your-api-key</code> * set secret to the **api key**: <code>/msg *push set secret your-api-key</code>
* set target to chat ID: <code>/msg *push set target your-chat-id</code> * set target to chat ID: <code>/msg *push set target your-chat-id</code>
You can style your messages with [basic HTML][HTML] when you set the
`message_escape` option accordingly.
set message_escape HTML
set message_content <i>{context}</i>: &lt;<b>{nick}</b>&gt; {message}
[Telegram]: https://telegram.org [Telegram]: https://telegram.org
[BotFather]: https://core.telegram.org/bots#6-botfather [BotFather]: https://core.telegram.org/bots#6-botfather
[HTML]: https://core.telegram.org/bots/api#formatting-options

12
push.cpp
View File

@ -140,6 +140,7 @@ class CPushMod : public CModule
defaults["message_uri_title"] = ""; defaults["message_uri_title"] = "";
defaults["message_priority"] = "0"; defaults["message_priority"] = "0";
defaults["message_sound"] = ""; defaults["message_sound"] = "";
defaults["message_escape"] = "";
// Notification conditions // Notification conditions
defaults["away_only"] = "no"; defaults["away_only"] = "no";
@ -268,6 +269,14 @@ class CPushMod : public CModule
replace["{network}"] = "(No network)"; replace["{network}"] = "(No network)";
} }
if (options["message_escape"] != "")
{
CString::EEscape esc = CString::ToEscape(options["message_escape"]);
for (MCString::iterator i = replace.begin(); i != replace.end(); i++) {
i->second = i->second.Escape(esc);
}
}
CString message_uri = expand(options["message_uri"], replace); CString message_uri = expand(options["message_uri"], replace);
CString message_title = expand(options["message_title"], replace); CString message_title = expand(options["message_title"], replace);
CString message_content = expand(options["message_content"], replace); CString message_content = expand(options["message_content"], replace);
@ -728,6 +737,9 @@ class CPushMod : public CModule
params["chat_id"] = options["target"]; params["chat_id"] = options["target"];
params["text"] = message_content; params["text"] = message_content;
if (options["message_escape"] == "HTML") {
params["parse_mode"] = "HTML";
}
} }
else else
{ {