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 #261 from nyuszika7h/strip-formatting 

Strip IRC formatting codes from messages
This commit is contained in:
John Reese 2021-06-06 20:06:53 -07:00 committed by GitHub
parent 21c4da3b31 f2865a1ceb
commit b203070196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
push.cpp
View File

@ -22,6 +22,7 @@
#include <znc/Client.h> #include <znc/Client.h>
#include "time.h" #include "time.h"
#include <string.h> #include <string.h>
#include <regex>
#ifdef USE_CURL #ifdef USE_CURL
#include <curl/curl.h> #include <curl/curl.h>
@ -235,12 +236,17 @@ class CPushMod : public CModule
// Set the last notification time // Set the last notification time
last_notification_time[context] = time(NULL); last_notification_time[context] = time(NULL);
// Strip color codes and other formatting from message
CString stripped_message = message;
std::regex irc_format_regex("\\x02|\\x03(?:\\d{0,2}(?:,\\d{1,2})?)?|\\x0F|\\x16|\\x1D|\\x1F");
stripped_message = std::regex_replace(message, irc_format_regex, "");
// Shorten message if needed // Shorten message if needed
unsigned int message_length = options["message_length"].ToUInt(); unsigned int message_length = options["message_length"].ToUInt();
CString short_message = message; CString short_message = stripped_message;
if (message_length > 0) if (message_length > 0)
{ {
short_message = message.Ellipsize(message_length); short_message = stripped_message.Ellipsize(message_length);
} }
// Generate an ISO8601 date string // Generate an ISO8601 date string