.clang-tidy

@@ -1,5 +1,5 @@
 # -*- mode: conf; fill-column: 100; -*-
-# Written for clang-tidy 11.
+# Written for clang-tidy 9.
 
 ---
 Checks:         '*,
@@ -26,20 +26,19 @@ Checks:         '*,
                 -fuchsia-statically-constructed-objects,
                 -google-readability-todo,
                 -modernize-use-trailing-return-type,
-                -fuchsia-multiple-inheritance,
-                -llvmlibc*'
-FormatStyle:    file            # Use .clang-format.
-CheckOptions:   # ↓ Clashes with static private member prefix. (static int _var;) ↓
-                - { key: readability-identifier-naming.VariableCase,          value: lower_case }
-                - { key: readability-identifier-naming.MemberCase,            value: lower_case }
-                - { key: readability-identifier-naming.PrivateMemberCase,     value: lower_case }
-                - { key: readability-identifier-naming.PrivateMemberPrefix,   value: _          }
-                - { key: readability-identifier-naming.ProtectedMemberCase,   value: lower_case }
-                - { key: readability-identifier-naming.ProtectedMemberPrefix, value: _          }
-
-                - { key: readability-identifier-naming.ClassCase,             value: CamelCase  }
-                - { key: readability-identifier-naming.StructCase,            value: lower_case }
+                -fuchsia-multiple-inheritance'
+CheckOptions:   - { key: readability-identifier-naming.ClassCase,             value: CamelCase  }
+                # Clashes with constant private member prefix. (const int _var;)
+                # - { key: readability-identifier-naming.ConstantCase,          value: lower_case }
                 - { key: readability-identifier-naming.EnumCase,              value: lower_case }
                 - { key: readability-identifier-naming.FunctionCase,          value: lower_case }
+                - { key: readability-identifier-naming.MemberCase,            value: lower_case }
                 - { key: readability-identifier-naming.ParameterCase,         value: lower_case }
+                - { key: readability-identifier-naming.PrivateMemberCase,     value: lower_case }
+                - { key: readability-identifier-naming.PrivateMemberPrefix,   value: _          }
+                - { key: readability-identifier-naming.ProtextedMemberCase,   value: lower_case }
+                - { key: readability-identifier-naming.ProtectedMemberPrefix, value: _          }
+                - { key: readability-identifier-naming.StructCase,            value: lower_case }
+                # Clashes with static private member prefix. (static int _var;)
+                # - { key: readability-identifier-naming.VariableCase,          value: lower_case }
 ...

.drone.yml

@@ -141,7 +141,7 @@ steps:
   - apt-get install -qq build-essential cmake lsb-release
   - apt-get install -qq libcurl4-openssl-dev
   - rm -rf build && mkdir -p build && cd build
-  - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DWITH_DEB=YES ..
+  - cmake -G "Unix Makefiles" -SCMAKE_INSTALL_PREFIX=/usr -DWITH_DEB=YES ..
   - make
   - make install DESTDIR=install
   - make package

README.adoc

@@ -22,10 +22,6 @@
 link:{uri-pleroma}[Pleroma] APIs. It replaces
 link:{uri-mastodon-cpp}[mastodon-cpp].
 
-[IMPORTANT]
-mastodonpp is in maintenance mode. I will continue to fix bugs, but won't add
-new features. If you'd like to adopt this project, please get in touch.
-
 We aim to create a library that is comfortable, yet minimal. All API endpoints
 from Mastodon and Pleroma are stored in ``enum class``es, to counteract typos
 and make your life easier. The network-facing code is built on
@@ -83,24 +79,16 @@ link:{uri-reference}/examples.html[More examples] are included in the reference.
 
 == Install
 
-[alt="Packaging status" link=https://repology.org/project/mastodonpp/versions]
-image::https://repology.org/badge/vertical-allrepos/mastodonpp.svg[]
-
 === Gentoo
 
 [source,shell]
 --------------------------------------------------------------------------------
-eselect repository enable guru
+eselect repository enable tastytea
 echo 'dev-cpp/mastodonpp' >> /etc/portage/package.accept_keywords/mastodonpp
-emaint sync -r guru
+emaint sync -r tastytea
 emerge -a dev-cpp/mastodonpp
 --------------------------------------------------------------------------------
 
-=== Arch
-
-The git-version is available via the AUR:
-<https://aur.archlinux.org/packages/mastodonpp-git/>.
-
 === Debian and Ubuntu
 
 We automatically generate packages for Debian buster (10) and Ubuntu bionic
@@ -172,10 +160,4 @@ cmake --build . -- -j$(nproc --ignore=1)
 
 To create a deb or rpm package, run `make package` after compiling.
 
-===== Windows
-
-mastodonpp has been reported to compile with MinGW GCC, but
-`http_method::DELETE` has to be renamed, because Windows headers define a
-`DELETE` macro.
-
 include::{uri-base}/raw/branch/main/CONTRIBUTING.adoc[]

cmake/debug_flags.cmake

@@ -22,6 +22,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
     "-Wdouble-promotion"
     "-Wformat=2"
     "-ftrapv"
+    "-fsanitize=undefined"
     "-Og"
     "-fno-omit-frame-pointer")
   if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -39,21 +40,15 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
       endif()
     endif()
   endif()
-  if(NOT MINGW)
-    list(APPEND DEBUG_CXXFLAGS
-      "-fsanitize=undefined")
-  endif()
   add_compile_options("$<$<CONFIG:Debug>:${DEBUG_CXXFLAGS}>")
 
-  if(NOT MINGW)
-    set(DEBUG_LDFLAGS
-      "-fsanitize=undefined")
-    # 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}>")
-    endif()
+  set(DEBUG_LDFLAGS
+    "-fsanitize=undefined")
+  # 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}>")
   endif()
 else()
   message(STATUS

src/types.cpp

@@ -1,5 +1,5 @@
 /*  This file is part of mastodonpp.
- *  Copyright © 2020, 2021 tastytea <tastytea@tastytea.de>
+ *  Copyright © 2020 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
@@ -71,7 +71,7 @@ parametermap answer_type::parse_pagination(const bool next) const
         return {};
     }
 
-    const string_view direction{next ? R"(rel="next")" : R"(rel="prev")"};
+    const auto direction{next ? R"(rel="next")" : R"(rel="prev")"};
     auto endpos{link.find(direction)};
     endpos = link.rfind('>', endpos);
     auto startpos{link.rfind('?', endpos) + 1};

tests/CMakeLists.txt

@@ -3,16 +3,11 @@ include(CTest)
 file(GLOB sources_tests test_*.cpp)
 
 find_package(Catch2 CONFIG)
-if(Catch2_FOUND)                # Catch 2.x / 3.x
+if(Catch2_FOUND)                # Catch 2.x
   include(Catch)
   add_executable(all_tests main.cpp ${sources_tests})
-  if(TARGET Catch2::Catch2WithMain) # Catch 3.x
-    target_link_libraries(all_tests
-      PRIVATE Catch2::Catch2WithMain ${PROJECT_NAME})
-  else()                        # Catch 2.x
-    target_link_libraries(all_tests
-      PRIVATE Catch2::Catch2 ${PROJECT_NAME})
-  endif()
+  target_link_libraries(all_tests
+    PRIVATE Catch2::Catch2 ${PROJECT_NAME})
   target_include_directories(all_tests PRIVATE "/usr/include/catch2")
   catch_discover_tests(all_tests EXTRA_ARGS "${EXTRA_TEST_ARGS}")
 else()                          # Catch 1.x

tests/main.cpp

@@ -1,5 +1,5 @@
 /*  This file is part of mastodonpp.
- *  Copyright © 2020, 2022 tastytea <tastytea@tastytea.de>
+ *  Copyright © 2020 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
@@ -16,9 +16,4 @@
 
 #define CATCH_CONFIG_MAIN
 
-// catch 3 does not have catch.hpp anymore
-#if __has_include(<catch.hpp>)
-#    include <catch.hpp>
-#else
-#    include <catch_all.hpp>
-#endif
+#include <catch.hpp>

tests/test_connection.cpp

@@ -1,5 +1,5 @@
 /*  This file is part of mastodonpp.
- *  Copyright © 2020, 2022 tastytea <tastytea@tastytea.de>
+ *  Copyright © 2020 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
@@ -17,12 +17,7 @@
 #include "connection.hpp"
 #include "instance.hpp"
 
-// catch 3 does not have catch.hpp anymore
-#if __has_include(<catch.hpp>)
-#    include <catch.hpp>
-#else
-#    include <catch_all.hpp>
-#endif
+#include <catch.hpp>
 
 #include <exception>
 

tests/test_html_unescape.cpp

@@ -1,5 +1,5 @@
 /*  This file is part of mastodonpp.
- *  Copyright © 2020, 2022 tastytea <tastytea@tastytea.de>
+ *  Copyright © 2020 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
@@ -16,12 +16,7 @@
 
 #include "helpers.hpp"
 
-// catch 3 does not have catch.hpp anymore
-#if __has_include(<catch.hpp>)
-#    include <catch.hpp>
-#else
-#    include <catch_all.hpp>
-#endif
+#include <catch.hpp>
 
 #include <exception>
 #include <string>

tests/test_instance.cpp

@@ -1,5 +1,5 @@
 /*  This file is part of mastodonpp.
- *  Copyright © 2020, 2022 tastytea <tastytea@tastytea.de>
+ *  Copyright © 2020 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
@@ -16,12 +16,7 @@
 
 #include "instance.hpp"
 
-// catch 3 does not have catch.hpp anymore
-#if __has_include(<catch.hpp>)
-#    include <catch.hpp>
-#else
-#    include <catch_all.hpp>
-#endif
+#include <catch.hpp>
 
 #include <exception>
 #include <string>