Compare commits
No commits in common. "master" and "0.106.0" have entirely different histories.
140
.drone.yml
140
.drone.yml
|
|
@ -25,16 +25,19 @@ steps:
|
|||
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
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- rm /var/cache/apt/archives/lock
|
||||
- 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
|
||||
- apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
|
||||
- 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="~[api]" ..
|
||||
- make VERBOSE=1
|
||||
- make install DESTDIR=install
|
||||
- cd tests && ctest
|
||||
- ctest
|
||||
volumes:
|
||||
- name: debian-package-cache
|
||||
path: /var/cache/apt/archives
|
||||
|
|
@ -48,22 +51,25 @@ steps:
|
|||
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
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- rm /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 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
|
||||
- apt-get install -qy build-essential cmake pkg-config
|
||||
- apt-get install -qy -t xenial g++-9
|
||||
- apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
|
||||
- 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 ..
|
||||
- cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="~[api]" ..
|
||||
- make VERBOSE=1
|
||||
- make install DESTDIR=install
|
||||
- ctest
|
||||
volumes:
|
||||
- name: debian-package-cache
|
||||
path: /var/cache/apt/archives
|
||||
|
|
@ -77,43 +83,52 @@ steps:
|
|||
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
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- rm /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
|
||||
- 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
|
||||
- apt-get install -qy build-essential cmake pkg-config
|
||||
- apt-get install -qy -t stretch-backports clang-5.0
|
||||
- apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
|
||||
- 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 ..
|
||||
- cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="~[api]" ..
|
||||
- make VERBOSE=1
|
||||
- make install DESTDIR=install
|
||||
- ctest
|
||||
volumes:
|
||||
- name: debian-package-cache
|
||||
path: /var/cache/apt/archives
|
||||
|
||||
- name: clang7
|
||||
image: debian:buster-slim
|
||||
- name: clang6
|
||||
image: debian:stretch-slim
|
||||
pull: true
|
||||
environment:
|
||||
LANG: C.utf8
|
||||
CXX: clang++
|
||||
CXX: clang++-6.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
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- rm /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
|
||||
- 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 clang
|
||||
- apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch
|
||||
- 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 ..
|
||||
- cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="~[api]" ..
|
||||
- make VERBOSE=1
|
||||
- make install DESTDIR=install
|
||||
- ctest
|
||||
volumes:
|
||||
- name: debian-package-cache
|
||||
path: /var/cache/apt/archives
|
||||
|
|
@ -153,73 +168,38 @@ trigger:
|
|||
- tag
|
||||
|
||||
steps:
|
||||
- name: Debian stretch
|
||||
- name: deb
|
||||
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
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- rm /var/cache/apt/archives/lock
|
||||
- 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 lsb-release
|
||||
- apt-get install -qy libpoco-dev libjsoncpp-dev file
|
||||
- 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_DEB=YES -DWITH_DOC=NO ..
|
||||
- cmake -DWITH_EXAMPLES=NO -DWITH_TESTS=NO ..
|
||||
- make package
|
||||
- cp -v libmastodon-cpp_${DRONE_TAG}-0_stretch_amd64.deb ..
|
||||
- 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:
|
||||
- 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
|
||||
- name: rpm
|
||||
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
|
||||
|
|
@ -227,10 +207,15 @@ steps:
|
|||
- 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 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_RPM=YES -DWITH_DOC=NO ..
|
||||
- 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:
|
||||
|
|
@ -247,9 +232,8 @@ steps:
|
|||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
150
CMakeLists.txt
150
CMakeLists.txt
|
|
@ -1,86 +1,124 @@
|
|||
# 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.106.0
|
||||
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"
|
||||
)
|
||||
|
||||
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")
|
||||
configure_file("tests/test.gif" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
|
||||
add_subdirectory(tests)
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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`.
|
||||
|
|
@ -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.
|
||||
147
LICENSE
147
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>.
|
||||
|
|
|
|||
97
README.adoc
97
README.adoc
|
|
@ -1,27 +1,17 @@
|
|||
= 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.
|
||||
*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.
|
||||
|
||||
== 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/`.
|
||||
https://doc.schlomp.space/mastodon-cpp/annotated.html[doc.schlomp.space/mastodon-cpp/].
|
||||
There are more
|
||||
https://schlomp.space/tastytea/mastodon-cpp/src/branch/master/examples[examples]
|
||||
in `examples/`.
|
||||
|
||||
=== Examples
|
||||
|
||||
|
|
@ -86,6 +76,10 @@ Not included in this list are entities.
|
|||
==== Return types
|
||||
|
||||
* `Mastodon::return_call`: Contains the response from `Mastodon::API` calls.
|
||||
* `Mastodon::Easy::return_entity`: Contains the response from high-level
|
||||
functions that return a single `Mastodon::Easy::Entity`.
|
||||
* `Mastodon::Easy::return_entities_vector`: Contains the response from
|
||||
high-level functions that return multiple `Mastodon::Easy::Entity`.
|
||||
|
||||
==== Other types
|
||||
|
||||
|
|
@ -103,12 +97,7 @@ Not included in this list are entities.
|
|||
* `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()`.
|
||||
* `Mastodon::Easy::Account::account_field_type`: Type for fields in accounts.
|
||||
|
||||
=== Error codes
|
||||
|
||||
|
|
@ -116,13 +105,14 @@ Not included in this list are entities.
|
|||
|===================================================
|
||||
| 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
|
||||
|===================================================
|
||||
|
||||
If you use a debug build, you get more verbose error messages.
|
||||
|
|
@ -138,11 +128,14 @@ If you use a debug build, you get more verbose error messages.
|
|||
=== 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.
|
||||
Upgrading from previous versions will require extensive code changes. You can
|
||||
keep using the old version, it is archived in the branch
|
||||
https://schlomp.space/tastytea/mastodon-cpp/src/branch/pre-0.100.0[pre-0.100.0].
|
||||
It will receive bug-fixes for a while but no new features.
|
||||
|
||||
=== Packages
|
||||
|
||||
Every https://schlomp.space/tastytea/{project}/releases[release] includes
|
||||
Every https://schlomp.space/tastytea/mastodon-cpp/releases[release] includes
|
||||
packages for Debian and Centos. Gentoo packages are available in my overlay.
|
||||
|
||||
==== Gentoo
|
||||
|
|
@ -164,15 +157,23 @@ 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
|
||||
https://packages.debian.org/libcurlpp0[libcurlpp0] from sid.
|
||||
|
||||
To use the `.rpm` package on CentOS 7, you will need
|
||||
https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/[curlpp]
|
||||
from EPEL 6.
|
||||
|
||||
=== From source
|
||||
|
||||
==== Dependencies
|
||||
|
||||
* Tested OS: Linux
|
||||
* C++ compiler (tested: https://gcc.gnu.org/[gcc] 6/8/9,
|
||||
https://llvm.org/[clang] 5/7)
|
||||
https://llvm.org/[clang] 5/6)
|
||||
* https://cmake.org/[cmake] (at least: 3.6)
|
||||
* https://pocoproject.org/[POCO] (tested: 1.9 / 1.7)
|
||||
* https://pkgconfig.freedesktop.org/wiki/[pkgconfig] (tested: 0.29 / 0.27)
|
||||
* http://www.curlpp.org/[curlpp] (tested: 0.8)
|
||||
* Optional
|
||||
** Easy interface & Examples:
|
||||
https://github.com/open-source-parsers/jsoncpp[jsoncpp] (tested: 1.8 / 1.7)
|
||||
|
|
@ -185,7 +186,11 @@ CentOS 7. These packages are automatically built and not tested.
|
|||
====
|
||||
[source,shell]
|
||||
----
|
||||
apt-get install build-essential cmake libpoco-dev libjsoncpp-dev doxygen
|
||||
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
|
||||
----
|
||||
====
|
||||
|
||||
|
|
@ -194,7 +199,7 @@ apt-get install build-essential cmake libpoco-dev libjsoncpp-dev doxygen
|
|||
===== Release
|
||||
|
||||
Download the current release at
|
||||
https://schlomp.space/tastytea/{project}/releases[schlomp.space].
|
||||
https://schlomp.space/tastytea/mastodon-cpp/releases[schlomp.space].
|
||||
|
||||
===== Development version
|
||||
|
||||
|
|
@ -259,8 +264,6 @@ the filter ID with `MASTODON_CPP_FILTER_ID`. You can select the list ID with
|
|||
* 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
|
||||
|
|
@ -348,9 +351,10 @@ strings and you can use unsupported fields in an `Entity` by converting it to
|
|||
** [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
|
||||
** [ ] GET /api/v1/polls/:id
|
||||
** [ ] POST /api/v1/polls/:id/votes
|
||||
* Reports
|
||||
** [x] GET /api/v1/reports ^(Deprecated)^
|
||||
** [x] POST /api/v1/reports
|
||||
* Scheduled Statuses
|
||||
** [ ] GET /api/v1/scheduled_statuses
|
||||
|
|
@ -358,6 +362,7 @@ strings and you can use unsupported fields in an `Entity` by converting it to
|
|||
** [ ] PUT /api/v1/scheduled_statuses/:id
|
||||
** [ ] DELETE /api/v1/scheduled_statuses/:id
|
||||
* Search
|
||||
** [x] GET /api/v1/search ^(Deprecated)^
|
||||
** [x] GET /api/v2/search
|
||||
* Statuses
|
||||
** [x] GET /api/v1/statuses/:id
|
||||
|
|
@ -373,19 +378,18 @@ strings and you can use unsupported fields in an `Entity` by converting it to
|
|||
** [x] POST /api/v1/statuses/:id/unpin
|
||||
* Timelines
|
||||
** [x] GET /api/v1/timelines/home
|
||||
** [x] GET /api/v1/conversations
|
||||
** [ ] 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
|
||||
** [ ] GET /api/v1/streaming/hashtag/local
|
||||
** [x] GET /api/v1/streaming/list
|
||||
** [x] GET /api/v1/streaming/direct
|
||||
** [ ] GET /api/v1/streaming/direct
|
||||
|
||||
==== Entities
|
||||
|
||||
|
|
@ -394,16 +398,17 @@ strings and you can use unsupported fields in an `Entity` by converting it to
|
|||
* [x] Attachment
|
||||
* [x] Card
|
||||
* [x] Context
|
||||
* [x] Conversation
|
||||
* [ ] Conversation
|
||||
* [x] Emoji
|
||||
* [x] Filter
|
||||
* [x] Instance
|
||||
* [x] List
|
||||
* [x] Mention
|
||||
* [x] Notification
|
||||
* [x] Poll
|
||||
* [ ] Poll
|
||||
* [x] PushSubscription
|
||||
* [x] Relationship
|
||||
* [ ] Report ^(Deprecated)^
|
||||
* [x] Results
|
||||
* [x] Status
|
||||
* [ ] ScheduledStatus
|
||||
|
|
@ -488,7 +493,7 @@ using this library.
|
|||
[source,text]
|
||||
----
|
||||
Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>.
|
||||
License AGPLv3: <https://www.gnu.org/licenses/agpl-3.0.html>.
|
||||
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.
|
||||
----
|
||||
|
|
|
|||
|
|
@ -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}")
|
||||
|
|
@ -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")
|
||||
|
|
@ -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)
|
||||
|
|
@ -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()
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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.adoc")
|
||||
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)
|
||||
|
|
@ -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")
|
||||
|
|
@ -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
|
||||
|
|
@ -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()
|
||||
|
|
@ -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 ¶ms)
|
||||
{
|
||||
|
||||
return _http.request(http_method::DELETE, call, *maptoformdata(params));
|
||||
return _http.request(http_method::DELETE, call, maptoformdata(params));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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, "" };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ¶ms,
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ¶ms)
|
||||
{
|
||||
|
||||
return _http.request(http_method::POST, call, *maptoformdata(params));
|
||||
return _http.request(http_method::POST, call, maptoformdata(params));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ¶ms)
|
||||
{
|
||||
|
||||
return _http.request(http_method::PUT, call, *maptoformdata(params));
|
||||
return _http.request(http_method::PUT, call, maptoformdata(params));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
@ -29,13 +29,12 @@
|
|||
#include "entities/mention.hpp"
|
||||
#include "entities/notification.hpp"
|
||||
#include "entities/relationship.hpp"
|
||||
#include "entities/report.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"
|
||||
|
||||
#endif // MASTODON_CPP_EASY_ALL_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/>.
|
||||
*/
|
||||
|
||||
|
|
@ -53,8 +53,7 @@ const vector<Easy::stream_event_type> 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 = {};
|
||||
|
||||
|
|
@ -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();
|
||||
|
|
@ -101,8 +98,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 +131,3 @@ const string Easy::Link::since_id() const
|
|||
{
|
||||
return _prev;
|
||||
}
|
||||
|
||||
const string Easy::Link::min_id() const
|
||||
{
|
||||
return _prev;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
@ -89,13 +89,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;
|
||||
|
|
@ -167,7 +160,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 +167,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 +180,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 = "");
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
/* 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
|
||||
{
|
||||
return Entity::check_valid(
|
||||
{
|
||||
"id",
|
||||
"action_taken"
|
||||
});
|
||||
}
|
||||
|
||||
bool Report::action_taken() const
|
||||
{
|
||||
return get_bool("action_taken");
|
||||
}
|
||||
|
||||
const string Report::id() const
|
||||
{
|
||||
return get_string("id");
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
/* 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>
|
||||
|
||||
#include "../../mastodon-cpp.hpp"
|
||||
#include "../entity.hpp"
|
||||
|
||||
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
|
||||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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>;
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
@ -36,9 +36,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 +61,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 +94,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.
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
@ -41,7 +41,6 @@ namespace Easy
|
|||
Notification,
|
||||
Delete,
|
||||
Error,
|
||||
Filters_changed,
|
||||
Undefined
|
||||
};
|
||||
|
||||
|
|
@ -225,15 +224,6 @@ namespace Easy
|
|||
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
|
||||
|
|
|
|||
379
src/http.cpp
379
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;
|
||||
|
|
|
|||
|
|
@ -2,34 +2,32 @@
|
|||
* 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 <fstream>
|
||||
#include <exception>
|
||||
#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,6 +35,8 @@ API::API(const string &instance, const string &access_token)
|
|||
, _useragent(string("mastodon-cpp/") + global::version)
|
||||
, _http(*this, instance, access_token)
|
||||
, _exceptions(false)
|
||||
, _proxy("")
|
||||
, _proxy_userpw("")
|
||||
{
|
||||
bool fash = false;
|
||||
const std::regex re_gab("(?:\\.|^)gab\\.[^\\.]+$");
|
||||
|
|
@ -111,12 +111,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 +122,51 @@ 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") &&
|
||||
if ((it.key == "avatar" ||
|
||||
it.key == "header" ||
|
||||
it.key == "file") &&
|
||||
it.values.front().substr(0, 5) != "data:")
|
||||
{
|
||||
ttdebug << key << ": Filename detected.\n";
|
||||
|
||||
try
|
||||
{
|
||||
ttdebug << it.key << ": Filename detected.\n";
|
||||
std::ifstream testfile(it.values.front());
|
||||
if (testfile.good())
|
||||
{
|
||||
formdata->addPart(key,
|
||||
new FilePartSource(it.values.front()));
|
||||
testfile.close();
|
||||
formdata.push_back(
|
||||
new curlpp::FormParts::File(it.key, it.values.front()));
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
else
|
||||
{
|
||||
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;
|
||||
std::cerr << "Error: File not found: " << it.values.front()
|
||||
<< std::endl;
|
||||
}
|
||||
}
|
||||
else if (key == "account_ids"
|
||||
}
|
||||
else
|
||||
{
|
||||
string key = it.key;
|
||||
// Append [] to array keys.
|
||||
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 +256,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 +282,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 ¶ms,
|
||||
|
|
@ -315,7 +311,7 @@ const parameters API::delete_params(const parameters ¶ms,
|
|||
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 +323,11 @@ const parameters API::delete_params(const parameters ¶ms,
|
|||
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -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,14 @@
|
|||
#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"
|
||||
|
||||
using std::string;
|
||||
using std::uint8_t;
|
||||
using std::unique_ptr;
|
||||
using Poco::Net::HTMLForm;
|
||||
|
||||
/*!
|
||||
* @example example01_get_public_timeline.cpp
|
||||
|
|
@ -56,13 +55,14 @@ namespace Mastodon
|
|||
* | 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 +102,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 +142,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 +153,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 +216,8 @@ namespace Mastodon
|
|||
|
||||
lists,
|
||||
accounts_id_lists,
|
||||
lists_id_accounts,
|
||||
lists_id,
|
||||
lists_id_accounts,
|
||||
|
||||
media,
|
||||
media_id,
|
||||
|
|
@ -244,39 +234,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 +399,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 +407,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,15 +439,25 @@ 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 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 that doesn't require parameters.
|
||||
|
|
@ -515,7 +514,7 @@ namespace Mastodon
|
|||
*/
|
||||
void get_stream(const Mastodon::API::v1 &call,
|
||||
const parameters ¶meters,
|
||||
unique_ptr<Mastodon::API::http> &ptr,
|
||||
std::unique_ptr<Mastodon::API::http> &ptr,
|
||||
string &stream);
|
||||
|
||||
/*!
|
||||
|
|
@ -528,7 +527,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,7 +540,7 @@ 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);
|
||||
|
||||
/*!
|
||||
|
|
@ -647,6 +646,8 @@ namespace Mastodon
|
|||
string _useragent;
|
||||
http _http;
|
||||
bool _exceptions;
|
||||
string _proxy;
|
||||
string _proxy_userpw;
|
||||
|
||||
/*!
|
||||
* @brief Converts map of parameters into a string.
|
||||
|
|
@ -664,9 +665,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 +684,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 +705,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.
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 test_*.cpp */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)
|
||||
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})
|
||||
target_link_libraries(${bin} ${PROJECT_NAME})
|
||||
add_test(${bin} ${bin} "${EXTRA_TEST_ARGS}")
|
||||
endforeach()
|
||||
else()
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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/>.
|
||||
*/
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue