.drone.yml

@@ -1,269 +1,235 @@
-kind: pipeline
-name: x86_64
+pipeline:
+  gcc6:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=g++-6
+      - CXXFLAGS=-pipe -O2
+    secrets:
+      - mastodon_cpp_access_token
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - 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 libcurl4-openssl-dev libjsoncpp-dev doxygen catch
+      - apt-get install -qy -t sid libcurlpp-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="[pleroma]" ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+      - ctest
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
 
-platform:
-  os: linux
-  arch: amd64
+  gcc7:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=g++-7
+      - CXXFLAGS=-pipe -O2
+    secrets:
+      - mastodon_cpp_access_token
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - apt-get update -q
+      - 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 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 libcurl4-openssl-dev libjsoncpp-dev doxygen catch
+      - apt-get install -qy -t sid libcurlpp-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="[pleroma]" ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+      - ctest
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
 
-volumes:
-- name: debian-package-cache
-  host:
-    path: /var/cache/debian-package-cache
+  gcc8:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=g++-8
+      - CXXFLAGS=-pipe -O2
+    secrets:
+      - mastodon_cpp_access_token
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - apt-get update -q
+      - 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 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 libcurl4-openssl-dev libjsoncpp-dev doxygen catch
+      - apt-get install -qy -t sid libcurlpp-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="[pleroma]" ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+      - ctest
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
 
-trigger:
-  event:
-    exclude:
-    - tag
+  clang5:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=clang++-5.0
+      - CXXFLAGS=-pipe -O2
+    secrets:
+      - mastodon_cpp_access_token
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - apt-get update -q
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list
+      - 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 -t stretch-backports clang-5.0
+      - apt-get install -qy libcurl4-openssl-dev libjsoncpp-dev doxygen catch
+      - apt-get install -qy -t sid libcurlpp-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="[pleroma]" ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+      - ctest
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
 
-steps:
-- name: gcc6
-  image: debian:stretch-slim
-  pull: true
-  environment:
-    CXX: g++-6
-    CXXFLAGS: -pipe -O2
-    MASTODON_CPP_ACCESS_TOKEN:
-      from_secret: mastodon_cpp_access_token
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - apt-get install -qy build-essential cmake
-  - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="~[api]" ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  - cd tests && ctest
-  volumes:
-    - name: debian-package-cache
-      path: /var/cache/apt/archives
+  clang6:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=clang++-6.0
+      - CXXFLAGS=-pipe -O2
+    secrets:
+      - mastodon_cpp_access_token
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - apt-get update -q
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list
+      - 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 -t stretch-backports clang-6.0
+      - apt-get install -qy libcurl4-openssl-dev libjsoncpp-dev doxygen catch
+      - apt-get install -qy -t sid libcurlpp-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="[pleroma]" ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+      - ctest
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
 
-- name: gcc9
-  image: debian:stretch-slim
-  pull: true
-  environment:
-    CXX: g++-9
-    CXXFLAGS: -pipe -O2
-    MASTODON_CPP_ACCESS_TOKEN:
-      from_secret: mastodon_cpp_access_token
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
-  - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
-  - 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
-  - apt-get install -qy -t xenial g++-9
-  - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_EXAMPLES=YES ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
+  package_deb:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: tag
+    environment:
+      - LANG=C.utf8
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - 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 libcurl4-openssl-dev libjsoncpp-dev doxygen
+      - apt-get install -qy -t sid libcurlpp-dev
+      - apt-get install -qy file
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DWITH_EXAMPLES=NO -DWITH_TESTS=NO ..
+      - make package
+      - cmake -DWITH_DEB=YES ..
+      - make package
+      - cp -v mastodon-cpp-${DRONE_TAG}_x86_64.tar.gz ..
+      - cp -v libmastodon-cpp_${DRONE_TAG}-0_amd64.deb ..
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
 
-- name: clang5
-  image: debian:stretch-slim
-  pull: true
-  environment:
-    CXX: clang++-5.0
-    CXXFLAGS: -pipe -O2
-    MASTODON_CPP_ACCESS_TOKEN:
-      from_secret: mastodon_cpp_access_token
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
-  - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list
-  - apt-get update -q
-  - apt-get install -qy build-essential cmake
-  - apt-get install -qy -t stretch-backports clang-5.0
-  - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_EXAMPLES=YES ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
+  package_rpm:
+    image: centos:7
+    pull: true
+    when:
+      event: tag
+    environment:
+      - LANG=C.utf8
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - sed -i 's/keepcache=0/keepcache=1/' /etc/yum.conf
+      - curl -s -o /var/cache/yum/epel-release-latest-7.noarch.rpm http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+      - rpm -i /var/cache/yum/epel-release-latest-7.noarch.rpm
+      - yum install -qy centos-release-scl
+      - yum install -qy devtoolset-6
+      - scl enable devtoolset-6 bash
+      - yum install -qy libcurl-devel doxygen rpm-build
+      - yum --enablerepo=epel install -qy cmake3 jsoncpp-devel
+      - curl -s -o /var/cache/yum/curlpp-devel-0.7.3-5.el6.x86_64.rpm https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-devel-0.7.3-5.el6.x86_64.rpm
+      - curl -s -o /var/cache/yum/curlpp-0.7.3-5.el6.x86_64.rpm https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-0.7.3-5.el6.x86_64.rpm
+      - yum localinstall -qy /var/cache/yum/curlpp-*
+      - rm -rf build && mkdir -p build && cd build
+      - cmake3 -DWITH_EXAMPLES=NO -DWITH_TESTS=NO ..
+      - make package
+      - cmake3 -DWITH_RPM=YES ..
+      - make package
+      - cp -v libmastodon-cpp-${DRONE_TAG}-0.x86_64.rpm ..
+    volumes:
+      - /var/cache/centos-package-cache:/var/cache/yum/
 
-- name: clang7
-  image: debian:buster-slim
-  pull: true
-  environment:
-    LANG: C.utf8
-    CXX: clang++
-    CXXFLAGS: -pipe -O2
-    MASTODON_CPP_ACCESS_TOKEN:
-      from_secret: mastodon_cpp_access_token
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - apt-get update -q
-  - apt-get install -qy build-essential cmake clang
-  - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_EXAMPLES=YES ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
-
-- name: notification
-  image: drillster/drone-email
-  pull: always
-  settings:
-    host: cryptoparty-celle.de
-    from: drone@tzend.de
-    username:
-      from_secret: email_username
-    password:
-      from_secret: email_password
-  when:
-    status: [ changed, failure ]
-
-
----
-kind: pipeline
-name: packages x86_64
-
-platform:
-  os: linux
-  arch: amd64
-
-volumes:
-- name: debian-package-cache
-  host:
-    path: /var/cache/debian-package-cache
-- name: centos-package-cache
-  host:
-    path: /var/cache/centos-package-cache
-
-trigger:
-  event:
-  - tag
-
-steps:
-- name: Debian stretch
-  image: debian:stretch-slim
-  pull: always
-  environment:
-    CXXFLAGS: -pipe -O2
-    LANG: C.utf8
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - apt-get install -qy build-essential cmake lsb-release
-  - apt-get install -qy libpoco-dev libjsoncpp-dev file
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_DEB=YES -DWITH_DOC=NO ..
-  - make package
-  - cp -v libmastodon-cpp_${DRONE_TAG}-0_stretch_amd64.deb ..
-  volumes:
-    - name: debian-package-cache
-      path: /var/cache/apt/archives
-
-- name: Debian buster
-  image: debian:buster-slim
-  pull: always
-  environment:
-    CXXFLAGS: -pipe -O2
-    LANG: C.utf8
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - apt-get install -qy build-essential cmake lsb-release
-  - apt-get install -qy libpoco-dev libjsoncpp-dev file
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_DEB=YES -DWITH_DOC=NO ..
-  - make package
-  - cp -v libmastodon-cpp_${DRONE_TAG}-0_buster_amd64.deb ..
-  volumes:
-    - name: debian-package-cache
-      path: /var/cache/apt/archives
-
-- name: Ubuntu bionic
-  image: ubuntu:bionic
-  pull: always
-  environment:
-    CXXFLAGS: -pipe -O2
-    LANG: C.utf8
-  commands:
-  - rm -f /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - apt-get install -qy build-essential cmake lsb-release
-  - apt-get install -qy libpoco-dev libjsoncpp-dev file
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DWITH_DEB=YES -DWITH_DOC=NO ..
-  - make package
-  - cp -v libmastodon-cpp_${DRONE_TAG}-0_bionic_amd64.deb ..
-  volumes:
-    - name: debian-package-cache
-      path: /var/cache/apt/archives
-
-- name: CentOS 7
-  image: centos:7
-  pull: always
-  environment:
-    CXX: /opt/rh/devtoolset-6/root/usr/bin/g++
-    CXXFLAGS: -pipe -O2
-    LANG: C.utf8
-  commands:
-  - sed -i 's/keepcache=0/keepcache=1/' /etc/yum.conf
-  - curl -s -o /var/cache/yum/epel-release-latest-7.noarch.rpm http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-  - rpm -i /var/cache/yum/epel-release-latest-7.noarch.rpm
-  - yum install -qy centos-release-scl
-  - yum install -qy devtoolset-6
-  - scl enable devtoolset-6 bash
-  - yum install -qy poco-devel openssl-devel doxygen rpm-build
-  - yum --enablerepo=epel install -qy cmake3 jsoncpp-devel
-  - rm -rf build && mkdir -p build && cd build
-  - cmake3 -DWITH_RPM=YES -DWITH_DOC=NO ..
-  - make package
-  - cp -v libmastodon-cpp-${DRONE_TAG}-0.x86_64.rpm ..
-  volumes:
-  - name: centos-package-cache
-    path: /var/cache/yum
-
-- name: gitea_release
-  image: plugins/gitea-release
-  pull: always
-  settings:
+  gitea_release:
+    image: plugins/gitea-release
+    pull: true
+    when:
+      event: tag
     base_url: https://schlomp.space
-    api_key:
-      from_secret: gitea_token
+    secrets: [ gitea_token ]
     title: ${DRONE_TAG}
     prerelease: true
     files:
-      - libmastodon-cpp_${DRONE_TAG}-0_stretch_amd64.deb
-      - libmastodon-cpp_${DRONE_TAG}-0_buster_amd64.deb
-      - libmastodon-cpp_${DRONE_TAG}-0_bionic_amd64.deb
+      - mastodon-cpp-${DRONE_TAG}_x86_64.tar.gz
+      - libmastodon-cpp_${DRONE_TAG}-0_amd64.deb
       - libmastodon-cpp-${DRONE_TAG}-0.x86_64.rpm
     checksum:
       - sha256
       - sha512
 
-- name: notification
-  image: drillster/drone-email
-  pull: always
-  settings:
+  notify:
+    when:
+      status: [ changed, failure ]
+    image: drillster/drone-email
+    pull: true
     host: cryptoparty-celle.de
+    secrets: [ email_username, email_password ]
     from: drone@tzend.de
-    username:
-      from_secret: email_username
-    password:
-      from_secret: email_password
-  when:
-    status: [ changed, failure ]

.editorconfig

@@ -1,20 +0,0 @@
-# Configuration file for EditorConfig.
-# More information is available under <https://editorconfig.org/>.
-
-root = true
-
-[*]
-indent_style = space
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 80
-
-[*.?pp]
-indent_size = 4
-tab_width = 4
-
-[{CMakeLists.txt,*.cmake}]
-indent_size = 2
-tab_width = 2

CMakeLists.txt

@@ -1,86 +1,127 @@
-# Support version 3.6 and above, but use policy settings up to 3.14.
-# 3.6 is needed because of IMPORTED_TARGET in pkg_check_modules().
-cmake_minimum_required(VERSION 3.6...3.14)
-# Ranges are supported from 3.12, set policy to current for < 3.12.
-if(${CMAKE_VERSION} VERSION_LESS 3.12)
-  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-endif()
+cmake_minimum_required (VERSION 3.6)
+project (mastodon-cpp
+  VERSION 0.105.1
+  LANGUAGES CXX
+  )
+
+set(WITH_EASY "YES" CACHE STRING "WITH_EASY defaults to \"YES\"")
+set(WITH_EXAMPLES "NO" CACHE STRING "WITH_EXAMPLES defaults to \"NO\"")
+set(WITH_TESTS "NO" CACHE STRING "WITH_TESTS defaults to \"NO\"")
+set(WITH_DOC "YES" CACHE STRING "WITH_DOC defaults to \"YES\"")
+set(WITH_DEB "NO" CACHE STRING "WITH_DEB defaults to \"NO\"")
+set(WITH_RPM "NO" CACHE STRING "WITH_RPM defaults to \"NO\"")
 
 include(GNUInstallDirs)
-
-project (mastodon-cpp
-  VERSION 0.111.5
-  LANGUAGES CXX)
-
-# DESCRIPTION was introduced in version 3.9.
-if(NOT (${CMAKE_VERSION} VERSION_LESS 3.9))
-  set(PROJECT_DESCRIPTION
-    "C++ wrapper for the Mastodon API.")
+find_package(PkgConfig REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(CURLPP REQUIRED curlpp)
+if(WITH_EASY)
+  pkg_check_modules(JSONCPP REQUIRED jsoncpp)
 endif()
 
-option(WITH_EASY "Compile Easy interface." YES)
-option(WITH_EXAMPLES "Compile examples." NO)
-option(WITH_TESTS "Compile tests." NO)
-option(WITH_DOC "Generate HTML documentation." YES)
-option(WITH_DEB "Prepare for the building of .deb packages." NO)
-option(WITH_RPM "Prepare for the building of .rpm packages." NO)
-option(BUILD_SHARED_LIBS "Build shared libraries." YES)
-set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type, Release or Debug.")
-
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(DEBUG_CXXFLAGS
-  "-Wall"
-  "-Wextra"
-  "-Wpedantic"
-  "-ftrapv"
-  "-fsanitize=undefined"
-  "-g"
-  "-Og"
-  "-fno-omit-frame-pointer"
-  "-Wno-deprecated-declarations")
-set(DEBUG_LDFLAGS
-  "-fsanitize=undefined")
-add_compile_options("$<$<CONFIG:Debug>:${DEBUG_CXXFLAGS}>")
-# add_link_options was introduced in version 3.13.
-if(${CMAKE_VERSION} VERSION_LESS 3.13)
-  set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${DEBUG_LDFLAGS}")
-else()
-  add_link_options("$<$<CONFIG:Debug>:${DEBUG_LDFLAGS}>")
+set(CMAKE_CXX_FLAGS_DEBUG
+  "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wpedantic -ftrapv -fsanitize=undefined -g -Og -fno-omit-frame-pointer")
+
+# Do not complain about compatibility-wrapper
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
 endif()
 
-# Turn on debug output.
+include_directories(${PROJECT_SOURCE_DIR}/src)
+include_directories(${PROJECT_BINARY_DIR})
+
+include_directories(${CURL_INCLUDE_DIRS})
+include_directories(${CURLPP_INCLUDE_DIRS})
+include_directories(${JSONCPP_INCLUDE_DIRS})
+
+link_directories(${CURL_LIBRARY_DIRS})
+link_directories(${CURLPP_LIBRARY_DIRS})
+link_directories(${JSONCPP_LIBRARY_DIRS})
+
+# Write version in header
+configure_file (
+  "${PROJECT_SOURCE_DIR}/src/version.hpp.in"
+  "${PROJECT_BINARY_DIR}/version.hpp"
+)
+
+# Announce that we are compiling mastodon-cpp (used to figure out where the
+# headers are)
+add_definitions(-DMASTODON_CPP=1)
+
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  add_definitions("-DDEBUG=1")
+  add_definitions(-DDEBUG=1)
 endif()
 
 if(NOT WITH_EASY)
-  add_definitions("-DWITHOUT_EASY=1")
+  add_definitions(-DWITHOUT_EASY=1)
 endif()
 
-add_subdirectory("src")
+# Compile library
+if(WITH_EASY)
+  file(GLOB sources src/*.cpp src/api/*.cpp
+    src/easy/*.cpp src/easy/entities/*.cpp)
+else()
+  file(GLOB sources src/*.cpp src/api/*.cpp)
+endif()
+add_library(${PROJECT_NAME} SHARED ${sources})
+set_target_properties(${PROJECT_NAME} PROPERTIES
+  VERSION ${PROJECT_VERSION}
+  SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}
+  )
 
+if(WITH_EASY)
+  target_link_libraries(${PROJECT_NAME}
+    ${CURLPP_LIBRARIES} pthread ${JSONCPP_LIBRARIES})
+else()
+  target_link_libraries(${PROJECT_NAME}
+    ${CURLPP_LIBRARIES} pthread)
+endif()
+
+# Compile examples
 if(WITH_EXAMPLES)
-  add_subdirectory("examples")
+  file(GLOB sources_examples examples/*.cpp)
+  foreach(src ${sources_examples})
+    get_filename_component(bin ${src} NAME_WE)
+    add_executable(${bin} ${src})
+    target_link_libraries(${bin} pthread ${JSONCPP_LIBRARIES} ${PROJECT_NAME})
+  endforeach()
 endif()
 
+# Compile tests
 if(WITH_TESTS)
-  add_subdirectory("tests")
+  include(tests.CMakeLists.txt)
 endif()
 
+# Install library and header files
+install(TARGETS ${PROJECT_NAME} LIBRARY
+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES src/mastodon-cpp.hpp src/return_types.hpp src/types.hpp
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+if(WITH_EASY)
+  file(GLOB easy_header src/easy/*.hpp)
+  install(FILES ${easy_header}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/easy)
+  file(GLOB easy_entities_header src/easy/entities/*.hpp)
+  install(FILES ${easy_entities_header}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/easy/entities)
+endif()
+
+# Compile & install documentation
 if(WITH_DOC)
   add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/doc/html
-    COMMAND "./build_doc.sh" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+    COMMAND ./build_doc.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
   add_custom_target(doc DEPENDS doc/html)
   add_dependencies(${PROJECT_NAME} doc)
-
   install(DIRECTORY ${PROJECT_SOURCE_DIR}/doc/html
-    DESTINATION "${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME}")
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}-${PROJECT_VERSION})
+  file(GLOB examples examples/example*.cpp)
+  install(FILES ${examples}
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}-${PROJECT_VERSION}/examples)
 endif()
 
-add_subdirectory("cmake")
-add_subdirectory("pkg-config")
-
-include("cmake/packages.cmake")
+# Packages
+include(packages.CMakeLists.txt)

CODE_OF_CONDUCT.adoc

@@ -1,49 +0,0 @@
-:contact-coc: tastytea@tastytea.de
-
-== Code of Conduct
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, education, ethnicity, gender identity and expression, level of
-experience, nationality, personal appearance, race, religion, sex
-characteristics, sexual identity and orientation or socio-economic status.
-
-=== Examples
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language.
-* Being respectful of differing viewpoints and experiences.
-* Gracefully accepting constructive criticism.
-* Focusing on what is best for the community.
-* Showing empathy towards other community members.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances.
-* Trolling, insulting/derogatory comments, and personal attacks.
-* Public or private harassment.
-* Publishing others’ private information, such as a physical or electronic
-  address, without explicit permission.
-
-=== Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at {contact-coc}.
-
-All complaints will be reviewed and investigated and will result in a response
-that is deemed necessary and appropriate to the circumstances. The project team
-is obligated to maintain confidentiality with regard to the reporter of an
-incident.
-
-=== Attribution
-
-This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
-available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

CONTRIBUTING.adoc

@@ -1,29 +0,0 @@
-:project: mastodon-cpp
-:uri-base: https://schlomp.space/tastytea/{project}
-:uri-coc: {uri-base}/src/branch/master/CODE_OF_CONDUCT.adoc
-:contact-email: tastytea@tastytea.de
-:contact-xmpp: {contact-email}
-:contact-fediverse: https://likeable.space/users/tastytea
-
-== How to contribute
-
-Read the link:{uri-coc}[Code of Conduct].
-
-=== Reporting bugs or suggesting enhancements
-
-Before reporting a bug, please
-https://schlomp.space/tastytea/{project}/issues[perform a search] to see if the
-problem has already been reported. If it has, add a comment to the existing
-issue instead of opening a new one. Same for enhancements.
-
-You can also contact me via mailto:{contact-email}[E-Mail],
-link:xmpp:{contact-xmpp}[XMPP] or the {contact-fediverse}[Fediverse] if you
-don't want to open an account.
-
-=== Pull requests
-
-Please use similar coding conventions as the rest of the project. The basic rule
-to remember is to write code in the same style as the existing/surrounding code.
-
-You can also send me your patches via mailto:{contact-email}[E-Mail], ideally
-using `git format-patch` or `git send-email`.

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+# How to contribute
+
+## Reporting bugs or suggesting enhancements
+
+Before reporting a bug , please
+[perform a search](https://schlomp.space/tastytea/mastodon-cpp/issues)
+to see if the problem has already been reported. If it has, add a comment to the
+existing issue instead of opening a new one. Same for enhancements.
+
+You can also contact me via the Fediverse if you don't want to open an account.
+My account is [@tastytea@likeable.space](https://likeable.space/users/tastytea).
+
+## Pull requests
+
+Please use similar coding conventions as the rest of the project. The basic rule
+to remember is to write code in the same style as the existing/surrounding code.

Doxyfile

@@ -1,7 +1,8 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "mastodon-cpp"
 PROJECT_NUMBER         = 0.0.0
-INPUT                  = src/ src/api/ src/easy/ src/easy/entities/
+INPUT                  = README.md src/ src/api/ src/easy/ src/easy/entities/
+USE_MDFILE_AS_MAINPAGE = README.md
 CREATE_SUBDIRS         = NO
 ALLOW_UNICODE_NAMES    = YES
 OUTPUT_LANGUAGE        = English

LICENSE

@@ -1,21 +1,23 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -24,34 +26,44 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -60,7 +72,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -537,45 +549,35 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
+  13. Use with the GNU Affero General Public License.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
+Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
+versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -633,29 +635,40 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
+    it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.adoc

@@ -1,494 +0,0 @@
-= mastodon-cpp
-:toc: preamble
-:project: mastodon-cpp
-:uri-base: https://schlomp.space/tastytea/{project}
-:uri-branch-main: {uri-base}/src/branch/master
-:uri-mastodonpp: https://schlomp.space/tastytea/mastodonpp
-
-[IMPORTANT]
-This project has become too complicated to maintain by myself and I can't find
-the energy to add features. **You can find a complete rewrite, with cleaner and
-much easier to understand code at link:{uri-mastodonpp}[mastodonpp].** I
-recommend switching to it. You can still report bugs here and I will respond,
-but I won't put too much work in it. If you want to take over maintainership,
-get in touch.
-
-*{project}* is a C++ wrapper for the Mastodon API. You submit an API call
-and get the raw JSON that you can then transform into easy to use abstractions.
-
-== Usage
-
-The HTML reference can be generated with `build_doc.sh`, if doxygen is
-installed. It is also available at
-https://doc.schlomp.space/{project}/annotated.html[doc.schlomp.space/{project}/].
-There are more {uri-branch-main}/examples[examples] in `examples/`.
-
-=== Examples
-
-.Print own account as JSON to stdout.
-====
-[source,c++]
-----
-#include <iostream>
-#include <mastodon-cpp/mastodon-cpp.hpp>
-
-int main()
-{
-    Mastodon::API masto("social.example.com", "auth_token");
-    std::cout << masto.get(Mastodon::API::v1::accounts_verify_credentials);
-    std::cout << std::endl;
-}
-----
-====
-
-.Use the `Easy` interface to get the last posts from the federated timeline.
-====
-[source,c++]
-----
-#include <iostream>
-#include <string>
-#include <mastodon-cpp/mastodon-cpp.hpp>
-#include <mastodon-cpp/easy/all.hpp>
-
-using Mastodon;
-
-int main()
-{
-    Easy::API masto("social.example", "");
-    return_call ret = masto.get(API::v1::timelines_public);
-
-    for (const std::string &str : Easy::json_array_to_vector(ret.answer))
-    {
-        Easy::Status status(str);
-        std::cout << "  " << status.account().acct() << " wrote:\n";
-        std::cout << status.content() << '\n';
-    }
-}
-----
-====
-
-=== Compiling your project
-
-A project consisting of one file can be compiled as follows:
-
-[source,shell]
-----
-g++ --std=c++14 -lmastodon-cpp example.cpp
-----
-
-=== List of types
-
-Learn more at <https://doc.schlomp.space/mastodon-cpp/namespaceMastodon.html>
-and <https://doc.schlomp.space/mastodon-cpp/namespaceMastodon_1_1Easy.html>.
-
-Not included in this list are entities.
-
-==== Return types
-
-* `Mastodon::return_call`: Contains the response from `Mastodon::API` calls.
-
-==== Other types
-
-* `Mastodon::parameters`: Vector of `Mastodon::param` with custom `find()`, for
-  specifying parameters to an `Mastodon::API` call.
-* `Mastodon::http_method`: HTTP method of an `Mastodon::API` call.
-* `Mastodon::Easy::event_type`: Event types returned in streams.
-* `Mastodon::Easy::visibility_type`: Describes the visibility of a post.
-* `Mastodon::Easy::attachment_type`: Describes the type of attachment.
-* `Mastodon::Easy::card_type`: Describes the type of card.
-* `Mastodon::Easy::notification_type`: The type of the notification.
-* `Mastodon::Easy::context_type`: Describes the context of a filter.
-* `Mastodon::Easy::stream_event_type`: Type and data of an events returned in
-  streams.
-* `Mastodon::Easy::alert_type`, used for push subscriptions.
-* `Mastodon::Easy::time_type`: Type for time, can be converted to `time_point`
-  and `string`.
-* `Mastodon::Easy::account_field_type`: Type for fields in accounts.
-* `Mastodon::Easy::urls_type`: Type for URLs returned by `Instance::urls()`.
-* `Mastodon::Easy::stats_type`: Type for statistics returned by
-  `Instance::stats()`.
-* `Mastodon::Easy::poll_options_type`: Type for poll options returned by
-  `Poll::options()`.
-
-=== Error codes
-
-[options="header",cols=">,<"]
-|===================================================
-| Code | Explanation
-|    0 | No error
-|    1 | Invalid argument
-|   10 | URL changed (HTTP 301 or 308)
-|   11 | Connection timed out
-|   12 | Connection refused (check http_error_code)
-|   13 | No route to host / Could not resolve host
-|   14 | Encryption error
-|  127 | Unknown error
-|===================================================
-
-If you use a debug build, you get more verbose error messages.
-
-=== Useful links
-
-* https://docs.joinmastodon.org/[Mastodon documentation]
-* https://git.pleroma.social/pleroma/pleroma/tree/develop/docs/api[Pleroma documentation]
-* https://glitch-soc.github.io/docs/#whats-different[glitch-soc documentation]
-
-== Install
-
-=== Upgrading from versions below 0.100.0
-
-Starting with version `0.100.0`, large parts of the library have been rewritten.
-Upgrading from previous versions will require extensive code changes.
-
-=== Packages
-
-Every https://schlomp.space/tastytea/{project}/releases[release] includes
-packages for Debian and Centos. Gentoo packages are available in my overlay.
-
-==== Gentoo
-
-Add my https://schlomp.space/tastytea/overlay[repository] and
-install it from there.
-
-[source,shell]
-----
-eselect repository enable tastytea
-echo 'dev-cpp/mastodon-cpp ~amd64' >> /etc/portage/package.accept_keywords/mastodon-cpp
-emaint sync -r tastytea
-emerge -a dev-cpp/mastodon-cpp
-----
-
-==== DEB and RPM
-
-Prebuilt DEB and RPM packages for x86_64(amd64) are provided with each release.
-`.deb` packages are built on Debian stretch and `.rpm` packages are built on
-CentOS 7. These packages are automatically built and not tested.
-
-=== From source
-
-==== Dependencies
-
-* Tested OS: Linux
-* C++ compiler (tested: https://gcc.gnu.org/[gcc] 6/8/9,
-  https://llvm.org/[clang] 5/7)
-* https://cmake.org/[cmake] (at least: 3.6)
-* https://pocoproject.org/[POCO] (tested: 1.9 / 1.7)
-* Optional
-  ** Easy interface & Examples:
-     https://github.com/open-source-parsers/jsoncpp[jsoncpp] (tested: 1.8 / 1.7)
-  ** Documentation: https://www.stack.nl/~dimitri/doxygen/[doxygen] (tested: 1.8)
-  ** DEB package: https://packages.qa.debian.org/dpkg[dpkg] (tested: 1.18)
-  ** RPM package: http://www.rpm.org[rpm-build] (tested: 4.11)
-  ** Tests: https://github.com/catchorg/Catch2[catch] (tested: 2.5 / 1.2)
-
-.Install dependencies in Debian stretch.
-====
-[source,shell]
-----
-apt-get install build-essential cmake libpoco-dev libjsoncpp-dev doxygen
-----
-====
-
-==== Get sourcecode
-
-===== Release
-
-Download the current release at
-https://schlomp.space/tastytea/{project}/releases[schlomp.space].
-
-===== Development version
-
-[source,shell]
-----
-git clone https://schlomp.space/tastytea/mastodon-cpp.git
-----
-
-==== Compile
-
-[source,shell]
-----
-mkdir build
-cd build/
-cmake ..
-cmake --build . -- -j$(nproc --ignore=1)
-----
-
-.cmake options:
-* `-DCMAKE_BUILD_TYPE=Debug` for a debug build.
-* `-DWITH_EASY=NO` to not build the Easy abstractions and to get rid of the
-  jsoncpp-dependency (not recommended).
-* `-DWITH_EXAMPLES=YES` if you want to compile the examples.
-* `-DWITH_TESTS=YES` if you want to compile the tests.
-* `-DEXTRA_TEST_ARGS` to run only some tests
-  (https://github.com/catchorg/Catch2/blob/master/docs/command-line.md#specifying-which-tests-to-run[format]).
-  ** Possible tags: `[api]`, `[auth]`, `[mastodon]`, `[glitch-soc]`,
-     `[pleroma]`, `[upload]`, `[entity]`.
-* `-DWITH_DOC=NO` if you don't want to compile the HTML reference.
-* One of:
-  ** `-DWITH_DEB=YES` if you want to be able to generate a deb-package.
-  ** `-DWITH_RPM=YES` if you want to be able to generate an rpm-package.
-
-.Run only tests for glitch-soc features that don't upload any files.
-====
-[source,shell]
-----
-cmake -DWITH_TESTS=YES -DEXTRA_TEST_ARGS=[glitch-soc]~[upload] ..
-----
-====
-
-==== Tests
-
-You can run the tests with `ctest` inside the build directory. You need to set
-the environment variable `MASTODON_CPP_ACCESS_TOKEN` to an access token with the
-scopes _read_, _write_ and _follow_ for tests tagged with `[auth]`.
-You can select the instance to use with `MASTODON_CPP_INSTANCE`, the default is
-_likeable.space_. You can select the user ID with `MASTODON_CPP_USER_ID`, the
-default is _9hnrrVPriLiLVAhfVo_. You can select the status ID with
-`MASTODON_CPP_STATUS_ID`, the default is _9hwnuJMq3eTdO4s1PU_. You can select
-the filter ID with `MASTODON_CPP_FILTER_ID`. You can select the list ID with
-`MASTODON_CPP_LIST_ID`, the default is _2_. You can select the media ID with
-`MASTODON_CPP_MEDIA_ID`, the default is _2127742613_.
-
-.Requirements for the test-user:
-* Have at least 1 follower.
-* Follow at least 1 account.
-* Have at least 1 account endorsed.
-* Have at least 1 public or unlisted status.
-* Have at least 1 post favourited.
-* Have no follow requests.
-* Have at least 1 list with at least one account in it.
-* have at least 1 account muted.
-
-include::{uri-base}/raw/branch/master/CONTRIBUTING.adoc[]
-
-== Status of implementation
-
-You can still use unsupported calls by using `API::get` and the others with
-strings and you can use unsupported fields in an `Entity` by converting it to
-`Json::Value`.
-
-=== Mastodon API
-
-==== Calls
-
-* Accounts
-  ** [x] GET /api/v1/accounts/:id
-  ** [x] POST /api/v1/accounts
-  ** [x] GET /api/v1/accounts/verify_credentials
-  ** [x] PATCH /api/v1/accounts/update_credentials
-  ** [x] GET /api/v1/accounts/:id/followers
-  ** [x] GET /api/v1/accounts/:id/following
-  ** [x] GET /api/v1/accounts/:id/statuses
-  ** [x] POST /api/v1/accounts/:id/follow
-  ** [x] POST /api/v1/accounts/:id/unfollow
-  ** [x] GET /api/v1/accounts/relationships
-  ** [x] GET /api/v1/accounts/search
-* Apps
-  ** [x] POST /api/v1/apps
-  ** [x] GET /api/v1/apps/verify_credentials
-* Blocks
-  ** [x] GET /api/v1/blocks
-  ** [x] POST /api/v1/accounts/:id/block
-  ** [x] POST /api/v1/accounts/:id/unblock
-* Custom emoji
-  ** [x] GET /api/v1/custom_emojis
-* Domain blocks
-  ** [x] GET /api/v1/domain_blocks
-  ** [x] POST /api/v1/domain_blocks
-  ** [x] DELETE /api/v1/domain_blocks
-* Endorsements
-  ** [x] GET /api/v1/endorsements
-  ** [x] POST /api/v1/accounts/:id/pin
-  ** [x] POST /api/v1/accounts/:id/unpin
-* Favourites
-  ** [x] GET /api/v1/favourites
-  ** [x] POST /api/v1/statuses/:id/favourite
-  ** [x] POST /api/v1/statuses/:id/unfavourite
-* Filters
-  ** [x] GET /api/v1/filters
-  ** [x] POST /api/v1/filters
-  ** [x] GET /api/v1/filters/:id
-  ** [x] PUT /api/v1/filters/:id
-  ** [x] DELETE /api/v1/filters/:id
-* Follow requests
-  ** [x] GET /api/v1/follow_requests
-  ** [x] POST /api/v1/follow_requests/:id/authorize
-  ** [x] POST /api/v1/follow_requests/:id/reject
-* Follow suggestions
-  ** [x] GET /api/v1/suggestions
-  ** [x] DELETE /api/v1/suggestions/:account_id
-* Instances
-  ** [x] GET /api/v1/instance
-* Lists
-  ** [x] GET /api/v1/lists
-  ** [x] GET /api/v1/accounts/:id/lists
-  ** [x] GET /api/v1/lists/:id/accounts
-  ** [x] GET /api/v1/lists/:id
-  ** [x] POST /api/v1/lists
-  ** [x] PUT /api/v1/lists/:id
-  ** [x] DELETE /api/v1/lists/:id
-  ** [x] POST /api/v1/lists/:id/accounts
-  ** [x] DELETE /api/v1/lists/:id/accounts
-* Media attachments
-  ** [x] POST /api/v1/media
-  ** [x] PUT /api/v1/media/:id
-* Mutes
-  ** [x] GET /api/v1/mutes
-  ** [x] POST /api/v1/accounts/:id/mute
-  ** [x] POST /api/v1/accounts/:id/unmute
-  ** [x] POST /api/v1/statuses/:id/mute
-  ** [x] POST /api/v1/statuses/:id/unmute
-* Notifications
-  ** [x] GET /api/v1/notifications
-  ** [x] GET /api/v1/notifications/:id
-  ** [x] POST /api/v1/notifications/clear
-  ** [x] POST /api/v1/notifications/dismiss
-  ** [x] POST /api/v1/push/subscription
-  ** [x] GET /api/v1/push/subscription
-  ** [x] PUT /api/v1/push/subscription
-  ** [x] DELETE /api/v1/push/subscription
-* Polls
-  ** [x] GET /api/v1/polls/:id
-  ** [x] POST /api/v1/polls/:id/votes
-* Reports
-  ** [x] POST /api/v1/reports
-* Scheduled Statuses
-  ** [ ] GET /api/v1/scheduled_statuses
-  ** [ ] GET /api/v1/scheduled_statuses/:id
-  ** [ ] PUT /api/v1/scheduled_statuses/:id
-  ** [ ] DELETE /api/v1/scheduled_statuses/:id
-* Search
-  ** [x] GET /api/v2/search
-* Statuses
-  ** [x] GET /api/v1/statuses/:id
-  ** [x] GET /api/v1/statuses/:id/context
-  ** [x] GET /api/v1/statuses/:id/card
-  ** [x] GET /api/v1/statuses/:id/reblogged_by
-  ** [x] GET /api/v1/statuses/:id/favourited_by
-  ** [x] POST /api/v1/statuses
-  ** [x] DELETE /api/v1/statuses/:id
-  ** [x] POST /api/v1/statuses/:id/reblog
-  ** [x] POST /api/v1/statuses/:id/unreblog
-  ** [x] POST /api/v1/statuses/:id/pin
-  ** [x] POST /api/v1/statuses/:id/unpin
-* Timelines
-  ** [x] GET /api/v1/timelines/home
-  ** [x] GET /api/v1/conversations
-  ** [x] GET /api/v1/timelines/public
-  ** [x] GET /api/v1/timelines/tag/:hashtag
-  ** [x] GET /api/v1/timelines/list/:list_id
-* Streaming API
-  ** [x] GET /api/v1/streaming/health
-  ** [x] GET /api/v1/streaming/user
-  ** [x] GET /api/v1/streaming/public
-  ** [x] GET /api/v1/streaming/public/local
-  ** [x] GET /api/v1/streaming/hashtag
-  ** [x] GET /api/v1/streaming/hashtag/local
-  ** [x] GET /api/v1/streaming/list
-  ** [x] GET /api/v1/streaming/direct
-
-==== Entities
-
-* [x] Account
-* [x] Application
-* [x] Attachment
-* [x] Card
-* [x] Context
-* [x] Conversation
-* [x] Emoji
-* [x] Filter
-* [x] Instance
-* [x] List
-* [x] Mention
-* [x] Notification
-* [x] Poll
-* [x] PushSubscription
-* [x] Relationship
-* [x] Results
-* [x] Status
-* [ ] ScheduledStatus
-* [x] Tag
-* [ ] Token
-
-=== glitch-soc API
-
-==== Calls
-
-* [x] GET /api/v1/bookmarks
-* [x] POST /api/v1/statuses/:id/bookmark
-* [x] POST /api/v1/statuses/:id/unbookmark
-
-==== Entities
-
-* [x] `max_toot_chars` in Instance
-
-=== Pleroma API
-
-==== Calls
-
-* [ ] `preview` and `content_type` in POST /api/v1/statuses
-* [ ] `no_rich_text`, `hide_followers`, `hide_follows`, `hide_favorites` and
-  `show_role` in /api/v1/update_credentials
-* [ ] GET /api/pleroma/emoji
-* [ ] POST /api/pleroma/follow_import
-* [ ] GET /api/pleroma/captcha
-* [ ] POST /api/pleroma/delete_account
-* [ ] POST /api/account/register
-* [ ] POST /api/v1/pleroma/flavour/:flavour
-* [ ] GET /api/v1/pleroma/flavour
-* [ ] POST /api/pleroma/notifications/read
-* [ ] POST /api/v1/pleroma/accounts/:id/subscribe
-* [ ] POST /api/v1/pleroma/accounts/:id/unsubscribe
-* [ ] GET /api/v1/pleroma/accounts/:id/favourites
-* [ ] PUT /api/pleroma/notification_settings
-* [ ] GET /api/pleroma/healthcheck
-* Admin API
-  ** [ ] GET /api/pleroma/admin/users
-  ** [ ] DELETE /api/pleroma/admin/user
-  ** [ ] POST /api/pleroma/admin/user
-  ** [ ] POST /api/pleroma/admin/user/follow
-  ** [ ] POST /api/pleroma/admin/user/unfollow
-  ** [ ] PATCH /api/pleroma/admin/users/:nickname/toggle_activation
-  ** [ ] PUT /api/pleroma/admin/users/tag
-  ** [ ] DELETE /api/pleroma/admin/users/tag
-  ** [ ] GET /api/pleroma/admin/permission_group/:nickname
-  ** [ ] GET /api/pleroma/admin/permission_group/:nickname/:permission_group
-  ** [ ] POST /api/pleroma/admin/permission_group/:nickname/:permission_group
-  ** [ ] DELETE /api/pleroma/admin/permission_group/:nickname/:permission_group
-  ** [ ] PUT /api/pleroma/admin/activation_status/:nickname
-  ** [ ] GET /api/pleroma/admin/users/:nickname
-  ** [ ] POST /api/pleroma/admin/relay
-  ** [ ] DELETE /api/pleroma/admin/relay
-  ** [ ] GET /api/pleroma/admin/invite_token
-  ** [ ] GET /api/pleroma/admin/invites
-  ** [ ] POST /api/pleroma/admin/revoke_invite
-  ** [ ] POST /api/pleroma/admin/email_invite
-  ** [ ] GET /api/pleroma/admin/password_reset
-
-==== Entities
-
-* `pleroma` object in:
-  ** [ ] Status
-  ** [ ] Attachment
-  ** [ ] Account
-  ** [ ] Source
-  ** [ ] Notification
-
-== Blocked instances
-
-Instances that are frequently used to hurt marginalized people are blocked from
-using this library.
-
-.List of blocked instances:
-* https://en.wikipedia.org/wiki/Gab_(social_network)[Gab]
-* https://en.wikipedia.org/wiki/Kiwi_Farms[Kiwi Farms]
-
-== Copyright
-
-[source,text]
-----
-Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>.
-License AGPLv3: <https://www.gnu.org/licenses/agpl-3.0.html>.
-This program comes with ABSOLUTELY NO WARRANTY. This is free software,
-and you are welcome to redistribute it under certain conditions.
-----

README.md

@@ -0,0 +1,383 @@
+**mastodon-cpp** is a C++ wrapper for the Mastodon API. You submit an API call
+and get the raw JSON or easy to use abstractions.
+
+**The ABI will be unstable in versions < 1.0.0**
+
+[Subscribe to mastodon-cpp releases](https://rss.schlomp.space/?repo=tastytea/mastodon-cpp).
+
+# Usage
+
+The HTML reference can be generated with `build_doc.sh`, if doxygen is
+installed. It is also available at
+[doc.schlomp.space/mastodon-cpp/](https://doc.schlomp.space/mastodon-cpp/annotated.html).
+There are [examples](https://schlomp.space/tastytea/mastodon-cpp/src/branch/master/examples)
+in `examples/`.
+
+## Most basic example
+
+```c++
+#include <iostream>
+#include <mastodon-cpp/mastodon-cpp.hpp>
+
+int main()
+{
+    Mastodon::API masto("social.example.com", "auth_token");
+    std::cout << masto.get(Mastodon::API::v1::accounts_verify_credentials);
+    std::cout << std::endl;
+}
+```
+
+## Another simple example
+
+Using the `Easy` interface.
+
+```c++
+#include <iostream>
+#include <string>
+#include <mastodon-cpp/mastodon-cpp.hpp>
+#include <mastodon-cpp/easy/all.hpp>
+
+using Mastodon;
+
+int main()
+{
+    Easy::API masto("social.example", "");
+    return_call ret = masto.get(API::v1::timelines_public);
+
+    for (const std::string &str : Easy::json_array_to_vector(ret.answer))
+    {
+        Easy::Status status(str);
+        std::cout << "  " << status.account().acct() << " wrote:\n";
+        std::cout << status.content() << '\n';
+    }
+}
+```
+
+## Compiling your project
+
+A project consisting of one file can be compiled as follows:
+
+``` shellsession
+g++ -std=c++14 -lmastodon-cpp example.cpp
+```
+
+## List of types
+
+Learn more at <https://doc.schlomp.space/mastodon-cpp/namespaceMastodon.html>
+and <https://doc.schlomp.space/mastodon-cpp/namespaceMastodon_1_1Easy.html>.
+
+### Return types
+
+* `Mastodon::return_call`: Contains the response from `Mastodon::API` calls.
+* `Mastodon::Easy::return_entity`: Contains the response from
+  `Mastodon::Easy::API` calls that return a single `Mastodon::Easy::Entity`.
+* `Mastodon::Easy::return_entities_vector`: Contains the response from
+  `Mastodon::Easy::API` calls that return multiple `Mastodon::Easy::Entity`.
+
+### Other types
+
+* `Mastodon::param`: A single parameter to an `Mastodon::API` call. Normally you
+  don't need this.
+* `Mastodon::parameters`: All parameters to an `Mastodon::API` call.
+* `Mastodon::http_method`: HTTP method of an `Mastodon::API` call.
+* `Mastodon::Easy::event_type`: Event types returned in streams.
+* `Mastodon::Easy::visibility_type`: Describes the visibility of a post.
+* `Mastodon::Easy::attachment_type`: Describes the type of attachment.
+* `Mastodon::Easy::card_type`: Describes the type of card.
+* `Mastodon::Easy::notification_type`: The type of the notification.
+* `Mastodon::Easy::context_type`: Describes the context of a filter.
+* `Mastodon::Easy::stream_event`: Type and data of an events returned in
+  streams.
+* `Mastodon::Easy::alert_type`: Type for a single alert.
+* `Mastodon::Easy::alerts`: Vector of `Mastodon::Easy::alert_type`, used for
+  push subscriptions.
+* `Mastodon::Easy::time`: Type for time, can be converted to `time_point` and
+  `string`.
+
+## Error codes
+
+|      Code | Explanation                                |
+| --------: |:-------------------------------------------|
+|         0 | No error                                   |
+|        22 | Invalid argument                           |
+|        78 | URL changed (HTTP 301 or 308)              |
+|       110 | Connection timed out                       |
+|       111 | Connection refused (check http_error_code) |
+|       113 | No route to host / Could not resolve host  |
+|       192 | curlpp runtime error                       |
+|       193 | curlpp logic error                         |
+|       255 | Unknown error                              |
+
+If you use a debug build, you get more verbose error messages.
+
+## Useful links
+
+* [Mastodon documentation](https://docs.joinmastodon.org/)
+* [Pleroma documentation](https://git.pleroma.social/pleroma/pleroma/tree/develop/docs/api)
+* [glitch-soc documentation](https://glitch-soc.github.io/docs/#whats-different)
+
+# Install
+
+## Upgrading from versions below 0.100.0
+
+Starting with version `0.100.0`, large parts of the library have been rewritten.
+Upgrading from previous versions will require extensive code changes. You can
+keep using the old version, it is archived in the branch
+[pre-0.100.0](https://schlomp.space/tastytea/mastodon-cpp/src/branch/pre-0.100.0).
+It will receive bug-fixes for a while but no new features.
+
+## Packages
+
+Every [release](https://schlomp.space/tastytea/mastodon-cpp/releases) includes
+packages for Debian and Centos. Gentoo packages are available in my overlay.
+
+### Gentoo
+
+Add my [repository](https://schlomp.space/tastytea/overlay) and
+install it from there.
+
+```shellsession
+eselect repository enable tastytea
+echo 'dev-cpp/mastodon-cpp ~amd64' >> /etc/portage/package.accept_keywords/mastodon-cpp
+emaint sync -r tastytea
+emerge -a dev-cpp/mastodon-cpp
+```
+
+### DEB and RPM
+
+Prebuilt DEB and RPM packages for x86_64(amd64) are provided with each release.
+`.deb` packages are built on Debian stretch and `.rpm` packages are built on
+CentOS 7. These packages are automatically built and not tested.
+
+To use the `.deb` package on Debian stretch, you will need
+[libcurlpp0](https://packages.debian.org/libcurlpp0) from sid.
+
+To use the `.rpm` package on CentOS 7, you will need
+[libcurlpp](https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/)
+from EPEL 6.
+
+## From source
+
+### Dependencies
+
+* Tested OS: Linux
+* C++ compiler (tested: [gcc](https://gcc.gnu.org/) 6/7/8,
+  [clang](https://llvm.org/) 5/6)
+* [cmake](https://cmake.org/) (at least: 3.6)
+* [pkgconfig](https://pkgconfig.freedesktop.org/wiki/) (tested: 0.29 / 0.27)
+* [curlpp](http://www.curlpp.org/) (tested: 0.8)
+* Optional
+    * Easy interface & Examples: [jsoncpp](https://github.com/open-source-parsers/jsoncpp) (tested: 1.8 / 1.7)
+    * Documentation: [doxygen](https://www.stack.nl/~dimitri/doxygen/) (tested: 1.8)
+    * DEB package: [dpkg](https://packages.qa.debian.org/dpkg) (tested: 1.18)
+    * RPM package: [rpm-build](http://www.rpm.org) (tested: 4.11)
+    * Tests: [catch](https://github.com/catchorg/Catch2) (tested: 2.5 / 1.2)
+
+#### Debian stretch
+
+``` shellsession
+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
+apt-get install build-essential cmake pkg-config libcurl4-openssl-dev libjsoncpp-dev doxygen file
+apt-get install -t sid libcurlpp-dev
+```
+
+#### Centos 7
+
+``` shellsession
+wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+rpm -i epel-release-latest-7.noarch.rpm
+yum install centos-release-scl
+yum install devtoolset-6
+scl enable devtoolset-6 bash
+yum install libcurl-devel doxygen rpm-build
+yum --enablerepo=epel install cmake3 jsoncpp-devel
+wget https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-devel-0.7.3-5.el6.x86_64.rpm
+wget https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-0.7.3-5.el6.x86_64.rpm
+yum localinstall curlpp-devel-0.7.3-5.el6.x86_64.rpm curlpp-0.7.3-5.el6.x86_64.rpm
+```
+
+### Get sourcecode
+
+#### Release
+
+Download the current release at
+[schlomp.space](https://schlomp.space/tastytea/mastodon-cpp/releases).
+
+#### Development version
+
+```shellsession
+git clone https://schlomp.space/tastytea/mastodon-cpp.git
+```
+
+### Compile
+
+```shellsession
+mkdir build
+cd build/
+cmake ..
+cmake --build . -- -j$(nproc --ignore=1)
+```
+
+cmake options:
+
+ * `-DCMAKE_BUILD_TYPE=Debug` for a debug build
+ * `-DWITH_EASY=NO` to not build the Easy abstractions and to get rid of the
+   jsoncpp-dependency (not recommended)
+ * `-DWITH_EXAMPLES=YES` if you want to compile the examples
+ * `-DWITH_TESTS=YES` if you want to compile the tests
+ * `-DEXTRA_TEST_ARGS` to run only some tests
+   * Possible values: `[api]`, `[mastodon]`, `[glitch-soc]`, `[pleroma]`
+   * Example: `-DEXTRA_TEST_ARGS=[pleroma]![mastodon]` to run the tests for features
+     in Pleroma that are not in Mastodon.
+ * `-DWITH_DOC=NO` if you don't want to compile the HTML reference
+ * One of:
+    * `-DWITH_DEB=YES` if you want to be able to generate a deb-package
+    * `-DWITH_RPM=YES` if you want to be able to generate an rpm-package
+
+Install with `make install`.
+
+### Tests
+
+You can run the tests with `ctest` inside the build directory. You need to set
+the environment variable `MASTODON_CPP_ACCESS_TOKEN` to an access token with the
+scopes *read*, *write* and *follow* for some tests.
+You can select the instance to use with `MASTODON_CPP_INSTANCE`, the default is
+*likeable.space*. You can select the user ID with `MASTODON_CPP_USER_ID`, the
+default is *9hnrrVPriLiLVAhfVo*. You can select the status ID with
+`MASTODON_CPP_STATUS_ID`, the default is *9hwnuJMq3eTdO4s1PU*. You can select
+the filter ID with `MASTODON_CPP_FILTER_ID`.
+
+Requirements for the test-user:
+
+* Have at least 1 follower.
+* Follow at least 1 account.
+* Have at least 1 account endorsed.
+* Have at least 1 public or unlisted status.
+* Have at least 1 post favourited.
+* Have no follow requests.
+
+### Packages
+
+#### DEB and RPM
+
+Compile with `-DWITH_DEB=ON` or `-DWITH_RPM=ON`.
+Run `make package` from the build directory to generate a DEB/RPM package.
+
+#### Other
+
+Run `make package` from the build directory to generate a tar.gz archive.
+
+# Status of implementation
+
+~~Feature complete as of Mastodon 2.6.1~~
+
+ * [x] GET /api/v1/accounts/:id
+ * [x] POST /api/v1/accounts
+ * [x] GET /api/v1/accounts/verify_credentials
+ * [x] PATCH /api/v1/accounts/update_credentials
+ * [x] GET /api/v1/accounts/:id/followers
+ * [x] GET /api/v1/accounts/:id/following
+ * [x] GET /api/v1/accounts/:id/statuses
+ * [x] POST /api/v1/accounts/:id/follow
+ * [x] POST /api/v1/accounts/:id/unfollow
+ * [x] GET /api/v1/accounts/relationships
+ * [x] GET /api/v1/accounts/search
+ * [x] POST /api/v1/apps
+ * [x] GET /api/v1/apps/verify_credentials
+ * [x] GET /api/v1/blocks
+ * [x] POST /api/v1/accounts/:id/block
+ * [x] POST /api/v1/accounts/:id/unblock
+ * [x] GET /api/v1/custom_emojis
+ * [x] GET /api/v1/domain_blocks
+ * [x] POST /api/v1/domain_blocks
+ * [x] DELETE /api/v1/domain_blocks
+ * [x] GET /api/v1/endorsements
+ * [x] POST /api/v1/accounts/:id/pin
+ * [x] POST /api/v1/accounts/:id/unpin
+ * [x] GET /api/v1/favourites
+ * [x] POST /api/v1/statuses/:id/favourite
+ * [x] POST /api/v1/statuses/:id/unfavourite
+ * [x] GET /api/v1/filters
+ * [x] POST /api/v1/filters
+ * [x] GET /api/v1/filters/:id
+ * [x] PUT /api/v1/filters/:id
+ * [x] DELETE /api/v1/filters/:id
+ * [x] GET /api/v1/follow_requests
+ * [x] POST /api/v1/follow_requests/:id/authorize
+ * [x] POST /api/v1/follow_requests/:id/reject
+ * [x] GET /api/v1/suggestions
+ * [x] DELETE /api/v1/suggestions/:account_id
+ * [x] GET /api/v1/instance
+ * [x] GET /api/v1/lists
+ * [x] GET /api/v1/accounts/:id/lists
+ * [x] GET /api/v1/lists/:id/accounts
+ * [x] GET /api/v1/lists/:id
+ * [x] POST /api/v1/lists
+ * [x] PUT /api/v1/lists/:id
+ * [x] DELETE /api/v1/lists/:id
+ * [x] POST /api/v1/lists/:id/accounts
+ * [x] DELETE /api/v1/lists/:id/accounts
+ * [x] POST /api/v1/media
+ * [x] PUT /api/v1/media/:id
+ * [x] GET /api/v1/mutes
+ * [x] POST /api/v1/accounts/:id/mute
+ * [x] POST /api/v1/accounts/:id/unmute
+ * [x] POST /api/v1/statuses/:id/mute
+ * [x] POST /api/v1/statuses/:id/unmute
+ * [x] GET /api/v1/notifications
+ * [x] GET /api/v1/notifications/:id
+ * [x] POST /api/v1/notifications/clear
+ * [x] POST /api/v1/notifications/dismiss
+ * [x] POST /api/v1/push/subscription
+ * [x] GET /api/v1/push/subscription
+ * [x] PUT /api/v1/push/subscription
+ * [x] DELETE /api/v1/push/subscription
+ * [x] ~~GET /api/v1/reports~~ (Deprecated)
+ * [x] POST /api/v1/reports
+ * [ ] GET /api/v1/scheduled_statuses
+ * [ ] GET /api/v1/scheduled_statuses/:id
+ * [ ] PUT /api/v1/scheduled_statuses/:id
+ * [ ] DELETE /api/v1/scheduled_statuses/:id
+ * [x] ~~GET /api/v1/search~~ (Deprecated)
+ * [x] GET /api/v2/search
+ * [x] GET /api/v1/statuses/:id
+ * [x] GET /api/v1/statuses/:id/context
+ * [x] GET /api/v1/statuses/:id/card
+ * [x] GET /api/v1/statuses/:id/reblogged_by
+ * [x] GET /api/v1/statuses/:id/favourited_by
+ * [x] POST /api/v1/statuses
+ * [x] DELETE /api/v1/statuses/:id
+ * [x] POST /api/v1/statuses/:id/reblog
+ * [x] POST /api/v1/statuses/:id/unreblog
+ * [x] POST /api/v1/statuses/:id/pin
+ * [x] POST /api/v1/statuses/:id/unpin
+ * [x] GET /api/v1/timelines/home
+ * [ ] GET /api/v1/conversations
+ * [x] GET /api/v1/timelines/public
+ * [x] GET /api/v1/timelines/tag/:hashtag
+ * [x] GET /api/v1/timelines/list/:list_id
+ * [x] GET /api/v1/streaming/user
+ * [x] GET /api/v1/streaming/public
+ * [x] GET /api/v1/streaming/public/local
+ * [x] GET /api/v1/streaming/hashtag
+ * [ ] GET /api/v1/streaming/hashtag/local
+ * [x] GET /api/v1/streaming/list
+ * [ ] GET /api/v1/streaming/direct
+
+## Glitch-Soc support
+
+* [x] max_toot_chars in /api/v1/instance
+* [x] GET /api/v1/bookmarks
+* [x] POST /api/v1/statuses/:id/bookmark
+* [x] POST /api/v1/statuses/:id/unbookmark
+
+# Copyright
+
+``` text
+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.
+```

cmake/CMakeLists.txt

@@ -1,19 +0,0 @@
-include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
-
-write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-  VERSION ${PACKAGE_VERSION}
-  COMPATIBILITY ExactVersion)   # TODO: Set to SameMajorVersion when stable.
-
-install(EXPORT ${PROJECT_NAME}Targets
-  FILE "${PROJECT_NAME}Targets.cmake"
-  NAMESPACE "${PROJECT_NAME}::"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-configure_file("${PROJECT_NAME}Config.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY)
-
-install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

cmake/mastodon-cppConfig.cmake.in

@@ -1,7 +0,0 @@
-include(CMakeFindDependencyMacro)
-include(GNUInstallDirs)
-
-find_dependency(jsoncpp CONFIG REQUIRED)
-find_package(Poco COMPONENTS Foundation Net NetSSL CONFIG REQUIRED)
-
-include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")

cmake/packages.cmake

@@ -1,46 +0,0 @@
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-set(CPACK_PACKAGE_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${${PROJECT_NAME}_VERSION_PATCH})
-set(CPACK_PACKAGE_VERSION ${mastodon-cpp_VERSION})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
-if(CPACK_PACKAGE_DESCRIPTION_SUMMARY STREQUAL "") # CMake < 3.9
-  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ wrapper for the Mastodon API.")
-endif()
-set(CPACK_PACKAGE_CONTACT "tastytea <tastytea@tastytea.de>")
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.adoc")
-
-execute_process(COMMAND uname -m
-  OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(CPACK_PACKAGE_FILE_NAME
-  "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_PACKAGE_ARCHITECTURE}")
-set(CPACK_GENERATOR "TGZ")
-
-if (WITH_DEB)
-  set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
-  set(CPACK_GENERATOR "DEB")
-  set(CPACK_DEBIAN_PACKAGE_HOMEPAGE
-    "https://schlomp.space/tastytea/${PROJECT_NAME}")
-  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-  execute_process(COMMAND dpkg --print-architecture
-    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND lsb_release --codename --short
-    OUTPUT_VARIABLE DEBIAN_CODENAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_${DEBIAN_CODENAME}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-endif()
-
-if (WITH_RPM)
-  set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
-  set(CPACK_GENERATOR "RPM")
-  set(CPACK_RPM_PACKAGE_LICENSE "AGPL-3")
-  set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/${PROJECT_NAME}")
-  set(CPACK_RPM_PACKAGE_REQUIRES "poco-netssl >= 1.6, jsoncpp >= 1.7.4")
-  set(CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}")
-endif()
-
-include(CPack)

examples/CMakeLists.txt

@@ -1,11 +0,0 @@
-file(GLOB sources_examples *.cpp)
-foreach(src ${sources_examples})
-  get_filename_component(bin ${src} NAME_WE)
-  add_executable(${bin} ${src})
-  target_link_libraries(${bin} PRIVATE ${PROJECT_NAME})
-endforeach()
-
-if(WITH_DOC)
-  install(FILES ${sources_examples}
-    DESTINATION "${CMAKE_INSTALL_DOCDIR}/${PROJECT_NAME}/examples")
-endif()

examples/example01_get_public_timeline.cpp

@@ -8,8 +8,13 @@
 #include <string>
 #include <cstdint>
 #include <regex>
-#include "mastodon-cpp.hpp"
-#include "easy/all.hpp"
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/all.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/all.hpp>
+#endif
 
 using std::cout;
 using std::cerr;

examples/example02_stream.cpp

@@ -10,8 +10,13 @@
 #include <mutex>
 #include <chrono>
 #include <vector>
-#include "mastodon-cpp.hpp"
-#include "easy/all.hpp"
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/all.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/all.hpp>
+#endif
 
 using std::cout;
 using std::cerr;
@@ -46,12 +51,11 @@ int main(int argc, char *argv[])
         // Acquire lock for the stream variable to avoid simultaneous access.
         std::lock_guard<std::mutex> lock(ptr->get_mutex());
         // Parse event stream into a vector.
-        std::vector<Easy::stream_event_type> events
-            = Easy::parse_stream(stream);
+        std::vector<Easy::stream_event> events = Easy::parse_stream(stream);
         // Clear the stream buffer.
         stream.clear();
 
-        for (const Easy::stream_event_type &event : events)
+        for (const Easy::stream_event &event : events)
         {
             // Print out some information about the events.
             switch (event.type)

examples/example03_get_favourites.cpp

@@ -1,91 +0,0 @@
-// This file is part of mastodon-cpp.
-// Get 2 pages of 5 favourites each.
-
-// Don't compile this if the Easy-interface is turned off
-#ifndef WITHOUT_EASY
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include "mastodon-cpp.hpp"
-#include "easy/all.hpp"
-
-using std::cout;
-using std::cerr;
-using std::endl;
-using std::string;
-using std::vector;
-using namespace Mastodon;
-
-void print_favs(Easy::API &masto, const string &max_id = "")
-{
-    // Set up parameters.
-    Mastodon::parameters params =
-        {
-            { "limit", { "5" } },
-            { "exclude_types", { "follow", "reblog", "mention" } }
-        };
-    // Set max_id if given.
-    if (!max_id.empty())
-    {
-        params.push_back({ "max_id", { max_id } });
-    }
-
-    // Retrieve the last 5 favourites.
-    return_call ret = masto.get(API::v1::notifications, params);
-    // If no error was returned.
-    if (ret)
-    {
-        // Convert answer to vector of strings, loop through vector.
-        for (const string &str : Easy::json_array_to_vector(ret.answer))
-        {
-            // Construct Mastodon::Easy::Notification from string.
-            const Easy::Notification notif(str);
-            cout << notif.created_at().strtime("%F %T: ");
-            cout << notif.account().display_name() << " favourited a status.\n";
-        }
-    }
-    else
-    {
-        // Print error message.
-        cerr << ret.error_message << endl;
-        // Print HTTP status code, if there is one.
-        if (ret.http_error_code != 0)
-        {
-            cerr << "HTTP status code: "
-                 << std::to_string(ret.http_error_code) << endl;
-        }
-    }
-}
-
-int main(int argc, char *argv[])
-{
-    const vector<string> args(argv, argv + argc);
-    if (args.size() < 3)
-    {
-        std::cerr << "usage: " << args[0] << " <instance> <auth token>\n";
-        return 1;
-    }
-
-    // Construct a Mastodon::Easy object.
-    Easy::API masto(args[1], args[2]);
-    print_favs(masto);
-
-    cout << "\nLink header is: " << masto.get_header("link") << "\n\n";
-
-    // Get the max_id for pagination.
-    // See <https://docs.joinmastodon.org/api/rest/notifications/#pagination>
-    print_favs(masto, masto.get_link().max_id());
-    // The same: print_favs(masto, masto.get_link().next());
-
-    return 0;
-}
-
-#else
-#include <iostream>
-int main()
-{
-    std::cout << "mastodon-cpp was compiled without Easy support.\n";
-    return 255;
-}
-#endif  // WITHOUT_EASY

examples/example04_list_custom_emojis.cpp

@@ -1,48 +0,0 @@
-// This file is part of mastodon-cpp.
-// Prints shortcode + URL for each custom emoji.
-
-// Don't compile this if the Easy-interface is turned off
-#ifndef WITHOUT_EASY
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include "mastodon-cpp.hpp"
-#include "easy/all.hpp"
-
-using std::string;
-using std::vector;
-using namespace Mastodon;
-
-int main(int argc, char *argv[])
-{
-    const vector<string> args(argv, argv + argc);
-    if (args.size() < 2)
-    {
-        std::cerr << "usage: " << args[0] << " <instance>\n";
-        return 1;
-    }
-
-    // Construct a Mastodon::Easy object.
-    Easy::API masto(args[1], "");
-    const return_call ret = masto.get(API::v1::custom_emojis);
-
-    // Convert JSON array into vector of strings.
-    for (const string &str : Easy::json_array_to_vector(ret))
-    {
-        // Construct Emoji object from string.
-        const Easy::Emoji emoji(str);
-        std::cout << ':' << emoji.shortcode() << ": <" << emoji.url() << ">\n";
-    }
-
-    return 0;
-}
-
-#else
-#include <iostream>
-int main()
-{
-    std::cout << "mastodon-cpp was compiled without Easy support.\n";
-    return 255;
-}
-#endif  // WITHOUT_EASY

packages.CMakeLists.txt

@@ -0,0 +1,54 @@
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_PACKAGE_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${${PROJECT_NAME}_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION ${mastodon-cpp_VERSION})
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ wrapper for the Mastodon API")
+set(CPACK_PACKAGE_CONTACT "tastytea <tastytea@tastytea.de>")
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/\\\\.git"
+                                      "/.gitignore"
+                                      "/build/"
+                                      "/doc/"
+                                      "\\\\.sublime-"
+                                      "/update_doc.sh"
+                                      "/.drone.yml"
+                                      "/ISSUE_TEMPLATE.md$")
+execute_process(COMMAND uname -m
+                OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(CPACK_PACKAGE_FILE_NAME
+    "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_PACKAGE_ARCHITECTURE}")
+set(CPACK_GENERATOR "TGZ")
+set(CPACK_SOURCE_GENERATOR "TGZ")
+
+if (WITH_DEB)
+    set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
+    set(CPACK_GENERATOR "DEB")
+    set(CPACK_SOURCE_GENERATOR "DEB")
+    set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://schlomp.space/tastytea/mastodon-cpp")
+    set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+    execute_process(COMMAND dpkg --print-architecture
+                    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(CPACK_PACKAGE_FILE_NAME
+        "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+    set(CPACK_SOURCE_PACKAGE_FILE_NAME
+        "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_src")
+endif()
+
+if (WITH_RPM)
+    set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
+    set(CPACK_GENERATOR "RPM")
+    set(CPACK_SOURCE_GENERATOR "RPM")
+    set(CPACK_RPM_PACKAGE_LICENSE "GPL-3")
+    set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/mastodon-cpp")
+    set(CPACK_RPM_PACKAGE_REQUIRES "curlpp >= 0.8.1 jsoncpp, >= 1.7.4")
+    set(CPACK_PACKAGE_FILE_NAME
+         "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}")
+    set(CPACK_SOURCE_PACKAGE_FILE_NAME
+        "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.src")
+endif()
+
+include(CPack)

pkg-config/CMakeLists.txt

@@ -1,7 +0,0 @@
-include(GNUInstallDirs)
-
-configure_file("${PROJECT_NAME}.pc.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" @ONLY)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

pkg-config/mastodon-cpp.pc.in

@@ -1,12 +0,0 @@
-name=@PROJECT_NAME@
-prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-
-Name: ${name}
-Description: @PROJECT_DESCRIPTION@
-Version: @PROJECT_VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -l${name} -lpthread -lPocoNet
-Requires: jsoncpp
-Libs.private: -lPocoFoundation -lPocoNetSSL

src/CMakeLists.txt

@@ -1,71 +0,0 @@
-include(GNUInstallDirs)
-
-if(WITH_EASY)
-  find_package(jsoncpp CONFIG REQUIRED)
-endif()
-# Some distributions do not contain Poco*Config.cmake recipes.
-find_package(Poco COMPONENTS Foundation Net NetSSL CONFIG)
-
-if(WITH_EASY)
-  file(GLOB_RECURSE sources *.cpp *.hpp)
-else()
-  file(GLOB sources *.cpp api/*.cpp *.hpp api/*.hpp)
-endif()
-
-# Write version in header
-configure_file ("version.hpp.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/version.hpp")
-
-add_library(${PROJECT_NAME} ${sources})
-set_target_properties(${PROJECT_NAME} PROPERTIES
-  VERSION ${PROJECT_VERSION}
-  SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
-
-target_include_directories(${PROJECT_NAME}
-  PRIVATE
-  "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
-  PUBLIC
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
-  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-
-if(WITH_EASY)
-  target_link_libraries(${PROJECT_NAME}
-    PUBLIC pthread jsoncpp_lib)
-endif()
-
-# If no Poco*Config.cmake recipes are found, look for headers in standard dirs.
-if(PocoNetSSL_FOUND)
-  target_link_libraries(${PROJECT_NAME}
-    PRIVATE Poco::Foundation Poco::Net Poco::NetSSL)
-else()
-  find_file(Poco_h NAMES "Poco/Poco.h"
-    PATHS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-
-  if("${Poco_h}" STREQUAL "Poco_h-NOTFOUND")
-    message(FATAL_ERROR "Could not find POCO.")
-  else()
-    message(WARNING
-      "Your distribution of POCO doesn't contain the *Config.cmake recipes, "
-      "but the files seem to be in the standard directories. "
-      "Let's hope this works.")
-    target_link_libraries(${PROJECT_NAME}
-      PRIVATE PocoFoundation PocoNet PocoNetSSL)
-  endif()
-endif()
-
-install(TARGETS ${PROJECT_NAME}
-  EXPORT "${PROJECT_NAME}Targets"
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-
-install(FILES mastodon-cpp.hpp return_types.hpp types.hpp
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
-if(WITH_EASY)
-  file(GLOB easy_header easy/*.hpp)
-  install(FILES ${easy_header}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/easy)
-  file(GLOB easy_entities_header easy/entities/*.hpp)
-  install(FILES ${easy_entities_header}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/easy/entities)
-endif()

src/api/delete.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2018 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -78,7 +78,7 @@ return_call API::del(const Mastodon::API::v1 &call,
     default:
     {
         ttdebug << "ERROR: Invalid argument.\n";
-        return { error::INVALID_ARGUMENT, "Invalid argument", 0, "" };
+        return { 22, "Invalid argument", 0, "" };
     }
     }
 
@@ -88,5 +88,5 @@ return_call API::del(const Mastodon::API::v1 &call,
 return_call API::del(const std::string &call, const parameters &params)
 {
 
-    return _http.request(http_method::DELETE, call, *maptoformdata(params));
+    return _http.request(http_method::DELETE, call, maptoformdata(params));
 }

src/api/get.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -86,6 +86,11 @@ const return_call API::get(const Mastodon::API::v1 &call,
         strcall = "/api/v1/notifications";
         break;
     }
+    case v1::reports:
+    {
+        strcall = "/api/v1/reports";
+        break;
+    }
     case v1::timelines_home:
     {
         strcall = "/api/v1/timelines/home";
@@ -146,6 +151,11 @@ const return_call API::get(const Mastodon::API::v1 &call,
         strcall = "/api/v1/notifications/" + strid;
         break;
     }
+    case v1::search:
+    {
+        strcall = "/api/v1/search";
+        break;
+    }
     case v1::statuses_id:
     {
         strcall = "/api/v1/statuses/" + strid;
@@ -182,7 +192,7 @@ const return_call API::get(const Mastodon::API::v1 &call,
         else
         {
             ttdebug << "ERROR: Invalid argument.\n";
-            return { error::INVALID_ARGUMENT, "Invalid argument", 0, "" };
+            return { 22, "Invalid argument", 0, "" };
         }
         break;
     }
@@ -226,25 +236,10 @@ const return_call API::get(const Mastodon::API::v1 &call,
         strcall = "/api/v1/suggestions";
         break;
     }
-    case v1::polls_id:
-    {
-        strcall = "/api/v1/polls/" + strid;
-        break;
-    }
-    case v1::conversations:
-    {
-        strcall = "/api/v1/conversations";
-        break;
-    }
-    case v1::streaming_health:
-    {
-        strcall = "/api/v1/streaming/health";
-        break;
-    }
     default:
     {
         ttdebug << "ERROR: Invalid argument.\n";
-        return { error::INVALID_ARGUMENT, "Invalid argument", 0, "" };
+        return { 22, "Invalid argument", 0, "" };
     }
     }
 
@@ -281,7 +276,7 @@ const return_call API::get(const Mastodon::API::v2 &call,
         default:
         {
             ttdebug << "ERROR: Invalid argument.\n";
-            return { error::INVALID_ARGUMENT, "Invalid argument", 0, "" };
+            return { 22, "Invalid argument", 0, "" };
         }
     }
 

src/api/get_stream.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,7 +20,6 @@
 
 using namespace Mastodon;
 using std::cerr;
-using std::to_string;
 
 void API::get_stream(const Mastodon::API::v1 &call,
                      const parameters &params,
@@ -51,27 +50,15 @@ void API::get_stream(const Mastodon::API::v1 &call,
         strcall = "/api/v1/streaming/hashtag";
         break;
     }
-    case v1::streaming_hashtag_local:
-    {
-        strcall = "/api/v1/streaming/hashtag/local";
-        break;
-    }
     case v1::streaming_list:
     {
         strcall = "/api/v1/streaming/list";
         break;
     }
-    case v1::streaming_direct:
-    {
-        strcall = "/api/v1/streaming/direct";
-        break;
-    }
     default:
     {
-        const uint8_t err = static_cast<uint8_t>(error::INVALID_ARGUMENT);
         ttdebug << "ERROR: Invalid call.\n";
-        stream = "event: ERROR\ndata: "
-            "{\"error_code\":" + to_string(err) + "}\n";
+        stream = "event: ERROR\ndata: {\"error_code\":22}\n";
         return;
     }
     }

src/api/patch.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -32,9 +32,10 @@ return_call API::patch(const Mastodon::API::v1 &call,
             break;
         default:
             ttdebug << "ERROR: Invalid argument.\n";
-            return { error::INVALID_ARGUMENT, "Invalid argument", 0, "" };
+            return { 22, "Invalid argument", 0, "" };
             break;
     }
 
-    return _http.request(http_method::PATCH, strcall, *maptoformdata(params));
+    return _http.request(http_method::PATCH,
+                         strcall, maptoformdata(params));
 }

src/api/post.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -195,15 +195,10 @@ return_call API::post(const Mastodon::API::v1 &call,
         strcall = "/api/v1/filters";
         break;
     }
-    case v1::polls_id_votes:
-    {
-        strcall = "/api/v1/polls/" + strid + "/votes";
-        break;
-    }
     default:
     {
         ttdebug << "ERROR: Invalid argument.\n";
-        return { error::INVALID_ARGUMENT, "Invalid argument", 0, ""};
+        return { 22, "Invalid argument", 0, ""};
     }
     }
 
@@ -219,5 +214,5 @@ return_call API::post(const Mastodon::API::v1 &call)
 return_call API::post(const string &call, const parameters &params)
 {
 
-    return _http.request(http_method::POST, call, *maptoformdata(params));
+    return _http.request(http_method::POST, call, maptoformdata(params));
 }

src/api/put.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -58,7 +58,7 @@ return_call API::put(const Mastodon::API::v1 &call,
     default:
     {
         ttdebug << "ERROR: Invalid argument.\n";
-        return { error::INVALID_ARGUMENT, "Invalid argument", 0, "" };
+        return { 22, "Invalid argument", 0, "" };
     }
     }
 
@@ -68,5 +68,5 @@ return_call API::put(const Mastodon::API::v1 &call,
 return_call API::put(const string &call, const parameters &params)
 {
 
-    return _http.request(http_method::PUT, call, *maptoformdata(params));
+    return _http.request(http_method::PUT, call, maptoformdata(params));
 }

src/debug.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

src/easy/all.hpp

@@ -2,40 +2,62 @@
  *  Copyright © 2018 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MASTODON_CPP_EASY_ALL_HPP
 #define MASTODON_CPP_EASY_ALL_HPP
 
-#include "easy.hpp"
-#include "entities/account.hpp"
-#include "entities/application.hpp"
-#include "entities/attachment.hpp"
-#include "entities/card.hpp"
-#include "entities/context.hpp"
-#include "entities/emoji.hpp"
-#include "entities/instance.hpp"
-#include "entities/list.hpp"
-#include "entities/mention.hpp"
-#include "entities/notification.hpp"
-#include "entities/relationship.hpp"
-#include "entities/results.hpp"
-#include "entities/status.hpp"
-#include "entities/tag.hpp"
-#include "entities/token.hpp"
-#include "entities/pushsubscription.hpp"
-#include "entities/filter.hpp"
-#include "entities/poll.hpp"
-#include "entities/conversation.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "easy/easy.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/application.hpp"
+    #include "easy/entities/attachment.hpp"
+    #include "easy/entities/card.hpp"
+    #include "easy/entities/context.hpp"
+    #include "easy/entities/emoji.hpp"
+    #include "easy/entities/instance.hpp"
+    #include "easy/entities/list.hpp"
+    #include "easy/entities/mention.hpp"
+    #include "easy/entities/notification.hpp"
+    #include "easy/entities/relationship.hpp"
+    #include "easy/entities/report.hpp"
+    #include "easy/entities/results.hpp"
+    #include "easy/entities/status.hpp"
+    #include "easy/entities/tag.hpp"
+    #include "easy/entities/token.hpp"
+    #include "easy/entities/pushsubscription.hpp"
+    #include "easy/entities/filter.hpp"
+#else
+    #include <mastodon-cpp/easy/easy.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entities/application.hpp>
+    #include <mastodon-cpp/easy/entities/attachment.hpp>
+    #include <mastodon-cpp/easy/entities/card.hpp>
+    #include <mastodon-cpp/easy/entities/context.hpp>
+    #include <mastodon-cpp/easy/entities/emoji.hpp>
+    #include <mastodon-cpp/easy/entities/instance.hpp>
+    #include <mastodon-cpp/easy/entities/list.hpp>
+    #include <mastodon-cpp/easy/entities/mention.hpp>
+    #include <mastodon-cpp/easy/entities/notification.hpp>
+    #include <mastodon-cpp/easy/entities/relationship.hpp>
+    #include <mastodon-cpp/easy/entities/report.hpp>
+    #include <mastodon-cpp/easy/entities/results.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
+    #include <mastodon-cpp/easy/entities/tag.hpp>
+    #include <mastodon-cpp/easy/entities/token.hpp>
+    #include <mastodon-cpp/easy/entities/pushsubscription.hpp>
+    #include <mastodon-cpp/easy/entities/filter.hpp>
+#endif
 
 #endif  // MASTODON_CPP_EASY_ALL_HPP

src/easy/easy.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -49,14 +49,13 @@ const std::vector<string> Easy::json_array_to_vector(const string &json)
     return {};
 }
 
-const vector<Easy::stream_event_type> Easy::parse_stream(
+const vector<Easy::stream_event> Easy::parse_stream(
     const std::string &streamdata)
 {
     string stream = streamdata;
-    std::regex reevent("event: (update|notification|delete|filters_changed"
-                       "|ERROR)\ndata: (.*)\n");
+    std::regex reevent("event: (update|notification|delete|ERROR)\ndata: (.*)\n");
     std::smatch match;
-    std::vector<stream_event_type> vec = {};
+    std::vector<stream_event> vec = {};
 
     while (std::regex_search(stream, match, reevent))
     {
@@ -64,16 +63,14 @@ const vector<Easy::stream_event_type> Easy::parse_stream(
         const string &data = match[2].str();
         event_type type = event_type::Undefined;
 
-        if (event == "update")
+        if (event.compare("update") == 0)
             type = event_type::Update;
-        else if (event == "notification")
+        else if (event.compare("notification") == 0)
             type = event_type::Notification;
-        else if (event == "delete")
+        else if (event.compare("delete") == 0)
             type = event_type::Delete;
-        else if (event == "ERROR")
+        else if (event.compare("ERROR") == 0)
             type = event_type::Error;
-        else if (event == "filters_changed")
-            type = event_type::Filters_changed;
 
         vec.push_back({ type, data });
         stream = match.suffix().str();
@@ -82,16 +79,6 @@ const vector<Easy::stream_event_type> Easy::parse_stream(
     return vec;
 }
 
-const Easy::time_type Easy::string_to_time(const string &strtime)
-{
-    std::stringstream sstime(strtime);
-    struct std::tm tm = {};
-    tm.tm_isdst = -1;       // Detect daylight saving time.
-    sstime >> std::get_time(&tm, "%Y-%m-%dT%T");
-    std::time_t time = timegm(&tm); // Assume time is UTC.
-    return { system_clock::from_time_t(time) };
-}
-
 const Easy::Link Easy::API::get_link() const
 {
     return Link(get_header("Link"));
@@ -101,8 +88,8 @@ Easy::Link::Link(const string &link_header)
 : _next()
 , _prev()
 {
-    std::regex renext("max_id=([[:alnum:]]*)");
-    std::regex reprev("(?:since|min)_id=([[:alnum:]]*)");
+    std::regex renext("max_id=([[:digit:]]*)");
+    std::regex reprev("since_id=([[:digit:]]*)");
     std::smatch match;
 
     if (std::regex_search(link_header, match, renext))
@@ -134,8 +121,3 @@ const string Easy::Link::since_id() const
 {
     return _prev;
 }
-
-const string Easy::Link::min_id() const
-{
-    return _prev;
-}

src/easy/easy.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -24,11 +24,20 @@
 #include <ostream>
 #include <jsoncpp/json/json.h>
 
-#include "../mastodon-cpp.hpp"
-#include "return_types_easy.hpp"
-#include "types_easy.hpp"
-#include "entities/notification.hpp"
-#include "entities/status.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/return_types_easy.hpp"
+    #include "easy/types_easy.hpp"
+    #include "easy/entities/notification.hpp"
+    #include "easy/entities/status.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/return_types_easy.hpp>
+    #include <mastodon-cpp/easy/types_easy.hpp>
+    #include <mastodon-cpp/easy/entities/notification.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
+#endif
 
 using std::string;
 using std::vector;
@@ -89,13 +98,6 @@ namespace Easy
          */
         const string since_id() const;
 
-        /*!
-         *  @brief  Returns min_id.
-         *
-         *  @since  0.111.0
-         */
-        const string min_id() const;
-
     private:
         string _next;
         string _prev;
@@ -110,7 +112,7 @@ namespace Easy
      *
      *  @since  before 0.11.0
      */
-    const vector<string> json_array_to_vector(const string &json);
+    const std::vector<string> json_array_to_vector(const string &json);
 
     /*!
      *  @brief  Split stream into a vector of events
@@ -121,14 +123,7 @@ namespace Easy
      *
      *  @since  before 0.11.0
      */
-    const vector<stream_event_type> parse_stream(const std::string &streamdata);
-
-    /*!
-     *  @brief Convert ISO 8601 time string to Easy::time.
-     *
-     *  @param strtime Time string as returned by Mastodon.
-     */
-    const Easy::time_type string_to_time(const string &strtime);
+    const std::vector<stream_event> parse_stream(const std::string &streamdata);
 
     /*!
      *  @brief  Child of Mastodon::API with abstract methods.
@@ -167,7 +162,6 @@ namespace Easy
          *
          *  @since  0.100.0
          */
-        [[deprecated("Will go away in 1.0.0 with no replacement.")]]
         const return_entity<Easy::Status> send_post(const Status &status);
 
         /*!
@@ -175,7 +169,6 @@ namespace Easy
          *
          *  @since  0.100.0
          */
-        [[deprecated("Will go away in 1.0.0 with no replacement.")]]
         const return_entity<Easy::Status> send_toot(const Status &status);
 
         /*!
@@ -189,7 +182,6 @@ namespace Easy
          *
          *  @since  0.100.0
          */
-        [[deprecated("Will go away in 1.0.0 with no replacement.")]]
         const return_entity_vector<Easy::Notification> get_notifications(
             const uint16_t limit = 20, const string since_id = "",
             const string max_id = "");

src/easy/entities/account.cpp

@@ -2,47 +2,49 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <array>
 #include <algorithm>
 #include "account.hpp"
 #include "debug.hpp"
-#include "easy/easy.hpp"
 
 using namespace Mastodon;
 using Account = Easy::Account;
 
 bool Account::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "username",
-            "acct",
-            "display_name",
-            "locked",
-            "created_at",
-            "followers_count",
-            "following_count",
-            "statuses_count",
-            "note",
-            "url",
-            "avatar",
-            "avatar_static",
-            "header",
-            "header_static",
-            "emojis"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "username",
+        "acct",
+        "display_name",
+        "locked",
+        "created_at",
+        "followers_count",
+        "following_count",
+        "statuses_count",
+        "note",
+        "url",
+        "avatar",
+        "avatar_static",
+        "header",
+        "header_static",
+        "emojis"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string Account::acct() const
@@ -55,6 +57,12 @@ const string Account::avatar() const
     return get_string("avatar");
 }
 
+Account Account::avatar(const string &avatar)
+{
+    set("avatar", Json::Value(avatar));
+    return *this;
+}
+
 const string Account::avatar_static() const
 {
     return get_string("avatar_static");
@@ -65,7 +73,7 @@ bool Account::bot() const
     return get_bool("bot");
 }
 
-const Easy::time_type Account::created_at() const
+const Easy::time Account::created_at() const
 {
     return get_time("created_at");
 }
@@ -75,46 +83,45 @@ const string Account::display_name() const
     return get_string("display_name");
 }
 
-const std::vector<Easy::Emoji> Account::emojis()
+Account Account::display_name(const string &display_name)
 {
-    const Json::Value &node = get("emojis");
+    set("display_name", Json::Value(display_name));
+    return *this;
+}
+
+const std::vector<Account::fields_pair> Account::fields() const
+{
+    const Json::Value &node = get("fields");
 
     if (node.isArray())
     {
-        std::vector<Easy::Emoji> vec;
+        std::vector<Account::fields_pair> vec;
         std::transform(node.begin(), node.end(), std::back_inserter(vec),
                        [](const Json::Value &value)
-                       {
-                           return Easy::Emoji(value);
-                       });
+                           {
+                               return Account::fields_pair
+                                   (value["name"].asString(),
+                                    value["value"].asString());
+                           });
         return vec;
     }
 
     return {};
 }
 
-const vector<Easy::account_field_type> Account::fields() const
+Account Account::fields(std::vector<Account::fields_pair> &fields)
 {
-    const Json::Value &node = get("fields");
+    Json::Value jsonarray(Json::arrayValue);
 
-    if (node.isArray())
+    for (const fields_pair &field : fields)
     {
-        vector<Easy::account_field_type> vec;
-        std::transform(node.begin(), node.end(), std::back_inserter(vec),
-                       [](const Json::Value &value)
-                       {
-                           return Easy::account_field_type(
-                               {
-                                   value["name"].asString(),
-                                   value["value"].asString(),
-                                   Easy::string_to_time(
-                                       value["verified_at"].asString())
-                               });
-                       });
-        return vec;
+        Json::Value jsonkeyval(Json::objectValue);
+        jsonkeyval["name"] = field.first;
+        jsonkeyval["value"] = field.second;
+        jsonarray.append(jsonkeyval);
     }
-
-    return {};
+    set("fields", jsonarray);
+    return *this;
 }
 
 std::uint64_t Account::followers_count() const
@@ -132,6 +139,12 @@ const string Account::header() const
     return get_string("header");
 }
 
+Account Account::header(const string &header)
+{
+    set("header", Json::Value(header));
+    return *this;
+}
+
 const string Account::header_static() const
 {
     return get_string("header_static");
@@ -147,6 +160,12 @@ bool Account::locked() const
     return get_bool("locked");
 }
 
+Account Account::locked(const bool &locked)
+{
+    set("locked", Json::Value(locked));
+    return *this;
+}
+
 bool Account::has_moved() const
 {
     if (get("moved").isObject())
@@ -161,7 +180,8 @@ const Account Account::moved() const
 {
     if (has_moved())
     {
-        return Account(get("moved"));
+        // TODO: Find an account with moved-node and test
+        return Account(get("moved").toStyledString());
     }
 
     return Account();
@@ -172,18 +192,25 @@ const string Account::note() const
     return get_string("note");
 }
 
+Account Account::note(const string &note)
+{
+    set("note", Json::Value(note));
+    return *this;
+}
+
 Easy::visibility_type Account::privacy() const
 {
-    const string strprivacy = get_string("privacy");
-    if (strprivacy == "public")
+    const string strprivacy = get_string("source.privacy");
+    if (strprivacy.compare("public") == 0)
         return visibility_type::Public;
-    else if (strprivacy == "unlisted")
+    else if (strprivacy.compare("unlisted") == 0)
         return visibility_type::Unlisted;
-    else if (strprivacy == "private")
+    else if (strprivacy.compare("private") == 0)
         return visibility_type::Private;
-    else if (strprivacy == "direct")
+    else if (strprivacy.compare("direct") == 0)
         return visibility_type::Direct;
 
+    ttdebug << "Could not get data: source.privacy\n";
     return visibility_type::Undefined;
 }
 
@@ -192,11 +219,131 @@ bool Account::sensitive() const
     return get_bool("source.sensitive");
 }
 
+bool Account::Source::valid() const
+{
+    return true;
+}
+
+const std::vector<Account::fields_pair> Account::Source::fields() const
+{
+    const Json::Value &node = get("fields");
+
+    if (node.isArray())
+    {
+        std::vector<Account::fields_pair> vec;
+        std::transform(node.begin(), node.end(), std::back_inserter(vec),
+                       [](const Json::Value &value)
+                           {
+                               return Account::fields_pair
+                                   (value["name"].asString(),
+                                    value["value"].asString());
+                           });
+        return vec;
+    }
+
+    return {};
+}
+
+Account::Source Account::Source::fields
+    (std::vector<Account::fields_pair> &fields)
+{
+    Json::Value jsonarray(Json::arrayValue);
+
+    for (const fields_pair &field : fields)
+    {
+        Json::Value jsonkeyval(Json::objectValue);
+        jsonkeyval["name"] = field.first;
+        jsonkeyval["value"] = field.second;
+        jsonarray.append(jsonkeyval);
+    }
+    set("fields", jsonarray);
+    return *this;
+}
+
+const string Account::Source::note() const
+{
+    return get_string("note");
+}
+
+Account::Source Account::Source::note(const string &note)
+{
+    set("note", Json::Value(note));
+    return *this;
+}
+
+Easy::visibility_type Account::Source::privacy() const
+{
+    const string strprivacy = get_string("privacy");
+    if (strprivacy.compare("public") == 0)
+        return visibility_type::Public;
+    else if (strprivacy.compare("unlisted") == 0)
+        return visibility_type::Unlisted;
+    else if (strprivacy.compare("private") == 0)
+        return visibility_type::Private;
+    else if (strprivacy.compare("direct") == 0)
+        return visibility_type::Direct;
+
+    ttdebug << "Could not get data: source.privacy\n";
+    return visibility_type::Undefined;
+}
+
+Account::Source Account::Source::privacy(const Easy::visibility_type &privacy)
+{
+    string strprivacy = "";
+    switch (privacy)
+    {
+        case visibility_type::Public:
+        {
+            strprivacy = "public";
+            break;
+        }
+        case visibility_type::Unlisted:
+        {
+            strprivacy = "unlisted";
+            break;
+        }
+        case visibility_type::Private:
+        {
+            strprivacy = "private";
+            break;
+        }
+        case visibility_type::Direct:
+        {
+            strprivacy = "direct";
+            break;
+        }
+        default:
+        {
+            strprivacy = "undefined";
+            break;
+        }
+    }
+    set("privacy", Json::Value(strprivacy));
+    return *this;
+}
+
+bool Account::Source::sensitive() const
+{
+    return get_bool("sensitive");
+}
+
+Account::Source Account::Source::sensitive(const bool &sensitive)
+{
+    set("source", Json::Value(sensitive));
+    return *this;
+}
+
 const Account::Source Account::source() const
 {
     return Account::Source(get("source"));
 }
 
+Account Account::source(const Account::Source &source)
+{
+    set("source", Json::Value(source.to_object()));
+    return *this;
+}
+
 std::uint64_t Account::statuses_count() const
 {
     return get_uint64("statuses_count");
@@ -211,66 +358,3 @@ const string Account::username() const
 {
     return get_string("username");
 }
-
-bool Account::Source::valid() const
-{
-    return Entity::check_valid(
-        {
-            "note",
-            "fields"
-        });
-}
-
-const vector<Easy::account_field_type> Account::Source::fields() const
-{
-    const Json::Value &node = get("fields");
-
-    if (node.isArray())
-    {
-        vector<Easy::account_field_type> vec;
-        std::transform(node.begin(), node.end(), std::back_inserter(vec),
-                       [](const Json::Value &value)
-                       {
-                           return Easy::account_field_type(
-                               {
-                                   value["name"].asString(),
-                                   value["value"].asString(),
-                                   Easy::string_to_time(
-                                       value["verified_at"].asString())
-                               });
-                           });
-        return vec;
-    }
-
-    return {};
-}
-
-const string Account::Source::language() const
-{
-    return get_string("language");
-}
-
-const string Account::Source::note() const
-{
-    return get_string("note");
-}
-
-Easy::visibility_type Account::Source::privacy() const
-{
-    const string strprivacy = get_string("privacy");
-    if (strprivacy == "public")
-        return visibility_type::Public;
-    else if (strprivacy == "unlisted")
-        return visibility_type::Unlisted;
-    else if (strprivacy == "private")
-        return visibility_type::Private;
-    else if (strprivacy == "direct")
-        return visibility_type::Direct;
-
-    return visibility_type::Undefined;
-}
-
-bool Account::Source::sensitive() const
-{
-    return get_bool("sensitive");
-}

src/easy/entities/account.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22,13 +22,17 @@
 #include <vector>
 #include <utility>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "emoji.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
-using std::vector;
 
 namespace Mastodon
 {
@@ -44,6 +48,13 @@ namespace Easy
     public:
         using Entity::Entity;
 
+        /*!
+         *  @brief  Describes a field. Format: name, value
+         *
+         *  @since  0.16.1
+         */
+        using fields_pair = std::pair<const string, const string>;
+
         virtual bool valid() const override;
 
         /*!
@@ -57,98 +68,130 @@ namespace Easy
         const string acct() const;
 
         /*!
-         *  @brief  Returns URL of avatar.
+         *  @brief  Returns URL of avatar
          *
          *  @since before 0.11.0
          */
         const string avatar() const;
 
         /*!
-         *  @brief  Returns URL of static avatar.
+         *  @brief  Sets avatar
+         *
+         *          Filename or base64-encoded
+         *
+         *  @since  0.18.5
+         */
+        Account avatar(const string &avatar);
+
+        /*!
+         *  @brief  Returns URL of static avatar
          *
          *  @since before 0.11.0
          */
         const string avatar_static() const;
 
         /*!
-         *  @brief  Returns true if the account performs automated actions.
+         *  @brief  Returns true if the account performs automated actions
          *
          *  @since  0.16.0
          */
         bool bot() const;
 
         /*!
-         *  @brief  Returns time of creation.
+         *  @brief  Returns time of creation
          *
          *  @since before 0.11.0
          */
-        const Easy::time_type created_at() const;
+        const Easy::time created_at() const;
 
         /*!
-         *  @brief  Returns display name.
+         *  @brief  Returns display name
          *
          *  @since before 0.11.0
          */
         const string display_name() const;
 
         /*!
-         *  @brief Returns emojis.
+         *  @brief  Sets display name
          *
-         *  @since 0.106.0
+         *  @since  0.18.5
          */
-        const std::vector<Easy::Emoji> emojis();
+        Account display_name(const string &display_name);
 
         /*!
-         *  @brief  Returns metadata fields.
+         *  @brief  Returns metadata fields
          *
          *  @since  0.16.1
          */
-        const vector<Easy::account_field_type> fields() const;
+        const std::vector<fields_pair> fields() const;
 
         /*!
-         *  @brief  Returns number of followers.
+         *  @brief  Sets metadata fields
+         *
+         *  @since  0.18.5
+         */
+        Account fields(std::vector<fields_pair> &fields);
+
+        /*!
+         *  @brief  Returns number of followers
          *
          *  @since before 0.11.0
          */
         uint64_t followers_count() const;
 
         /*!
-         *  @brief  Returns number of people this account follows.
+         *  @brief  Returns number of people this account follows
          *
          *  @since before 0.11.0
          */
         uint64_t following_count() const;
 
         /*!
-         *  @brief  Returns URL of header image.
+         *  @brief  Returns URL of header image
          *
          *  @since before 0.11.0
          */
         const string header() const;
 
         /*!
-         *  @brief  Returns URL of static header image.
+         *  @brief  Sets header image
+         *
+         *          Filename or base64-encoded.
+         *
+         *  @since  0.18.5
+         */
+        Account header(const string &header);
+
+        /*!
+         *  @brief  Returns URL of static header image
          *
          *  @since before 0.11.0
          */
         const string header_static() const;
 
         /*!
-         *  @brief  Returns account-ID.
+         *  @brief  Returns account-ID
          *
          *  @since before 0.11.0
          */
         const string id() const;
 
         /*!
-         *  @brief  Returns true if the account is locked.
+         *  @brief  Returns true if the account is locked
          *
          *  @since before 0.11.0
          */
         bool locked() const;
 
         /*!
-         *  @brief  Returns true if the account has been moved. (Deprecated)
+         *  @brief  Sets locked state
+         *
+         *  @since  0.18.5
+         */
+        Account locked(const bool &locked);
+
+        /*!
+         *  @brief  Returns true if the account has been moved
          *
          *  @since before 0.11.0
          */
@@ -156,35 +199,42 @@ namespace Easy
 
         /*!
          *  @brief  If the owner decided to switch accounts, new account is in
-         *          this attribute.
+         *          this attribute
          *
          *  @since before 0.11.0
          */
         const Account moved() const;
 
         /*!
-         *  @brief  Returns account description, or biography.
+         *  @brief  Returns note
          *
          *  @since before 0.11.0
          */
         const string note() const;
 
         /*!
-         *  @brief  Returns default privacy of new toots.
+         *  @brief  Sets note
+         *
+         *  @since  0.18.5
+         */
+        Account note(const string &note);
+
+        /*!
+         *  @brief  Returns default privacy of new toots
          *
          *  @since before 0.11.0
          */
         visibility_type privacy() const;
 
         /*!
-         *  @brief  Returns if media is marked as sensitive by default.
+         *  @brief  Returns if media is marked as sensitive by default
          *
          *  @since before 0.11.0
          */
         bool sensitive() const;
 
         /*!
-         *  @brief  Class to hold source attribute.
+         *  @brief  Class to hold source attribute
          *
          *  @since  0.18.5
          */
@@ -196,39 +246,60 @@ namespace Easy
             virtual bool valid() const override;
 
             /*!
-             *  @brief  Returns metadata fields.
+             *  @brief  Returns metadata fields
              *
              *  @since  0.18.5
              */
-            const vector<Easy::account_field_type> fields() const;
+            const std::vector<fields_pair> fields() const;
 
             /*!
-             *  @brief  Returns the language as ISO 6391 string.
+             *  @brief  Sets metadata fields
              *
-             *  @since 0.106.0
+             *  @since  0.18.5
              */
-            const string language() const;
+            Source fields(std::vector<fields_pair> &fields);
 
             /*!
-             *  @brief  Returns account description in plain text.
+             *  @brief  Returns note in plain text
              *
              *  @since 0.18.5
              */
             const string note() const;
 
             /*!
-             *  @brief  Returns default privacy of new toots.
+             *  @brief  Sets note
+             *
+             *  @since  0.18.5
+             */
+            Source note(const string &note);
+
+            /*!
+             *  @brief  Returns default privacy of new toots
              *
              *  @since 0.18.5
              */
             visibility_type privacy() const;
 
             /*!
-             *  @brief  Returns if media is marked as sensitive by default.
+             *  @brief  Sets default privacy of new toots
+             *
+             *  @since 0.18.5
+             */
+            Source privacy(const visibility_type &privacy);
+
+            /*!
+             *  @brief  Returns if media is marked as sensitive by default
              *
              *  @since 0.18.5
              */
             bool sensitive() const;
+
+            /*!
+             *  @brief  Sets if media is marked as sensitive by default
+             *
+             *  @since 0.18.5
+             */
+            Source sensitive(const bool &sensitive);
         };
 
         /*!
@@ -238,6 +309,13 @@ namespace Easy
          */
         const Source source() const;
 
+        /*!
+         *  @brief  Set source.
+         *
+         *  @since  before 0.100.0
+         */
+        Account source(const Source &source);
+
         /*!
          *  @brief  Returns number of statuses
          *

src/easy/entities/application.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

src/easy/entities/application.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -19,8 +19,14 @@
 
 #include <string>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 

src/easy/entities/attachment.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -23,13 +23,30 @@ using Attachment = Easy::Attachment;
 
 bool Attachment::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "type",
-            "url",
-            "preview_url"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "type",
+        "url",
+        "preview_url"
+    }};
+
+    return Entity::check_valid(attributes);
+}
+
+double Attachment::aspect() const
+{
+    return get_double("meta.original.aspect");
+}
+
+double Attachment::aspect_small() const
+{
+    return get_double("meta.small.aspect");
+}
+
+uint64_t Attachment::bitrate() const
+{
+    return get_uint64("meta.original.bitrate");
 }
 
 const string Attachment::description() const
@@ -43,6 +60,13 @@ Attachment Attachment::description(const string &description)
     return *this;
 }
 
+const std::chrono::duration<double> Attachment::duration() const
+{
+    const double sec = get_double("meta.original.duration");
+
+    return std::chrono::duration<double>(sec);
+}
+
 const string Attachment::file() const
 {
     return get_string("file");
@@ -78,16 +102,40 @@ Attachment Attachment::focus(const std::array<double, 2> &focus)
     return *this;
 }
 
+double Attachment::framerate() const
+{
+    string strframes = get_string("meta.original.frame_rate");
+
+    if (!strframes.empty())
+    {
+        std::size_t pos = strframes.find('/');
+        if (pos != std::string::npos)
+        {
+            std::uint16_t frames = std::stoul(strframes.substr(0, pos));
+            std::uint16_t divider = std::stoul(strframes.substr(pos + 1));
+
+            return frames / divider;
+        }
+    }
+
+    return 0.0;
+}
+
+uint64_t Attachment::height() const
+{
+    return get_uint64("meta.original.height");
+}
+
+uint64_t Attachment::height_small() const
+{
+    return get_uint64("meta.small.height");
+}
+
 const string Attachment::id() const
 {
     return get_string("id");
 }
 
-const Attachment::Meta Attachment::meta() const
-{
-    return Meta(get("meta"));
-}
-
 const string Attachment::preview_url() const
 {
     return get_string("preview_url");
@@ -98,6 +146,16 @@ const string Attachment::remote_url() const
     return get_string("remote_url");
 }
 
+const string Attachment::size() const
+{
+    return get_string("meta.original.size");
+}
+
+const string Attachment::size_small() const
+{
+    return get_string("meta.small.size");
+}
+
 const string Attachment::text_url() const
 {
     return get_string("text_url");
@@ -124,78 +182,12 @@ const string Attachment::url() const
     return get_string("url");
 }
 
-bool Attachment::Meta::valid() const
+uint64_t Attachment::width() const
 {
-    return true;
+    return get_uint64("meta.original.width");
 }
 
-double Attachment::Meta::aspect() const
+uint64_t Attachment::width_small() const
 {
-    return get_double("original.aspect");
-}
-
-double Attachment::Meta::aspect_small() const
-{
-    return get_double("small.aspect");
-}
-
-uint64_t Attachment::Meta::bitrate() const
-{
-    return get_uint64("original.bitrate");
-}
-
-const std::chrono::duration<double> Attachment::Meta::duration() const
-{
-    const double sec = get_double("original.duration");
-
-    return std::chrono::duration<double>(sec);
-}
-
-double Attachment::Meta::frame_rate() const
-{
-    string strframes = get_string("original.frame_rate");
-
-    if (!strframes.empty())
-    {
-        std::size_t pos = strframes.find('/');
-        if (pos != std::string::npos)
-        {
-            std::uint16_t frames = std::stoul(strframes.substr(0, pos));
-            std::uint16_t divider = std::stoul(strframes.substr(pos + 1));
-
-            return frames / divider;
-        }
-    }
-
-    return 0.0;
-}
-
-uint64_t Attachment::Meta::height() const
-{
-    return get_uint64("original.height");
-}
-
-uint64_t Attachment::Meta::height_small() const
-{
-    return get_uint64("small.height");
-}
-
-const string Attachment::Meta::size() const
-{
-    return get_string("original.size");
-}
-
-const string Attachment::Meta::size_small() const
-{
-    return get_string("small.size");
-}
-
-uint64_t Attachment::Meta::width() const
-{
-    return get_uint64("original.width");
-}
-
-uint64_t Attachment::Meta::width_small() const
-{
-    return get_uint64("small.width");
+    return get_uint64("meta.small.width");
 }

src/easy/entities/attachment.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22,8 +22,14 @@
 #include <chrono>
 #include <array>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
@@ -42,98 +48,29 @@ namespace Easy
     public:
         using Entity::Entity;
 
-        /*!
-         *  @brief  Metadata for attachments.
-         *
-         *  @since  0.106.0
-         */
-        class Meta : public Entity
-        {
-        public:
-            using Entity::Entity;
-
-            virtual bool valid() const override;
-
-            /*!
-             *  @brief  Aspect of original image.
-             *
-             *  @since  0.106.0
-             */
-            double aspect() const;
-
-            /*!
-             *  @brief  Aspect of preview image.
-             *
-             *  @since  0.106.0
-             */
-            double aspect_small() const;
-
-            /*!
-             *  @brief  Returns the bitrate of a video.
-             *
-             *  @since  0.106.0
-             */
-            uint64_t bitrate() const;
-
-            /*!
-             *  @brief  Returns the duration of a video in seconds.
-             *
-             *  @since  0.106.0
-             */
-            const std::chrono::duration<double> duration() const;
-
-            /*!
-             *  @brief  Returns the framerate of a video in frames per second.
-             *
-             *  @since  0.106.0
-             */
-            double frame_rate() const;
-
-            /*!
-             *  @brief  Returns the height of the original image.
-             *
-             *  @since  0.106.0
-             */
-            uint64_t height() const;
-
-            /*!
-             *  @brief  Returns the height of the preview image.
-             *
-             *  @since  0.106.0
-             */
-            uint64_t height_small() const;
-
-            /*!
-             *  @brief  Returns the size of the original image.
-             *
-             *  @since  0.106.0
-             */
-            const string size() const;
-
-            /*!
-             *  @brief  Returns the size of the preview image.
-             *
-             *  @since  0.106.0
-             */
-            const string size_small() const;
-
-            /*!
-             *  @brief  Returns the width of the original image.
-             *
-             *  @since  0.106.0
-             */
-            uint64_t width() const;
-
-            /*!
-             *  @brief  Returns the width of the preview image
-             *
-             *  @since  0.106.0
-             */
-            uint64_t width_small() const;
-        };
-
         virtual bool valid() const override;
 
+        /*!
+         *  @brief  Aspect of original image
+         *
+         *  @since before 0.11.0
+         */
+        double aspect() const;
+
+        /*!
+         *  @brief  Aspect of preview image
+         *
+         *  @since before 0.11.0
+         */
+        double aspect_small() const;
+
+        /*!
+         *  @brief  Returns the bitrate of a video
+         *
+         *  @since before 0.11.0
+         */
+        uint64_t bitrate() const;
+
         /*!
          *  @brief  Returns the image description
          *
@@ -148,6 +85,13 @@ namespace Easy
          */
         Attachment description(const string &description);
 
+        /*!
+         *  @brief  Returns the duration of a video in seconds
+         *
+         *  @since before 0.11.0
+         */
+        const std::chrono::duration<double> duration() const;
+
         /*!
          * @brief  Gets file to upload
          *
@@ -182,6 +126,27 @@ namespace Easy
          */
         Attachment focus(const std::array<double, 2> &focus);
 
+        /*!
+         *  @brief  Returns the framerate of a video in frames per second
+         *
+         *  @since before 0.11.0
+         */
+        double framerate() const;
+
+        /*!
+         *  @brief  Returns the height of the original image
+         *
+         *  @since before 0.11.0
+         */
+        uint64_t height() const;
+
+        /*!
+         *  @brief  Returns the height of the preview image
+         *
+         *  @since before 0.11.0
+         */
+        uint64_t height_small() const;
+
         /*!
          *  @brief  Returns the ID of the attachment
          *
@@ -189,13 +154,6 @@ namespace Easy
          */
         const string id() const;
 
-        /*!
-         *  @brief  Returns metadata about the attachment.
-         *
-         *  @since  0.106.0
-         */
-        const Meta meta() const;
-
         /*!
          *  @brief  Returns the URL of the preview image
          *
@@ -210,6 +168,20 @@ namespace Easy
          */
         const string remote_url() const;
 
+        /*!
+         *  @brief  Returns the size of the original image
+         *
+         *  @since before 0.11.0
+         */
+        const string size() const;
+
+        /*!
+         *  @brief  Returns the size of the preview image
+         *
+         *  @since before 0.11.0
+         */
+        const string size_small() const;
+
         /*!
          *  @brief  Returns shorter URL for the image
          *
@@ -230,6 +202,22 @@ namespace Easy
          *  @since before 0.11.0
          */
         const string url() const;
+
+        /*!
+         *  @brief  Returns the width of the original image
+         *
+         *  @since before 0.11.0
+         */
+        uint64_t width() const;
+
+        /*!
+         *  @brief  Returns the width of the preview image
+         *
+         *  @since before 0.11.0
+         */
+        uint64_t width_small() const;
+
+
     };
 }
 }

src/easy/entities/card.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22,13 +22,15 @@ using Card = Easy::Card;
 
 bool Card::valid() const
 {
-    return Entity::check_valid(
-        {
-            "url",
-            "title",
-            "description",
-            "type"
-        });
+    const std::vector<string> attributes =
+    {{
+        "url",
+        "title",
+        "description",
+        "type"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string Card::author_name() const
@@ -46,11 +48,6 @@ const string Card::description() const
     return get_string("description");
 }
 
-const string Card::embed_url() const
-{
-    return get_string("embed_url");
-}
-
 uint64_t Card::height() const
 {
     return get_uint64("height");
@@ -84,16 +81,17 @@ const string Card::title() const
 Easy::card_type Card::type() const
 {
     const string strtype = get_string("type");
-    if (strtype == "link")
+    if (strtype.compare("link") == 0)
         return card_type::Link;
-    else if (strtype == "photo")
+    else if (strtype.compare("photo") == 0)
         return card_type::Photo;
-    else if (strtype == "video")
+    else if (strtype.compare("video") == 0)
         return card_type::Video;
-    else if (strtype == "rich")
+    else if (strtype.compare("rich") == 0)
         return card_type::Rich;
-    else
-        return card_type::Undefined;
+
+    ttdebug << "Could not get data: type\n";
+    return card_type::Undefined;
 }
 
 const string Card::url() const

src/easy/entities/card.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,8 +20,14 @@
 #include <string>
 #include <cstdint>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
@@ -63,15 +69,6 @@ namespace Easy
          */
         const string description() const;
 
-        /*!
-         *  @brief  Returns the embed URL.
-         *
-         *  This is an undocumented attribute and may vanish at any time.
-         *
-         *  @since  0.106.0
-         */
-        const string embed_url() const;
-
         /*!
          *  @brief  Returns the height of the card
          *

src/easy/entities/context.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -23,11 +23,13 @@ using Context = Easy::Context;
 
 bool Context::valid() const
 {
-    return Entity::check_valid(
-        {
-            "ancestors",
-            "descendants"
-        });
+    const std::vector<string> attributes =
+    {{
+        "ancestors",
+        "descendants"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const std::vector<Easy::Status> Context::ancestors() const
@@ -38,10 +40,11 @@ const std::vector<Easy::Status> Context::ancestors() const
         std::vector<Easy::Status> vec;
         std::transform(node.begin(), node.end(), std::back_inserter(vec),
                        [](const Json::Value &value)
-                       { return Easy::Status(value); });
+                           { return Easy::Status(value); });
         return vec;
     }
 
+    ttdebug << "Could not get data: ancestors\n";
     return {};
 }
 
@@ -53,9 +56,10 @@ const std::vector<Easy::Status> Context::descendants() const
         std::vector<Easy::Status> vec;
         std::transform(node.begin(), node.end(), std::back_inserter(vec),
                        [](const Json::Value &value)
-                       { return Easy::Status(value); });
+                           { return Easy::Status(value); });
         return vec;
     }
 
+    ttdebug << "Could not get data: descendants\n";
     return {};
 }

src/easy/entities/context.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,9 +20,16 @@
 #include <string>
 #include <vector>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "status.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+    #include "easy/entities/status.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
+#endif
 
 using std::string;
 

src/easy/entities/conversation.cpp

@@ -1,68 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  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 Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <algorithm>
-#include "conversation.hpp"
-#include "debug.hpp"
-
-using namespace Mastodon;
-using Conversation = Easy::Conversation;
-
-bool Conversation::valid() const
-{
-    return Entity::check_valid(
-        {
-            "id",
-            "accounts",
-            "unread"
-        });
-}
-
-const string Conversation::id() const
-{
-    return get_string("id");
-}
-
-const std::vector<Easy::Account> Conversation::accounts() const
-{
-    const Json::Value node = get("accounts");
-    if (node.isArray())
-    {
-        std::vector<Easy::Account> vec;
-        std::transform(node.begin(), node.end(), std::back_inserter(vec),
-                       [](const Json::Value &value)
-                       { return Easy::Account(value); });
-        return vec;
-    }
-
-    return {};
-}
-
-const Easy::Status Conversation::last_status() const
-{
-    const Json::Value &node = get("last_status");
-    if (!node.isNull())
-    {
-        return Easy::Status(node);
-    }
-
-    return {};
-}
-
-bool Conversation::unread() const
-{
-    return get_bool("unread");
-}

src/easy/entities/conversation.hpp

@@ -1,77 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  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 Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MASTODON_CPP_EASY_CONVERSATION_HPP
-#define MASTODON_CPP_EASY_CONVERSATION_HPP
-
-#include <string>
-#include <vector>
-
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "account.hpp"
-#include "status.hpp"
-
-using std::string;
-
-namespace Mastodon
-{
-namespace Easy
-{
-    /*!
-     *  @brief  Class to hold conversations.
-     *
-     *  @since  0.110.0
-     */
-    class Conversation : public Entity
-    {
-    public:
-        using Entity::Entity;
-
-        virtual bool valid() const override;
-
-        /*!
-         *  @brief  Returns the id of the conversation.
-         *
-         *  @since  0.110.0
-         */
-        const string id() const;
-
-        /*!
-         *  @brief  Returns the participating accounts.
-         *
-         *  @since  0.110.0
-         */
-        const std::vector<Account> accounts() const;
-
-        /*!
-         *  @brief  Returns the last status.
-         *
-         *  @since  0.110.0
-         */
-        const Status last_status() const;
-
-        /*!
-         *  @brief  Returns true if unread.
-         *
-         *  @since  0.110.0
-         */
-        bool unread() const;
-    };
-}
-}
-
-#endif  // MASTODON_CPP_EASY_CONVERSATION_HPP

src/easy/entities/emoji.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22,13 +22,15 @@ using Emoji = Easy::Emoji;
 
 bool Emoji::valid() const
 {
-    return Entity::check_valid(
-        {
-            "shortcode",
-            "static_url",
-            "url",
-            "visible_in_picker"
-        });
+    const std::vector<string> attributes =
+    {{
+        "shortcode",
+        "static_url",
+        "url",
+        "visible_in_picker"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string Emoji::shortcode() const
@@ -45,8 +47,3 @@ const string Emoji::url() const
 {
     return get_string("url");
 }
-
-bool Emoji::visible_in_picker() const
-{
-    return get_bool("visible_in_picker");
-}

src/easy/entities/emoji.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -19,8 +19,14 @@
 
 #include <string>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 
@@ -29,9 +35,9 @@ namespace Mastodon
 namespace Easy
 {
     /*!
-     *  @brief  Class to hold emojis.
+     *  @brief  Class to hold emojis
      *
-     *  @since  before 0.11.0
+     *  @since before 0.11.0
      */
     class Emoji : public Entity
     {
@@ -41,32 +47,25 @@ namespace Easy
         virtual bool valid() const override;
 
         /*!
-         *  @brief  Returns the shortcode of the emoji.
+         *  @brief  Returns the shortcode of the emoji
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string shortcode() const;
 
         /*!
-         *  @brief  Returns the URL to the emoji static image.
+         *  @brief  Returns the URL to the emoji static image
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string static_url() const;
 
         /*!
-         *  @brief  Returns the URL to the emoji image.
+         *  @brief  Returns the URL to the emoji image
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string url() const;
-
-        /*!
-         *  @brief  Returns if the emoji is visible in the picker.
-         *
-         *  @since  0.106.0
-         */
-        bool visible_in_picker() const;
     };
 }
 }

src/easy/entities/filter.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -24,14 +24,11 @@ using Filter = Easy::Filter;
 
 bool Filter::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "phrase",
-            "context",
-            "irreversible",
-            "whole_word"
-        });
+    return Entity::check_valid({ "id",
+                                 "phrase",
+                                 "context",
+                                 "irreversible",
+                                 "whole_word" });
 }
 
 const string Filter::id() const
@@ -52,26 +49,26 @@ const vector<Easy::context_type> Filter::context() const
         vector<Easy::context_type> vec;
         std::transform(node.begin(), node.end(), std::back_inserter(vec),
                        [](const Json::Value &value)
-                       {
-                           const string strtype = value.asString();
-                           if (strtype == "home")
-                               return Easy::context_type::Home;
-                           else if (strtype == "notifications")
-                               return Easy::context_type::Notifications;
-                           else if (strtype == "public")
-                               return Easy::context_type::Public;
-                           else if (strtype == "thread")
-                               return Easy::context_type::Thread;
-                           else
-                               return context_type::Undefined;
-                       });
+                           {
+                               const string strtype = value.asString();
+                               if (strtype == "home")
+                                   return Easy::context_type::Home;
+                               else if (strtype == "notifications")
+                                   return Easy::context_type::Notifications;
+                               else if (strtype == "public")
+                                   return Easy::context_type::Public;
+                               else if (strtype == "thread")
+                                   return Easy::context_type::Thread;
+                               else
+                                   return context_type::Undefined;
+                           });
         return vec;
     }
 
     return {};
 }
 
-const Easy::time_type Filter::expires_at() const
+const Easy::time Filter::expires_at() const
 {
     return get_time("expires_at");
 }

src/easy/entities/filter.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -19,8 +19,14 @@
 
 #include <string>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 
@@ -66,7 +72,7 @@ namespace Easy
          *
          *  @since  0.104.0
          */
-        const Easy::time_type expires_at() const;
+        const Easy::time expires_at() const;
 
         /*!
          *  @brief  Returns if the phrase should disappear irreversibly.

src/easy/entities/instance.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -24,17 +24,18 @@ using Instance = Easy::Instance;
 
 bool Instance::valid() const
 {
-    return Entity::check_valid(
-        {
-            "uri",
-            "title",
-            "description",
-            "email",
-            "version",
-            "urls",
-            "stats",
-            "languages"
-        });
+    const std::vector<string> attributes =
+    {{
+        "uri",
+        "title",
+        "description",
+        "email",
+        "version",
+        "urls",
+        "languages"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const Easy::Account Instance::contact_account() const
@@ -42,9 +43,10 @@ const Easy::Account Instance::contact_account() const
     const Json::Value node = get("contact_account");
     if (node.isObject())
     {
-        return Easy::Account(node);
+        return Easy::Account(node.toStyledString());
     }
 
+    ttdebug << "Could not get data: contact_account\n";
     return Easy::Account();
 }
 
@@ -63,15 +65,6 @@ const std::vector<string> Instance::languages() const
     return get_vector("languages");
 }
 
-const Easy::stats_type Instance::stats() const
-{
-    Easy::stats_type s;
-    s.user_count = get_uint64("stats.user_count");
-    s.status_count = get_uint64("stats.status_count");
-    s.domain_count = get_uint64("stats.domain_count");
-    return s;
-}
-
 const string Instance::title() const
 {
     return get_string("title");
@@ -82,19 +75,14 @@ const string Instance::uri() const
     return get_string("uri");
 }
 
-const Easy::urls_type Instance::urls() const
-{
-    return { get_string("urls.streaming_api") };
-}
-
 const string Instance::version() const
 {
     return get_string("version");
 }
 
-const string Instance::thumbnail() const
+const string Instance::streaming_api() const
 {
-    return get_string("thumbnail");
+    return get_string("urls.streaming_api");
 }
 
 uint64_t Instance::max_toot_chars() const

src/easy/entities/instance.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22,9 +22,16 @@
 
 using std::uint64_t;
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "account.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 
@@ -33,9 +40,9 @@ namespace Mastodon
 namespace Easy
 {
     /*!
-     *  @brief  Class to hold instances.
+     *  @brief  Class to hold instances
      *
-     *  @since  before 0.11.0
+     *  @since before 0.11.0
      */
     class Instance : public Entity
     {
@@ -45,77 +52,63 @@ namespace Easy
         virtual bool valid() const override;
 
         /*!
-         *  @brief  Returns the Account of the admin or another contact person.
+         *  @brief  Returns the Account of the admin or another contact person
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const Account contact_account() const;
 
         /*!
-         *  @brief  Returns the description of the instance.
+         *  @brief  Returns the description of the instance
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string description() const;
 
         /*!
          *  @brief  Returns the email address which can be used to contact the
-         *          instance administrator.
+         *          instance administrator
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string email() const;
 
         /*!
          *  @brief  Returns a vector of ISO 6391 language codes the instance has
-         *          chosen to advertise.
+         *          chosen to advertise
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
-        const vector<string> languages() const;
+        const std::vector<string> languages() const;
 
         /*!
-         *  @brief  Returns the thumbnail of the instance.
+         *  @brief  Returns the title of the instance
          *
-         *  @since  0.106.0
-         */
-        const string thumbnail() const;
-
-        /*!
-         *  @brief  Returns the title of the instance.
-         *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string title() const;
 
         /*!
-         *  @brief  Returns the URI of the instance.
+         *  @brief  Returns the URI of the instance
          *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string uri() const;
 
         /*!
-         *  @brief  Returns the URL for the streaming API and possibly others.
+         *  @brief  Returns the version used by the instance
          *
-         *  @since  0.106.0
-         */
-        const Easy::urls_type urls() const;
-
-        /*!
-         *  @brief  Returns statistics about the instance.
-         *
-         *  @since  0.106.0
-         */
-        const Easy::stats_type stats() const;
-
-        /*!
-         *  @brief  Returns the version used by the instance.
-         *
-         *  @since  before 0.11.0
+         *  @since before 0.11.0
          */
         const string version() const;
 
+        /*!
+         *  @brief  Returns the URL for the streaming API
+         *
+         *  @since before 0.11.0
+         */
+        const string streaming_api() const;
+
         /*!
          *  @brief  Returns the maximum chars a post can have
          *

src/easy/entities/list.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -23,11 +23,13 @@ using std::uint64_t;
 
 bool List::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "title"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "title"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string List::id() const

src/easy/entities/list.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,8 +21,14 @@
 #include <vector>
 #include <cstdint>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;

src/easy/entities/mention.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,13 +21,15 @@ using Mention = Easy::Mention;
 
 bool Mention::valid() const
 {
-    return Entity::check_valid(
-        {
-            "url",
-            "username",
-            "acct",
-            "id"
-        });
+    const std::vector<string> attributes =
+    {{
+        "url",
+        "username",
+        "acct",
+        "id"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string Mention::acct() const

src/easy/entities/mention.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,8 +20,14 @@
 #include <string>
 #include <cstdint>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;

src/easy/entities/notification.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -22,13 +22,15 @@ using Notification = Easy::Notification;
 
 bool Notification::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "type",
-            "created_at",
-            "account"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "type",
+        "created_at",
+        "account"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const Easy::Account Notification::account() const
@@ -43,7 +45,7 @@ const Easy::Account Notification::account() const
     return Easy::Account();
 }
 
-const Easy::time_type Notification::created_at() const
+const Easy::time Notification::created_at() const
 {
     return get_time("created_at");
 }

src/easy/entities/notification.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,10 +20,18 @@
 #include <string>
 #include <cstdint>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "account.hpp"
-#include "status.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/status.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
@@ -56,7 +64,7 @@ namespace Easy
          *
          *  @since before 0.11.0
          */
-        const Easy::time_type created_at() const;
+        const Easy::time created_at() const;
 
         /*!
          *  @brief  Returns notification ID

src/easy/entities/poll.cpp

@@ -1,86 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "poll.hpp"
-#include "debug.hpp"
-
-using namespace Mastodon;
-using Poll = Easy::Poll;
-
-bool Poll::valid() const
-{
-    return Entity::check_valid(
-        {
-            "id",
-            "expired",
-            "expired",
-            "multiple",
-            "votes_count",
-            "options"
-        });
-}
-
-const string Poll::id() const
-{
-    return get_string("id");
-}
-
-const Easy::time_type Poll::expires_at() const
-{
-    return get_time("expires_at");
-}
-
-bool Poll::expired() const
-{
-    return get_bool("expired");
-}
-
-bool Poll::multiple() const
-{
-    return get_bool("multiple");
-}
-
-uint64_t Poll::votes_count() const
-{
-    return get_uint64("votes_count");
-}
-
-const vector<Easy::poll_options_type> Poll::options() const
-{
-    const Json::Value &node = get("options");
-
-    if (node.isArray())
-    {
-        vector<Easy::poll_options_type> vec_options;
-        std::transform(node.begin(), node.end(), std::back_inserter(vec_options),
-                       [](const Json::Value &value)
-                       {
-                           return Easy::poll_options_type(
-                               {
-                                   value["title"].asString(),
-                                   value["votes_count"].asUInt64()
-                               });
-                       });
-        return vec_options;
-    }
-
-    return {};
-}
-
-bool Poll::voted() const
-{
-    return get_bool("voted");
-}

src/easy/entities/poll.hpp

@@ -1,98 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MASTODON_CPP_EASY_POLL_HPP
-#define MASTODON_CPP_EASY_POLL_HPP
-
-#include <string>
-#include <cstdint>
-#include <vector>
-
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-
-using std::string;
-using std::uint64_t;
-
-namespace Mastodon
-{
-namespace Easy
-{
-    /*!
-     *  @brief  Class to hold polls.
-     *
-     *  @since  0.110.0
-     */
-    class Poll : public Entity
-    {
-    public:
-        using Entity::Entity;
-
-        virtual bool valid() const override;
-
-        /*!
-         *  @brief  Returns poll ID.
-         *
-         *  @since  0.110.0
-         */
-        const string id() const;
-
-        /*!
-         *  @brief  Returns time when the poll expires.
-         *
-         *  @since  0.110.0
-         */
-        const Easy::time_type expires_at() const;
-
-        /*!
-         *  @brief  Returns true if poll has expired.
-         *
-         *  @since  0.110.0
-         */
-        bool expired() const;
-
-        /*!
-         *  @brief  Returns true or false.
-         *
-         *  @since  0.110.0
-         */
-        bool multiple() const;
-
-        /*!
-         *  @brief  Returns the number of votes.
-         *
-         *  @since  0.110.0
-         */
-        uint64_t votes_count() const;
-
-        /*!
-         *  @brief  Returns poll options and their votes count.
-         *
-         *  @since  0.110.0
-         */
-        const vector<poll_options_type> options() const;
-
-        /*!
-         *  @brief  Returns whether you voted or not.
-         *
-         *  @since  0.110.0
-         */
-        bool voted() const;
-    };
-}
-}
-
-#endif  // MASTODON_CPP_EASY_POLL_HPP

src/easy/entities/pushsubscription.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -26,13 +26,14 @@ const string PushSubscription::id() const
 
 bool PushSubscription::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "endpoint",
-            "server_key",
-            "alerts"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "endpoint",
+        "server_key"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string PushSubscription::endpoint() const
@@ -45,9 +46,9 @@ const string PushSubscription::server_key() const
     return get_string("server_key");
 }
 
-const vector<Easy::alert_type> PushSubscription::alerts() const
+const Easy::alerts PushSubscription::alerts() const
 {
-    vector<Easy::alert_type> alerts;
+    Easy::alerts alerts;
     const Json::Value node = get("alerts");
     for (auto it = node.begin(); it != node.end(); ++it)
     {

src/easy/entities/pushsubscription.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -18,15 +18,19 @@
 #define MASTODON_CPP_EASY_PUSHSUBSCRIPTION_HPP
 
 #include <string>
-#include <vector>
 #include <cstdint>
 #include <map>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
-using std::vector;
 
 namespace Mastodon
 {
@@ -65,12 +69,13 @@ namespace Easy
          */
         const string server_key() const;
 
+        // TODO: Look up what the data looks like
         /*!
          *  @brief  Returns a vector of Easy::alert_type.
          *
          *  @since  0.100.0
          */
-        const vector<Easy::alert_type> alerts() const;
+        const Easy::alerts alerts() const;
 
     protected:
         /*!

src/easy/entities/relationship.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,19 +21,19 @@ using Relationship = Easy::Relationship;
 
 bool Relationship::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "following",
-            "followed_by",
-            "blocking",
-            "muting",
-            "muting_notifications",
-            "requested",
-            "domain_blocking",
-            "showing_reblogs",
-            "endorsed"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "following",
+        "followed_by",
+        "blocking",
+        "muting",
+        "muting_notifications",
+        "requested",
+        "domain_blocking"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 bool Relationship::blocking() const
@@ -85,8 +85,3 @@ bool Relationship::showing_notifications() const
 {
     return get_bool("showing_notifications");
 }
-
-bool Relationship::showing_reblogs() const
-{
-    return get_bool("showing_reblogs");
-}

src/easy/entities/relationship.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,8 +20,14 @@
 #include <string>
 #include <cstdint>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
@@ -43,81 +49,74 @@ namespace Easy
         virtual bool valid() const override;
 
         /*!
-         *  @brief  Returns true if the user is blocking the account.
+         *  @brief  Returns true if the user is blocking the account
          *
          *  @since  before 0.11.0
          */
         bool blocking() const;
 
         /*!
-         *  @brief  Returns true if the user is blocking the account's domain.
+         *  @brief  Returns true if the user is blocking the account's domain
          *
          *  @since  before 0.11.0
          */
         bool domain_blocking() const;
 
         /*!
-         *  @brief  Returns true if the account is endorsed by the user.
+         *  @brief  Returns true if the account is endorsed by the user
          *
          *  @since  0.19.0
          */
         bool endorsed() const;
 
         /*!
-         *  @brief  Returns true if the user is being followed by the account.
+         *  @brief  Returns true if the user is being followed by the account
          *
          *  @since  before 0.11.0
          */
         bool followed_by() const;
 
         /*!
-         *  @brief  Returns true if the user is being following the account.
+         *  @brief  Returns true if the user is being following the account
          *
          *  @since  before 0.11.0
          */
         bool following() const;
 
         /*!
-         *  @brief  Returns the target account ID.
+         *  @brief  Returns the target account ID
          *
          *  @since  before 0.11.0
          */
         const string id() const;
 
         /*!
-         *  @brief  Returns true if the user is muting the account.
+         *  @brief  Returns true if the user is muting the account
          *
          *  @since  before 0.11.0
          */
         bool muting() const;
 
         /*!
-         *  @brief  Returns true if the user is also muting notifications.
+         *  @brief  Returns true if the user is also muting notifications
          *
          *  @since  before 0.11.0
          */
         bool muting_notifications() const;
 
         /*!
-         *  @brief  Returns true if the user has requested to follow the account.
+         *  @brief  Returns true if the user has requested to follow the account
          *
          *  @since  before 0.11.0
          */
         bool requested() const;
 
         /*!
-         *  @brief  Returns true if the user is showing notifications.
+         *  @brief  Returns true if the user is showing notifications
          *
          *  @since  0.19.0
          */
         bool showing_notifications() const;
-
-        /*!
-         *  @brief  Returns true if the user is showing reblogs.
-         *
-         *  @since  0.106.0
-         */
-        bool showing_reblogs() const;
     };
 }
 }

src/easy/entities/report.cpp

@@ -0,0 +1,41 @@
+/*  This file is part of mastodon-cpp.
+ *  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
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "report.hpp"
+
+using namespace Mastodon;
+using Report = Easy::Report;
+
+bool Report::valid() const
+{
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "action_taken"
+    }};
+
+    return Entity::check_valid(attributes);
+}
+
+bool Report::action_taken() const
+{
+    return get_bool("action_taken");
+}
+
+const string Report::id() const
+{
+    return get_string("id");
+}

src/easy/entities/report.hpp

@@ -0,0 +1,68 @@
+/*  This file is part of mastodon-cpp.
+ *  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
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MASTODON_CPP_EASY_REPORT_HPP
+#define MASTODON_CPP_EASY_REPORT_HPP
+
+#include <string>
+#include <cstdint>
+
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
+
+using std::string;
+
+namespace Mastodon
+{
+namespace Easy
+{
+    /*!
+     *  @brief  Class to hold reports
+     *
+     *  before 0.11.0
+     */
+    class Report : public Entity
+    {
+    public:
+        using Entity::Entity;
+
+        virtual bool valid() const override;
+
+        /*!
+         *  @brief  Returns true if an action was taken in response to the
+         *          report
+         *
+         *  @since  before 0.11.0
+         */
+        bool action_taken() const;
+
+        /*!
+         *  @brief  Returns the ID of the report
+         *
+         *  @since  before 0.11.0
+         */
+        const string id() const;
+    };
+}
+}
+
+#endif  // MASTODON_CPP_EASY_REPORT_HPP

src/easy/entities/results.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -23,12 +23,14 @@ using Results = Easy::Results;
 
 bool Results::valid() const
 {
-    return Entity::check_valid(
-        {
-            "accounts",
-            "statuses",
-            "hashtags"
-        });
+    const std::vector<string> attributes =
+    {{
+        "accounts",
+        "statuses",
+        "hashtags"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const std::vector<Easy::Account> Results::accounts() const

src/easy/entities/results.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,11 +20,20 @@
 #include <string>
 #include <vector>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "account.hpp"
-#include "status.hpp"
-#include "tag.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/status.hpp"
+    #include "easy/entities/tag.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
+    #include <mastodon-cpp/easy/entities/tag.hpp>
+#endif
 
 using std::string;
 

src/easy/entities/status.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -24,25 +24,27 @@ using Status = Easy::Status;
 
 bool Status::valid() const
 {
-    return Entity::check_valid(
-        {
-            "id",
-            "uri",
-            "account",
-            "content",
-            "created_at",
-            "emojis",
-            "replies_count",
-            "reblogs_count",
-            "favourites_count",
-            "sensitive",
-            "spoiler_text",
-            "visibility",
-            "media_attachments",
-            "mentions",
-            "tags",
-            "application"
-        });
+    const std::vector<string> attributes =
+    {{
+        "id",
+        "uri",
+        "account",
+        "content",
+        "created_at",
+        "emojis",
+        "replies_count",
+        "reblogs_count",
+        "favourites_count",
+        "sensitive",
+        "spoiler_text",
+        "visibility",
+        "media_attachments",
+        "mentions",
+        "tags",
+        "application"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const Easy::Account Status::account() const
@@ -78,7 +80,7 @@ const Easy::Card Status::card() const
     return Easy::Card();
 }
 
-const Easy::time_type Status::created_at() const
+const Easy::time Status::created_at() const
 {
     return get_time("created_at");
 }
@@ -169,6 +171,7 @@ const std::vector<Easy::Attachment> Status::media_attachments() const
 Status Status::media_attachments
     (const std::vector<Attachment> &media_attachments)
 {
+    // FIXME: Needs writable Easy::Attachment()
     Json::Value jsonarray(Json::arrayValue);
 
     for (const Attachment &att : media_attachments)

src/easy/entities/status.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,15 +21,28 @@
 #include <cstdint>
 #include <vector>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
-#include "account.hpp"
-#include "emoji.hpp"
-#include "attachment.hpp"
-#include "mention.hpp"
-#include "tag.hpp"
-#include "application.hpp"
-#include "card.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/emoji.hpp"
+    #include "easy/entities/attachment.hpp"
+    #include "easy/entities/mention.hpp"
+    #include "easy/entities/tag.hpp"
+    #include "easy/entities/application.hpp"
+    #include "easy/entities/card.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entities/emoji.hpp>
+    #include <mastodon-cpp/easy/entities/attachment.hpp>
+    #include <mastodon-cpp/easy/entities/mention.hpp>
+    #include <mastodon-cpp/easy/entities/tag.hpp>
+    #include <mastodon-cpp/easy/entities/application.hpp>
+    #include <mastodon-cpp/easy/entities/card.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
@@ -76,7 +89,7 @@ namespace Easy
          *
          *  @since  before 0.11.0
          */
-        const Easy::time_type created_at() const;
+        const Easy::time created_at() const;
 
         /*!
          *  @brief  Returns content of status

src/easy/entities/tag.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -25,11 +25,13 @@ using Tag = Easy::Tag;
 
 bool Tag::valid() const
 {
-    return Entity::check_valid(
-        {
-            "name",
-            "url"
-        });
+    const std::vector<string> attributes =
+    {{
+        "name",
+        "url"
+    }};
+
+    return Entity::check_valid(attributes);
 }
 
 const string Tag::name() const
@@ -50,7 +52,7 @@ const std::vector<Tag::History> Tag::history() const
         std::vector<Easy::Tag::History> vec;
         std::transform(node.begin(), node.end(), std::back_inserter(vec),
                        [](const Json::Value &value)
-                       { return Easy::Tag::History(value); });
+                           { return Easy::Tag::History(value); });
         return vec;
     }
 
@@ -70,12 +72,12 @@ bool Tag::History::valid() const
     return Entity::check_valid(attributes);
 }
 
-uint64_t Tag::History::accounts() const
+uint64_t Tag::History::accounts()
 {
-    return get_uint64("accounts");
+    return stouint64(get_string("accounts"));
 }
 
-const Easy::time_type Tag::History::day() const
+const Easy::time Tag::History::day()
 {
     const Json::Value node = get("day");
 
@@ -86,10 +88,10 @@ const Easy::time_type Tag::History::day() const
     }
 
     ttdebug << "Could not get data: day\n";
-    return Easy::time_type();
+    return Easy::time();
 }
 
-uint64_t Tag::History::uses() const
+uint64_t Tag::History::uses()
 {
-    return get_uint64("uses");
+    return stouint64(get_string("uses"));
 }

src/easy/entities/tag.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,8 +20,14 @@
 #include <string>
 #include <cstdint>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 using std::uint64_t;
@@ -55,21 +61,21 @@ namespace Easy
              *
              *  @since  0.16.0
              */
-            uint64_t accounts() const;
+            uint64_t accounts();
 
             /*!
              *  @brief  Returns the day.
              *
              *  @since  0.16.0
              */
-            const Easy::time_type day() const;
+            const Easy::time day();
 
             /*!
-             *  @brief  Returns the number of statuses with that hashtag.
+             *  @brief  Returns the number of accounts using that hashtag.
              *
              *  @since  0.16.0
              */
-            uint64_t uses() const;
+            uint64_t uses();
         };
 
         using Entity::Entity;

src/easy/entities/token.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,13 +21,10 @@ using Token = Easy::Token;
 
 bool Token::valid() const
 {
-    return Entity::check_valid(
-        {
-            "access_token",
-            "token_type",
-            "scope",
-            "created_at"
-        });
+    return Entity::check_valid({"access_token",
+                                "token_type",
+                                "scope",
+                                "created_at"});
 }
 
 const string Token::access_token() const
@@ -45,7 +42,7 @@ const string Token::scope() const
     return get_string("scope");
 }
 
-const Easy::time_type Token::created_at() const
+const Easy::time Token::created_at() const
 {
     return get_time("created_at");
 }

src/easy/entities/token.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -19,8 +19,14 @@
 
 #include <string>
 
-#include "../../mastodon-cpp.hpp"
-#include "../entity.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+    #include "easy/entity.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+    #include <mastodon-cpp/easy/entity.hpp>
+#endif
 
 using std::string;
 
@@ -66,7 +72,7 @@ namespace Easy
          *
          *  @since  0.103.0
          */
-        const Easy::time_type created_at() const;
+        const Easy::time created_at() const;
 };
 }
 }

src/easy/entity.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,7 +21,6 @@
 #include <regex>
 #include <algorithm>
 #include "easy/entity.hpp"
-#include "easy/easy.hpp"
 #include "debug.hpp"
 
 using namespace Mastodon;
@@ -101,7 +100,7 @@ const Json::Value Easy::Entity::to_object() const
 
 bool Easy::Entity::check_valid(const std::vector<string> &attributes) const
 {
-    for (const string &attribute : attributes)
+    for (const string &attribute: attributes)
     {
         get(attribute);
         if (!was_set())
@@ -227,14 +226,19 @@ bool Easy::Entity::get_bool(const string &key) const
     return false;
 }
 
-const Easy::time_type Easy::Entity::get_time(const string &key) const
+const Easy::time Easy::Entity::get_time(const string &key) const
 {
     const Json::Value node = get(key);
 
     if (node.isString())
     {
+        std::stringstream sstime(node.asString());
+        struct std::tm tm = {};
+        tm.tm_isdst = -1;       // Detect daylight saving time.
+        sstime >> std::get_time(&tm, "%Y-%m-%dT%T");
+        std::time_t time = timegm(&tm); // Assume time is UTC.
         _was_set = true;
-        return Easy::string_to_time(node.asString());
+        return { system_clock::from_time_t(time) };
     }
 
     _was_set = false;
@@ -309,3 +313,29 @@ std::uint64_t Easy::Entity::stouint64(const string &str) const
         return stoull(str);
     }
 }
+
+// Easy::GenericEntity::GenericEntity(const string &json)
+// : Entity(json)
+// {}
+
+// Easy::GenericEntity::GenericEntity()
+// : Entity()
+// {}
+
+// bool Easy::GenericEntity::valid() const
+// {
+//     return true;
+// }
+
+// template<typename T> GenericEntity<T>::GenericEntity(const string &json)
+//     : Entity(json)
+// {}
+
+// template<typename T> GenericEntity<T>::GenericEntity()
+//     : Entity()
+// {}
+
+// template<typename T> bool GenericEntity<T>::valid() const
+// {
+//     return true;
+// }

src/easy/entity.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,7 +20,12 @@
 #include <string>
 #include <jsoncpp/json/json.h>
 
-#include "types_easy.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "easy/types_easy.hpp"
+#else
+    #include <mastodon-cpp/easy/types_easy.hpp>
+#endif
 
 using std::string;
 
@@ -185,6 +190,7 @@ namespace Easy
          */
         double get_double(const string &key) const;
 
+        // TODO: Maybe an enum would be better?
         /*!
          *  @brief  Returns the value of key as bool
          *
@@ -197,7 +203,7 @@ namespace Easy
          *
          *          Returns clocks epoch if the value does not exist or is null.
          */
-        const Easy::time_type get_time(const string &key) const;
+        const Easy::time get_time(const string &key) const;
 
         /*!
          *  @brief  Returns the value of key as vector

src/easy/return_types_easy.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -26,14 +26,13 @@
 #include "easy/entities/mention.hpp"
 #include "easy/entities/notification.hpp"
 #include "easy/entities/relationship.hpp"
+#include "easy/entities/report.hpp"
 #include "easy/entities/results.hpp"
 #include "easy/entities/status.hpp"
 #include "easy/entities/tag.hpp"
 #include "easy/entities/token.hpp"
 #include "easy/entities/pushsubscription.hpp"
 #include "easy/entities/filter.hpp"
-#include "easy/entities/poll.hpp"
-#include "easy/entities/conversation.hpp"
 
 using namespace Mastodon;
 
@@ -52,16 +51,6 @@ Easy::return_entity<T>::return_entity(const uint8_t ec, const string &em,
     http_error_code = hec;
 }
 
-template<typename T>
-Easy::return_entity<T>::return_entity(const error ec, const string &em,
-                                      const uint16_t hec, const T &ent)
-    : entity(ent)
-{
-    error_code = static_cast<uint8_t>(ec);
-    error_message = em;
-    http_error_code = hec;
-}
-
 template<typename T>
 Easy::return_entity<T>::return_entity::operator const T() const
 {
@@ -86,14 +75,13 @@ template struct Easy::return_entity<Easy::List>;
 template struct Easy::return_entity<Easy::Mention>;
 template struct Easy::return_entity<Easy::Notification>;
 template struct Easy::return_entity<Easy::Relationship>;
+template struct Easy::return_entity<Easy::Report>;
 template struct Easy::return_entity<Easy::Results>;
 template struct Easy::return_entity<Easy::Status>;
 template struct Easy::return_entity<Easy::Tag>;
 template struct Easy::return_entity<Easy::Token>;
 template struct Easy::return_entity<Easy::PushSubscription>;
 template struct Easy::return_entity<Easy::Filter>;
-template struct Easy::return_entity<Easy::Poll>;
-template struct Easy::return_entity<Easy::Conversation>;
 
 
 template<typename T>
@@ -132,11 +120,10 @@ template struct Easy::return_entity_vector<Easy::List>;
 template struct Easy::return_entity_vector<Easy::Mention>;
 template struct Easy::return_entity_vector<Easy::Notification>;
 template struct Easy::return_entity_vector<Easy::Relationship>;
+template struct Easy::return_entity_vector<Easy::Report>;
 template struct Easy::return_entity_vector<Easy::Results>;
 template struct Easy::return_entity_vector<Easy::Status>;
 template struct Easy::return_entity_vector<Easy::Tag>;
 template struct Easy::return_entity_vector<Easy::Token>;
 template struct Easy::return_entity_vector<Easy::PushSubscription>;
 template struct Easy::return_entity_vector<Easy::Filter>;
-template struct Easy::return_entity_vector<Easy::Poll>;
-template struct Easy::return_entity_vector<Easy::Conversation>;

src/easy/return_types_easy.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -21,7 +21,12 @@
 #include <vector>
 #include <ostream>
 #include <cstdint>
-#include "../mastodon-cpp.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "mastodon-cpp.hpp"
+#else
+    #include <mastodon-cpp/mastodon-cpp.hpp>
+#endif
 
 using std::string;
 using std::vector;
@@ -36,9 +41,8 @@ namespace Easy
      *
      *  @since  0.100.0
      */
-    template <typename T> struct
-    [[deprecated("Will go away in 1.0.0 with no replacement.")]]
-    return_entity : return_base
+    template <typename T>
+    struct return_entity : return_base
     {
         /*!
          *  @brief  Mastodon::Easy::Entity
@@ -62,19 +66,6 @@ namespace Easy
         return_entity(const uint8_t ec, const string &em,
                       const uint16_t hec, const T &ent);
 
-        /*!
-         *  @brief  Return type for easy Mastodon::Easy::API.
-         *
-         *  @param ec  Error code
-         *  @param em  Error message
-         *  @param hec HTTP error code
-         *  @param ent Answer
-         *
-         *  @since  0.110.0
-         */
-        return_entity(const error ec, const string &em,
-                      const uint16_t hec, const T &ent);
-
         /*!
          *  @brief  Same as return_entity::entity.
          *
@@ -108,9 +99,8 @@ namespace Easy
      *
      *  @since  0.100.0
      */
-    template <typename T> struct
-    [[deprecated("Will go away in 1.0.0 with no replacement.")]]
-    return_entity_vector : return_base
+    template <typename T>
+    struct return_entity_vector : return_base
     {
         /*!
          *  @brief  std::vector of Mastodon::Easy::Entity.

src/easy/simple_calls.cpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -39,8 +39,7 @@ const return_entity<Status> API::send_post(const Status &status)
     else
     {
         ttdebug << "ERROR: Easy::Status::content can not be empty.\n";
-        return { error::INVALID_ARGUMENT,
-                 "Easy::Status::content can not be empty", 0, Status() };
+        return { 22, "Easy::Status::content can not be empty", 0, Status() };
     }
 
     if (!status.in_reply_to_id().empty())
@@ -95,9 +94,8 @@ const return_entity<Status> API::send_post(const Status &status)
             else
             {
                 ttdebug << "ERROR: Easy::Attachment::file can not be empty.\n";
-                return { error::INVALID_ARGUMENT,
-                         "Easy::Attachment::file can not be empty", 0,
-                         Status() };
+                return { 22, "Easy::Attachment::file can not be empty",
+                         0, Status() };
             }
             if (!att.description().empty())
             {

src/easy/types_easy.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,17 +20,17 @@ namespace Mastodon
 {
 namespace Easy
 {
-    time_type::operator const system_clock::time_point() const
+    time::operator const system_clock::time_point() const
     {
         return timepoint;
     }
 
-    time_type::operator const string() const
+    time::operator const string() const
     {
         return strtime("%FT%T%z", true);
     }
 
-    const string time_type::strtime(const string &format, const bool &local) const
+    const string time::strtime(const string &format, const bool &local) const
     {
         constexpr std::uint16_t bufsize = 1024;
         std::time_t time = system_clock::to_time_t(timepoint);
@@ -51,7 +51,7 @@ namespace Easy
     }
 
     std::ostream &operator <<(std::ostream &out,
-                              const time_type &t)
+                              const time &t)
     {
         const string s = t;         // Converts using operator const string().
         out << s;

src/easy/types_easy.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -20,11 +20,11 @@
 #include <string>
 #include <utility>
 #include <chrono>
-#include <cstdint>
+#include <vector>
 
 using std::string;
 using std::chrono::system_clock;
-using std::uint64_t;
+using std::vector;
 
 namespace Mastodon
 {
@@ -41,7 +41,6 @@ namespace Easy
         Notification,
         Delete,
         Error,
-        Filters_changed,
         Undefined
     };
 
@@ -122,14 +121,11 @@ namespace Easy
      *
      *  @since  0.100.0
      */
-    typedef struct stream_event_type
+    typedef struct stream_event
     {
         event_type type = event_type::Undefined;
         string data;
-    } stream_event_type;
-
-    [[deprecated("Replaced by Mastodon::Easy::stream_event_type")]]
-    typedef stream_event_type stream_event;
+    } stream_event;
 
     /*!
      *  @brief  Type of notification and 'push is requested or not'.
@@ -142,12 +138,21 @@ namespace Easy
         bool pushreq = false;
     } alert_type;
 
+    /*!
+     *  @brief  Vector of Easy::alert_type.
+     *
+     *          Used in PushSubscription::alerts().
+     *
+     *  @since  0.100.0
+     */
+    typedef vector<alert_type> alerts;
+
     /*!
      *  @brief  Type for time. Converts to time_point and string.
      *
      *  @since  0.100.0
      */
-    struct time_type
+    struct time
     {
         system_clock::time_point timepoint = system_clock::time_point();
 
@@ -166,7 +171,7 @@ namespace Easy
          *  @since  0.100.0
          */
         friend std::ostream &operator <<(std::ostream &out,
-                                         const Easy::time_type &t);
+                                         const Easy::time &t);
 
         /*!
          *  @brief  Converts time to a string.
@@ -190,50 +195,6 @@ namespace Easy
         const string strtime(const string &format,
                              const bool &local = true) const;
     };
-
-    [[deprecated("Replaced by Mastodon::Easy::time_type")]]
-    typedef time_type time;
-
-    /*!
-     *  @brief  Describes an account-field.
-     *
-     *  @since  0.106.0
-     */
-    typedef struct account_field_type
-    {
-        const string name;
-        const string value;
-        Easy::time_type verified_at;
-    } account_field_type;
-
-    /*!
-     *  @brief  URLs returned by Instance::urls().
-     *
-     *  @since  0.106.0
-     */
-    typedef struct urls_type
-    {
-        string streaming_api;
-    } urls_type;
-
-    /*!
-     *  @brief Statistics returned by Instance::stats().
-     */
-    typedef struct stats_type
-    {
-        uint64_t user_count = 0;
-        uint64_t status_count = 0;
-        uint64_t domain_count = 0;
-    } stats_type;
-
-    /*!
-     *  @brief Poll options returned by Poll::options().
-     */
-    typedef struct poll_options_type
-    {
-        string title;
-        uint64_t votes_count = 0;
-    } poll_options_type;
 }
 }
 #endif  // MASTODON_CPP_EASY_TYPES_EASY_HPP

src/http.cpp

@@ -2,49 +2,33 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <iostream>
 #include <functional>   // std::bind
+#include <list>
+#include <cstring>      // std::strncmp
 #include <exception>
 #include <thread>
-#include <regex>
-#include <Poco/Net/HTTPSClientSession.h>
-#include <Poco/Net/HTTPRequest.h>
-#include <Poco/Net/HTTPResponse.h>
-#include <Poco/StreamCopier.h>
-#include <Poco/URI.h>
-#include <Poco/Environment.h>
-#include <Poco/Exception.h>
-#include <Poco/Net/NetException.h>
-#include <Poco/Net/SSLException.h>
+#include <curlpp/Options.hpp>
+#include <curlpp/Exception.hpp>
+#include <curlpp/Infos.hpp>
 #include "debug.hpp"
 #include "mastodon-cpp.hpp"
 
 using namespace Mastodon;
+namespace curlopts = curlpp::options;
 using std::cerr;
-using std::istream;
-using std::make_unique;
-using std::move;
-using std::regex;
-using std::regex_search;
-using std::smatch;
-using Poco::Net::HTTPSClientSession;
-using Poco::Net::HTTPRequest;
-using Poco::Net::HTTPResponse;
-using Poco::Net::HTTPMessage;
-using Poco::StreamCopier;
-using Poco::Environment;
 
 API::http::http(const API &api, const string &instance,
                 const string &access_token)
@@ -53,95 +37,21 @@ API::http::http(const API &api, const string &instance,
 , _access_token(access_token)
 , _cancel_stream(false)
 {
-    Poco::Net::initializeSSL();
-
-    try
-    {
-        string env_proxy = Environment::get("http_proxy");
-        size_t pos;
-
-        // Only keep text between // and /.
-        if ((pos = env_proxy.find("//")) != string::npos)
-        {
-            env_proxy = env_proxy.substr(pos + 2);
-        }
-        if ((pos = env_proxy.find('/')) != string::npos)
-        {
-            env_proxy = env_proxy.substr(0, pos);
-        }
-
-        if ((pos = env_proxy.find('@')) != string::npos)
-        {
-            string hostport = env_proxy.substr(pos + 1);
-            string userpw = env_proxy.substr(0, pos);
-            set_proxy(hostport, userpw);
-        }
-        else
-        {
-            set_proxy(env_proxy);
-        }
-    }
-    catch (const std::exception &)
-    {
-        // No proxy found, no problem.
-    }
-
+    curlpp::initialize();
 }
 
 API::http::~http()
 {
-    Poco::Net::uninitializeSSL();
-}
-
-void API::http::set_proxy(const string &hostport, const string &userpw)
-{
-    try
-    {
-        HTTPSClientSession::ProxyConfig proxyconfig;
-        size_t pos = hostport.find(':');
-
-        proxyconfig.host = hostport.substr(0, pos);
-        if (pos != string::npos)
-        {
-            proxyconfig.port = std::stoi(hostport.substr(pos + 1));
-        }
-
-        if (!userpw.empty())
-        {
-            string username;
-
-            pos = userpw.find(':');
-            Poco::URI::decode(userpw.substr(0, pos), username);
-            proxyconfig.username = username;
-
-            if (pos != string::npos)
-            {
-                string password;
-                Poco::URI::decode(userpw.substr(pos + 1), password);
-                proxyconfig.password = password;
-            }
-        }
-
-        HTTPSClientSession::setGlobalProxyConfig(proxyconfig);
-        ttdebug << "Set proxy to " << hostport << ".\n";
-    }
-    catch (const std::exception &e)
-    {
-        if (parent.exceptions())
-        {
-            std::rethrow_exception(std::current_exception());
-        }
-    }
+    curlpp::terminate();
 }
 
 return_call API::http::request(const http_method &meth, const string &path)
 {
-    HTMLForm form;
-    return request(meth, path, form);
+    return request(meth, path, curlpp::Forms());
 }
 
 return_call API::http::request(const http_method &meth, const string &path,
-                               HTMLForm &formdata)
+                               const curlpp::Forms &formdata)
 {
     string answer;
     return request_common(meth, path, formdata, answer);
@@ -153,9 +63,8 @@ void API::http::request_stream(const string &path, string &stream)
     _streamthread = std::thread(
         [&, path]               // path is captured by value because it may be
         {                       // deleted before we access it.
-            HTMLForm form;
             ret = request_common(http_method::GET_STREAM, path,
-                                 form, stream);
+                                 curlpp::Forms(), stream);
             ttdebug << "Remaining content of the stream: " << stream << '\n';
             if (!ret)
             {
@@ -169,181 +78,149 @@ void API::http::request_stream(const string &path, string &stream)
 
 return_call API::http::request_common(const http_method &meth,
                                       const string &path,
-                                      HTMLForm &formdata,
+                                      const curlpp::Forms &formdata,
                                       string &answer)
 {
+    using namespace std::placeholders;  // _1, _2, _3
+
     ttdebug << "Path is: " << path << '\n';
 
     try
     {
-        string method;
+        curlpp::Easy request;
+        std::list<string> headers;
+
+        request.setOpt<curlopts::Url>("https://" + _instance + path);
+        ttdebug << "User-Agent: " << parent.get_useragent() << "\n";
+        request.setOpt<curlopts::UserAgent>(parent.get_useragent());
+
+        {
+            string proxy;
+            string userpw;
+            parent.get_proxy(proxy, userpw);
+            if (!proxy.empty())
+            {
+                request.setOpt<curlopts::Proxy>(proxy);
+                if (!userpw.empty())
+                {
+                    request.setOpt<curlopts::ProxyUserPwd>(userpw);
+                }
+            }
+        }
+
+        if (!_access_token.empty())
+        {
+            headers.push_back("Authorization: Bearer " + _access_token);
+        }
+        if (meth != http_method::GET_STREAM)
+        {
+            headers.push_back("Connection: close");
+            // Get headers from server
+            request.setOpt<curlpp::options::Header>(true);
+        }
+
+        request.setOpt<curlopts::HttpHeader>(headers);
+        request.setOpt<curlopts::FollowLocation>(true);
+        request.setOpt<curlopts::WriteFunction>
+            (std::bind(&http::callback_write, this, _1, _2, _3, &answer));
+        request.setOpt<curlopts::ProgressFunction>
+            (std::bind(&http::callback_progress, this, _1, _2, _3, _4));
+        request.setOpt<curlopts::NoProgress>(0);
+        if (!formdata.empty())
+        {
+            request.setOpt<curlopts::HttpPost>(formdata);
+        }
 
         switch (meth)
         {
         case http_method::GET:
         case http_method::GET_STREAM:
-        {
-            method = HTTPRequest::HTTP_GET;
             break;
-        }
-        case http_method::PUT:
-        {
-            method = HTTPRequest::HTTP_PUT;
-            break;
-        }
-        case http_method::POST:
-        {
-            method = HTTPRequest::HTTP_POST;
-            break;
-        }
         case http_method::PATCH:
-        {
-            // POCO in CentOS 7 (1.6.1) doesn't have HTTPRequest::HTTP_PATCH.
-            method = "PATCH";
+            request.setOpt<curlopts::CustomRequest>("PATCH");
+            break;
+        case http_method::POST:
+            request.setOpt<curlopts::CustomRequest>("POST");
+            break;
+        case http_method::PUT:
+            request.setOpt<curlopts::CustomRequest>("PUT");
             break;
-        }
         case http_method::DELETE:
-        {
-            method = HTTPRequest::HTTP_DELETE;
+            request.setOpt<curlopts::CustomRequest>("DELETE");
             break;
         }
-        default:
-        {
-            break;
-        }
-        }
 
-        HTTPSClientSession session(_instance);
-        HTTPRequest request(method, path, HTTPMessage::HTTP_1_1);
-        request.set("User-Agent", parent.get_useragent());
+        //request.setOpt<curlopts::Verbose>(true);
 
-        if (!_access_token.empty())
-        {
-            request.set("Authorization", " Bearer " + _access_token);
+        answer.clear();
+        request.perform();
+        uint16_t http_code = curlpp::infos::ResponseCode::get(request);
+        ttdebug << "Response code: " << http_code << '\n';
+        // Work around "HTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 200 OK"
+        size_t pos = answer.find("\r\n\r\n", 25);
+        _headers = answer.substr(0, pos);
+        // Only return body
+        answer = answer.substr(pos + 4);
+
+        if (http_code == 200 || http_code == 302 || http_code == 307)
+        {   // OK or Found or Temporary Redirect
+            return { 0, "", http_code, answer };
         }
-
-        if (!formdata.empty())
+        else if (http_code == 301 || http_code == 308)
+        {   // Moved Permanently or Permanent Redirect
+            // return new URL
+            answer = curlpp::infos::EffectiveUrl::get(request);
+            return { 78, "Remote address changed", http_code, answer };
+        }
+        else if (http_code == 0)
         {
-            ttdebug << "Size of HTMLForm is " << formdata.size() << '\n';
-            formdata.prepareSubmit(request);
-            formdata.write(session.sendRequest(request));
+            return { 255, "Unknown error", http_code, answer };
         }
         else
         {
-            session.sendRequest(request);
-        }
-
-        HTTPResponse response;
-        istream &body_stream = session.receiveResponse(response);
-
-        const uint16_t http_code = response.getStatus();
-        ttdebug << "Response code: " << http_code << '\n';
-
-        answer.clear();
-        StreamCopier::copyToString(body_stream, answer);
-
-        std::ostringstream headers_stream;
-        response.write(headers_stream);
-        _headers = headers_stream.str();
-
-        switch (http_code)
-        {
-        case HTTPResponse::HTTP_OK:
-        {
-            return { error::OK, "", http_code, answer };
-        }
-        // Not using the constants because some are too new for Debian stretch.
-        case 301:               // HTTPResponse::HTTP_MOVED_PERMANENTLY
-        case 308:               // HTTPResponse::HTTP_PERMANENT_REDIRECT
-        case 302:               // HTTPResponse::HTTP_FOUND
-        case 303:               // HTTPResponse::HTTP_SEE_OTHER
-        case 307:               // HTTPResponse::HTTP_TEMPORARY_REDIRECT
-        {
-            ttdebug << "HTTP redirect.\n";
-            string location = response.get("Location");
-
-            if (location.substr(0, 4) == "http")
-            {                   // Remove protocol and instance from path.
-                size_t pos1 = location.find("//") + 2;
-                size_t pos2 = location.find('/', pos1);
-
-                if (location.substr(pos1, pos2 - pos1) != _instance)
-                {               // Return new location if the domain changed.
-                    ttdebug << "New location is on another domain.\n";
-                    return { error::URL_CHANGED, "Remote address changed",
-                             http_code, location };
-                }
-
-                location = location.substr(pos2);
-            }
-
-            if (http_code == 301 || http_code == 308)
-            {                   // Return new location for permanent redirects.
-                return { error::URL_CHANGED, "Remote address changed",
-                         http_code, location };
-            }
-            else
-            {
-                ttdebug << "Following temporary redirect: " << location << '\n';
-                return request_common(meth, location, formdata, answer);
-            }
-        }
-        default:
-        {
-            return { error::CONNECTION_REFUSED, "Connection refused",
-                     http_code, answer };
-        }
+            return { 111, "Connection refused", http_code, answer };
         }
     }
-    catch (const Poco::Net::DNSException &e)
+    catch (curlpp::RuntimeError &e)
     {
+        const string what = e.what();
+        // This error is thrown if http.cancel_stream() is used.
+        if ((what.compare(0, 16, "Callback aborted") == 0) ||
+            (what.compare(0, 19, "Failed writing body") == 0))
+        {
+            ttdebug << "Request was cancelled by user\n";
+            return { 0, "Request was cancelled by user", 0, "" };
+        }
+        else if (what.compare(what.size() - 20, 20, "Connection timed out") == 0)
+        {
+            ttdebug << what << "\n";
+            return { 110, "Connection timed out", 0, "" };
+        }
+        else if (what.compare(0, 23, "Could not resolve host:") == 0)
+        {
+            ttdebug << what << "\n";
+            return { 113, "Could not resolve host", 0, "" };
+        }
+
         if (parent.exceptions())
         {
-            e.rethrow();
+            std::rethrow_exception(std::current_exception());
         }
-
-        ttdebug << e.displayText() << "\n";
-        return { error::DNS, e.displayText(), 0, "" };
-    }
-    catch (const Poco::Net::ConnectionRefusedException &e)
-    {
-        if (parent.exceptions())
+        else
         {
-            e.rethrow();
+            ttdebug << "curlpp::RuntimeError: " << e.what() << std::endl;
+            return { 192, e.what(), 0, "" };
         }
-
-        ttdebug << e.displayText() << "\n";
-        return { error::CONNECTION_REFUSED, e.displayText(), 0, "" };
     }
-    catch (const Poco::Net::SSLException &e)
-    {
-        if (parent.exceptions())
-        {
-            e.rethrow();
-        }
-
-        ttdebug << e.displayText() << "\n";
-        return { error::ENCRYPTION, e.displayText(), 0, "" };
-    }
-    catch (const Poco::Net::NetException &e)
-    {
-        if (parent.exceptions())
-        {
-            e.rethrow();
-        }
-
-        ttdebug << "Unknown network error: " << e.displayText() << std::endl;
-        return { error::UNKNOWN, e.displayText(), 0, "" };
-    }
-    catch (const std::exception &e)
+    catch (curlpp::LogicError &e)
     {
         if (parent.exceptions())
         {
             std::rethrow_exception(std::current_exception());
         }
 
-        ttdebug << "Unknown error: " << e.what() << std::endl;
-        return { error::UNKNOWN, e.what(), 0, "" };
+        ttdebug << "curlpp::LogicError: " << e.what() << std::endl;
+        return { 193, e.what(), 0, "" };
     }
 }
 
@@ -352,6 +229,26 @@ void API::http::get_headers(string &headers) const
     headers = _headers;
 }
 
+size_t API::http::callback_write(char* data, size_t size, size_t nmemb,
+                                 string *str)
+{
+    std::lock_guard<std::mutex> lock(_mutex);
+    str->append(data, size * nmemb);
+    // ttdebug << "Received " << size * nmemb << " Bytes\n";
+    return size * nmemb;
+}
+
+double API::http::callback_progress(double /* dltotal */, double /* dlnow */,
+                                    double /* ultotal */, double /* ulnow */)
+{
+    if (_cancel_stream)
+    {
+        // This throws the runtime error: Callback aborted
+        return 1;
+    }
+    return 0;
+}
+
 void API::http::cancel_stream()
 {
     _cancel_stream = true;

src/mastodon-cpp.cpp

@@ -2,34 +2,30 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sstream>
 #include <regex>
 #include <locale>
 #include <codecvt>
 #include <utility>
 #include <iostream>
-#include <exception>
 #include <algorithm>
-#include <Poco/Net/FilePartSource.h>
-#include <Poco/URI.h>
 #include "version.hpp"
 #include "debug.hpp"
 #include "mastodon-cpp.hpp"
 
 using namespace Mastodon;
-using std::make_unique;
-using Poco::Net::FilePartSource;
 
 API::API(const string &instance, const string &access_token)
 : _instance(instance)
@@ -37,25 +33,9 @@ API::API(const string &instance, const string &access_token)
 , _useragent(string("mastodon-cpp/") + global::version)
 , _http(*this, instance, access_token)
 , _exceptions(false)
-{
-    bool fash = false;
-    const std::regex re_gab("(?:\\.|^)gab\\.[^\\.]+$");
-    const std::regex re_kiwifarms("(?:\\.|^)kiwifarms\\.[^\\.]+$");
-
-    for (const std::regex &re : { re_gab, re_kiwifarms })
-    {
-        if (std::regex_search(_instance, re))
-        {
-            fash = true;
-            break;
-        }
-    }
-
-    if (fash)
-    {
-        throw std::runtime_error("Fascist instance detected: " + _instance);
-    }
-}
+, _proxy("")
+, _proxy_userpw("")
+{}
 
 API::~API()
 {}
@@ -111,12 +91,9 @@ const string API::maptostr(const parameters &map, const bool &firstparam)
     return result;
 }
 
-unique_ptr<HTMLForm> API::maptoformdata(const parameters &map)
+const curlpp::Forms API::maptoformdata(const parameters &map)
 {
-    ttdebug << "Transforming Mastodon::parameters to Poco::Net::HTMLForm.\n";
-
-    unique_ptr<HTMLForm> formdata =
-        make_unique<HTMLForm>(HTMLForm::ENCODING_MULTIPART);
+    curlpp::Forms formdata;
 
     if (map.size() == 0)
     {
@@ -125,58 +102,41 @@ unique_ptr<HTMLForm> API::maptoformdata(const parameters &map)
 
     for (const auto &it : map)
     {
-        string key = it.key;
-        ttdebug << "Processing \"" + key + "\".\n";
-
-        // TODO: Test nested parameters.
-        if (const size_t pos = key.find('.') != string::npos)
-        {                       // Nested parameters.
-            key.replace(pos, 1, "[");
-            key += ']';
-        }
-
         if (it.values.size() == 1)
-        {   // If the file is not base64-encoded, treat as filename.
-            if ((key == "avatar" ||
-                 key == "header" ||
-                 key == "file") &&
-                it.values.front().substr(0, 5) != "data:")
-            {
-                ttdebug << key << ": Filename detected.\n";
-
-                try
-                {
-                    formdata->addPart(key,
-                                     new FilePartSource(it.values.front()));
-                }
-                catch (const std::exception &e)
-                {
-                    if (exceptions())
-                    {
-                        std::rethrow_exception(std::current_exception());
-                    }
-
-                    // TODO: Proper error handling without exceptions.
-                    std::cerr << "Error: Could not open file: "
-                              << it.values.front() << std::endl;
-                }
-            }
-            else if (key == "account_ids"
+        {   // If the file is not base64-encoded, treat as filename
+            if ((it.key == "avatar" ||
+                it.key == "header" ||
+                it.key == "file") &&
+                it.values.front().substr(0, 4).compare("data") != 0)
+             {
+                ttdebug << it.key << ": Filename detected.\n";
+                formdata.push_back(
+                    new curlpp::FormParts::File(it.key, it.values.front()));
+             }
+             else
+             {
+                 // Append [] to array keys.
+                 string key = it.key;
+                 if (key == "account_ids"
                      || key == "exclude_types"
                      || key == "media_ids"
                      || key == "context")
-            {
-                key += "[]";
+                 {
+                     key += "[]";
+                 }
+                 formdata.push_back(
+                     new curlpp::FormParts::Content(key, it.values.front()));
             }
-
-            formdata->add(key, it.values.front());
         }
         else
         {
-            for (const string &value : it.values)
-            {
-                formdata->add(key + "[]", value);
-            }
+            std::transform(it.values.begin(), it.values.end(),
+                           std::back_inserter(formdata),
+                           [&it](const string &s)
+                               {
+                                   return new curlpp::FormParts::Content
+                                       (it.key + "[]", s);
+                               });
         }
     }
 
@@ -266,18 +226,11 @@ return_call API::register_app2(const string &client_id,
     return ret;
 }
 
-const string API::get_header(std::string header) const
+const string API::get_header(const std::string &header) const
 {
     string headers;
-    string headers_lower;
     _http.get_headers(headers);
-    headers_lower.resize(headers.size());
-
-    std::transform(headers.begin(), headers.end(),
-                   headers_lower.begin(), ::tolower);
-    std::transform(header.begin(), header.end(), header.begin(), ::tolower);
-
-    size_t startpos = headers_lower.find(header + ':');
+    size_t startpos = headers.find(header + ':');
     if (startpos != std::string::npos)
     {
         startpos = headers.find(':', startpos) + 2;
@@ -299,9 +252,22 @@ bool API::exceptions() const
     return _exceptions;
 }
 
-void API::set_proxy(const string &hostport, const string &userpw)
+void API::set_proxy(const string &proxy, const string &userpw)
 {
-    _http.set_proxy(hostport, userpw);
+    _proxy = proxy;
+    _proxy_userpw = userpw;
+}
+
+void API::get_proxy(string &proxy, string &userpw) const
+{
+    if (!_proxy.empty())
+    {
+        proxy = _proxy;
+        if (!_proxy_userpw.empty())
+        {
+            userpw = _proxy_userpw;
+        }
+    }
 }
 
 const parameters API::delete_params(const parameters &params,
@@ -315,7 +281,7 @@ const parameters API::delete_params(const parameters &params,
         std::copy_if(params.begin(), params.end(), newparams.begin(),
                      [&keys](const param &p)
                      {
-                         return std::all_of(keys.begin(), keys.end(),
+                         return std::any_of(keys.begin(), keys.end(),
                                             [&p](const string &k)
                                             {
                                                 return (k != p.key);
@@ -327,16 +293,11 @@ const parameters API::delete_params(const parameters &params,
 
 const string Mastodon::urlencode(const std::string &str)
 {
-    string out;
-    Poco::URI::encode(str, "", out);
-    return out;
+    return curlpp::escape(str);
 }
-
 const string Mastodon::urldecode(const std::string &str)
 {
-    string out;
-    Poco::URI::decode(str, out);
-    return out;
+    return curlpp::unescape(str);
 }
 
 const string Mastodon::unescape_html(const string &html)
@@ -347,7 +308,7 @@ const string Mastodon::unescape_html(const string &html)
     // Used to convert int to utf-8 char
     std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> u8c;
     // Matches numbered entities between 1 and 8 digits, decimal or hexadecimal
-    std::regex re_entity("&#(x)?([[:alnum:]]{1,8});");
+    std::regex re_entity("&#(x)?(\\d{1,8});");
     std::smatch match;
 
     while (std::regex_search(buffer, match, re_entity))

src/mastodon-cpp.hpp

@@ -2,15 +2,15 @@
  *  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 Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -25,15 +25,20 @@
 #include <ostream>
 #include <thread>
 #include <cstdint>
-#include <Poco/Net/HTMLForm.h>
+#include <curlpp/cURLpp.hpp>
+#include <curlpp/Easy.hpp>
 
-#include "return_types.hpp"
-#include "types.hpp"
+// If we are compiling mastodon-cpp, use another include path
+#ifdef MASTODON_CPP
+    #include "return_types.hpp"
+    #include "types.hpp"
+#else
+    #include <mastodon-cpp/return_types.hpp>
+    #include <mastodon-cpp/types.hpp>
+#endif
 
 using std::string;
 using std::uint8_t;
-using std::unique_ptr;
-using Poco::Net::HTMLForm;
 
 /*!
  *  @example example01_get_public_timeline.cpp
@@ -49,20 +54,22 @@ namespace Mastodon
     /*!
      *  @brief  Interface to the Mastodon API.
      *
-     *          All input is expected to be UTF-8. Binary data must be a
-     *          filename.
+     *          All input is expected to be UTF-8. Binary data must be
+     *          base64-encoded or a filename.
+     *          It appears that media attachements can not be base64 encoded.
      *
      *  @section error Error codes
      *  |      Code | Explanation                                |
      *  | --------: |:-------------------------------------------|
      *  |         0 | No error                                   |
-     *  |         1 | Invalid argument                           |
-     *  |        10 | URL changed (HTTP 301 or 308)              |
-     *  |        11 | Connection timed out                       |
-     *  |        12 | Connection refused (check http_error_code) |
-     *  |        13 | No route to host / Could not resolve host  |
-     *  |        14 | Encryption error                           |
-     *  |       127 | Unknown error                              |
+     *  |        22 | Invalid argument                           |
+     *  |        78 | URL changed (HTTP 301 or 308)              |
+     *  |       110 | Connection timed out                       |
+     *  |       111 | Connection refused (check http_error_code) |
+     *  |       113 | No route to host / Could not resolve host  |
+     *  |       192 | curlpp runtime error                       |
+     *  |       193 | curlpp logic error                         |
+     *  |       255 | Unknown error                              |
      *
      *  @since  before 0.11.0
      */
@@ -102,7 +109,7 @@ namespace Mastodon
              */
             return_call request(const http_method &meth,
                                 const string &path,
-                                HTMLForm &formdata);
+                                const curlpp::Forms &formdata);
 
             /*!
              *  @brief HTTP Request for streams.
@@ -142,16 +149,6 @@ namespace Mastodon
              */
             std::mutex &get_mutex();
 
-            /*!
-             *  @brief  Set proxy. Do not call this directly.
-             *
-             *  @param  hostport host[:port]
-             *  @param  userpw   user[:password] (optional)
-             *
-             *  @since  0.110.0
-             */
-            void set_proxy(const string &hostport, const string &userpw = "");
-
         private:
             const API &parent;
             const string _instance;
@@ -163,7 +160,7 @@ namespace Mastodon
 
             return_call request_common(const http_method &meth,
                                        const string &path,
-                                       HTMLForm &formdata,
+                                       const curlpp::Forms &formdata,
                                        string &answer);
             size_t callback_write(char* data, size_t size, size_t nmemb,
                                   string *oss);
@@ -226,8 +223,8 @@ namespace Mastodon
 
             lists,
             accounts_id_lists,
-            lists_id_accounts,
             lists_id,
+            lists_id_accounts,
 
             media,
             media_id,
@@ -244,39 +241,37 @@ namespace Mastodon
             notifications_dismiss,
             push_subscription,
 
-            polls_id,
-            polls_id_votes,
-
             reports,
 
             // scheduled_statuses,
             // scheduled_statuses_id,
 
+            search,
+
+            statuses,
             statuses_id,
             statuses_id_context,
             statuses_id_card,
             statuses_id_reblogged_by,
             statuses_id_favourited_by,
-            statuses,
             statuses_id_reblog,
             statuses_id_unreblog,
             statuses_id_pin,
             statuses_id_unpin,
 
             timelines_home,
-            conversations,
+            // timelines_conversations,
             timelines_public,
             timelines_tag_hashtag,
             timelines_list_list_id,
 
-            streaming_health,
             streaming_user,
             streaming_public,
             streaming_public_local,
             streaming_hashtag,
-            streaming_hashtag_local,
+            // streaming_hashtag_local,
             streaming_list,
-            streaming_direct,
+            // streaming_direct,
 
             // Glitch-Soc
             bookmarks,
@@ -411,7 +406,7 @@ namespace Mastodon
                                   string &access_token);
 
         /*!
-         *  @brief  Gets the header from the last answer. Case insensitive.
+         *  @brief  Gets the header from the last answer.
          *
          *  @param  header  The header to get
          *
@@ -419,12 +414,13 @@ namespace Mastodon
          *
          *  @since  before 0.11.0
          */
-        const string get_header(string header) const;
+        const string get_header(const string &header) const;
 
         /*!
          *  @brief  Turn exceptions on or off. Defaults to off.
          *
-         *          Most exceptions will be thrown at you to handle if on.
+         *          This applies to exceptions from curlpp. curlpp::RuntimeError
+         *          and curlpp::LogicError.
          *
          *  @param  value   true for on, false for off
          *
@@ -450,18 +446,28 @@ namespace Mastodon
         /*!
          *  @brief  Sets the proxy.
          *
-         *          Both the username and the password will be URL decoded
-         *          before use.
+         *          Since mastodon-cpp is built on libcurl, it respects the same
+         *          proxy environment variables. See `man curl`.
          *
-         *  @param  hostport host[:port]
-         *  @param  userpw   username[:password] (optional)
+         *  @param  proxy   See `man 3 CURLOPT_PROXY`
+         *  @param  userpw  See `man 3 CURLOPT_PROXYUSERPWD` (optional)
          *
          *  @since  0.15.0
          */
-        void set_proxy(const string &hostport, const string &userpw = "");
+        void set_proxy(const string &proxy, const string &userpw = "");
 
         /*!
-         *  @brief  Make a GET request that doesn't require parameters.
+         *  @brief  For internal use
+         *
+         *  @param  proxy   URL
+         *  @param  userpw  username:password
+         *
+         *  @since  0.15.1
+         */
+        void get_proxy(string &proxy, string &userpw) const;
+
+        /*!
+         *  @brief  Make a GET request which doesn't require parameters.
          *
          *  @param  call    A call defined in Mastodon::API::v1
          *
@@ -470,7 +476,7 @@ namespace Mastodon
         const return_call get(const Mastodon::API::v1 &call);
 
         /*!
-         *  @brief  Make a GET request that requires parameters.
+         *  @brief  Make a GET request which requires parameters.
          *
          *  @param  call        A call defined in Mastodon::API::v1
          *  @param  parameters  A Mastodon::parametermap containing
@@ -482,7 +488,7 @@ namespace Mastodon
                               const parameters &parameters);
 
         /*!
-         *  @brief  Make a GET request that requires parameters.
+         *  @brief  Make a GET request which requires parameters.
          *
          *  @param  call        A call defined in Mastodon::API::v2
          *  @param  parameters  A Mastodon::parametermap containing
@@ -515,7 +521,7 @@ namespace Mastodon
          */
         void get_stream(const Mastodon::API::v1 &call,
                         const parameters &parameters,
-                        unique_ptr<Mastodon::API::http> &ptr,
+                        std::unique_ptr<Mastodon::API::http> &ptr,
                         string &stream);
 
         /*!
@@ -528,7 +534,7 @@ namespace Mastodon
          *  @since  0.100.0
          */
         void get_stream(const Mastodon::API::v1 &call,
-                        unique_ptr<Mastodon::API::http> &ptr,
+                        std::unique_ptr<Mastodon::API::http> &ptr,
                         string &stream);
 
         /*!
@@ -541,13 +547,13 @@ namespace Mastodon
          *  @since  0.100.0
          */
         void get_stream(const string &call,
-                        unique_ptr<Mastodon::API::http> &ptr,
+                        std::unique_ptr<Mastodon::API::http> &ptr,
                         string &stream);
 
         /*!
          *  @brief  Make a PATCH request.
          *
-         *          Binary data must be a filename.
+         *          Binary data must be base64-encoded or a filename.
          *
          *  @param  call        A call defined in Mastodon::API::v1
          *  @param  parameters  A Mastodon::parametermap containing
@@ -559,7 +565,7 @@ namespace Mastodon
                           const parameters &parameters);
 
         /*!
-         *  @brief  Make a POST request that doesn't require parameters.
+         *  @brief  Make a POST request which doesn't require parameters.
          *
          *  @param  call    A call defined in Mastodon::API::v1
          *
@@ -568,9 +574,9 @@ namespace Mastodon
         return_call post(const Mastodon::API::v1 &call);
 
         /*!
-         *  @brief  Make a POST request that requires parameters.
+         *  @brief  Make a POST request which requires parameters.
          *
-         *          Binary data must be a filename.
+         *          Binary data must be base64-encoded or a filename.
          *
          *  @param  call        A call defined in Mastodon::API::v1
          *  @param  parameters  A Mastodon::parametermap containing
@@ -584,7 +590,7 @@ namespace Mastodon
         /*!
          *  @brief  Make a custom POST request.
          *
-         *          Binary data must be a filename.
+         *          Binary data must be base64-encoded or a filename.
          *
          *  @param  call        String in the form `/api/v1/example`
          *  @param  parameters  A Mastodon::parametermap containing
@@ -596,7 +602,7 @@ namespace Mastodon
                          const parameters &parameters);
 
         /*!
-         *  @brief  Make a PUT request that requires parameters.
+         *  @brief  Make a PUT request which requires a parameters.
          *
          *  @param  call        A call defined in Mastodon::API::v1
          *  @param  parameters  A Mastodon::parametermap containing
@@ -619,7 +625,7 @@ namespace Mastodon
         return_call put(const string &call, const parameters &parameters);
 
         /*!
-         *  @brief  Make a DELETE request that requires parameters.
+         *  @brief  Make a DELETE request which requires parameters.
          *
          *  @param  call        A call defined in Mastodon::API::v1
          *  @param  parameters  A Mastodon::parametermap containing
@@ -647,6 +653,8 @@ namespace Mastodon
         string _useragent;
         http _http;
         bool _exceptions;
+        string _proxy;
+        string _proxy_userpw;
 
         /*!
          *  @brief  Converts map of parameters into a string.
@@ -664,9 +672,9 @@ namespace Mastodon
          *
          *  @param  map     Map of parameters
          *
-         *  @return Form data as Poco::Net::HTMLForm.
+         *  @return Form data as curlpp::Forms
          */
-        unique_ptr<HTMLForm> maptoformdata(const parameters &map);
+        const curlpp::Forms maptoformdata(const parameters &map);
 
         /*!
          *  @brief  Delete Mastodon::param from Mastodon::parameters.
@@ -683,12 +691,13 @@ namespace Mastodon
     };
 
     /*!
-     *  @brief  Percent-encodes a string.
+     *  @brief  Percent-encodes a string. This is done automatically, unless
+     *          you make a custom request.
      *
+     *          Calls curlpp::escape(str).
      *
-     *          This is done automatically where necessary. The only time you
-     *          should use this, is if you use get(const string &call, string
-     *          &answer).
+     *          The only time you should use this, is if you use
+     *          get(const string &call, string &answer).
      *
      *          See RFC 3986 section 2.1 for more info.
      *
@@ -703,6 +712,8 @@ namespace Mastodon
     /*!
      *  @brief  Decodes a percent-encoded string.
      *
+     *          Calls curlpp::unescape(str).
+     *
      *          See RFC 3986 section 2.1 for more info.
      *
      *  @param  str The string to decode.

src/return_types.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -18,7 +18,7 @@
 
 namespace Mastodon
 {
-    return_base::operator bool() const
+    return_base::operator bool()
     {
         if (error_code == 0)
         {
@@ -30,7 +30,7 @@ namespace Mastodon
         }
     }
 
-    return_base::operator uint8_t() const
+    return_base::operator uint8_t()
     {
         return error_code;
     }
@@ -57,13 +57,4 @@ namespace Mastodon
         error_message = em;
         http_error_code = hec;
     }
-
-    return_call::return_call(const error ec, const string &em,
-                             const uint16_t hec, const string &a)
-        : answer(a)
-    {
-        error_code = static_cast<uint8_t>(ec);
-        error_message = em;
-        http_error_code = hec;
-    }
 }

src/return_types.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -19,7 +19,6 @@
 
 #include <cstdint>
 #include <string>
-#include "types.hpp"
 
 using std::uint8_t;
 using std::uint16_t;
@@ -60,14 +59,14 @@ namespace Mastodon
          *
          *  @since  0.100.0
          */
-        operator bool() const;
+        operator bool();
 
         /*!
          *  @brief  Same as return_base::error_code.
          *
          *  @since  0.100.0
          */
-        operator uint8_t() const;
+        operator uint8_t();
     } return_base;
 
     /*!
@@ -114,19 +113,6 @@ namespace Mastodon
         return_call(const uint8_t ec, const string &em,
                     const uint16_t hec, const string &a);
 
-        /*!
-         *  @brief  Return type for Mastodon::API.
-         *
-         *  @param  ec  Error code
-         *  @param  em  Error message
-         *  @param  hec HTTP error code
-         *  @param  a   Answer
-         *
-         *  @since  0.110.0
-         */
-        return_call(const error ec, const string &em,
-                    const uint16_t hec, const string &a);
-
         /*!
          *  @brief  Same es return_call::answer.
          *

src/types.cpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

src/types.hpp

@@ -2,15 +2,15 @@
  *  Copyright © 2019 tastytea <tastytea@tastytea.de>
  *
  *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
+ *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
+ *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU Affero General Public License
+ *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
@@ -93,18 +93,6 @@ namespace Mastodon
         DELETE,
         GET_STREAM
     };
-
-    enum class error
-    {
-        OK = 0,
-        INVALID_ARGUMENT = 1,
-        URL_CHANGED = 10,
-        CONNECTION_TIMEOUT = 11,
-        CONNECTION_REFUSED = 12,
-        DNS = 13,
-        ENCRYPTION = 14,
-        UNKNOWN = 127
-    };
 }
 
 #endif  // MASTODON_CPP_TYPES_HPP

tests.CMakeLists.txt

@@ -1,23 +1,20 @@
 include(CTest)
-
-file(GLOB_RECURSE sources_tests test_*.cpp)
-
-configure_file("test.gif" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
+file(GLOB sources_tests tests/test_*.cpp)
 
 find_package(Catch2)
-if(Catch2_FOUND)                # Catch 2.x
+if(Catch2_FOUND)    # Catch 2.x
   include(Catch)
-  add_executable(all_tests main.cpp ${sources_tests})
-  target_link_libraries(all_tests PRIVATE ${PROJECT_NAME} Catch2::Catch2)
+  add_executable(all_tests tests/main.cpp ${sources_tests})
+  target_link_libraries(all_tests ${PROJECT_NAME} Catch2::Catch2)
   target_include_directories(all_tests PRIVATE "/usr/include/catch2")
   catch_discover_tests(all_tests EXTRA_ARGS "${EXTRA_TEST_ARGS}")
-else()                          # Catch 1.x
+else()              # Catch 1.x
   if(EXISTS "/usr/include/catch.hpp")
     message(STATUS "Catch 1.x found.")
     foreach(src ${sources_tests})
       get_filename_component(bin ${src} NAME_WE)
-      add_executable(${bin} main.cpp ${src})
-      target_link_libraries(${bin} PRIVATE ${PROJECT_NAME})
+      add_executable(${bin} tests/main.cpp ${src})
+      target_link_libraries(${bin} ${PROJECT_NAME})
       add_test(${bin} ${bin} "${EXTRA_TEST_ARGS}")
     endforeach()
   else()

tests/api/test_api_v1_accounts_id_lists.cpp

@@ -1,64 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/accounts/:id/lists can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance + ", user ID = " + user_id)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/accounts/" + user_id + "/lists is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::accounts_id_lists,
-                                {{ "id", { user_id }}});
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No unexpected errors are returned")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(ret.answer == "[]");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_accounts_id_mute.cpp

@@ -1,72 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/relationship.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/accounts/:id/mute can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Relationship relationship;
-        bool exception = false;
-
-        WHEN ("POST /api/v1/accounts/" + user_id + "/mute is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::accounts_id_mute,
-                                 {
-                                     { "id", { user_id } }
-                                 });
-                relationship.from_string(ret);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No unexpected errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(relationship.valid());
-
-                REQUIRE(relationship.muting());
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_accounts_id_unmute.cpp

@@ -1,72 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/relationship.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/accounts/:id/unmute can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Relationship relationship;
-        bool exception = false;
-
-        WHEN ("POST /api/v1/accounts/" + user_id + "/unmute is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::accounts_id_unmute,
-                                 {
-                                     { "id", { user_id } }
-                                 });
-                relationship.from_string(ret);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No unexpected errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(relationship.valid());
-
-                REQUIRE(!relationship.muting());
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_conversations.cpp

@@ -1,74 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/conversation.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/conversations can be called successfully",
-          "[api][auth][mastodon][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Conversation conversation;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/conversations is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::conversations, {{ "limit", { "2" }}});
-                if (ret.answer == "[]")
-                {
-                    WARN("No Conversations found.");
-                }
-                else
-                {
-                    conversation.from_string(
-                        Easy::json_array_to_vector(ret.answer).front());
-                }
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No error is returned")
-                AND_THEN ("Answer is valid")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-                REQUIRE(conversation.valid());
-                REQUIRE(conversation.id() != "");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_lists.cpp

@@ -1,105 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/list.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/lists can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::List list;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/lists is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::lists);
-                if (ret.answer == "[]")
-                {
-                    WARN("No lists found.");
-                }
-                else
-                {
-                    list.from_string
-                        (Easy::json_array_to_vector(ret.answer).front());
-                }
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-                REQUIRE(list.valid());
-
-                REQUIRE(list.id() != "");
-            }
-        }
-
-        WHEN ("POST /api/v1/lists is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::lists,
-                                 {{ "title", { "testlist" }}});
-                list.from_string(ret.answer);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-                REQUIRE(list.valid());
-
-                REQUIRE(list.id() != "");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_lists_id.cpp

@@ -1,126 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/list.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/lists/:id can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance + ", list ID = " + list_id)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::List list;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/lists/" + list_id + " is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::lists_id,
-                                {{ "id", { list_id }}});
-                list.from_string(ret.answer);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(list.valid());
-
-                REQUIRE(list.id() == list_id);
-            }
-        }
-
-        WHEN ("PUT /api/v1/lists/" + list_id + " is called")
-        {
-            try
-            {
-                ret = masto.put(API::v1::lists_id,
-                                {
-                                    { "id", { list_id }},
-                                    { "title", { "testlist" }}
-                                });
-                list.from_string(ret.answer);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(list.valid());
-
-                REQUIRE(list.title() == "testlist");
-            }
-        }
-
-        WHEN ("DELETE /api/v1/lists/donotdelete is called")
-        {
-            try
-            {
-                ret = masto.del(API::v1::lists_id,
-                                {{ "id", { "donotdelete" }}});
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No unexpected errors are returned")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 111);
-                REQUIRE(ret.http_error_code == 400);
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_lists_id_accounts.cpp

@@ -1,135 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/account.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/lists/:id/accounts can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance + ", list ID = " + list_id
-           + ", user ID = " + user_id)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Account account;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/lists/" + list_id + "/accounts is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::lists_id_accounts,
-                                {
-                                    { "id", { list_id }},
-                                    { "limit", { "5" }}
-                                });
-                if (ret.answer == "[]")
-                {
-                    WARN("No accounts found.");
-                }
-                else
-                {
-                    account.from_string
-                        (Easy::json_array_to_vector(ret.answer).front());
-                }
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(account.valid());
-
-                REQUIRE(account.id() != "");
-            }
-        }
-
-        WHEN ("POST /api/v1/lists/" + list_id + "/accounts is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::lists_id_accounts,
-                                 {
-                                     { "id", { list_id }},
-                                     { "account_ids", { user_id }}
-                                 });
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-            }
-        }
-
-        WHEN ("DELETE /api/v1/lists/" + list_id + "/accounts is called")
-        {
-            try
-            {
-                ret = masto.del(API::v1::lists_id_accounts,
-                                {
-                                    { "id", { list_id }},
-                                    { "account_ids", { user_id }}
-                                });
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-            }
-        }
-
-    }
-}
-

tests/api/test_api_v1_media.cpp

@@ -1,73 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/attachment.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/media can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc][upload]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Attachment attachment;
-        bool exception = false;
-
-        WHEN ("POST /api/v1/media is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::media,
-                                 {
-                                     { "file", { "test.gif" }},
-                                     { "description", { "Test pixel." }},
-                                     { "focus", { "0.0,0.0" }}
-                                 });
-                attachment.from_string(ret.answer);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-                REQUIRE(attachment.valid());
-
-                REQUIRE(attachment.description() == "Test pixel.");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_media_id.cpp

@@ -1,69 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/attachment.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-// We use a media attachment that is attached to a status, therefore we get an
-// error.
-SCENARIO ("/api/v1/media/:id can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance + ", media ID = " + media_id)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Attachment attachment;
-        bool exception = false;
-
-        WHEN ("PUT /api/v1/media/" + media_id + " is called")
-        {
-            try
-            {
-                ret = masto.put(API::v1::media_id,
-                                {
-                                    { "id", { media_id }},
-                                    { "description", { "Test description." }}
-                                });
-                attachment.from_string(ret.answer);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No unexpected errors are returned")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 111);
-                REQUIRE(ret.http_error_code == 500);
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_mutes.cpp

@@ -1,80 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/account.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/mutes can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Account account;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/mutes is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::mutes,
-                                {
-                                    { "limit", { "1" } }
-                                });
-                if (ret.answer == "[]")
-                {
-                    WARN("No mutes found.");
-                }
-                else
-                {
-                    account.from_string
-                        (Easy::json_array_to_vector(ret.answer).front());
-                }
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(account.valid());
-
-                REQUIRE(account.acct() != "");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_polls_id.cpp

@@ -1,76 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/poll.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/polls/:id can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Poll poll;
-        bool exception = false;
-
-        WHEN ("GET /api/v1/polls/:id is called")
-        {
-            try
-            {
-                ret = masto.get(API::v1::polls_id,
-                                {{ "id", { "4823515" } }});
-                if (ret.answer == "[]")
-                {
-                    WARN("Poll not found.");
-                }
-                else
-                {
-                    poll.from_string(ret.answer);
-                }
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-                REQUIRE(poll.valid());
-
-                REQUIRE(poll.id() != "");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_polls_id_votes.cpp

@@ -1,80 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/poll.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/polls/:id/votes can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Poll poll;
-        bool exception = false;
-
-        WHEN ("POST /api/v1/polls/:id/votes is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::polls_id_votes,
-                                 {
-                                     { "id", { "4823515" } },
-                                     // TODO: Check if this is the right format.
-                                     { "choices", { "false", "false", "true",
-                                                    "false", "false" } }
-                                 });
-                if (ret.answer == "[]")
-                {
-                    WARN("Poll not found.");
-                }
-                else
-                {
-                    poll.from_string(ret.answer);
-                }
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("An error is returned")
-                AND_THEN ("Answer is invalid")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 12);
-                REQUIRE(ret.http_error_code != 200); // Pleroma returns 422.
-                REQUIRE_FALSE(poll.valid());
-                REQUIRE(poll.id() == "");
-                REQUIRE(poll.error() == "Poll's author can't vote");
-            }
-        }
-    }
-}
-

tests/api/test_api_v1_status_id_mute.cpp

@@ -1,72 +0,0 @@
-/*  This file is part of mastodon-cpp.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <exception>
-#include <string>
-#include <catch.hpp>
-#include "mastodon-cpp.hpp"
-#include "easy/easy.hpp"
-#include "easy/entities/status.hpp"
-#include "../environment_variables.hpp"
-
-using namespace Mastodon;
-
-SCENARIO ("/api/v1/statuses/:id/mute can be called successfully",
-          "[api][auth][mastodon][pleroma][glitch-soc]")
-{
-    REQUIRE (access_token != nullptr);
-
-    GIVEN ("instance = " + instance)
-    {
-        Mastodon::Easy::API masto(instance, access_token);
-        return_call ret;
-        Easy::Status status;
-        bool exception = false;
-
-        WHEN ("POST /api/v1/statuses/" + status_id + "/mute is called")
-        {
-            try
-            {
-                ret = masto.post(API::v1::statuses_id_mute,
-                                 {
-                                     { "id", { status_id } }
-                                 });
-                status.from_string(ret);
-            }
-            catch (const std::exception &e)
-            {
-                exception = true;
-                WARN(e.what());
-            }
-
-            THEN("No exception is thrown")
-                AND_THEN ("No unexpected errors are returned")
-                AND_THEN ("Answer is valid")
-                AND_THEN ("The answer makes sense")
-            {
-                REQUIRE_FALSE(exception);
-
-                REQUIRE(ret.error_code == 0);
-                REQUIRE(ret.http_error_code == 200);
-
-                REQUIRE(status.valid());
-
-                REQUIRE(status.muted());
-            }
-        }
-    }
-}
-