Compare commits

...

39 Commits

Author SHA1 Message Date
tastytea c04a1b8926
Updated to support mastodon-cpp 0.106.0. 2 years ago
tastytea 7baaae1abc
Bugfix: Use the right mastodon-cpp object. 3 years ago
tastytea 64f78e0300
Ported to mastodon-cpp 0.105.0. 3 years ago
tastytea a4988d72f2
Got rid of tables in manpage. 3 years ago
tastytea 087ae68136
Fixed build script: would never compile manpage 3 years ago
tastytea 217a4bb7f0
Added cmake options 3 years ago
tastytea 1ba5d4e444
Added manpage 3 years ago
tastytea 32fbdf7375
CI: migrated to Debian stretch containers. 3 years ago
tastytea d938959598
curlpp is not in buster anymore, changed to sid 3 years ago
tastytea 0f471e860f
Updated to mastodon-cpp 0.30.0 3 years ago
tastytea cade0f8a4a
Bugfix: would hang if link is of class mention 3 years ago
tastytea 3808a89a13
Set timeout to 30 seconds 3 years ago
tastytea 3a44361bf7
Added more default replacements (AMP) 3 years ago
tastytea 73ddaf2776
Updated dependencies 3 years ago
tastytea b744fb0903
Enhanced CI 3 years ago
tastytea f42bff3918
bugfix: Treated Easy::Results as Easy::Status, resulting in always-false validity. 3 years ago
tastytea 52604d536a
Made URL-detecting regular expression better 3 years ago
tastytea 23ad1917f9
drone: changed downloaded mastodon-cpp to 0.17.1 3 years ago
tastytea 07629de436
Updated dependencies 3 years ago
tastytea 8c91751fbe
downgraded drone from buster to stretch 3 years ago
tastytea a25672c039
drone: always pull new images 4 years ago
tastytea c4b4522dc7
Rewrote send_reply(), upped mastodon-cpp dependency to version 0.17.0 4 years ago
tastytea 0b218fd472
updated dependencies 4 years ago
tastytea 46f7ddc575
drone: Added email notification 4 years ago
tastytea c602278dc5
changed download method in drone script 4 years ago
tastytea ef7067a169
added drone config 4 years ago
tastytea 764e84cefd
fixed connectionbrokennessdetection 4 years ago
tastytea 209743fd55
Check for new messages every 2 seconds (was: 5), made the connection-brokenness-detection easier to understand 4 years ago
tastytea f70b5f1a82
strip: replaced wtmc and wt_zmc with wt_? 4 years ago
tastytea cfec84d455
Changed URL of screenshot, syntax highlighting clarifications 4 years ago
tastytea f5a8f04d73
make surer config file is written on shutdown 4 years ago
tastytea 42d1898ce3
git.schlomp.space -> schlomp.space 4 years ago
tastytea bf5fffca3a
Changed website URL when registering on the server 4 years ago
tastytea a6f37098f2
changed spaces to tabs 4 years ago
tastytea 6463f8ef1f
readme highlighting 4 years ago
tastytea 5d34c938e1
Changed URLs to point to git.schlomp.space 4 years ago
tastytea b147b42b79
Increased delay after error from 60 to 120 seconds 4 years ago
tastytea bf608f5145
removed redundancy in error message 4 years ago
tastytea e528cf6baa
updated documentation 4 years ago
  1. 87
      .drone.yml
  2. 39
      CMakeLists.txt
  3. 73
      README.md
  4. 13
      build_manpage.sh
  5. 75
      expandurl-mastodon.1.adoc
  6. 6
      packages/gentoo/expandurl-mastodon-9999.ebuild
  7. 6
      src/configjson.cpp
  8. 6
      src/configjson.hpp
  9. 32
      src/expandurl-mastodon.hpp
  10. 32
      src/main.cpp
  11. 214
      src/masto.cpp
  12. 25
      src/url.cpp

87
.drone.yml

@ -0,0 +1,87 @@
pipeline:
download:
image: plugins/download
pull: true
source: https://schlomp.space/tastytea/mastodon-cpp/releases/download/0.106.0/libmastodon-cpp_0.106.0-0_amd64.deb
destination: mastodon-cpp.deb
gcc6:
image: debian:stretch-slim
pull: true
environment:
- LANG=C.utf8
- CXX=g++-6
- CXXFLAGS=-pipe -O2
commands:
- echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
- echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list
- apt-get update -q
- apt-get install -qy build-essential cmake pkg-config
- apt-get install -qy libjsoncpp-dev libcurl4-openssl-dev libxdg-basedir-dev asciidoc
- apt-get install -qy -t sid libcurlpp-dev
- dpkg -i mastodon-cpp.deb
- rm -rf build && mkdir -p build && cd build
- cmake ..
- make VERBOSE=1
- make install DESTDIR=install
gcc7:
image: debian:stretch-slim
pull: true
environment:
- LANG=C.utf8
- CXX=g++-7
- CXXFLAGS=-pipe -O2
commands:
- echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
- echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
- apt-get update -q
- apt-get install -qy gnupg
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
- apt-get update -q
- apt-get install -qy build-essential cmake pkg-config
- apt-get install -qy -t xenial g++-7
- apt-get install -qy libjsoncpp-dev libcurl4-openssl-dev libxdg-basedir-dev asciidoc
- apt-get install -qy -t sid libcurlpp-dev
- dpkg -i mastodon-cpp.deb
- rm -rf build && mkdir -p build && cd build
- cmake ..
- make VERBOSE=1
- make install DESTDIR=install
gcc8:
image: debian:stretch-slim
pull: true
environment:
- LANG=C.utf8
- CXX=g++-8
- CXXFLAGS=-pipe -O2
commands:
- echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
- echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
- apt-get update -q
- apt-get install -qy gnupg
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
- apt-get update -q
- apt-get install -qy build-essential cmake pkg-config
- apt-get install -qy -t xenial g++-8
- apt-get install -qy libjsoncpp-dev libcurl4-openssl-dev libxdg-basedir-dev asciidoc
- apt-get install -qy -t sid libcurlpp-dev
- dpkg -i mastodon-cpp.deb
- rm -rf build && mkdir -p build && cd build
- cmake ..
- make VERBOSE=1
- make install DESTDIR=install
notify:
image: drillster/drone-email
pull: true
host: cryptoparty-celle.de
secrets: [ email_username, email_password ]
from: drone@tzend.de
when:
status: [ changed, failure ]

39
CMakeLists.txt

@ -1,8 +1,8 @@
cmake_minimum_required (VERSION 3.7)
project (expandurl-mastodon
VERSION 0.9.1
LANGUAGES CXX
)
VERSION 0.9.14
LANGUAGES CXX
)
include(GNUInstallDirs)
find_package(CURL REQUIRED)
@ -15,14 +15,10 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
# uint_fast16_t can be bigger than 16 bit, but that doesn't matter because
# everything but the last 16 bit is padded with zeroes.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format")
endif()
set(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wpedantic -ftrapv \
-fsanitize=undefined -g -Og -fno-omit-frame-pointer")
include_directories(${PROJECT_SOURCE_DIR}/src)
include_directories(${PROJECT_BINARY_DIR})
include_directories(${CURL_INCLUDE_DIRS})
@ -37,13 +33,26 @@ link_directories(${LIBXDG_BASEDIR_LIBRARY_DIRS})
# Write version in header
configure_file (
"${PROJECT_SOURCE_DIR}/src/version.hpp.in"
"${PROJECT_BINARY_DIR}/version.hpp"
)
"${PROJECT_SOURCE_DIR}/src/version.hpp.in"
"${PROJECT_BINARY_DIR}/version.hpp"
)
file(GLOB sources src/*.cpp)
add_executable(expandurl-mastodon ${sources})
target_link_libraries(expandurl-mastodon
${CURLPP_LIBRARIES} ${JSONCPP_LIBRARIES}
${LIBXDG_BASEDIR_LIBRARIES} mastodon-cpp pthread stdc++fs)
${CURLPP_LIBRARIES} ${JSONCPP_LIBRARIES} ${LIBXDG_BASEDIR_LIBRARIES}
mastodon-cpp pthread stdc++fs)
install(TARGETS expandurl-mastodon DESTINATION ${CMAKE_INSTALL_BINDIR})
set(WITH_MAN "YES" CACHE STRING "WITH_MAN defaults to \"YES\"")
if (WITH_MAN)
add_custom_command(OUTPUT "${PROJECT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.1"
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
DEPENDS "${CMAKE_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.1.adoc"
COMMAND ${CMAKE_SOURCE_DIR}/build_manpage.sh
ARGS ${PROJECT_VERSION})
add_custom_target(run ALL
DEPENDS "${PROJECT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.1")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
endif()

73
README.md

@ -3,7 +3,7 @@
If you want the bot to expand an URL, reply to the post with the URL in it and
mention the bot account (`@expandurl@botsin.space` for example).
![Example screenshot](https://user-images.githubusercontent.com/3681516/39963736-908e3eea-5663-11e8-9a9c-55ca74279235.jpg)
![Example screenshot](https://doc.schlomp.space/expandurl-mastodon/expandurl_screenshot.jpg)
This bot uses the same visibility as you, but posts unlisted instead of public.
It retains the sensitive flag and spoiler warnings.
@ -14,68 +14,59 @@ to rewrite [AMP](https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages) URLs to
point at the real webpages.
Please report any bugs via the
[issue tracker on GitHub](https://github.com/tastytea/expandurl-mastodon/issues)
[issue tracker on schlomp.space](https://schlomp.space/tastytea/expandurl-mastodon/issues)
or to [@tastytea@soc.ialis.me](https://soc.ialis.me/@tastytea).
# Install
## Dependencies
* Tested OS: Linux
* C++ compiler (tested: gcc 6.4)
* [cmake](https://cmake.org/) (tested: 3.9.6)
* [curlpp](http://www.curlpp.org/) (tested: 0.8.1)
* [mastodon-cpp](https://github.com/tastytea/mastodon-cpp) (at least: 0.15.1)
* [jsoncpp](https://github.com/open-source-parsers/jsoncpp) (tested: 1.8.4)
* [libxdg-basedir](http://repo.or.cz/w/libxdg-basedir.git) (tested: 1.2.0)
* Tested OS: Linux
* C++ compiler (tested: gcc 6/7/8)
* [cmake](https://cmake.org/) (tested: 3.9 / 3.11)
* [curlpp](http://www.curlpp.org/) (tested: 0.8)
* [mastodon-cpp](https://schlomp.space/tastytea/mastodon-cpp) (at least: 0.106)
* [jsoncpp](https://github.com/open-source-parsers/jsoncpp) (tested: 1.8 / 1.7)
* [libxdg-basedir](http://repo.or.cz/w/libxdg-basedir.git) (tested: 1.2)
* Optional:
* Manpage: [asciidoc](http://asciidoc.org/) (tested: 8.6)
## Get sourcecode
### Latest release
https://github.com/tastytea/expandurl-mastodon/releases/latest
https://schlomp.space/tastytea/expandurl-mastodon/releases
### Development version
git clone https://github.com/tastytea/expandurl-mastodon.git
```SH
git clone https://schlomp.space/tastytea/expandurl-mastodon.git
```
## Compile
mkdir build
cd build/
cmake ..
make
```SH
mkdir build
cd build/
cmake ..
make
```
cmake options:
* `-DCMAKE_BUILD_TYPE=Debug` for a debug build
* `-DWITH_MAN=NO` to not compile the manpage
Install with `make install`.
# Usage
**The config file has changed from cfg to JSON in 0.4.0.**
Start expandurl-mastodon without parameters.
If no config file is found, you will be asked to provide your account address
and an access token is generated. The config file can be found in
`${HOME}/.config/expandurl-mastodon.json` and looks like this:
{
"account": "expandurl@example.social",
"access_token": "abc123",
"proxy":
{
"url": "socks5h://[::1]:1080/",
"user": "user23",
"password": "supersecure"
}
}
If you want to use a proxy, you have to edit the configuration file manually.
After the configuration file is generated, you can start expandurl-mastodon as
daemon.
Have a look at the [manpage](https://schlomp.space/tastytea/expandurl-mastodon/src/branch/master/expandurl-mastodon.1.adoc).
# Copyright
Copyright © 2018 tastytea <tastytea@tastytea.de>.
License GPLv3: GNU GPL version 3 <https://www.gnu.org/licenses/gpl-3.0.html>.
This program comes with ABSOLUTELY NO WARRANTY. This is free software,
and you are welcome to redistribute it under certain conditions.
```PLAIN
Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>.
License GPLv3: GNU GPL version 3 <https://www.gnu.org/licenses/gpl-3.0.html>.
This program comes with ABSOLUTELY NO WARRANTY. This is free software,
and you are welcome to redistribute it under certain conditions.
```

13
build_manpage.sh

@ -0,0 +1,13 @@
#!/bin/sh
name="expandurl-mastodon"
if [ -n "${1}" ]; then
dir="$(dirname ${0})"
version="${1}"
cp -vf "${dir}/${name}.1.adoc" .
sed -Ei "s/(Revision: +)[0-9]+\.[0-9]\.[0-9]/\1${version}/" "${name}.1.adoc"
a2x --doctype manpage --format manpage --no-xmllint "${name}.1.adoc"
else
echo "usage: ${0} VERSION" >&2
fi

75
expandurl-mastodon.1.adoc

@ -0,0 +1,75 @@
= expandurl-mastodon(1)
:Author: tastytea
:Email: tastytea@tastytea.de
:Date: 2019-04-12
:Revision: 0.0.0
:man source: expandurl-mastodon
:man version: {revision}
:man manual: General Commands Manual
== NAME
expandurl-mastodon - Mastodon bot that expands shortened URLs.
== SYNOPSIS
*expandurl-mastodon*
== DESCRIPTION
If you want the bot to expand an URL, reply to the post with the URL in it and
mention the bot account.
This bot uses the same visibility as you, but posts unlisted instead of public.
It retains the sensitive flag and spoiler warnings.
Some tracking parameters, like those beginning with
https://en.wikipedia.org/wiki/UTM_parameters[utm_] are stripped. It also tries
to rewrite https://en.wikipedia.org/wiki/Accelerated_Mobile_Pages[AMP] URLs to
point at the real webpages.
== CONFIGURATION
If no config file is found, you will be asked to provide your account address
and an access token is generated. The config file can be found in
`${XDG_CONFIG_HOME}/expandurl-mastodon.json` and looks like this:
[source,json]
----
{
"account": "expandurl@example.social",
"access_token": "abc123",
"proxy":
{
"url": "socks5h://[::1]:1080/",
"user": "user23",
"password": "supersecure"
},
"replace" :
{
"//amp\\." : "//",
"[\\?&]__twitter_impression=[^&]+" : "",
"[\\?&]utm_[^&]+" : "",
"[\\?&]wt_zmc=[^&]+" : "",
"[\\?&]wtmc=[^&]+" : ""
}
}
----
If you want to use a proxy or define your own replacements, you have to edit the
configuration file manually. After the configuration file is generated, you can
start expandurl-mastodon as daemon.
== FILES
- *Configuration file*: `${XDG_CONFIG_HOME}/expandurl-mastodon.json`
`${XDG_CONFIG_HOME}` is usually `~/.config`.
== REPORTING BUGS
Bugtracker: https://schlomp.space/tastytea/expandurl-mastodon/issues
E-mail: tastytea@tastytea.de
Fediverse: https://soc.ialis.me/@tastytea

6
packages/gentoo/expandurl-mastodon-9999.ebuild

@ -6,15 +6,15 @@ EAPI=6
inherit git-r3 cmake-utils
DESCRIPTION="Mastodon bot that expands shortened URLs."
HOMEPAGE="https://github.com/tastytea/expandurl-mastodon"
EGIT_REPO_URI="https://github.com/tastytea/expandurl-mastodon.git"
HOMEPAGE="https://git.schlomp.space/tastytea/expandurl-mastodon"
EGIT_REPO_URI="https://git.schlomp.space/tastytea/expandurl-mastodon.git"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
IUSE=""
RDEPEND=">=dev-cpp/mastodon-cpp-9999
>=dev-cpp/curlpp-0.8.1
>=dev-libs/libxdg-basedir-1.2.0-r1"
>=dev-libs/libxdg-basedir-1.2.0-r1"
DEPEND=">=dev-util/cmake-3.9.6
${RDEPEND}"

6
src/configjson.cpp

@ -1,5 +1,5 @@
/* This file is part of expandurl-mastodon.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -42,7 +42,7 @@ ConfigJSON::ConfigJSON(const string &filename, const string &subdir)
_filepath += '/' + filename;
}
const bool ConfigJSON::read()
bool ConfigJSON::read()
{
std::ifstream file(_filepath);
if (file.is_open())
@ -60,7 +60,7 @@ const bool ConfigJSON::read()
}
}
const bool ConfigJSON::write()
bool ConfigJSON::write()
{
std::ofstream file(_filepath);
if (file.is_open())

6
src/configjson.hpp

@ -1,5 +1,5 @@
/* This file is part of expandurl-mastodon.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -43,14 +43,14 @@ public:
*
* @return `true` on success
*/
const bool read();
bool read();
/*!
* @brief Write the file
*
* @return `true` on success
*/
const bool write();
bool write();
/*!
* @brief Returns a reference to the config as Json::Value

32
src/expandurl-mastodon.hpp

@ -1,5 +1,5 @@
/* This file is part of expandurl-mastodon.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -27,15 +27,15 @@
#include <jsoncpp/json/json.h>
#include "configjson.hpp"
using namespace Mastodon;
using std::string;
using Mastodon::API;
using Mastodon::Easy;
extern ConfigJSON configfile;
void signal_handler(int signum);
/*!
* @brief Extract URLs from HTML
*
@ -54,7 +54,7 @@ const string expand(const string &url);
/*!
* @brief Filters out tracking stuff
*
*
* Currently removes all arguments beginning with `utm_`
*
* @param url URL to filter
@ -70,7 +70,7 @@ const string strip(const string &url);
* inserted.
*
*/
const void init_replacements();
void init_replacements();
class Listener
@ -82,24 +82,24 @@ public:
/*!
* @brief Starts listening on Mastodon
*/
const void start();
void start();
/*!
* @brief Stops listening on Mastodon
*/
const void stop();
void stop();
const std::vector<Easy::Notification> get_new_messages();
const std::vector<Easy::Notification> catchup();
Easy::Status get_status(const std::uint_fast64_t &id);
const bool send_reply(const Easy::Status &to_status, const string &message);
const std::uint_fast64_t get_parent_id(const Easy::Notification &notif);
Easy::Status get_status(const string &id);
bool send_reply(const Easy::Status &to_status, const string &message);
const string get_parent_id(const Easy::Notification &notif);
const bool stillrunning() const;
bool stillrunning() const;
private:
string _instance;
string _access_token;
std::unique_ptr<Easy> _masto;
std::unique_ptr<Easy::API> _masto;
string _stream;
std::unique_ptr<API::http> _ptr;
std::thread _thread;
@ -109,10 +109,10 @@ private:
string _proxy_password;
Json::Value &_config;
const void read_config();
const bool write_config();
const bool register_app();
const void set_proxy(Easy &masto);
void read_config();
bool write_config();
bool register_app();
void set_proxy(Easy::API &masto);
};
#endif // EXPANDURL_MASTODON_HPP

32
src/main.cpp

@ -1,5 +1,5 @@
/* This file is part of expandurl-mastodon.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,14 +18,16 @@
#include <chrono>
#include <csignal>
#include <regex>
#include <numeric>
#include <syslog.h>
#include <unistd.h> // getuid()
#include <curlpp/cURLpp.hpp>
#include "configjson.hpp"
#include "expandurl-mastodon.hpp"
using namespace Mastodon;
using std::string;
using Mastodon::Easy;
bool running = true;
ConfigJSON configfile("expandurl-mastodon.json");
@ -50,14 +52,15 @@ void signal_handler(int signum)
}
}
int main(int argc, char *argv[])
int main()
{
signal(SIGINT, signal_handler);
signal(SIGTERM, signal_handler);
if (!configfile.read())
{
syslog(LOG_WARNING, "Could not open %s.", configfile.get_filepath().c_str());
syslog(LOG_WARNING, "Could not open %s.",
configfile.get_filepath().c_str());
}
init_replacements();
@ -71,7 +74,7 @@ int main(int argc, char *argv[])
while (running)
{
std::this_thread::sleep_for(std::chrono::seconds(5));
std::this_thread::sleep_for(std::chrono::seconds(2));
if (!listener.stillrunning())
{
listener.stop();
@ -89,25 +92,26 @@ int main(int argc, char *argv[])
for (Easy::Notification &notif : new_messages)
{
syslog(LOG_DEBUG, "new message");
const std::uint_fast64_t id = listener.get_parent_id(notif);
syslog(LOG_DEBUG, "in_reply_to_id: %lu", id);
const string id = listener.get_parent_id(notif);
syslog(LOG_DEBUG, "in_reply_to_id: %s", id.c_str());
Easy::Status status;
if (id > 0)
if (!id.empty())
{
status = listener.get_status(id);
if (status.valid())
{
string message = "";
for (const string &url : get_urls(status.content()))
{
message += url + " \n";
}
const std::vector<string> vec = get_urls(status.content());
const string message =
std::accumulate(vec.begin(), vec.end(), string(),
[](const string &s1, const string s2)
{ return s1 + s2 + " \n"; });
if (!message.empty())
{
if (!listener.send_reply(notif.status(), message))
{
syslog(LOG_ERR, "could not send reply to %lu", id);
syslog(LOG_ERR, "could not send reply to %s",
id.c_str());
}
}
else

214
src/masto.cpp

@ -1,5 +1,5 @@
/* This file is part of expandurl-mastodon.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,11 +20,13 @@
#include <mutex>
#include <sstream>
#include <syslog.h>
#include <chrono>
#include "version.hpp"
#include "expandurl-mastodon.hpp"
using std::cout;
using std::string;
using std::uint8_t;
Listener::Listener()
: _instance("")
@ -58,7 +60,7 @@ Listener::Listener()
}
}
_masto = std::make_unique<Easy>(_instance, _access_token);
_masto = std::make_unique<Easy::API>(_instance, _access_token);
_masto->set_useragent(static_cast<const string>("expandurl-mastodon/") +
global::version);
set_proxy(*_masto);
@ -66,14 +68,9 @@ Listener::Listener()
Listener::~Listener()
{
if (!configfile.write())
{
syslog(LOG_ERR, "Could not write %s.",
configfile.get_filepath().c_str());
}
}
const void Listener::read_config()
void Listener::read_config()
{
_instance = _config["account"].asString();
_instance = _instance.substr(_instance.find('@') + 1);
@ -83,44 +80,22 @@ const void Listener::read_config()
_proxy_password = _config["proxy"]["password"].asString();
}
const void Listener::start()
void Listener::start()
{
static std::uint_fast16_t ret;
_thread = std::thread([=]
{
ret = 0;
_running = true;
Easy masto(_instance, _access_token);
masto.set_useragent(static_cast<const string>("expandurl-mastodon/") +
global::version);
set_proxy(masto);
ret = masto.get_stream(Mastodon::API::v1::streaming_user, _stream, _ptr);
syslog(LOG_DEBUG, "Connection lost.");
if (ret != 0 && ret != 14) // 14 means canceled by user
{
syslog(LOG_ERR, "Connection terminated: Error %u", ret);
syslog(LOG_INFO, "Waiting for 60 seconds");
std::this_thread::sleep_for(std::chrono::seconds(60));
}
_running = false;
});
while (!_ptr)
{
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
_running = true;
_masto->get_stream(API::v1::streaming_user, _ptr, _stream);
if (ret == 0)
{
syslog(LOG_NOTICE, "Connected to %s", _instance.c_str());
}
else if (ret != 14)
{ // If the stream thread sleeps, the main thread should sleep too
std::this_thread::sleep_for(std::chrono::seconds(60));
}
syslog(LOG_NOTICE, "Connecting to %s ...", _instance.c_str());
}
const void Listener::stop()
void Listener::stop()
{
if (!configfile.write())
{
syslog(LOG_ERR, "Could not write %s.",
configfile.get_filepath().c_str());
}
if (_ptr)
{
_ptr->cancel_stream();
@ -137,35 +112,45 @@ const void Listener::stop()
const std::vector<Easy::Notification> Listener::get_new_messages()
{
using namespace std::chrono;
std::vector<Easy::Notification> v;
static std::uint_fast8_t count_empty = 0;
static system_clock::time_point lastping = system_clock::now();
std::lock_guard<std::mutex> lock(_ptr->get_mutex());
if (!_stream.empty())
{
const string buffer = _stream;
_stream.clear();
for (const Easy::stream_event &event : Easy::parse_stream(buffer))
for (const Easy::stream_event_type &event : Easy::parse_stream(_stream))
{
if (event.first == Easy::event_type::Notification)
if (event.type == Easy::event_type::Notification)
{
Easy::Notification notif(event.second);
Easy::Notification notif(event.data);
if (notif.type() == Easy::notification_type::Mention)
{
v.push_back(notif);
}
}
else if (event.type == Easy::event_type::Error)
{
constexpr uint8_t delay_after_error = 120;
syslog(LOG_DEBUG, "Connection lost.");
const Json::Value err;
syslog(LOG_ERR, "Connection terminated: Error %u",
err["error_code"].asUInt());
syslog(LOG_INFO, "Waiting for %u seconds", delay_after_error);
std::this_thread::sleep_for(std::chrono::seconds(delay_after_error));
_running = false;
}
}
count_empty = 0;
_stream.clear();
lastping = system_clock::now();
}
else
{
// If we got an empty message 5 times, set state to not running
++count_empty;
if (count_empty > 5)
// If the last keep-alive packet was received 25 seconds or more ago
if (duration_cast<seconds>(system_clock::now() - lastping).count() >= 25)
{
count_empty = 0;
lastping = system_clock::now();
syslog(LOG_NOTICE, "Detected broken connection.");
_running = false;
}
@ -181,143 +166,118 @@ const std::vector<Easy::Notification> Listener::catchup()
if (last_id != "")
{
syslog(LOG_DEBUG, "Catching up...");
API::parametermap parameter =
parameters parameter =
{
{ "since_id", { last_id } },
{ "exclude_types", { "follow", "favourite", "reblog" } }
};
string answer;
std::uint_fast16_t ret;
return_call ret;;
ret = _masto->get(API::v1::notifications, parameter, answer);
ret = _masto->get(API::v1::notifications, parameter);
if (ret == 0)
if (ret)
{
for (const string str : Easy::json_array_to_vector(answer))
for (const string str : Easy::json_array_to_vector(ret.answer))
{
v.push_back(Easy::Notification(str));
}
}
else
{
syslog(LOG_ERR, "Could not catch up: Error %u", ret);
syslog(LOG_ERR, "Could not catch up: Error %u", ret.error_code);
}
}
return v;
}
Mastodon::Easy::Status Listener::get_status(const std::uint_fast64_t &id)
Mastodon::Easy::Status Listener::get_status(const string &id)
{
std::uint_fast16_t ret;
string answer;
return_call ret;
ret = _masto->get(API::v1::statuses_id, {{ "id", { std::to_string(id) }}},
answer);
if (ret == 0)
ret = _masto->get(API::v1::statuses_id, {{ "id", { id }}});
if (ret)
{
return Easy::Status(answer);
return Easy::Status(ret.answer);
}
else
{
syslog(LOG_ERR, "Error %u in %s.", ret, __FUNCTION__);
syslog(LOG_ERR, "Error %u in %s.", ret.error_code, __FUNCTION__);
return Easy::Status();
}
}
const bool Listener::send_reply(const Easy::Status &to_status,
const string &message)
bool Listener::send_reply(const Easy::Status &to_status,
const string &message)
{
std::uint_fast16_t ret;
string answer;
const string id = std::to_string(to_status.id());
string strvisibility;
switch (to_status.visibility())
{
case Easy::visibility_type::Private:
strvisibility = "private";
break;
case Easy::visibility_type::Direct:
strvisibility = "direct";
break;
default:
strvisibility = "unlisted";
break;
}
Easy::return_entity<Easy::Status> ret;
Easy::parametermap parameters =
Easy::Status new_status;
if (to_status.visibility() == Easy::visibility_type::Public)
{
{ "in_reply_to_id", { id } },
{ "visibility", { strvisibility } },
{ "status", { '@' + to_status.account().acct() + ' ' + message } }
};
if (to_status.sensitive())
{
parameters.insert({ "sensitive", { "true" } });
new_status.visibility(Easy::visibility_type::Unlisted);
}
if (!to_status.spoiler_text().empty())
else
{
parameters.insert({ "spoiler_text", { to_status.spoiler_text() } });
new_status.visibility(to_status.visibility());
}
new_status.in_reply_to_id(to_status.id());
new_status.content('@' + to_status.account().acct() + ' ' + message);
new_status.sensitive(to_status.sensitive());
new_status.spoiler_text(to_status.spoiler_text());
ret = _masto->post(API::v1::statuses, parameters, answer);
ret = _masto->send_post(new_status);
if (ret == 0)
if (ret)
{
syslog(LOG_DEBUG, "Sent reply");
return true;
}
else
{
syslog(LOG_ERR, "Error %u in %s.", ret, __FUNCTION__);
syslog(LOG_ERR, "Error %u in %s.", ret.error_code, __FUNCTION__);
return false;
}
}
const std::uint_fast64_t Listener::get_parent_id(const Easy::Notification &notif)
const string Listener::get_parent_id(const Easy::Notification &notif)
{
string answer;
std::uint_fast16_t ret;
return_call ret;
// Retry up to 2 times
for (std::uint_fast8_t retries = 1; retries <= 2; ++retries)
{
// Fetch full status
ret = _masto->get(API::v1::search, {{ "q", { notif.status().url() }}},
answer);
if (ret > 0 || !Easy::Status(answer).valid())
ret = _masto->get(API::v1::search, {{ "q", { notif.status().url() }}});
if (!ret)
{
syslog(LOG_ERR, "Error %u: Could not fetch status (in %s).",
ret, __FUNCTION__);
ret.error_code, __FUNCTION__);
return 0;
}
ret = _masto->get(API::v1::statuses_id,
{{ "id", { std::to_string(notif.status().id()) }}},
answer);
{{ "id", { notif.status().id() }}});
if (ret > 0)
if (!ret)
{
syslog(LOG_ERR, "Error %u: Could not get status (in %s).",
ret, __FUNCTION__);
ret.error_code, __FUNCTION__);
return 0;
}
else
{
_config["last_id"] = std::to_string(notif.id());
const Easy::Status s(answer);
_config["last_id"] = notif.id();
const Easy::Status s(ret.answer);
// If parent is found, return ID; else retry
if (s.in_reply_to_id() != 0)
if (!s.in_reply_to_id().empty())
{
return s.in_reply_to_id();
}
else
{
syslog(LOG_WARNING, "Could not get ID of replied-to parent post");
syslog(LOG_WARNING, "Could not get ID of replied-to post");
std::this_thread::sleep_for(std::chrono::seconds(2));
}
}
@ -326,32 +286,32 @@ const std::uint_fast64_t Listener::get_parent_id(const Easy::Notification &notif
return 0;
}
const bool Listener::stillrunning() const
bool Listener::stillrunning() const
{
return _running;
}
const bool Listener::register_app()
bool Listener::register_app()
{
cout << "Account (username@instance): ";
std::cin >> _instance;
_config["account"] = _instance;
_instance = _instance.substr(_instance.find('@') + 1);
_masto = std::make_unique<Easy>(_instance, "");
_masto = std::make_unique<Easy::API>(_instance, "");
_masto->set_useragent(static_cast<const string>("expandurl-mastodon/") +
global::version);
std::uint_fast16_t ret;
return_call ret;
string client_id, client_secret, url;
ret = _masto->register_app1("expandurl-mastodon",
"urn:ietf:wg:oauth:2.0:oob",
"read write",
"https://github.com/tastytea/expandurl-mastodon",
"https://schlomp.space/tastytea/expandurl-mastodon",
client_id,
client_secret,
url);
if (ret == 0)
if (ret)
{
string code;
cout << "Visit " << url << " to authorize this application.\n";
@ -362,25 +322,25 @@ const bool Listener::register_app()
"urn:ietf:wg:oauth:2.0:oob",
code,
_access_token);
if (ret == 0)
if (ret)
{
_config["access_token"] = _access_token;
return true;
}
else
{
syslog(LOG_ERR, "register_app2(): %u", ret);
syslog(LOG_ERR, "register_app2(): %u", ret.error_code);
}
}
else
{
syslog(LOG_ERR, "register_app1(): %u", ret);
syslog(LOG_ERR, "register_app1(): %u", ret.error_code);
}
return false;
}
const void Listener::set_proxy(Mastodon::Easy &masto)
void Listener::set_proxy(Easy::API &masto)
{
if (!_proxy.empty())
{

25
src/url.cpp

@ -1,5 +1,5 @@
/* This file is part of expandurl-mastodon.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -31,15 +31,19 @@ namespace curlopts = curlpp::options;
const std::vector<string> get_urls(const string &html)
{
const std::regex re_url("href=\"([^\"]+)\" rel");
const std::regex re_url("href=\\\\?\"([^\"\\\\]+)\\\\?\"([^>]+)");
std::smatch match;
string buffer = html;
std::vector<string> v;
while (std::regex_search(buffer, match, re_url))
{
string url = Easy::unescape_html(match[1].str());
v.push_back(strip(expand(url)));
// Add URL to vector if it is not a mention.#
if (match[2].str().find("mention") == std::string::npos)
{
string url = unescape_html(match[1].str());
v.push_back(strip(expand(url)));
}
buffer = match.suffix().str();
}
@ -61,6 +65,7 @@ const string expand(const string &url)
"Connection: close",
});
request.setOpt<curlopts::FollowLocation>(true);
request.setOpt(curlopts::Timeout(30));
try
{
@ -69,6 +74,7 @@ const string expand(const string &url)
catch (const std::exception &e)
{
syslog(LOG_ERR, "%s", e.what());
// TODO: Do something when: "Couldn't resolve host …"
syslog(LOG_NOTICE, "The previous error is ignored.");
}
@ -100,19 +106,20 @@ const string strip(const string &url)
return newurl;
}
const void init_replacements()
void init_replacements()
{
using replace_pair = std::pair<const std::string, const std::string>;
Json::Value &config = configfile.get_json();
if (config["replace"].isNull())
{
const std::array<const replace_pair, 5> replace_array =
const std::array<const replace_pair, 6> replace_array =
{{
{ "[\\?&]utm_[^&]+", "" }, // Google
{ "[\\?&]wtmc=[^&]+", "" }, // Twitter?
{ "[\\?&]wt_?[^&]+", "" }, // Twitter?
{ "[\\?&]__twitter_impression=[^&]+", "" }, // Twitter?
{ "[\\?&]wt_zmc=[^&]+", "" }, // Twitter?
{ "//amp\\.", "//" } // AMP
{ "//amp\\.", "//" }, // AMP
{ "/amp/", "" }, // AMP
{ "[\\?&]service=amp", "" } // AMP
}};
for (const replace_pair &pair : replace_array)

Loading…
Cancel
Save