tastytea/mastorss
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

small fixes

Browse Source
This commit is contained in:
tastytea 2018-02-06 13:53:34 +01:00
parent 42eea89863
commit 0fe04040a7
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.7)
include(GNUInstallDirs) include(GNUInstallDirs)
project (rss2mastodon project (rss2mastodon
VERSION 0.1.7 VERSION 0.1.8
LANGUAGES CXX LANGUAGES CXX
) )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall")

9
src/rss2mastodon.cpp
View File

@ -37,7 +37,7 @@ using std::cout;
using std::cerr; using std::cerr;
using std::string; using std::string;
uint16_t max_size = 500; std::uint16_t max_size = 500;
const string filepath = string(getenv("HOME")) + "/.config/rss2mastodon/"; const string filepath = string(getenv("HOME")) + "/.config/rss2mastodon/";
void read_config(pt::ptree &config, const string &profile, string &instance, string &access_token, string &feedurl) void read_config(pt::ptree &config, const string &profile, string &instance, string &access_token, string &feedurl)
@ -161,12 +161,12 @@ std::vector<string> parse_website(const string &profile, const string &xml)
for (const string &hashtag : watchwords) for (const string &hashtag : watchwords)
{ {
std::regex rehashtag("([[:space:][:punct:]^])(" + hashtag + ")([[:space:][:punct:]$])", std::regex rehashtag("([[:space:][:punct:]]|^)(" + hashtag + ")([[:space:][:punct:]]|$)",
std::regex_constants::icase); std::regex_constants::icase);
str = std::regex_replace(str, rehashtag, "$1#$2$3", str = std::regex_replace(str, rehashtag, "$1#$2$3",
std::regex_constants::format_first_only); std::regex_constants::format_first_only);
} }
if ((str.size() + link.size()) > (max_size - 15)) if ((str.size() + link.size()) > (std::uint16_t)(max_size - 15))
{ {
str.resize((max_size - link.size() - 15)); str.resize((max_size - link.size() - 15));
str += " […]"; str += " […]";
@ -209,7 +209,8 @@ int main(int argc, char *argv[])
string answer; string answer;
string last_entry = config.get(profile + ".last_entry", ""); string last_entry = config.get(profile + ".last_entry", "");
std::vector<string> entries; std::vector<string> entries;
ret = http_get(hostname, path, answer); //FIXME: User-Agent
ret = http_get(hostname, path, answer, "rss2mastodon/experimental");
if (ret != 0) if (ret != 0)
{ {
return ret; return ret;