Skip to content

Commit d6d238d

Browse files
committed
*: merge the split/v0 branch to split/webhooks
1 parent c294031 commit d6d238d

File tree

17 files changed

+881
-765
lines changed

17 files changed

+881
-765
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ README.md eol=lf
66
CMakeLists.txt eol=lf
77
docs/Doxyfile eol=lf
88
docs/*.png binary
9-
docs/*.css eol=lf linguist-vendored=true
109
docs/*.html eol=lf linguist-vendored=true
1110
**/*.cmake eol=lf
1211
**/*.cpp eol=lf

.gitignore

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
**/*.deb
22
**/*.rpm
3+
**/*.exe
4+
**/*.obj
5+
*.cmake
36
.idea
7+
48
cmake-build-debug/
9+
CMakePresets.json
510

611
.vscode/
712
include/dpp/
8-
build/
9-
deps/
10-
docs/html/
13+
include/cpp-httplib/
14+
include/drogon/
15+
include/nlohmann/
16+
**/build/
17+
**/*.dll
18+
**/*.lib
19+
docs/html/
20+
21+
cpp-httplib/
22+
json/
23+
24+
conan_toolchain.cmake
25+
*conan*.bat

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(
44
topgg
55
LANGUAGES CXX
66
HOMEPAGE_URL "https://docs.top.gg/docs"
7-
DESCRIPTION "A simple API wrapper for Top.gg written in C++."
7+
DESCRIPTION "A community-maintained C++ API Client for the Top.gg API."
88
)
99

1010
set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -141,4 +141,4 @@ target_include_directories(topgg PUBLIC
141141
${DROGON_INCLUDE_DIR}
142142
)
143143

144-
target_link_libraries(topgg PUBLIC ${DPP_LIBRARIES} ${JSONCPP_LIBRARIES} ${DROGON_LIBRARY})
144+
target_link_libraries(topgg PUBLIC ${DPP_LIBRARIES} ${JSONCPP_LIBRARIES} ${DROGON_LIBRARY})

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Top.gg & null8626
3+
Copyright (c) 2024-2025 Top.gg & null8626
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

cmake/FindDPP.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
if(WIN32 AND NOT EXISTS ${CMAKE_SOURCE_DIR}/deps/dpp.lib)
1+
get_filename_component(CMAKE_CURRENT_LIST_DIRECTORY "${CMAKE_CURRENT_LIST_FILE}" PATH)
2+
3+
if(WIN32 AND NOT EXISTS ${CMAKE_CURRENT_LIST_DIRECTORY}/../deps/dpp.lib)
24
string(TOLOWER ${CMAKE_BUILD_TYPE} INSTALL_DPP_BUILD_TYPE)
3-
execute_process(COMMAND powershell "-NoLogo" "-NoProfile" "-File" ".\\install_dpp_msvc.ps1" ${INSTALL_DPP_BUILD_TYPE} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
5+
execute_process(COMMAND powershell "-NoLogo" "-NoProfile" "-File" "${CMAKE_CURRENT_LIST_DIRECTORY}/../install_dpp_msvc.ps1" ${INSTALL_DPP_BUILD_TYPE} WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIRECTORY}/..")
46
endif()
57

68
if(APPLE)
79
find_path(DPP_INCLUDE_DIR NAMES dpp/dpp.h HINTS "/opt/homebrew/include")
810
find_library(DPP_LIBRARIES NAMES dpp "libdpp.a" HINTS "/opt/homebrew/lib")
911
else()
10-
find_path(DPP_INCLUDE_DIR NAMES dpp/dpp.h HINTS ${CMAKE_SOURCE_DIR}/include)
11-
find_library(DPP_LIBRARIES NAMES dpp "libdpp.a" HINTS ${CMAKE_SOURCE_DIR}/deps)
12+
find_path(DPP_INCLUDE_DIR NAMES dpp/dpp.h HINTS ${CMAKE_CURRENT_LIST_DIRECTORY}/../include)
13+
find_library(DPP_LIBRARIES NAMES dpp "libdpp.a" HINTS ${CMAKE_CURRENT_LIST_DIRECTORY}/../deps)
1214
endif()
1315

1416
include(FindPackageHandleStandardArgs)

docs/Doxyfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ PROJECT_NAME = "Top.gg C++ SDK"
4848
# could be handy for archiving the generated documentation or if some version
4949
# control system is used.
5050

51-
PROJECT_NUMBER = 2.0.0
51+
PROJECT_NUMBER = 2.1.0
5252

5353
# Using the PROJECT_BRIEF tag one can provide an optional one line description
5454
# for a project that appears at the top of each page and should give viewer a
5555
# quick idea about the purpose of the project. Keep the description short.
5656

57-
PROJECT_BRIEF = "The official C++ wrapper for the Top.gg API."
57+
PROJECT_BRIEF = "A community-maintained C++ API Client for the Top.gg API."
5858

5959
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
6060
# in the documentation. The maximum height of the logo should not exceed 55
@@ -1348,8 +1348,7 @@ HTML_STYLESHEET =
13481348
# This tag requires that the tag GENERATE_HTML is set to YES.
13491349

13501350
HTML_EXTRA_STYLESHEET = doxygen-awesome-css/doxygen-awesome.css \
1351-
doxygen-awesome-css/doxygen-awesome-sidebar-only.css \
1352-
style.css
1351+
doxygen-awesome-css/doxygen-awesome-sidebar-only.css
13531352

13541353
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
13551354
# other source files which should be copied to the HTML output directory. Note

docs/header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta charset="utf-8">
77
<meta property="og:title" content="Top.gg C++ SDK">
8-
<meta property="og:description" content="The official C++ wrapper for the Top.gg API.">
9-
<meta name="description" content="The official C++ wrapper for the Top.gg API.">
8+
<meta property="og:description" content="A community-maintained C++ API Client for the Top.gg API.">
9+
<meta name="description" content="A community-maintained C++ API Client for the Top.gg API.">
1010
<meta property="og:url" content="https://docs.top.gg/docs/">
1111
<meta property="og:type" content="website">
1212
<meta property="twitter:title" content="Top.gg C++ SDK">

docs/style.css

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)