mirror of
https://gitlab.com/niansa/discord_llama.git
synced 2025-03-06 20:48:25 +01:00
Updated various submodules
This commit is contained in:
parent
1763435505
commit
66999b6041
614 changed files with 80 additions and 132359 deletions
12
.gitmodules
vendored
12
.gitmodules
vendored
|
|
@ -1,9 +1,9 @@
|
|||
[submodule "cosched"]
|
||||
path = cosched
|
||||
url = https://gitlab.com/niansa/cosched.git
|
||||
[submodule "anyproc"]
|
||||
path = anyproc
|
||||
url = https://gitlab.com/niansa/anyproc.git
|
||||
[submodule "libjustlm"]
|
||||
path = libjustlm
|
||||
url = https://gitlab.com/niansa/libjustlm.git
|
||||
[submodule "cosched2"]
|
||||
path = cosched2
|
||||
url = https://gitfab.org/niansa/cosched2.git
|
||||
[submodule "DPP"]
|
||||
path = DPP
|
||||
url = https://github.com/brainboxdotcc/DPP.git
|
||||
|
|
|
|||
|
|
@ -7,14 +7,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,memory")
|
||||
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined,memory")
|
||||
|
||||
set(ANYPROC_COSCHED ON CACHE BOOL "" FORCE)
|
||||
set(ANYPROC_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||
set(LM_COSCHED ON CACHE BOOL "" FORCE)
|
||||
set(LM_NOEXCEPT ON CACHE BOOL "" FORCE)
|
||||
|
||||
add_subdirectory(libjustlm)
|
||||
add_subdirectory(anyproc)
|
||||
add_subdirectory(cosched)
|
||||
add_subdirectory(cosched2)
|
||||
add_subdirectory(DPP)
|
||||
add_subdirectory(fmt)
|
||||
|
||||
|
|
@ -23,7 +20,7 @@ add_executable(discord_llama
|
|||
config.hpp config.cpp
|
||||
utils.cpp utils.hpp
|
||||
)
|
||||
target_link_libraries(discord_llama PUBLIC dpp fmt pthread justlm anyproc cosched sqlite3)
|
||||
target_link_libraries(discord_llama PUBLIC dpp fmt pthread justlm cosched2 sqlite3)
|
||||
|
||||
install(TARGETS discord_llama
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
|
|
|||
1
DPP
Submodule
1
DPP
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 46044c8f80134633f7b396b4d5814f83d54a96d3
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
version: 2
|
||||
|
||||
jobs:
|
||||
build:
|
||||
docker:
|
||||
- image: "debian:bullseye"
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
name: Installing build dependencies
|
||||
command: 'apt-get update && apt-get install -y sudo gcc g++ build-essential git cmake libssl-dev zlib1g-dev'
|
||||
- run:
|
||||
name: Creating Build Files
|
||||
command: 'cmake -H. -Bbuild'
|
||||
- run:
|
||||
name: Creating Binary Files
|
||||
command: 'cmake --build build'
|
||||
- run:
|
||||
name: Testing installation
|
||||
command: 'cmake --build build --target install'
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
{
|
||||
"version": "0.2",
|
||||
"language": "en-GB",
|
||||
"words": [
|
||||
"buildcmake",
|
||||
"cmake",
|
||||
"vsproj",
|
||||
"mybot",
|
||||
"ldpp",
|
||||
"XHXVH",
|
||||
"Aytzm",
|
||||
"lpthread",
|
||||
"repls",
|
||||
"migitate",
|
||||
"DCMAKE",
|
||||
"mydppbot",
|
||||
"joinvc",
|
||||
"serialno",
|
||||
"lopus",
|
||||
"lopusfile",
|
||||
"logg",
|
||||
"blep",
|
||||
"Blep",
|
||||
"myid",
|
||||
"nlohmann",
|
||||
"myselid",
|
||||
"subcomamnd",
|
||||
"lmpg",
|
||||
"ffplay",
|
||||
"gumf",
|
||||
"ctxm",
|
||||
"rdynamic",
|
||||
"oeval",
|
||||
"bobo",
|
||||
"Mzgx",
|
||||
"Uzkzz",
|
||||
"delorean",
|
||||
"myvar",
|
||||
"Sporks",
|
||||
"ldconfig",
|
||||
"nsfw",
|
||||
"cotype",
|
||||
"anim",
|
||||
"Fortnite",
|
||||
"FURUHASHI",
|
||||
"Sadayuki",
|
||||
"Sarlacc",
|
||||
"prunable",
|
||||
"obuffer",
|
||||
"apng",
|
||||
"stoull",
|
||||
"nulled",
|
||||
"requalified",
|
||||
"erlpack",
|
||||
"repacketizer",
|
||||
"repacketized",
|
||||
"airty",
|
||||
"punner",
|
||||
"uulong",
|
||||
"stoul",
|
||||
"invitable",
|
||||
"chrono",
|
||||
"deserialise",
|
||||
"stoi",
|
||||
"mymessage",
|
||||
"achoice",
|
||||
"slashcommand",
|
||||
"dialogs",
|
||||
"thonk",
|
||||
"decomp",
|
||||
"unsuppress",
|
||||
"hahaha",
|
||||
"wstype",
|
||||
"ssrc",
|
||||
"clion",
|
||||
"followup",
|
||||
"gifv",
|
||||
"ctls",
|
||||
"ctest",
|
||||
"automod",
|
||||
"amod",
|
||||
"apult",
|
||||
"cplusplus",
|
||||
"xmake",
|
||||
"CORO",
|
||||
"cback",
|
||||
"mentionables",
|
||||
"stringified"
|
||||
],
|
||||
"flagWords": [
|
||||
"hte"
|
||||
],
|
||||
"allowCompoundWords": true,
|
||||
"useCompounds": true
|
||||
}
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
doxygen-awesome-css/
|
||||
docpages/
|
||||
testdata/
|
||||
win32/
|
||||
.github/
|
||||
.circleci/
|
||||
test/
|
||||
build/
|
||||
docs/
|
||||
.vscode/
|
||||
.vs/
|
||||
.idea/
|
||||
config.json
|
||||
.misspell-fixer.ignore
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
handle SIGPIPE pass nostop noprint
|
||||
handle SIGHUP pass nostop noprint
|
||||
run
|
||||
6
DPP/.gitattributes
vendored
6
DPP/.gitattributes
vendored
|
|
@ -1,6 +0,0 @@
|
|||
*.c linguist-detectable=false
|
||||
*.sh linguist-detectable=false
|
||||
*.pl linguist-detectable=false
|
||||
*.html linguist-detectable=false
|
||||
*.h linguist-language=C++
|
||||
win32/* linguist-vendored
|
||||
1
DPP/.github/FUNDING.yml
vendored
1
DPP/.github/FUNDING.yml
vendored
|
|
@ -1 +0,0 @@
|
|||
custom: ['https://www.paypal.com/donate?hosted_button_id=ZP76Y5J24WLMU']
|
||||
33
DPP/.github/ISSUE_TEMPLATE/bug_report.md
vendored
33
DPP/.github/ISSUE_TEMPLATE/bug_report.md
vendored
|
|
@ -1,33 +0,0 @@
|
|||
---
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: braindigitalis
|
||||
|
||||
---
|
||||
|
||||
**Git commit reference**
|
||||
The git commit reference of the version you are using, obtainable via `git show -s --format="%H"`
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behavior:
|
||||
1. Issue the method call 'X'
|
||||
2. Retrieve returned value 'Y'
|
||||
3. Returned value not in the range 'A..B'
|
||||
|
||||
**Expected behavior**
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**System Details:**
|
||||
- OS: [e.g. Debian Bullseye]
|
||||
- Discord Client used for testing [mobile, desktop, web]
|
||||
|
||||
**Additional context**
|
||||
Add any other context about the problem here.
|
||||
20
DPP/.github/ISSUE_TEMPLATE/feature_request.md
vendored
20
DPP/.github/ISSUE_TEMPLATE/feature_request.md
vendored
|
|
@ -1,20 +0,0 @@
|
|||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: ''
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Is your feature request related to a problem? Please describe.**
|
||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||
|
||||
**Describe the solution you'd like**
|
||||
A clear and concise description of what you want to happen.
|
||||
|
||||
**Describe alternatives you've considered**
|
||||
A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
**Additional context**
|
||||
Add any other context or screenshots about the feature request here.
|
||||
14
DPP/.github/dependabot.yml
vendored
14
DPP/.github/dependabot.yml
vendored
|
|
@ -1,14 +0,0 @@
|
|||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "gitsubmodule"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
target-branch: "dev"
|
||||
allow:
|
||||
- dependency-name: "doxygen-awesome-css"
|
||||
- package-ecosystem: "docker"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
target-branch: "dev"
|
||||
252
DPP/.github/workflows/ci.yml
vendored
252
DPP/.github/workflows/ci.yml
vendored
|
|
@ -1,252 +0,0 @@
|
|||
name: D++ CI
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- '**Dockerfile'
|
||||
- '**.cxx'
|
||||
- '**.cpp'
|
||||
- '**.h'
|
||||
- '**.hpp'
|
||||
- '**.cmake'
|
||||
- '**ci.yml'
|
||||
- '**CMakeLists.txt'
|
||||
pull_request:
|
||||
paths:
|
||||
- '**Dockerfile'
|
||||
- '**.cxx'
|
||||
- '**.cpp'
|
||||
- '**.h'
|
||||
- '**.hpp'
|
||||
- '**.cmake'
|
||||
- '**ci.yml'
|
||||
- '**CMakeLists.txt'
|
||||
|
||||
|
||||
jobs:
|
||||
linux-with-unit-test:
|
||||
concurrency:
|
||||
group: linux-build-unit-test
|
||||
cancel-in-progress: false
|
||||
name: Linux ${{matrix.cfg.arch}} (${{matrix.cfg.cpp-version}})
|
||||
runs-on: ${{matrix.cfg.os}}
|
||||
strategy:
|
||||
fail-fast: false # Don't fail everything if one fails. We want to test each OS/Compiler individually
|
||||
matrix:
|
||||
cfg:
|
||||
- { arch: 'amd64', os: ubuntu-20.04, cpp-version: g++-8 }
|
||||
|
||||
steps:
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install apt packages
|
||||
run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} ninja-build libsodium-dev libopus-dev zlib1g-dev rpm
|
||||
|
||||
- name: Generate CMake
|
||||
run: mkdir build && cd build && cmake -G Ninja -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release ..
|
||||
env:
|
||||
CXX: ${{matrix.cfg.cpp-version}}
|
||||
|
||||
- name: Build Project
|
||||
run: cd build && ninja
|
||||
|
||||
- name: Run unit tests
|
||||
run: cd build/library && ./unittest
|
||||
env:
|
||||
DPP_UNIT_TEST_TOKEN: ${{secrets.DPP_UNIT_TEST_TOKEN}}
|
||||
TEST_GUILD_ID: ${{secrets.TEST_GUILD_ID}}
|
||||
TEST_TEXT_CHANNEL_ID: ${{secrets.TEST_TEXT_CHANNEL_ID}}
|
||||
TEST_VC_ID: ${{secrets.TEST_VC_ID}}
|
||||
TEST_USER_ID: ${{secrets.TEST_USER_ID}}
|
||||
TEST_EVENT_ID: ${{secrets.TEST_EVENT_ID}}
|
||||
|
||||
linux-no-unit-tests:
|
||||
name: Linux ${{matrix.cfg.arch}} (${{matrix.cfg.cpp-version}})
|
||||
runs-on: ${{matrix.cfg.os}}
|
||||
strategy:
|
||||
fail-fast: false # Don't fail everything if one fails. We want to test each OS/Compiler individually
|
||||
matrix:
|
||||
cfg:
|
||||
- { arch: 'amd64', os: ubuntu-22.04, cpp-version: g++-11 }
|
||||
- { arch: 'amd64', os: ubuntu-22.04, cpp-version: g++-10 }
|
||||
- { arch: 'amd64', os: ubuntu-20.04, cpp-version: g++-9 }
|
||||
|
||||
steps:
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install apt packages
|
||||
run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} ninja-build libsodium-dev libopus-dev zlib1g-dev rpm
|
||||
|
||||
- name: Generate CMake
|
||||
run: mkdir build && cd build && cmake -G Ninja -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release ..
|
||||
env:
|
||||
CXX: ${{matrix.cfg.cpp-version}}
|
||||
|
||||
- name: Build Project
|
||||
run: cd build && ninja
|
||||
|
||||
- name: Package distributable
|
||||
if: ${{ matrix.cfg.cpp-version == 'g++-10' }}
|
||||
run: cd build && cpack --verbose
|
||||
|
||||
- name: Upload Binary (DEB)
|
||||
if: ${{ matrix.cfg.cpp-version == 'g++-10' }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: "libdpp - Debian Package ${{matrix.cfg.arch}}"
|
||||
path: '${{github.workspace}}/build/*.deb'
|
||||
|
||||
- name: Upload Binary (RPM)
|
||||
if: ${{ matrix.cfg.cpp-version == 'g++-10' }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: "libdpp - RPM Package ${{matrix.cfg.arch}}"
|
||||
path: '${{github.workspace}}/build/*.rpm'
|
||||
|
||||
macos:
|
||||
name: macOS x64
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install homebrew packages
|
||||
run: brew install cmake ninja libsodium opus openssl
|
||||
|
||||
- name: Generate CMake
|
||||
run: mkdir build && cd build && cmake -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -G Ninja ..
|
||||
env:
|
||||
DONT_RUN_VCPKG: true
|
||||
|
||||
- name: Build Project
|
||||
run: cd build && ninja
|
||||
env:
|
||||
DONT_RUN_VCPKG: true
|
||||
|
||||
windows: # Windows x64 and x86 build matrix
|
||||
strategy:
|
||||
fail-fast: false # Don't cancel other matrix jobs if one fails
|
||||
matrix:
|
||||
cfg:
|
||||
- { name: x64, arch: x64, config: Release, vs: '2019', os: 'windows-2019', vsv: '16' }
|
||||
- { name: x64, arch: x64, config: Debug, vs: '2019', os: 'windows-2019', vsv: '16' }
|
||||
- { name: x86, arch: x86, config: Release, vs: '2019', os: 'windows-2019', vsv: '16' }
|
||||
- { name: x86, arch: x86, config: Debug, vs: '2019', os: 'windows-2019', vsv: '16' }
|
||||
- { name: x64, arch: x64, config: Release, vs: '2022', os: 'windows-2022', vsv: '17' }
|
||||
- { name: x64, arch: x64, config: Debug, vs: '2022', os: 'windows-2022', vsv: '17' }
|
||||
- { name: x86, arch: x86, config: Release, vs: '2022', os: 'windows-2022', vsv: '17' }
|
||||
- { name: x86, arch: x86, config: Debug, vs: '2022', os: 'windows-2022', vsv: '17' }
|
||||
|
||||
name: "Windows ${{matrix.cfg.name}}-${{matrix.cfg.config}}-vs${{matrix.cfg.vs}}"
|
||||
runs-on: ${{matrix.cfg.os}}
|
||||
steps:
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
path: main
|
||||
|
||||
- name: Add MSBuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.2
|
||||
|
||||
- name: Install chocolatey packages ${{ matrix.cfg.arch}}
|
||||
uses: seanmiddleditch/gha-setup-ninja@master
|
||||
|
||||
- name: Generate CMake (x64)
|
||||
if: ${{ matrix.cfg.arch == 'x64' }}
|
||||
run: mkdir main/build && cd main/build && cmake -G "Visual Studio ${{matrix.cfg.vsv}} ${{matrix.cfg.vs}}" -DDPP_NO_VCPKG=ON ..
|
||||
env:
|
||||
DONT_RUN_VCPKG: true
|
||||
|
||||
- name: Generate CMake (x86)
|
||||
if: ${{ matrix.cfg.arch == 'x86' }}
|
||||
run: mkdir main/build && cd main/build && cmake -DCMAKE_TOOLCHAIN_FILE="cmake\Win32Toolchain.cmake" -DDPP_NO_VCPKG=ON -G "Visual Studio ${{matrix.cfg.vsv}} ${{matrix.cfg.vs}}" -A Win32 -T host=x86 ..
|
||||
env:
|
||||
DONT_RUN_VCPKG: true
|
||||
|
||||
- name: Build Project
|
||||
run: cmake --build main/build --target dpp --config ${{matrix.cfg.config}}
|
||||
env:
|
||||
DONT_RUN_VCPKG: true
|
||||
|
||||
- name: Move debug files for packaging
|
||||
if: ${{ matrix.cfg.config == 'Debug' }}
|
||||
run: xcopy main\build\library\Debug\* main\build\library\Release\ /s /q
|
||||
|
||||
- name: Package distributable
|
||||
run: cd main/build && cpack --verbose
|
||||
env:
|
||||
DONT_RUN_VCPKG: true
|
||||
|
||||
- name: Upload Binary
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: "libdpp - Windows ${{matrix.cfg.name}}-${{matrix.cfg.config}}-vs${{matrix.cfg.vs}}"
|
||||
path: '${{github.workspace}}/main/build/*.zip'
|
||||
|
||||
cross-compiles:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
cfg:
|
||||
- {name: "ARM64", os: ubuntu-20.04, cmake-options: -DCMAKE_TOOLCHAIN_FILE=cmake/ARM64ToolChain.cmake}
|
||||
- {name: "ARMv7 HF", os: ubuntu-20.04, cmake-options: -DCMAKE_TOOLCHAIN_FILE=cmake/ARMv7ToolChain.cmake}
|
||||
- {name: "Linux x86", os: ubuntu-22.04, cmake-options: -DCMAKE_TOOLCHAIN_FILE=cmake/LINUXx86ToolChain.cmake}
|
||||
- {name: "ARMv6", os: ubuntu-20.04, cmake-options: -DCMAKE_TOOLCHAIN_FILE=cmake/ARMv6ToolChain.cmake}
|
||||
|
||||
name: ${{matrix.cfg.name}}
|
||||
runs-on: ${{matrix.cfg.os}}
|
||||
steps:
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install Packages
|
||||
run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install cmake ninja-build rpm
|
||||
|
||||
- name: Generate CMakeFiles
|
||||
run: mkdir build && cd build && sudo cmake ${{matrix.cfg.cmake-options}} -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -G Ninja ..
|
||||
|
||||
- name: Compile Source
|
||||
run: cd build && sudo ninja
|
||||
|
||||
- name: Package Distributable
|
||||
run: cd build && cpack --verbose
|
||||
|
||||
- name: Upload Binaries (DEB)
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: "libdpp - Debian Package ${{matrix.cfg.name}}"
|
||||
path: "${{github.workspace}}/build/*.deb"
|
||||
|
||||
- name: Upload Binaries (RPM)
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: "libdpp - RPM Package ${{matrix.cfg.name}}"
|
||||
path: "${{github.workspace}}/build/*.rpm"
|
||||
|
||||
# testfreebsd:
|
||||
# runs-on: macos-10.15
|
||||
# name: FreeBSD (g++-10)
|
||||
# steps:
|
||||
# - uses: actions/checkout@v2
|
||||
# - name: FreeBSD Build and Package
|
||||
# id: freebsdtest
|
||||
# uses: vmactions/freebsd-vm@v0.1.5
|
||||
# with:
|
||||
# usesh: true
|
||||
# prepare: pkg install -y openssl-devel gcc gmake ninja cmake git
|
||||
# run: |
|
||||
# pwd
|
||||
# ls -lah
|
||||
# mkdir build
|
||||
# cd build
|
||||
# cmake ..
|
||||
# make -j2
|
||||
# make install
|
||||
# cpack --verbose
|
||||
#
|
||||
# - name: Upload Binaries (BZ2)
|
||||
# uses: actions/upload-artifact@v2
|
||||
# with:
|
||||
# name: "libdpp - FreeBSD x64"
|
||||
# path: "${{github.workspace}}/build/*.tar.bz2"
|
||||
83
DPP/.github/workflows/construct-vcpkg-info.yml
vendored
83
DPP/.github/workflows/construct-vcpkg-info.yml
vendored
|
|
@ -1,83 +0,0 @@
|
|||
name: Prepare release for VCPKG
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
Collect-Vcpkg-Info:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
|
||||
- name: Update vcpkg and install other dependencies
|
||||
run: sudo apt-get install nasm &&
|
||||
cd /usr/local/share/vcpkg &&
|
||||
sudo ./bootstrap-vcpkg.sh &&
|
||||
sudo git stash &&
|
||||
sudo git pull &&
|
||||
sudo vcpkg update
|
||||
|
||||
- name: Collect the repo
|
||||
run: sudo git config --global user.email "noreply@dpp.dev" &&
|
||||
sudo git config --global user.name "DPP VCPKG Bot" &&
|
||||
sudo git clone https://braindigitalis:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/brainboxdotcc/dpp ./dpp --depth=1
|
||||
|
||||
- name: Construct the original portfile and version file
|
||||
run: cd ./dpp &&
|
||||
sudo touch ./cmake/Raw-Files/Portfile-The-First.cmake &&
|
||||
sudo touch ./cmake/Raw-Files/Portfile-The-Second.cmake &&
|
||||
sudo touch ./vcpkg/ports/dpp/vcpkg.json &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Top-Of-Portfile.cmake >> ./cmake/Raw-Files/Portfile-The-First.cmake" &&
|
||||
sudo git rev-parse HEAD | sudo tee ./cmake/Raw-Files/Portfile-The-First.cmake -a &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Middle-Of-Portfile.cmake >> ./cmake/Raw-Files/Portfile-The-First.cmake" &&
|
||||
sudo bash -c "echo $'0' >> ./cmake/Raw-Files/Portfile-The-First.cmake" &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Bottom-Of-Portfile.cmake >> ./cmake/Raw-Files/Portfile-The-First.cmake" &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Top-Of-Version-File.txt > ./vcpkg/ports/dpp/vcpkg.json" &&
|
||||
echo \"$(grep DPP_VERSION_TEXT ./include/dpp/version.h | perl -pe '($_)=/([0-9]+([.][0-9]+)+)/')\" | sudo tee ./vcpkg/ports/dpp/vcpkg.json -a &&
|
||||
sudo truncate -s -1 ./vcpkg/ports/dpp/vcpkg.json &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Bottom-Of-Version-File.txt >> ./vcpkg/ports/dpp/vcpkg.json"
|
||||
|
||||
- name: Attempt to install the library, to collect the SHA512 value
|
||||
run: cd ./dpp &&
|
||||
sudo mkdir /usr/local/share/vcpkg/ports/dpp/ &&
|
||||
[ -f /usr/local/share/vcpkg/ports/dpp/vcpkg.json ] && echo "File exists." || sudo cp -v -R ./vcpkg/ports/dpp/vcpkg.json /usr/local/share/vcpkg/ports/dpp/vcpkg.json &&
|
||||
sudo cp -v -R ./cmake/Raw-Files/Portfile-The-First.cmake /usr/local/share/vcpkg/ports/dpp/portfile.cmake &&
|
||||
sudo /usr/local/share/vcpkg/vcpkg install dpp:x64-linux | sudo tee InstallOutput.txt || true
|
||||
|
||||
- name: Update the portfile and download/install the library
|
||||
run: cd ./dpp &&
|
||||
sudo sed -i '/Actual hash/,$!d' InstallOutput.txt &&
|
||||
sudo sed -i 's/^.....................//' InstallOutput.txt &&
|
||||
sudo sed -i '2,250d' InstallOutput.txt &&
|
||||
sudo truncate -s -3 InstallOutput.txt &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Top-Of-Portfile.cmake >> ./cmake/Raw-Files/Portfile-The-Second.cmake" &&
|
||||
sudo git rev-parse HEAD | sudo tee ./cmake/Raw-Files/Portfile-The-Second.cmake -a &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Middle-Of-Portfile.cmake >> ./cmake/Raw-Files/Portfile-The-Second.cmake" &&
|
||||
sudo bash -c "cat InstallOutput.txt >> ./cmake/Raw-Files/Portfile-The-Second.cmake" &&
|
||||
sudo bash -c "echo $'' >> ./cmake/Raw-Files/Portfile-The-Second.cmake" &&
|
||||
sudo bash -c "cat ./cmake/Raw-Files/Bottom-Of-Portfile.cmake >> ./cmake/Raw-Files/Portfile-The-Second.cmake" &&
|
||||
sudo touch ./vcpkg/ports/dpp/portfile.cmake &&
|
||||
sudo cp -v -R ./cmake/Raw-Files/Portfile-The-Second.cmake /usr/local/share/vcpkg/ports/dpp/portfile.cmake &&
|
||||
sudo cp -v -R ./cmake/Raw-Files/Portfile-The-Second.cmake ./vcpkg/ports/dpp/portfile.cmake &&
|
||||
sudo cp -v -R ./vcpkg/ports/* /usr/local/share/vcpkg/ports/ &&
|
||||
cd /usr/local/share/vcpkg &&
|
||||
sudo ./vcpkg format-manifest ./ports/dpp/vcpkg.json &&
|
||||
sudo git add . &&
|
||||
sudo git commit -m "[bot] VCPKG info update" &&
|
||||
cat /usr/local/share/vcpkg/versions/d-/dpp.json &&
|
||||
sudo /usr/local/share/vcpkg/vcpkg x-add-version dpp &&
|
||||
cd /home/runner/work/DPP/DPP/dpp &&
|
||||
sudo cp -v -R /usr/local/share/vcpkg/ports/dpp/vcpkg.json ./vcpkg/ports/dpp/vcpkg.json &&
|
||||
sudo cp -v -R /usr/local/share/vcpkg/versions/baseline.json ./vcpkg/versions/baseline.json &&
|
||||
sudo cp -v -R /usr/local/share/vcpkg/versions/d-/dpp.json ./vcpkg/versions/d-/dpp.json &&
|
||||
cat ./vcpkg/versions/d-/dpp.json &&
|
||||
sudo rm -rf InstallOutput.txt &&
|
||||
sudo rm -rf ./cmake/Raw-Files/Portfile-The-First.cmake &&
|
||||
sudo rm -rf ./cmake/Raw-Files/Portfile-The-Second.cmake &&
|
||||
sudo git add . &&
|
||||
sudo git commit -m "[bot] VCPKG info update [skip ci]" &&
|
||||
sudo git config pull.rebase false &&
|
||||
sudo git pull &&
|
||||
sudo git push origin master &&
|
||||
sudo /usr/local/share/vcpkg/vcpkg install dpp:x64-linux
|
||||
49
DPP/.github/workflows/docker.yml
vendored
49
DPP/.github/workflows/docker.yml
vendored
|
|
@ -1,49 +0,0 @@
|
|||
name: Docker image build and push
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
jobs:
|
||||
docker:
|
||||
if: github.repository == 'brainboxdotcc/DPP'
|
||||
runs-on: ubuntu-latest
|
||||
concurrency:
|
||||
group: docker-deployment
|
||||
cancel-in-progress: false
|
||||
steps:
|
||||
-
|
||||
name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
-
|
||||
name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
-
|
||||
name: Login to DockerHub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
-
|
||||
name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
-
|
||||
name: Build and push
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
push: true
|
||||
tags: brainboxdotcc/dpp
|
||||
- # copy multiplatform image from dockerhub to ghcr
|
||||
name: Push Image to multiple registries
|
||||
uses: akhilerm/tag-push-action@v2.0.0
|
||||
with:
|
||||
src: docker.io/brainboxdotcc/dpp:latest
|
||||
dst: |
|
||||
ghcr.io/brainboxdotcc/dpp:latest
|
||||
25
DPP/.github/workflows/documentation-check.yml
vendored
25
DPP/.github/workflows/documentation-check.yml
vendored
|
|
@ -1,25 +0,0 @@
|
|||
name: Docs PR Spellcheck
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- 'dev'
|
||||
files:
|
||||
- '**Doxyfile'
|
||||
- '**docpages/**'
|
||||
- '**/*.h'
|
||||
- '**/documentation-check.yml'
|
||||
push:
|
||||
files:
|
||||
- '**/documentation-check.yml'
|
||||
|
||||
jobs:
|
||||
docs:
|
||||
name: Check Documentation Spelling
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Check docs spelling
|
||||
run: npx -y cspell lint --language-id=cpp --no-progress --no-summary --show-context --show-suggestions --relative --color docpages/*.md include/dpp/*.h
|
||||
37
DPP/.github/workflows/documentation.yml
vendored
37
DPP/.github/workflows/documentation.yml
vendored
|
|
@ -1,37 +0,0 @@
|
|||
name: Docs Build (dpp.dev)
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'dev'
|
||||
files:
|
||||
- '**Doxyfile'
|
||||
- '**docpages/**'
|
||||
- '**/*.h'
|
||||
- '**/documentation.yml'
|
||||
|
||||
jobs:
|
||||
docs:
|
||||
name: Build Documentation
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
concurrency:
|
||||
group: docs-deployment
|
||||
cancel-in-progress: false
|
||||
|
||||
steps:
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@v2
|
||||
with:
|
||||
php-version: '8.0'
|
||||
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Generate Docs
|
||||
run: cd docpages && php makedocs-gh.php
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
|
||||
|
||||
21
DPP/.github/workflows/gitguardian.yml
vendored
21
DPP/.github/workflows/gitguardian.yml
vendored
|
|
@ -1,21 +0,0 @@
|
|||
name: GitGuardian scan
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
scanning:
|
||||
name: GitGuardian scan
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0 # fetch all history so multiple commits can be scanned
|
||||
- name: GitGuardian scan
|
||||
uses: GitGuardian/ggshield-action@master
|
||||
env:
|
||||
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
|
||||
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
|
||||
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
|
||||
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
|
||||
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
|
||||
34
DPP/.github/workflows/sitemap.yml
vendored
34
DPP/.github/workflows/sitemap.yml
vendored
|
|
@ -1,34 +0,0 @@
|
|||
name: Generate dpp.dev sitemap
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 6 * * 6'
|
||||
|
||||
jobs:
|
||||
updater:
|
||||
name: Generate Sitemap
|
||||
if: github.repository == 'brainboxdotcc/DPP'
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
steps:
|
||||
- name: Checkout github pages repository
|
||||
run: git config --global user.email "robot@dpp.dev" && git config --global user.name "D++ Sitemap Updater Bot" && git clone https://braindigitalis:$PERSONAL_ACCESS_TOKEN@github.com/brainboxdotcc/dpp-web.git /home/runner/dpp-web
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
|
||||
|
||||
- name: Install sitemap-generator
|
||||
run: npm install -g sitemap-generator-cli
|
||||
|
||||
- name: Run sitemap-generator
|
||||
run: cd /home/runner/dpp-web && npx sitemap-generator --no-respect-robots-txt --verbose https://dpp.dev/
|
||||
|
||||
- name: commit and push
|
||||
run: cd /home/runner/dpp-web && git add sitemap.xml && git commit -am "Update sitemap" && git pull --ff && git push
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
|
||||
|
||||
|
||||
13
DPP/.github/workflows/stale.yml
vendored
13
DPP/.github/workflows/stale.yml
vendored
|
|
@ -1,13 +0,0 @@
|
|||
name: 'Close stale issues and PRs'
|
||||
on:
|
||||
schedule:
|
||||
- cron: '30 1 * * *'
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@v4
|
||||
with:
|
||||
stale-issue-message: 'This issue has had no activity and is being marked as stale. If you still wish to continue with this issue please comment to reopen it.'
|
||||
stale-pr-message: 'This pull request has had no activity and is being marked as stale. If you still wish to continue with this pull request please comment to reopen it.'
|
||||
31
DPP/.github/workflows/target-master.yml
vendored
31
DPP/.github/workflows/target-master.yml
vendored
|
|
@ -1,31 +0,0 @@
|
|||
name: Close master-targeted PRs
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- 'master'
|
||||
|
||||
jobs:
|
||||
docs:
|
||||
name: PR Check
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
concurrency:
|
||||
group: pr
|
||||
cancel-in-progress: true
|
||||
|
||||
steps:
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@v2
|
||||
with:
|
||||
php-version: '8.0'
|
||||
|
||||
- name: Checkout D++
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Close master target PRs
|
||||
run: php buildtools/close-master-pr.php
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
18
DPP/.gitignore
vendored
18
DPP/.gitignore
vendored
|
|
@ -1,18 +0,0 @@
|
|||
test
|
||||
build
|
||||
config.json
|
||||
docs
|
||||
testdata/maxpower.pcm
|
||||
testdata/onandon.pcm
|
||||
buildtools/composer.phar
|
||||
docs/doxygen_sqlite3.db
|
||||
src/build
|
||||
.vs
|
||||
*.autosave
|
||||
.misspell-fixer.ignore
|
||||
core
|
||||
compile_commands.json
|
||||
tags
|
||||
.cache
|
||||
src/dpp/dpp.rc
|
||||
/main
|
||||
3
DPP/.gitmodules
vendored
3
DPP/.gitmodules
vendored
|
|
@ -1,3 +0,0 @@
|
|||
[submodule "doxygen-awesome-css"]
|
||||
path = doxygen-awesome-css
|
||||
url = https://github.com/jothepro/doxygen-awesome-css.git
|
||||
18
DPP/.vscode/c_cpp_properties.json
vendored
18
DPP/.vscode/c_cpp_properties.json
vendored
|
|
@ -1,18 +0,0 @@
|
|||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Linux",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/**"
|
||||
],
|
||||
"defines": [],
|
||||
"compilerPath": "/usr/bin/g++-12",
|
||||
"cStandard": "gnu17",
|
||||
"cppStandard": "gnu++17",
|
||||
"intelliSenseMode": "linux-gcc-x64",
|
||||
"compileCommands": "${workspaceFolder}/build/compile_commands.json",
|
||||
"configurationProvider": "ms-vscode.cmake-tools"
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
28
DPP/.vscode/launch.json
vendored
28
DPP/.vscode/launch.json
vendored
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
// Use IntelliSense to learn about possible attributes.
|
||||
// Hover to view descriptions of existing attributes.
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "(gdb) Launch",
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"program": "${workspaceFolder}/build/library/unittest",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
"cwd": "${workspaceFolder}/build/library",
|
||||
"environment": [],
|
||||
"externalConsole": false,
|
||||
"MIMode": "gdb",
|
||||
"setupCommands": [
|
||||
{
|
||||
"description": "Enable pretty-printing for gdb",
|
||||
"text": "-enable-pretty-printing",
|
||||
"ignoreFailures": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
84
DPP/.vscode/settings.json
vendored
84
DPP/.vscode/settings.json
vendored
|
|
@ -1,84 +0,0 @@
|
|||
{
|
||||
"C_Cpp.errorSquiggles": "Disabled",
|
||||
"cmake.configureOnOpen": true,
|
||||
"files.associations": {
|
||||
"functional": "cpp",
|
||||
"new": "cpp",
|
||||
"string": "cpp",
|
||||
"string_view": "cpp",
|
||||
"format": "cpp",
|
||||
"cctype": "cpp",
|
||||
"clocale": "cpp",
|
||||
"cmath": "cpp",
|
||||
"csignal": "cpp",
|
||||
"cstdarg": "cpp",
|
||||
"cstddef": "cpp",
|
||||
"cstdio": "cpp",
|
||||
"cstdlib": "cpp",
|
||||
"cstring": "cpp",
|
||||
"ctime": "cpp",
|
||||
"cwchar": "cpp",
|
||||
"cwctype": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"strstream": "cpp",
|
||||
"*.tcc": "cpp",
|
||||
"bitset": "cpp",
|
||||
"chrono": "cpp",
|
||||
"complex": "cpp",
|
||||
"condition_variable": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"deque": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"list": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"vector": "cpp",
|
||||
"exception": "cpp",
|
||||
"optional": "cpp",
|
||||
"fstream": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"iostream": "cpp",
|
||||
"istream": "cpp",
|
||||
"limits": "cpp",
|
||||
"mutex": "cpp",
|
||||
"ostream": "cpp",
|
||||
"numeric": "cpp",
|
||||
"ratio": "cpp",
|
||||
"shared_mutex": "cpp",
|
||||
"sstream": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"system_error": "cpp",
|
||||
"thread": "cpp",
|
||||
"cfenv": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"regex": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"utility": "cpp",
|
||||
"typeindex": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"valarray": "cpp",
|
||||
"bit": "cpp",
|
||||
"concepts": "cpp",
|
||||
"map": "cpp",
|
||||
"set": "cpp",
|
||||
"algorithm": "cpp",
|
||||
"iterator": "cpp",
|
||||
"memory": "cpp",
|
||||
"memory_resource": "cpp",
|
||||
"random": "cpp",
|
||||
"variant": "cpp",
|
||||
"unordered_set": "cpp",
|
||||
"codecvt": "cpp",
|
||||
"future": "cpp",
|
||||
"cerrno": "cpp",
|
||||
"compare": "cpp",
|
||||
"coroutine": "cpp",
|
||||
"numbers": "cpp",
|
||||
"semaphore": "cpp",
|
||||
"stop_token": "cpp"
|
||||
}
|
||||
}
|
||||
23
DPP/.vscode/tasks.json
vendored
23
DPP/.vscode/tasks.json
vendored
|
|
@ -1,23 +0,0 @@
|
|||
{
|
||||
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
||||
// for the documentation about the tasks.json format
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "cmake",
|
||||
"type": "shell",
|
||||
"command": "cd build && cmake .. && make -j8",
|
||||
"problemMatcher": [],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "doxygen",
|
||||
"type": "shell",
|
||||
"command": "doxygen",
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
#
|
||||
# D++ (DPP), The Lightweight C++ Discord Library
|
||||
#
|
||||
# Copyright 2021 Craig Edwards <support@brainbox.cc>
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
cmake_minimum_required (VERSION 3.16)
|
||||
|
||||
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
|
||||
option(BUILD_VOICE_SUPPORT "Build voice support" ON)
|
||||
option(RUN_LDCONFIG "Run ldconfig after installation" ON)
|
||||
option(DPP_INSTALL "Generate the install target" ON)
|
||||
option(DPP_BUILD_TEST "Build the test program" ON)
|
||||
option(DPP_NO_VCPKG "No VCPKG" OFF)
|
||||
option(DPP_CORO "Experimental support for C++20 coroutines" OFF)
|
||||
option(DPP_USE_EXTERNAL_JSON "Use an external installation of nlohmann::json" OFF)
|
||||
|
||||
include(CheckCXXSymbolExists)
|
||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
add_compile_definitions(DPP_BUILD)
|
||||
|
||||
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/include/dpp/version.h" version_h)
|
||||
|
||||
if(NOT version_h MATCHES "DPP_VERSION_SHORT ([0-9][0-9])([0-9][0-9])([0-9][0-9])")
|
||||
message(FATAL_ERROR "Cannot get DPP_VERSION_SHORT from version.h")
|
||||
endif()
|
||||
|
||||
math(EXPR DPP_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||
math(EXPR DPP_VERSION_MINOR "${CMAKE_MATCH_2}")
|
||||
math(EXPR DPP_VERSION_PATCH "${CMAKE_MATCH_3}")
|
||||
|
||||
string(CONCAT DPP_VERSION "${DPP_VERSION_MAJOR}.${DPP_VERSION_MINOR}.${DPP_VERSION_PATCH}")
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/")
|
||||
|
||||
if (DPP_NO_VCPKG)
|
||||
message("-- INFO: Explicitly disabling VCPKG as running inside the CI action.")
|
||||
else()
|
||||
message("-- INFO: Using VCPKG if detected")
|
||||
endif()
|
||||
|
||||
if (WIN32 AND NOT MINGW AND BUILD_SHARED_LIBS)
|
||||
message("-- INFO: Configuring .rc resource script")
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/dpp/dpp.rc.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/dpp/dpp.rc" NEWLINE_STYLE WIN32)
|
||||
endif()
|
||||
|
||||
if (NOT DPP_NO_VCPKG AND EXISTS "${_VCPKG_ROOT_DIR}")
|
||||
set(PROJECT_NAME "dpp")
|
||||
project(
|
||||
"${PROJECT_NAME}"
|
||||
VERSION "${DPP_VERSION}"
|
||||
LANGUAGES CXX
|
||||
HOMEPAGE_URL "https://dpp.dev/"
|
||||
DESCRIPTION "An incredibly lightweight C++ Discord library."
|
||||
)
|
||||
add_subdirectory(library-vcpkg)
|
||||
else()
|
||||
set(PROJECT_NAME "libdpp")
|
||||
project(
|
||||
"${PROJECT_NAME}"
|
||||
VERSION "${DPP_VERSION}"
|
||||
LANGUAGES CXX
|
||||
HOMEPAGE_URL "https://dpp.dev/"
|
||||
DESCRIPTION "An incredibly lightweight C++ Discord library."
|
||||
)
|
||||
add_subdirectory(library)
|
||||
endif()
|
||||
|
||||
if(DPP_USE_EXTERNAL_JSON)
|
||||
# We do nothing here, we just assume it is on the include path.
|
||||
# nlohmann::json's cmake stuff does all kinds of weird, and is more hassle than it's worth.
|
||||
# This functionality is here mostly for package maintainers so if you enable it you should
|
||||
# know what you are doing.
|
||||
message("-- Using external nlohmann::json")
|
||||
target_compile_definitions(dpp PUBLIC DPP_USE_EXTERNAL_JSON)
|
||||
else()
|
||||
# Add the nlohmann single include to the include path. Note that nlohmann::json is kinda
|
||||
# fussy, this is an older version because trying to use v3.11.2 gave a bunch of parse errors
|
||||
# that made no sense, it seems they may have changed their parsing rules somehow.
|
||||
message("-- Using bundled nlohmann::json")
|
||||
endif()
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "x64-Debug",
|
||||
"generator": "Ninja",
|
||||
"configurationType": "Release",
|
||||
"inheritEnvironments": [ "msvc_x64_x64" ],
|
||||
"buildRoot": "${projectDir}\\out\\build\\${name}",
|
||||
"installRoot": "${projectDir}\\out\\install\\${name}",
|
||||
"cmakeCommandArgs": "",
|
||||
"buildCommandArgs": "",
|
||||
"ctestCommandArgs": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,134 +0,0 @@
|
|||
|
||||
# Contributor Covenant Code of Conduct
|
||||
|
||||
## Our Pledge
|
||||
|
||||
We as members, contributors, and leaders pledge to make participation in our
|
||||
community a harassment-free experience for everyone, regardless of age, body
|
||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
||||
identity and expression, level of experience, education, socio-economic status,
|
||||
nationality, personal appearance, race, caste, color, religion, or sexual
|
||||
identity and orientation.
|
||||
|
||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
||||
diverse, inclusive, and healthy community.
|
||||
|
||||
## Our Standards
|
||||
|
||||
Examples of behavior that contributes to a positive environment for our
|
||||
community include:
|
||||
|
||||
* Demonstrating empathy and kindness toward other people
|
||||
* Being respectful of differing opinions, viewpoints, and experiences
|
||||
* Giving and gracefully accepting constructive feedback
|
||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
||||
and learning from the experience
|
||||
* Focusing on what is best not just for us as individuals, but for the overall
|
||||
community
|
||||
|
||||
Examples of unacceptable behavior include:
|
||||
|
||||
* The use of sexualized language or imagery, and sexual attention or advances of
|
||||
any kind
|
||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
||||
* Public or private harassment
|
||||
* Publishing others' private information, such as a physical or email address,
|
||||
without their explicit permission
|
||||
* Other conduct which could reasonably be considered inappropriate in a
|
||||
professional setting
|
||||
|
||||
## Enforcement Responsibilities
|
||||
|
||||
Community leaders are responsible for clarifying and enforcing our standards of
|
||||
acceptable behavior and will take appropriate and fair corrective action in
|
||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
||||
or harmful.
|
||||
|
||||
Community leaders have the right and responsibility to remove, edit, or reject
|
||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
||||
decisions when appropriate.
|
||||
|
||||
## Scope
|
||||
|
||||
This Code of Conduct applies within all community spaces, and also applies when
|
||||
an individual is officially representing the community in public spaces.
|
||||
Examples of representing our community include using an official e-mail address,
|
||||
posting via an official social media account, or acting as an appointed
|
||||
representative at an online or offline event.
|
||||
|
||||
## Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported to the community leaders responsible for enforcement in the
|
||||
[Discord][discord] server.
|
||||
All complaints will be reviewed and investigated promptly and fairly.
|
||||
|
||||
All community leaders are obligated to respect the privacy and security of the
|
||||
reporter of any incident.
|
||||
|
||||
## Enforcement Guidelines
|
||||
|
||||
Community leaders will follow these Community Impact Guidelines in determining
|
||||
the consequences for any action they deem in violation of this Code of Conduct:
|
||||
|
||||
### 1. Correction
|
||||
|
||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
||||
unprofessional or unwelcome in the community.
|
||||
|
||||
**Consequence**: A private, written warning from community leaders, providing
|
||||
clarity around the nature of the violation and an explanation of why the
|
||||
behavior was inappropriate. A public apology may be requested.
|
||||
|
||||
### 2. Warning
|
||||
|
||||
**Community Impact**: A violation through a single incident or series of
|
||||
actions.
|
||||
|
||||
**Consequence**: A warning with consequences for continued behavior. No
|
||||
interaction with the people involved, including unsolicited interaction with
|
||||
those enforcing the Code of Conduct, for a specified period of time. This
|
||||
includes avoiding interactions in community spaces as well as external channels
|
||||
like social media. Violating these terms may lead to a temporary or permanent
|
||||
ban.
|
||||
|
||||
### 3. Temporary Ban
|
||||
|
||||
**Community Impact**: A serious violation of community standards, including
|
||||
sustained inappropriate behavior.
|
||||
|
||||
**Consequence**: A temporary ban from any sort of interaction or public
|
||||
communication with the community for a specified period of time. No public or
|
||||
private interaction with the people involved, including unsolicited interaction
|
||||
with those enforcing the Code of Conduct, is allowed during this period.
|
||||
Violating these terms may lead to a permanent ban.
|
||||
|
||||
### 4. Permanent Ban
|
||||
|
||||
**Community Impact**: Demonstrating a pattern of violation of community
|
||||
standards, including sustained inappropriate behavior, harassment of an
|
||||
individual, or aggression toward or disparagement of classes of individuals.
|
||||
|
||||
**Consequence**: A permanent ban from any sort of public interaction within the
|
||||
community.
|
||||
|
||||
## Attribution
|
||||
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
||||
version 2.1, available at
|
||||
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
|
||||
|
||||
Community Impact Guidelines were inspired by
|
||||
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
|
||||
|
||||
For answers to common questions about this code of conduct, see the FAQ at
|
||||
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
|
||||
[https://www.contributor-covenant.org/translations][translations].
|
||||
|
||||
[discord]: https://discord.gg/dpp
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
|
||||
[Mozilla CoC]: https://github.com/mozilla/diversity
|
||||
[FAQ]: https://www.contributor-covenant.org/faq
|
||||
[translations]: https://www.contributor-covenant.org/translations
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# Contributing
|
||||
|
||||
When contributing to this repository, please do not feel intimidated! We welcome PRs from developers of all levels of experience and we were all new once.
|
||||
|
||||
## Pull Request Process
|
||||
|
||||
1. Pull requests should be made against the `dev` branch.
|
||||
2. Ensure that the changed library can be built on your target system. Do not introduce any platform-
|
||||
specific code.
|
||||
3. Ensure that all methods and functions you add are **fully documented** using doxygen style comments.
|
||||
4. Test your commit! Make a simple single-file test bot to demonstrate the change, include this with the PR
|
||||
as an attached file on a comment, so we can test and see how it works.
|
||||
5. Ensure that you do not break any existing API calls without discussing on Discord first!
|
||||
6. Be sure to follow the coding style guide (if you are not sure, match the code style of existing files
|
||||
including indent style etc).
|
||||
7. Your PR must pass the CI actions before being allowed to be merged. Our PR actions check that the
|
||||
build will compile on various platforms before release and makes precompiled versions of the library.
|
||||
8. If you are on the discord server for the project and your PR is accepted, let a moderator know and we
|
||||
will grant you the 'Contributors' role.
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
FROM ubuntu:focal
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y libssl-dev zlib1g-dev libsodium-dev libopus-dev cmake pkg-config g++ gcc git make && apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
WORKDIR /usr/src/DPP
|
||||
|
||||
COPY . .
|
||||
|
||||
WORKDIR /usr/src/DPP/build
|
||||
|
||||
RUN cmake .. -DDPP_BUILD_TEST=OFF
|
||||
RUN make -j "$(nproc)"
|
||||
RUN make install
|
||||
2284
DPP/Doxyfile
2284
DPP/Doxyfile
File diff suppressed because it is too large
Load diff
201
DPP/LICENSE
201
DPP/LICENSE
|
|
@ -1,201 +0,0 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright 2021 Craig Edwards and D++ Contributors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
134
DPP/README.md
134
DPP/README.md
|
|
@ -1,134 +0,0 @@
|
|||
<div align="center"><img src="docpages/DPP-markdown-logo.png" alt="DPP"/>
|
||||
<h3>An incredibly lightweight C++ Discord library</h3>
|
||||
<br />
|
||||
|
||||
[](https://discord.gg/dpp)
|
||||
|
||||
[](https://www.codacy.com/gh/brainboxdotcc/DPP/dashboard?utm_source=github.com&utm_medium=referral&utm_content=brainboxdotcc/DPP&utm_campaign=Badge_Grade)
|
||||
|
||||
[](https://github.com/brainboxdotcc/DPP/actions/workflows/ci.yml)
|
||||
[](https://aur.archlinux.org/packages/dpp) [](CODE_OF_CONDUCT.md)
|
||||
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
|
||||
D++ is a lightweight and efficient library for **Discord** written in **modern C++**, covering as much of the API specification as possible with an **incredibly small memory footprint** even when caching large amounts of data.
|
||||
|
||||
### Library features:
|
||||
|
||||
* Support for Discord API v10
|
||||
* Really small memory footprint
|
||||
* Efficient caching system for guilds, channels, guild members, roles, users
|
||||
* Sharding and clustering (Many shards, one process: specify the number of shards, or let the library decide)
|
||||
* Highly optimised ETF (Erlang Term Format) support for very fast websocket throughput
|
||||
* [Slash Commands/Interactions support](https://dpp.dev/slashcommands.html)
|
||||
* [Voice support](https://dpp.dev/soundboard.html) (sending **and** receiving audio)
|
||||
* The entire Discord API is available for use in the library
|
||||
* Stable [Windows support](https://dpp.dev/buildwindows.html)
|
||||
* Ready-made compiled packages for Windows, Raspberry Pi (ARM64/ARM7/ARMv6), Debian x86/x64 and RPM based distributions
|
||||
* Highly scalable for large amounts of guilds and users
|
||||
|
||||
Want to help? Drop me a line or send a PR.
|
||||
|
||||
This library is in use on [TriviaBot](https://triviabot.co.uk/) and [Sporks bot](https://sporks.gg) and many other bots!
|
||||
|
||||
## Documentation
|
||||
|
||||
The documentation is constantly evolving and improving, generated from the code comments and markdown examples using Doxygen.
|
||||
|
||||
#### [View the D++ library documentation](https://dpp.dev/)
|
||||
|
||||
### Example
|
||||
|
||||
This is a simple ping-pong example using slash commands.
|
||||
|
||||
```c++
|
||||
#include <dpp/dpp.h>
|
||||
#include <cstdlib>
|
||||
|
||||
int main() {
|
||||
dpp::cluster bot(std::getenv("BOT_TOKEN"));
|
||||
|
||||
bot.on_slashcommand([](auto event) {
|
||||
if (event.command.get_command_name() == "ping") {
|
||||
event.reply("Pong!");
|
||||
}
|
||||
});
|
||||
|
||||
bot.on_ready([&bot](auto event) {
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
bot.global_command_create(
|
||||
dpp::slashcommand("ping", "Ping pong!", bot.me.id)
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
}
|
||||
```
|
||||
|
||||
You can find more examples in our [example page](https://dpp.dev/md_docpages_03_example_programs.html).
|
||||
|
||||
## Supported Systems
|
||||
|
||||
### Linux
|
||||
The library runs ideally on **Linux**.
|
||||
|
||||
### Mac OS X and FreeBSD
|
||||
The library is well-functional and stable on **Mac OS X** and **FreeBSD** too.
|
||||
|
||||
### Raspberry Pi
|
||||
For running your bot on a **Raspberry Pi**, we offer a prebuilt .deb package for ARM64, ARM6, and ARM7 so that you do not have to wait for it to compile.
|
||||
|
||||
### Windows
|
||||
**Windows** is well-supported with ready-made compiled DLL and LIB files, please check out our [Windows Bot Template repository](https://github.com/brainboxdotcc/windows-bot-template). The Windows Bot repository can be cloned and integrated immediately into any Visual Studio 2019 and 2022 project in a matter of minutes.
|
||||
|
||||
### Other OS
|
||||
The library should work fine on other operating systems as well, and if you run a D++ bot on something not listed here, please let us know!
|
||||
|
||||
## 🤝 Contributing
|
||||
|
||||
Contributions, issues and feature requests are welcome. After cloning and setting up project locally, you can just submit
|
||||
a PR to this repo and it will be deployed once it's accepted.
|
||||
|
||||
Please read the [D++ Code Style Guide](https://dpp.dev/coding-standards.html) for more information on how we format pull requests.
|
||||
|
||||
## 💬 Get in touch
|
||||
|
||||
If you have various suggestions, questions or want to discuss things with our community, [Join our discord server](https://discord.gg/dpp)!
|
||||
Make a humorous reference to brains in your nickname to get access to a secret brain cult channel! :)
|
||||
|
||||
[](https://discord.gg/dpp)
|
||||
|
||||
## Show your support
|
||||
|
||||
We love people's support in growing and improving. Be sure to leave a ⭐️ if you like the project and also be sure to contribute, if you're interested!
|
||||
|
||||
## Dependencies
|
||||
|
||||
### Build requirements
|
||||
* [cmake](https://cmake.org/) (version 3.13+)
|
||||
* A supported C++ compiler from the list below
|
||||
|
||||
### Supported compilers
|
||||
* [g++](https://gcc.gnu.org) (version 8 or higher)
|
||||
* [clang](https://clang.llvm.org/)
|
||||
* AppleClang (12.0 or higher)
|
||||
* Microsoft Visual Studio 2019 or 2022 (16.x/17.x)
|
||||
* [mingw-w64](https://www.mingw-w64.org/) (gcc version 8 or higher)
|
||||
|
||||
Other compilers may work (either newer versions of those listed above, or different compilers entirely) but have not been tested by us.
|
||||
|
||||
### External Dependencies (You must install these)
|
||||
* [OpenSSL](https://openssl.org/) (whichever `-dev` package comes with your OS)
|
||||
* [zlib](https://zlib.net) (whichever `-dev` package comes with your OS)
|
||||
|
||||
#### Optional Dependencies
|
||||
For voice support you require both of:
|
||||
* [LibOpus](https://www.opus-codec.org)
|
||||
* [libsodium](https://github.com/jedisct1/libsodium)
|
||||
|
||||
### Included Dependencies (Packaged with the library)
|
||||
* [nlohmann::json](https://github.com/nlohmann/json)
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# Security Policy
|
||||
|
||||
## Supported Versions
|
||||
|
||||
| Version | Supported |
|
||||
| ------- | ------------------ |
|
||||
| 10.0.x | ✅ |
|
||||
| 9.0.x | ⛔ |
|
||||
| 1.0.x | ⛔ |
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
To report a vulnerability please contact the development team confidentially on Discord. We will discuss via a group chat if necessary and action
|
||||
the fix. Once the fix has been put into a release version, the vulnerability will be made public.
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
<?php
|
||||
|
||||
// D++ changelog generator, saves 15 minutes for each release :-)
|
||||
|
||||
// Pattern list
|
||||
$categories = [
|
||||
'break' => '💣 Breaking Changes',
|
||||
'breaking' => '💣 Breaking Changes',
|
||||
'feat' => '✨ New Features',
|
||||
'feature' => '✨ New Features',
|
||||
'add' => '✨ New Features',
|
||||
'added' => '✨ New Features',
|
||||
'fix' => '🐞 Bug Fixes',
|
||||
'bug' => '🐞 Bug Fixes',
|
||||
'bugfix' => '🐞 Bug Fixes',
|
||||
'fixed' => '🐞 Bug Fixes',
|
||||
'fixes' => '🐞 Bug Fixes',
|
||||
'perf' => '🚀 Performance Improvements',
|
||||
'performance' => '🚀 Performance Improvements',
|
||||
'impro' => '♻️ Refactoring',
|
||||
'improved' => '♻️ Refactoring',
|
||||
'improvement' => '♻️ Refactoring',
|
||||
'refactor' => '♻️ Refactoring',
|
||||
'refactored' => '♻️ Refactoring',
|
||||
'deprecated' => '♻️ Refactoring',
|
||||
'deprecate' => '♻️ Refactoring',
|
||||
'remove' => '♻️ Refactoring',
|
||||
'change' => '♻️ Refactoring',
|
||||
'changed' => '♻️ Refactoring',
|
||||
'test' => '🚨 Testing',
|
||||
'tests' => '🚨 Testing',
|
||||
'testing' => '🚨 Testing',
|
||||
'ci' => '👷 Build/CI',
|
||||
'build' => '👷 Build/CI',
|
||||
'docs' => '📚 Documentation',
|
||||
'documentation' => '📚 Documentation',
|
||||
'style' => '💎 Style Changes',
|
||||
'chore' => '🔧 Chore',
|
||||
'misc' => '📜 Miscellaneous Changes',
|
||||
'update' => '📜 Miscellaneous Changes',
|
||||
'updated' => '📜 Miscellaneous Changes',
|
||||
];
|
||||
|
||||
$catgroup = [];
|
||||
$changelog = [];
|
||||
$githubstyle = true;
|
||||
if (count($argv) > 2 && $argv[1] == '--discord') {
|
||||
$githubstyle = false;
|
||||
}
|
||||
|
||||
// Magic sauce
|
||||
exec("git log --format=\"%s\" $(git log --no-walk --tags | head -n1 | cut -d ' ' -f 2)..HEAD | grep -v '^Merge '", $changelog);
|
||||
|
||||
// Leadin
|
||||
if ($githubstyle) {
|
||||
echo "The changelog is listed below:\n\nRelease Changelog\n===========\n";
|
||||
} else {
|
||||
echo "The changelog is listed below:\n\n__**Release Changelog**__\n";
|
||||
}
|
||||
|
||||
// Case insensitive removal of duplicates
|
||||
$changelog = array_intersect_key($changelog, array_unique(array_map("strtolower", $changelog)));
|
||||
|
||||
// remove duplicates where two entries are the same but one ends with a GitHub pull request link
|
||||
foreach ($changelog as $item) {
|
||||
$entryWithoutPrLink = preg_replace('/( \(#\d+\))$/', '', $item);
|
||||
if ($entryWithoutPrLink === $item) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// if $item ends with (#123)
|
||||
foreach ($changelog as $key => $change) {
|
||||
if ($entryWithoutPrLink === $change) {
|
||||
unset($changelog[$key]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($changelog as $change) {
|
||||
|
||||
// Wrap anything that looks like a symbol name in backticks
|
||||
$change = preg_replace('/([a-zA-Z][\w_\/\-]+\.\w+|\S+\(\)|\w+::\w+|dpp::\w+|utility::\w+|(\w+_\w+)+)/', '`$1`', $change);
|
||||
$change = preg_replace("/vs(\d+)/", "Visual Studio $1", $change);
|
||||
$change = preg_replace("/\bfaq\b/", "FAQ", $change);
|
||||
$change = preg_replace("/\bdiscord\b/", "Discord", $change);
|
||||
$change = preg_replace("/\bmicrosoft\b/", "Microsoft", $change);
|
||||
$change = preg_replace("/\bwindows\b/", "Windows", $change);
|
||||
$change = preg_replace("/\blinux\b/", "Linux", $change);
|
||||
$change = preg_replace("/\sarm(\d+)\s/i", ' ARM$1 ', $change);
|
||||
$change = preg_replace("/\b(was|is|wo)nt\b/i", '$1n\'t', $change);
|
||||
$change = preg_replace("/\bfreebsd\b/", 'FreeBSD', $change);
|
||||
$change = preg_replace("/``/", "`", $change);
|
||||
|
||||
// Match keywords against categories
|
||||
$matched = false;
|
||||
foreach ($categories as $cat => $header) {
|
||||
// Purposefully ignored: comments that are one word, merge commits, and version bumps
|
||||
if (strpos($change, ' ') === false || preg_match("/^Merge (branch|pull request|remote-tracking branch) /", $change) || preg_match("/version bump/i", $change)) {
|
||||
$matched = true;
|
||||
continue;
|
||||
}
|
||||
// Groupings
|
||||
if ((preg_match("/^" . $cat . ":/i", $change)) || (preg_match("/^\[" . $cat . "\//i", $change)) || (preg_match("/^\[" . $cat . "\]/i", $change)) || (preg_match("/^\[" . $cat . ":/i", $change)) || (preg_match("/^" . $cat . "\//i", $change)) || (preg_match("/^" . $cat . ":/i", $change))) {
|
||||
if (!isset($catgroup[$header])) {
|
||||
$catgroup[$header] = [];
|
||||
}
|
||||
$matched = true;
|
||||
$catgroup[$header][] = preg_replace("/^\S+\s+/", "", $change);
|
||||
break;
|
||||
} else if (preg_match("/^" . $cat . " /i", $change)) {
|
||||
if (!isset($catgroup[$header])) {
|
||||
$catgroup[$header] = [];
|
||||
}
|
||||
$matched = true;
|
||||
$catgroup[$header][] = $change;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Output tidy formatting
|
||||
foreach ($catgroup as $cat => $list) {
|
||||
echo "\n" . ($githubstyle ? '## ' : '__**') . $cat . ($githubstyle ? '' : '**__') . "\n";
|
||||
foreach ($list as $item) {
|
||||
// Exclude bad commit messages like 'typo fix', 'test push' etc by pattern
|
||||
if (!preg_match("/^(typo|test|fix)\s\w+$/", $item) && strpos($item, ' ') !== false) {
|
||||
echo ($githubstyle ? '-' : '•') . ' ' . ucfirst(str_replace('@', '', $item)) . "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Leadout
|
||||
echo "\n\n**Thank you for using D++!**\n\n";
|
||||
if (!$githubstyle) {
|
||||
$version = $argv[2];
|
||||
echo 'The ' . $version . ' download can be found here: <https://dl.dpp.dev/' . $version . '>';
|
||||
echo "\n";
|
||||
}
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Dpp\Generator;
|
||||
|
||||
use Dpp\StructGeneratorInterface;
|
||||
|
||||
/**
|
||||
* Generate header and .cpp file for coroutine calls (starting with 'co_')
|
||||
*/
|
||||
class CoroGenerator implements StructGeneratorInterface
|
||||
{
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateHeaderStart(): string
|
||||
{
|
||||
return <<<EOT
|
||||
/************************************************************************************
|
||||
*
|
||||
* D++, A Lightweight C++ library for Discord
|
||||
*
|
||||
* Copyright 2022 Craig Edwards and D++ contributors
|
||||
* (https://github.com/brainboxdotcc/DPP/graphs/contributors)
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
|
||||
/* Auto @generated by buildtools/make_coro_struct.php.
|
||||
*
|
||||
* DO NOT EDIT BY HAND!
|
||||
*
|
||||
* To re-generate this header file re-run the script!
|
||||
*/
|
||||
|
||||
EOT;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateCppStart(): string
|
||||
{
|
||||
return $this->generateHeaderStart() . <<<EOT
|
||||
|
||||
#include <dpp/export.h>
|
||||
#include <dpp/snowflake.h>
|
||||
#include <dpp/cluster.h>
|
||||
#include <dpp/coro.h>
|
||||
|
||||
namespace dpp {
|
||||
|
||||
|
||||
EOT;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function checkForChanges(): bool
|
||||
{
|
||||
/* Check if we need to re-generate by comparing modification times */
|
||||
$us = file_exists('include/dpp/cluster_coro_calls.h') ? filemtime('include/dpp/cluster_coro_calls.h') : 0;
|
||||
$them = filemtime('include/dpp/cluster.h');
|
||||
if ($them <= $us) {
|
||||
echo "-- No change required.\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
echo "-- Autogenerating include/dpp/cluster_coro_calls.h\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateHeaderDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterNames): string
|
||||
{
|
||||
$parameterNames = preg_replace('/^, /', '', $parameterNames);
|
||||
if (!empty($parameterNames)) {
|
||||
$parameterNames .= ', ';
|
||||
}
|
||||
return "auto inline co_{$currentFunction}($noDefaults) {\n\treturn dpp::awaitable(this, [&] (auto cc) { this->$currentFunction({$parameterNames}cc); }); \n}\n\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateCppDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterNames): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function getCommentArray(): array
|
||||
{
|
||||
return [" * \memberof dpp::cluster"];
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function saveHeader(string $content): void
|
||||
{
|
||||
$content .= "auto inline co_request(const std::string &url, http_method method, const std::string &postdata = \"\", const std::string &mimetype = \"text/plain\", const std::multimap<std::string, std::string> &headers = {}) {\n\treturn dpp::awaitable(this, [&] (auto cc) { this->request(url, method, cc, mimetype, headers); }); \n}\n\n";
|
||||
file_put_contents('include/dpp/cluster_coro_calls.h', $content);
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function saveCpp(string $cppcontent): void
|
||||
{
|
||||
/* No cpp file to save, code is all inline */
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Dpp\Generator;
|
||||
|
||||
use Dpp\StructGeneratorInterface;
|
||||
|
||||
/**
|
||||
* Generate header and .cpp file for synchronous calls (ending in '_sync')
|
||||
*/
|
||||
class SyncGenerator implements StructGeneratorInterface
|
||||
{
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateHeaderStart(): string
|
||||
{
|
||||
return <<<EOT
|
||||
/************************************************************************************
|
||||
*
|
||||
* D++, A Lightweight C++ library for Discord
|
||||
*
|
||||
* Copyright 2022 Craig Edwards and D++ contributors
|
||||
* (https://github.com/brainboxdotcc/DPP/graphs/contributors)
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
|
||||
/* Auto @generated by buildtools/make_sync_struct.php.
|
||||
*
|
||||
* DO NOT EDIT BY HAND!
|
||||
*
|
||||
* To re-generate this header file re-run the script!
|
||||
*/
|
||||
|
||||
EOT;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateCppStart(): string
|
||||
{
|
||||
return $this->generateHeaderStart() . <<<EOT
|
||||
|
||||
#include <dpp/export.h>
|
||||
#include <dpp/snowflake.h>
|
||||
#include <dpp/cluster.h>
|
||||
|
||||
namespace dpp {
|
||||
|
||||
|
||||
EOT;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function checkForChanges(): bool
|
||||
{
|
||||
/* Check if we need to re-generate by comparing modification times */
|
||||
$us = file_exists('include/dpp/cluster_sync_calls.h') ? filemtime('include/dpp/cluster_sync_calls.h') : 0;
|
||||
$them = filemtime('include/dpp/cluster.h');
|
||||
if ($them <= $us) {
|
||||
echo "-- No change required.\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
echo "-- Autogenerating include/dpp/cluster_sync_calls.h\n";
|
||||
echo "-- Autogenerating src/dpp/cluster_sync_calls.cpp\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateHeaderDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterNames): string
|
||||
{
|
||||
return "$returnType {$currentFunction}_sync($parameters);\n\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function generateCppDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterNames): string
|
||||
{
|
||||
return "$returnType cluster::{$currentFunction}_sync($noDefaults) {\n\treturn dpp::sync<$returnType>(this, &cluster::$currentFunction$parameterNames);\n}\n\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function getCommentArray(): array
|
||||
{
|
||||
return [
|
||||
" * \memberof dpp::cluster",
|
||||
" * @throw dpp::rest_exception upon failure to execute REST function",
|
||||
" * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.",
|
||||
" * Avoid direct use of this function inside an event handler.",
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function saveHeader(string $content): void
|
||||
{
|
||||
file_put_contents('include/dpp/cluster_sync_calls.h', $content);
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
public function saveCpp(string $cppcontent): void
|
||||
{
|
||||
file_put_contents('src/dpp/cluster_sync_calls.cpp', $cppcontent);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Dpp;
|
||||
|
||||
/**
|
||||
* Represents a header/cpp generator used to auto-generate cpp/.h files.
|
||||
*/
|
||||
interface StructGeneratorInterface
|
||||
{
|
||||
/**
|
||||
* Generate the start of the header file
|
||||
*
|
||||
* @return string header content
|
||||
*/
|
||||
public function generateHeaderStart(): string;
|
||||
|
||||
/**
|
||||
* Generate the start of the cpp file
|
||||
*
|
||||
* @return string cpp content
|
||||
*/
|
||||
public function generateCppStart(): string;
|
||||
|
||||
/**
|
||||
* Check if the script should run and re-generate content or not
|
||||
*
|
||||
* @return string true if the script should run, false to exit
|
||||
*/
|
||||
public function checkForchanges(): bool;
|
||||
|
||||
/**
|
||||
* Generate header definition for a function
|
||||
*
|
||||
* @param string $returnType Return type of function
|
||||
* @param string $currentFunction Current function name
|
||||
* @param string $parameters Current function parameters with default values
|
||||
* @param string $noDefaults Current function parameters without default values
|
||||
* @param string $parameterNames Parameter names only
|
||||
* @return string header content to append
|
||||
*/
|
||||
public function generateHeaderDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterNames): string;
|
||||
|
||||
/**
|
||||
* Generate cpp definition for a function
|
||||
*
|
||||
* @param string $returnType Return type of function
|
||||
* @param string $currentFunction Current function name
|
||||
* @param string $parameters Current function parameters with default values
|
||||
* @param string $noDefaults Current function parameters without default values
|
||||
* @param string $parameterNames Parameter names only
|
||||
* @return string cpp content to append
|
||||
*/
|
||||
public function generateCppDef(string $returnType, string $currentFunction, string $parameters, string $noDefaults, string $parameterNames): string;
|
||||
|
||||
/**
|
||||
* Return comment lines to add to each header definition
|
||||
*
|
||||
* @return array Comment lines to add
|
||||
*/
|
||||
public function getCommentArray(): array;
|
||||
|
||||
/**
|
||||
* Save the .h file
|
||||
*
|
||||
* @param string $content Content to save
|
||||
*/
|
||||
public function saveHeader(string $content): void;
|
||||
|
||||
/**
|
||||
* Save the .cpp file
|
||||
*
|
||||
* @param string $cppcontent Content to save
|
||||
*/
|
||||
public function saveCpp(string $cppcontent): void;
|
||||
};
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Comment on and close all PRs targeted at master branch
|
||||
|
||||
// Magic sauce
|
||||
exec("gh pr list --base master | sed 's/\|/ /' |awk '{print $1}'", $master_prs);
|
||||
|
||||
foreach ($master_prs as $pr) {
|
||||
$pr = (int)$pr;
|
||||
if ($pr > 0) {
|
||||
system("gh pr comment $pr -b \"You have opened a PR against the master branch. PRs must target the \`dev\` branch, as such this PR has been automatically closed. Please re-target your PR against the dev branch if you reopen it. Thank you for your contribution.\"");
|
||||
system("gh pr close $pr");
|
||||
}
|
||||
}
|
||||
|
||||
// Tidy up the workflow run list so it isn't littered with these
|
||||
exec("gh run list -w \"Close master-targeted PRs\"", $runs);
|
||||
$runindex = 0;
|
||||
foreach ($runs as $run) {
|
||||
$run = preg_replace('/ /', ' ', $run);
|
||||
$data = preg_split('/\s+/', $run);
|
||||
$id = $data[sizeof($data) - 3];
|
||||
$id = (int)$id;
|
||||
if ($id > 0 && $runindex > 0) {
|
||||
// Delete all but the first completed workflow run and this one
|
||||
// (the first is the currently executing one!)
|
||||
exec("gh api repos/brainboxdotcc/DPP/actions/runs/$id -X DELETE");
|
||||
sleep(1);
|
||||
}
|
||||
$runindex++;
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"name": "brainboxdotcc/dpp",
|
||||
"description": "DPP Build Tools",
|
||||
"type": "project",
|
||||
"license": "Apache 2.0",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Dpp\\": "classes/"
|
||||
}
|
||||
},
|
||||
"authors": [
|
||||
{
|
||||
"name": "brain"
|
||||
}
|
||||
],
|
||||
"require": {}
|
||||
}
|
||||
|
|
@ -1,185 +0,0 @@
|
|||
<?php
|
||||
|
||||
chdir('buildtools');
|
||||
|
||||
require __DIR__ . '/vendor/autoload.php';
|
||||
|
||||
use Dpp\StructGeneratorInterface;
|
||||
|
||||
if (count($argv) < 2) {
|
||||
die("You must specify a generator type\n");
|
||||
} else {
|
||||
$generatorName = $argv[1];
|
||||
$generator = new $generatorName();
|
||||
}
|
||||
|
||||
chdir('..');
|
||||
|
||||
/* Get the content of all cluster source files into an array */
|
||||
exec("cat src/dpp/cluster/*.cpp", $clustercpp);
|
||||
|
||||
/* These methods have signatures incompatible with this script */
|
||||
$blacklist = [
|
||||
'channel_edit_permissions',
|
||||
'message_add_reaction',
|
||||
'message_delete_reaction',
|
||||
'message_delete_reaction_emoji',
|
||||
'message_delete_all_reactions',
|
||||
'message_delete_own_reaction',
|
||||
'message_get_reactions',
|
||||
'channel_typing',
|
||||
'application_role_connection_get', // TODO: rest_request_vector
|
||||
'application_role_connection_update',
|
||||
];
|
||||
|
||||
/* The script cannot determine the correct return type of these methods,
|
||||
* so we specify it by hand here.
|
||||
*/
|
||||
$forcedReturn = [
|
||||
'direct_message_create' => 'message',
|
||||
'guild_get_members' => 'guild_member_map',
|
||||
'guild_search_members' => 'guild_member_map',
|
||||
'message_create' => 'message',
|
||||
'message_edit' => 'message',
|
||||
'thread_create_in_forum' => 'thread',
|
||||
];
|
||||
|
||||
/* Get the contents of cluster.h into an array */
|
||||
$header = explode("\n", file_get_contents('include/dpp/cluster.h'));
|
||||
|
||||
/* Finite state machine state constants */
|
||||
const STATE_SEARCH_FOR_FUNCTION = 0;
|
||||
const STATE_IN_FUNCTION = 1;
|
||||
const STATE_END_OF_FUNCTION = 2;
|
||||
|
||||
$state = STATE_SEARCH_FOR_FUNCTION;
|
||||
$currentFunction = $parameters = $returnType = '';
|
||||
$content = $generator->generateHeaderStart();
|
||||
$cppcontent = $generator->generatecppStart();
|
||||
|
||||
if (!$generator->checkForChanges()) {
|
||||
exit(0);
|
||||
}
|
||||
|
||||
/* Scan every line of the C++ source */
|
||||
foreach ($clustercpp as $cpp) {
|
||||
/* Look for declaration of function body */
|
||||
if ($state == STATE_SEARCH_FOR_FUNCTION &&
|
||||
preg_match('/^\s*void\s+cluster::([^(]+)\s*\((.*)command_completion_event_t\s*callback\s*\)/', $cpp, $matches)) {
|
||||
$currentFunction = $matches[1];
|
||||
$parameters = preg_replace('/,\s*$/', '', $matches[2]);
|
||||
if (!in_array($currentFunction, $blacklist)) {
|
||||
$state = STATE_IN_FUNCTION;
|
||||
}
|
||||
/* Scan function body */
|
||||
} elseif ($state == STATE_IN_FUNCTION) {
|
||||
/* End of function */
|
||||
if (preg_match('/^\}\s*$/', $cpp)) {
|
||||
$state = STATE_END_OF_FUNCTION;
|
||||
/* look for the return type of the method */
|
||||
} elseif (preg_match('/rest_request<([^>]+)>/', $cpp, $matches)) {
|
||||
/* rest_request<T> */
|
||||
$returnType = $matches[1];
|
||||
} elseif (preg_match('/rest_request_list<([^>]+)>/', $cpp, $matches)) {
|
||||
/* rest_request_list<T> */
|
||||
$returnType = $matches[1] . '_map';
|
||||
} elseif (preg_match('/callback\(confirmation_callback_t\(\w+, ([^(]+)\(.*, \w+\)\)/', $cpp, $matches)) {
|
||||
/* confirmation_callback_t */
|
||||
$returnType = $matches[1];
|
||||
} elseif (!empty($forcedReturn[$currentFunction])) {
|
||||
/* Forced return type */
|
||||
$returnType = $forcedReturn[$currentFunction];
|
||||
}
|
||||
}
|
||||
/* Completed parsing of function body */
|
||||
if ($state == STATE_END_OF_FUNCTION && !empty($currentFunction) && !empty($returnType)) {
|
||||
if (!in_array($currentFunction, $blacklist)) {
|
||||
$parameterList = explode(',', $parameters);
|
||||
$parameterNames = [];
|
||||
foreach ($parameterList as $parameter) {
|
||||
$parts = explode(' ', trim($parameter));
|
||||
$parameterNames[] = trim(preg_replace('/[\s\*\&]+/', '', $parts[count($parts) - 1]));
|
||||
}
|
||||
$content .= getComments($generator, $currentFunction, $returnType, $parameterNames) . "\n";
|
||||
$fullParameters = getFullParameters($currentFunction, $parameterNames);
|
||||
$parameterNames = trim(join(', ', $parameterNames));
|
||||
if (!empty($parameterNames)) {
|
||||
$parameterNames = ', ' . $parameterNames;
|
||||
}
|
||||
$noDefaults = $parameters;
|
||||
$parameters = !empty($fullParameters) ? $fullParameters : $parameters;
|
||||
$content .= $generator->generateHeaderDef($returnType, $currentFunction, $parameters, $noDefaults, $parameterNames);
|
||||
$cppcontent .= $generator->generateCppDef($returnType, $currentFunction, $parameters, $noDefaults, $parameterNames);
|
||||
}
|
||||
$currentFunction = $parameters = $returnType = '';
|
||||
$state = STATE_SEARCH_FOR_FUNCTION;
|
||||
}
|
||||
}
|
||||
$content .= <<<EOT
|
||||
|
||||
/* End of auto-generated definitions */
|
||||
|
||||
EOT;
|
||||
$cppcontent .= <<<EOT
|
||||
|
||||
};
|
||||
|
||||
/* End of auto-generated definitions */
|
||||
|
||||
EOT;
|
||||
|
||||
/**
|
||||
* @brief Get parameters of a function with defaults
|
||||
* @param string $currentFunction Current function name
|
||||
* @param array $parameters Parameter names
|
||||
* @return string Parameter list
|
||||
*/
|
||||
function getFullParameters(string $currentFunction, array $parameters): string
|
||||
{
|
||||
global $header;
|
||||
foreach ($header as $line) {
|
||||
if (preg_match('/^\s*void\s+' . $currentFunction . '\s*\((.*' . join('.*', $parameters) . '.*)command_completion_event_t\s*callback\s*/', $line, $matches)) {
|
||||
return preg_replace('/,\s*$/', '', $matches[1]);
|
||||
}
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get the comment block of a function.
|
||||
* Adds see/return doxygen tags
|
||||
* @param string $currentFunction function name
|
||||
* @param string $returnType Return type of function
|
||||
* @param array $parameters Parameter names
|
||||
* @return string Comment block
|
||||
*/
|
||||
function getComments(StructGeneratorInterface $generator, string $currentFunction, string $returnType, array $parameters): string
|
||||
{
|
||||
global $header;
|
||||
/* First find the function */
|
||||
foreach ($header as $i => $line) {
|
||||
if (preg_match('/^\s*void\s+' . $currentFunction . '\s*\(.*' . join('.*', $parameters) . '.*command_completion_event_t\s*callback\s*/', $line)) {
|
||||
/* Backpeddle */
|
||||
$lineIndex = 1;
|
||||
for ($n = $i; $n != 0; --$n, $lineIndex++) {
|
||||
$header[$n] = preg_replace('/^\t+/', '', $header[$n]);
|
||||
$header[$n] = preg_replace('/@see (.+?)$/', '@see dpp::cluster::' . $currentFunction . "\n * @see \\1", $header[$n]);
|
||||
$header[$n] = preg_replace('/@param callback .*$/', '@return ' . $returnType . ' returned object on completion', $header[$n]);
|
||||
if (preg_match('/\s*\* On success /i', $header[$n])) {
|
||||
$header[$n] = "";
|
||||
}
|
||||
if (preg_match('/\s*\/\*\*\s*$/', $header[$n])) {
|
||||
$part = array_slice($header, $n, $lineIndex - 1);
|
||||
array_splice($part, count($part) - 1, 0, $generator->getCommentArray());
|
||||
return str_replace("\n\n", "\n", join("\n", $part));
|
||||
}
|
||||
}
|
||||
return '';
|
||||
}
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
/* Finished parsing, output autogenerated files */
|
||||
$generator->saveHeader($content);
|
||||
$generator->savecpp($cppcontent);
|
||||
12
DPP/buildtools/vendor/autoload.php
vendored
12
DPP/buildtools/vendor/autoload.php
vendored
|
|
@ -1,12 +0,0 @@
|
|||
<?php
|
||||
|
||||
// autoload.php @generated by Composer
|
||||
|
||||
if (PHP_VERSION_ID < 50600) {
|
||||
echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit0e8415491642f27914717986db49b1db::getLoader();
|
||||
572
DPP/buildtools/vendor/composer/ClassLoader.php
vendored
572
DPP/buildtools/vendor/composer/ClassLoader.php
vendored
|
|
@ -1,572 +0,0 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of Composer.
|
||||
*
|
||||
* (c) Nils Adermann <naderman@naderman.de>
|
||||
* Jordi Boggiano <j.boggiano@seld.be>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
/**
|
||||
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
|
||||
*
|
||||
* $loader = new \Composer\Autoload\ClassLoader();
|
||||
*
|
||||
* // register classes with namespaces
|
||||
* $loader->add('Symfony\Component', __DIR__.'/component');
|
||||
* $loader->add('Symfony', __DIR__.'/framework');
|
||||
*
|
||||
* // activate the autoloader
|
||||
* $loader->register();
|
||||
*
|
||||
* // to enable searching the include path (eg. for PEAR packages)
|
||||
* $loader->setUseIncludePath(true);
|
||||
*
|
||||
* In this example, if you try to use a class in the Symfony\Component
|
||||
* namespace or one of its children (Symfony\Component\Console for instance),
|
||||
* the autoloader will first look for the class under the component/
|
||||
* directory, and it will then fallback to the framework/ directory if not
|
||||
* found before giving up.
|
||||
*
|
||||
* This class is loosely based on the Symfony UniversalClassLoader.
|
||||
*
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
* @author Jordi Boggiano <j.boggiano@seld.be>
|
||||
* @see https://www.php-fig.org/psr/psr-0/
|
||||
* @see https://www.php-fig.org/psr/psr-4/
|
||||
*/
|
||||
class ClassLoader
|
||||
{
|
||||
/** @var ?string */
|
||||
private $vendorDir;
|
||||
|
||||
// PSR-4
|
||||
/**
|
||||
* @var array[]
|
||||
* @psalm-var array<string, array<string, int>>
|
||||
*/
|
||||
private $prefixLengthsPsr4 = array();
|
||||
/**
|
||||
* @var array[]
|
||||
* @psalm-var array<string, array<int, string>>
|
||||
*/
|
||||
private $prefixDirsPsr4 = array();
|
||||
/**
|
||||
* @var array[]
|
||||
* @psalm-var array<string, string>
|
||||
*/
|
||||
private $fallbackDirsPsr4 = array();
|
||||
|
||||
// PSR-0
|
||||
/**
|
||||
* @var array[]
|
||||
* @psalm-var array<string, array<string, string[]>>
|
||||
*/
|
||||
private $prefixesPsr0 = array();
|
||||
/**
|
||||
* @var array[]
|
||||
* @psalm-var array<string, string>
|
||||
*/
|
||||
private $fallbackDirsPsr0 = array();
|
||||
|
||||
/** @var bool */
|
||||
private $useIncludePath = false;
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
* @psalm-var array<string, string>
|
||||
*/
|
||||
private $classMap = array();
|
||||
|
||||
/** @var bool */
|
||||
private $classMapAuthoritative = false;
|
||||
|
||||
/**
|
||||
* @var bool[]
|
||||
* @psalm-var array<string, bool>
|
||||
*/
|
||||
private $missingClasses = array();
|
||||
|
||||
/** @var ?string */
|
||||
private $apcuPrefix;
|
||||
|
||||
/**
|
||||
* @var self[]
|
||||
*/
|
||||
private static $registeredLoaders = array();
|
||||
|
||||
/**
|
||||
* @param ?string $vendorDir
|
||||
*/
|
||||
public function __construct($vendorDir = null)
|
||||
{
|
||||
$this->vendorDir = $vendorDir;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string[]
|
||||
*/
|
||||
public function getPrefixes()
|
||||
{
|
||||
if (!empty($this->prefixesPsr0)) {
|
||||
return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
|
||||
}
|
||||
|
||||
return array();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array[]
|
||||
* @psalm-return array<string, array<int, string>>
|
||||
*/
|
||||
public function getPrefixesPsr4()
|
||||
{
|
||||
return $this->prefixDirsPsr4;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array[]
|
||||
* @psalm-return array<string, string>
|
||||
*/
|
||||
public function getFallbackDirs()
|
||||
{
|
||||
return $this->fallbackDirsPsr0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array[]
|
||||
* @psalm-return array<string, string>
|
||||
*/
|
||||
public function getFallbackDirsPsr4()
|
||||
{
|
||||
return $this->fallbackDirsPsr4;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string[] Array of classname => path
|
||||
* @psalm-return array<string, string>
|
||||
*/
|
||||
public function getClassMap()
|
||||
{
|
||||
return $this->classMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string[] $classMap Class to filename map
|
||||
* @psalm-param array<string, string> $classMap
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function addClassMap(array $classMap)
|
||||
{
|
||||
if ($this->classMap) {
|
||||
$this->classMap = array_merge($this->classMap, $classMap);
|
||||
} else {
|
||||
$this->classMap = $classMap;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a set of PSR-0 directories for a given prefix, either
|
||||
* appending or prepending to the ones previously set for this prefix.
|
||||
*
|
||||
* @param string $prefix The prefix
|
||||
* @param string[]|string $paths The PSR-0 root directories
|
||||
* @param bool $prepend Whether to prepend the directories
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function add($prefix, $paths, $prepend = false)
|
||||
{
|
||||
if (!$prefix) {
|
||||
if ($prepend) {
|
||||
$this->fallbackDirsPsr0 = array_merge(
|
||||
(array) $paths,
|
||||
$this->fallbackDirsPsr0
|
||||
);
|
||||
} else {
|
||||
$this->fallbackDirsPsr0 = array_merge(
|
||||
$this->fallbackDirsPsr0,
|
||||
(array) $paths
|
||||
);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$first = $prefix[0];
|
||||
if (!isset($this->prefixesPsr0[$first][$prefix])) {
|
||||
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
|
||||
|
||||
return;
|
||||
}
|
||||
if ($prepend) {
|
||||
$this->prefixesPsr0[$first][$prefix] = array_merge(
|
||||
(array) $paths,
|
||||
$this->prefixesPsr0[$first][$prefix]
|
||||
);
|
||||
} else {
|
||||
$this->prefixesPsr0[$first][$prefix] = array_merge(
|
||||
$this->prefixesPsr0[$first][$prefix],
|
||||
(array) $paths
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a set of PSR-4 directories for a given namespace, either
|
||||
* appending or prepending to the ones previously set for this namespace.
|
||||
*
|
||||
* @param string $prefix The prefix/namespace, with trailing '\\'
|
||||
* @param string[]|string $paths The PSR-4 base directories
|
||||
* @param bool $prepend Whether to prepend the directories
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function addPsr4($prefix, $paths, $prepend = false)
|
||||
{
|
||||
if (!$prefix) {
|
||||
// Register directories for the root namespace.
|
||||
if ($prepend) {
|
||||
$this->fallbackDirsPsr4 = array_merge(
|
||||
(array) $paths,
|
||||
$this->fallbackDirsPsr4
|
||||
);
|
||||
} else {
|
||||
$this->fallbackDirsPsr4 = array_merge(
|
||||
$this->fallbackDirsPsr4,
|
||||
(array) $paths
|
||||
);
|
||||
}
|
||||
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
|
||||
// Register directories for a new namespace.
|
||||
$length = strlen($prefix);
|
||||
if ('\\' !== $prefix[$length - 1]) {
|
||||
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
|
||||
}
|
||||
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
|
||||
$this->prefixDirsPsr4[$prefix] = (array) $paths;
|
||||
} elseif ($prepend) {
|
||||
// Prepend directories for an already registered namespace.
|
||||
$this->prefixDirsPsr4[$prefix] = array_merge(
|
||||
(array) $paths,
|
||||
$this->prefixDirsPsr4[$prefix]
|
||||
);
|
||||
} else {
|
||||
// Append directories for an already registered namespace.
|
||||
$this->prefixDirsPsr4[$prefix] = array_merge(
|
||||
$this->prefixDirsPsr4[$prefix],
|
||||
(array) $paths
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a set of PSR-0 directories for a given prefix,
|
||||
* replacing any others previously set for this prefix.
|
||||
*
|
||||
* @param string $prefix The prefix
|
||||
* @param string[]|string $paths The PSR-0 base directories
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function set($prefix, $paths)
|
||||
{
|
||||
if (!$prefix) {
|
||||
$this->fallbackDirsPsr0 = (array) $paths;
|
||||
} else {
|
||||
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a set of PSR-4 directories for a given namespace,
|
||||
* replacing any others previously set for this namespace.
|
||||
*
|
||||
* @param string $prefix The prefix/namespace, with trailing '\\'
|
||||
* @param string[]|string $paths The PSR-4 base directories
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setPsr4($prefix, $paths)
|
||||
{
|
||||
if (!$prefix) {
|
||||
$this->fallbackDirsPsr4 = (array) $paths;
|
||||
} else {
|
||||
$length = strlen($prefix);
|
||||
if ('\\' !== $prefix[$length - 1]) {
|
||||
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
|
||||
}
|
||||
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
|
||||
$this->prefixDirsPsr4[$prefix] = (array) $paths;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Turns on searching the include path for class files.
|
||||
*
|
||||
* @param bool $useIncludePath
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setUseIncludePath($useIncludePath)
|
||||
{
|
||||
$this->useIncludePath = $useIncludePath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Can be used to check if the autoloader uses the include path to check
|
||||
* for classes.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function getUseIncludePath()
|
||||
{
|
||||
return $this->useIncludePath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Turns off searching the prefix and fallback directories for classes
|
||||
* that have not been registered with the class map.
|
||||
*
|
||||
* @param bool $classMapAuthoritative
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setClassMapAuthoritative($classMapAuthoritative)
|
||||
{
|
||||
$this->classMapAuthoritative = $classMapAuthoritative;
|
||||
}
|
||||
|
||||
/**
|
||||
* Should class lookup fail if not found in the current class map?
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isClassMapAuthoritative()
|
||||
{
|
||||
return $this->classMapAuthoritative;
|
||||
}
|
||||
|
||||
/**
|
||||
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
|
||||
*
|
||||
* @param string|null $apcuPrefix
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function setApcuPrefix($apcuPrefix)
|
||||
{
|
||||
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The APCu prefix in use, or null if APCu caching is not enabled.
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
public function getApcuPrefix()
|
||||
{
|
||||
return $this->apcuPrefix;
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function register($prepend = false)
|
||||
{
|
||||
spl_autoload_register(array($this, 'loadClass'), true, $prepend);
|
||||
|
||||
if (null === $this->vendorDir) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($prepend) {
|
||||
self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
|
||||
} else {
|
||||
unset(self::$registeredLoaders[$this->vendorDir]);
|
||||
self::$registeredLoaders[$this->vendorDir] = $this;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters this instance as an autoloader.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function unregister()
|
||||
{
|
||||
spl_autoload_unregister(array($this, 'loadClass'));
|
||||
|
||||
if (null !== $this->vendorDir) {
|
||||
unset(self::$registeredLoaders[$this->vendorDir]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the given class or interface.
|
||||
*
|
||||
* @param string $class The name of the class
|
||||
* @return true|null True if loaded, null otherwise
|
||||
*/
|
||||
public function loadClass($class)
|
||||
{
|
||||
if ($file = $this->findFile($class)) {
|
||||
includeFile($file);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds the path to the file where the class is defined.
|
||||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return string|false The path if found, false otherwise
|
||||
*/
|
||||
public function findFile($class)
|
||||
{
|
||||
// class map lookup
|
||||
if (isset($this->classMap[$class])) {
|
||||
return $this->classMap[$class];
|
||||
}
|
||||
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
|
||||
return false;
|
||||
}
|
||||
if (null !== $this->apcuPrefix) {
|
||||
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
|
||||
if ($hit) {
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
|
||||
$file = $this->findFileWithExtension($class, '.php');
|
||||
|
||||
// Search for Hack files if we are running on HHVM
|
||||
if (false === $file && defined('HHVM_VERSION')) {
|
||||
$file = $this->findFileWithExtension($class, '.hh');
|
||||
}
|
||||
|
||||
if (null !== $this->apcuPrefix) {
|
||||
apcu_add($this->apcuPrefix.$class, $file);
|
||||
}
|
||||
|
||||
if (false === $file) {
|
||||
// Remember that this class does not exist.
|
||||
$this->missingClasses[$class] = true;
|
||||
}
|
||||
|
||||
return $file;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the currently registered loaders indexed by their corresponding vendor directories.
|
||||
*
|
||||
* @return self[]
|
||||
*/
|
||||
public static function getRegisteredLoaders()
|
||||
{
|
||||
return self::$registeredLoaders;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $class
|
||||
* @param string $ext
|
||||
* @return string|false
|
||||
*/
|
||||
private function findFileWithExtension($class, $ext)
|
||||
{
|
||||
// PSR-4 lookup
|
||||
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
|
||||
|
||||
$first = $class[0];
|
||||
if (isset($this->prefixLengthsPsr4[$first])) {
|
||||
$subPath = $class;
|
||||
while (false !== $lastPos = strrpos($subPath, '\\')) {
|
||||
$subPath = substr($subPath, 0, $lastPos);
|
||||
$search = $subPath . '\\';
|
||||
if (isset($this->prefixDirsPsr4[$search])) {
|
||||
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
|
||||
foreach ($this->prefixDirsPsr4[$search] as $dir) {
|
||||
if (file_exists($file = $dir . $pathEnd)) {
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// PSR-4 fallback dirs
|
||||
foreach ($this->fallbackDirsPsr4 as $dir) {
|
||||
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
|
||||
// PSR-0 lookup
|
||||
if (false !== $pos = strrpos($class, '\\')) {
|
||||
// namespaced class name
|
||||
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
|
||||
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
|
||||
} else {
|
||||
// PEAR-like class name
|
||||
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
|
||||
}
|
||||
|
||||
if (isset($this->prefixesPsr0[$first])) {
|
||||
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
|
||||
if (0 === strpos($class, $prefix)) {
|
||||
foreach ($dirs as $dir) {
|
||||
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// PSR-0 fallback dirs
|
||||
foreach ($this->fallbackDirsPsr0 as $dir) {
|
||||
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
|
||||
// PSR-0 include paths.
|
||||
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
|
||||
return $file;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Scope isolated include.
|
||||
*
|
||||
* Prevents access to $this/self from included files.
|
||||
*
|
||||
* @param string $file
|
||||
* @return void
|
||||
* @private
|
||||
*/
|
||||
function includeFile($file)
|
||||
{
|
||||
include $file;
|
||||
}
|
||||
21
DPP/buildtools/vendor/composer/LICENSE
vendored
21
DPP/buildtools/vendor/composer/LICENSE
vendored
|
|
@ -1,21 +0,0 @@
|
|||
|
||||
Copyright (c) Nils Adermann, Jordi Boggiano
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is furnished
|
||||
to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<?php
|
||||
|
||||
// autoload_classmap.php @generated by Composer
|
||||
|
||||
$vendorDir = dirname(__DIR__);
|
||||
$baseDir = dirname($vendorDir);
|
||||
|
||||
return array(
|
||||
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
|
||||
);
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?php
|
||||
|
||||
// autoload_namespaces.php @generated by Composer
|
||||
|
||||
$vendorDir = dirname(__DIR__);
|
||||
$baseDir = dirname($vendorDir);
|
||||
|
||||
return array(
|
||||
);
|
||||
10
DPP/buildtools/vendor/composer/autoload_psr4.php
vendored
10
DPP/buildtools/vendor/composer/autoload_psr4.php
vendored
|
|
@ -1,10 +0,0 @@
|
|||
<?php
|
||||
|
||||
// autoload_psr4.php @generated by Composer
|
||||
|
||||
$vendorDir = dirname(__DIR__);
|
||||
$baseDir = dirname($vendorDir);
|
||||
|
||||
return array(
|
||||
'Dpp\\' => array($baseDir . '/classes'),
|
||||
);
|
||||
36
DPP/buildtools/vendor/composer/autoload_real.php
vendored
36
DPP/buildtools/vendor/composer/autoload_real.php
vendored
|
|
@ -1,36 +0,0 @@
|
|||
<?php
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit0e8415491642f27914717986db49b1db
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
public static function loadClassLoader($class)
|
||||
{
|
||||
if ('Composer\Autoload\ClassLoader' === $class) {
|
||||
require __DIR__ . '/ClassLoader.php';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \Composer\Autoload\ClassLoader
|
||||
*/
|
||||
public static function getLoader()
|
||||
{
|
||||
if (null !== self::$loader) {
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit0e8415491642f27914717986db49b1db', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit0e8415491642f27914717986db49b1db', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit0e8415491642f27914717986db49b1db::getInitializer($loader));
|
||||
|
||||
$loader->register(true);
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
<?php
|
||||
|
||||
// autoload_static.php @generated by Composer
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit0e8415491642f27914717986db49b1db
|
||||
{
|
||||
public static $prefixLengthsPsr4 = array (
|
||||
'D' =>
|
||||
array (
|
||||
'Dpp\\' => 4,
|
||||
),
|
||||
);
|
||||
|
||||
public static $prefixDirsPsr4 = array (
|
||||
'Dpp\\' =>
|
||||
array (
|
||||
0 => __DIR__ . '/../..' . '/classes',
|
||||
),
|
||||
);
|
||||
|
||||
public static $classMap = array (
|
||||
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
|
||||
);
|
||||
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit0e8415491642f27914717986db49b1db::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit0e8415491642f27914717986db49b1db::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit0e8415491642f27914717986db49b1db::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
SET(CMAKE_SYSTEM_NAME Linux)
|
||||
# Possibly needed tweak
|
||||
#SET(CMAKE_SYSTEM_PROCESSOR aarch64)
|
||||
|
||||
SET(CMAKE_C_COMPILER ${COMPILER_ROOT}/aarch64-linux-gnu-gcc-8)
|
||||
SET(CMAKE_CXX_COMPILER ${COMPILER_ROOT}/aarch64-linux-gnu-g++-8)
|
||||
|
||||
# Below call is necessary to avoid non-RT problem.
|
||||
SET(CMAKE_LIBRARY_ARCHITECTURE aarch64-linux-gnu)
|
||||
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE aarch64)
|
||||
SET(CPACK_RPM_PACKAGE_ARCHITECTURE aarch64)
|
||||
|
||||
SET(RASPBERRY_ROOT_PATH ${CMAKE_SOURCE_DIR}/arm_raspberry)
|
||||
SET(RASPBERRY_KINETIC_PATH ${RASPBERRY_ROOT_PATH}/opt/ros/kinetic)
|
||||
|
||||
SET(CMAKE_FIND_ROOT_PATH ${RASPBERRY_ROOT_PATH} ${CATKIN_DEVEL_PREFIX})
|
||||
|
||||
#If you have installed cross compiler to somewhere else, please specify that path.
|
||||
SET(COMPILER_ROOT /usr/bin)
|
||||
|
||||
#Have to set this one to BOTH, to allow CMake to find rospack
|
||||
#This set of variables controls whether the CMAKE_FIND_ROOT_PATH and CMAKE_SYSROOT are used for find_xxx() operations.
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
/usr/include/aarch64-linux-gnu)
|
||||
|
||||
SET(ZLIB_LIBRARY /lib/aarch64-linux-gnu/libz.so.1.2.11)
|
||||
SET(OPENSSL_CRYPTO_LIBRARY /usr/lib/aarch64-linux-gnu/libcrypto.so)
|
||||
SET(OPENSSL_SSL_LIBRARY /usr/lib/aarch64-linux-gnu/libssl.so)
|
||||
|
||||
SET(CMAKE_PREFIX_PATH ${RASPBERRY_KINETIC_PATH} ${RASPBERRY_ROOT_PATH}/usr)
|
||||
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -Wno-psabi" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -Wno-psabi" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -ldl" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -ldl" CACHE INTERNAL "" FORCE)
|
||||
|
||||
SET(LD_LIBRARY_PATH ${RASPBERRY_KINETIC_PATH}/lib)
|
||||
|
||||
EXECUTE_PROCESS(COMMAND printf "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main multiverse restricted universe\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main multiverse restricted universe\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main multiverse restricted universe\ndeb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main multiverse restricted universe\ndeb [arch=amd64] http://security.ubuntu.com/ubuntu/ focal-security main multiverse restricted universe"
|
||||
OUTPUT_FILE TMPFILE)
|
||||
EXECUTE_PROCESS(COMMAND sudo mv TMPFILE /etc/apt/sources.list)
|
||||
EXECUTE_PROCESS(COMMAND sudo dpkg --add-architecture arm64)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt-add-repository -y ppa:canonical-kernel-team/ppa)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt update)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt install -y cmake ninja-build gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu libc6-dev-arm64-cross zlib1g-dev:arm64 libssl-dev:arm64 libopus-dev:arm64 libsodium-dev:arm64)
|
||||
EXECUTE_PROCESS(COMMAND sudo mv /usr/lib/aarch64-linux-gnu/pkgconfig/libsodium.pc /usr/lib/pkgconfig/)
|
||||
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
SET(CMAKE_SYSTEM_NAME Linux)
|
||||
# Possibly needed tweak
|
||||
#SET(CMAKE_SYSTEM_PROCESSOR armhf)
|
||||
|
||||
#If you have installed cross compiler to somewhere else, please specify that path.
|
||||
SET(COMPILER_ROOT /opt/cross-pi-gcc)
|
||||
|
||||
SET(CMAKE_C_COMPILER ${COMPILER_ROOT}/bin/arm-linux-gnueabihf-gcc-8.3.0)
|
||||
SET(CMAKE_CXX_COMPILER ${COMPILER_ROOT}/bin/arm-linux-gnueabihf-g++)
|
||||
|
||||
# Below call is necessary to avoid non-RT problem.
|
||||
SET(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf)
|
||||
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf)
|
||||
SET(CPACK_RPM_PACKAGE_ARCHITECTURE armhf)
|
||||
|
||||
SET(RASPBERRY_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}/arm_raspberry)
|
||||
SET(RASPBERRY_KINETIC_PATH ${RASPBERRY_ROOT_PATH}/opt/ros/kinetic)
|
||||
|
||||
SET(CMAKE_FIND_ROOT_PATH ${RASPBERRY_ROOT_PATH} ${CATKIN_DEVEL_PREFIX})
|
||||
|
||||
|
||||
#Have to set this one to BOTH, to allow CMake to find rospack
|
||||
#This set of variables controls whether the CMAKE_FIND_ROOT_PATH and CMAKE_SYSROOT are used for find_xxx() operations.
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
|
||||
SET(CMAKE_PREFIX_PATH ${RASPBERRY_KINETIC_PATH} ${RASPBERRY_ROOT_PATH}/usr)
|
||||
|
||||
UNSET(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES)
|
||||
UNSET(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES)
|
||||
|
||||
SET(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
|
||||
INCLUDE_DIRECTORIES(
|
||||
${COMPILER_ROOT}/arm-linux-gnueabihf/libc/usr/include
|
||||
${COMPILER_ROOT}/arm-linux-gnueabihf/include
|
||||
${COMPILER_ROOT}/arm-linux-gnueabihf/include/c++/8.3.0
|
||||
${COMPILER_ROOT}/arm-linux-gnueabihf/include/c++/8.3.0/arm-linux-gnueabihf
|
||||
${COMPILER_ROOT}/lib/gcc/arm-linux-gnueabihf/8.3.0/include
|
||||
${COMPILER_ROOT}/lib/gcc/arm-linux-gnueabihf/8.3.0/include-fixed
|
||||
${CMAKE_SOURCE_DIR}/rootfs/usr/include/arm-linux-gnueabihf)
|
||||
SET(CMAKE_INCLUDE_DIRECTORIES_BEFORE OFF)
|
||||
|
||||
SET(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/rootfs/lib/arm-linux-gnueabihf/libz.so.1.2.11)
|
||||
SET(OPENSSL_CRYPTO_LIBRARY ${CMAKE_SOURCE_DIR}/rootfs/usr/lib/arm-linux-gnueabihf/libcrypto.so.1.1)
|
||||
SET(OPENSSL_SSL_LIBRARY ${CMAKE_SOURCE_DIR}/rootfs/usr/lib/arm-linux-gnueabihf/libssl.so.1.1)
|
||||
|
||||
SET(CMAKE_CXX_COMPILER_WORKS 1)
|
||||
SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -nostdinc --sysroot=${RASPBERRY_ROOT_PATH} -Wno-psabi " CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -nostdinc -nostdinc++ --sysroot=${RASPBERRY_ROOT_PATH} -Wno-psabi " CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -ldl" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -ldl" CACHE INTERNAL "" FORCE)
|
||||
|
||||
SET(LD_LIBRARY_PATH ${RASPBERRY_KINETIC_PATH}/lib)
|
||||
|
||||
EXECUTE_PROCESS(COMMAND wget -P ${CMAKE_SOURCE_DIR}/rootfs -q http://content.dpp.dev/zlib1g_1.2.11.dfsg-1_armhf.deb http://content.dpp.dev/zlib1g-dev_1.2.11.dfsg-1_armhf.deb http://content.dpp.dev/libssl1.1_1.1.1m-1_armhf.deb http://content.dpp.dev/libssl-dev_1.1.1m-1_armhf.deb https://content.dpp.dev/raspi-toolchain.tar.gz)
|
||||
|
||||
EXECUTE_PROCESS(
|
||||
COMMAND tar -xzf ${CMAKE_SOURCE_DIR}/rootfs/raspi-toolchain.tar.gz -C /opt
|
||||
COMMAND sudo dpkg-deb -x ${CMAKE_SOURCE_DIR}/rootfs/zlib1g-dev_1.2.11.dfsg-1_armhf.deb ${CMAKE_SOURCE_DIR}/rootfs
|
||||
COMMAND sudo dpkg-deb -x ${CMAKE_SOURCE_DIR}/rootfs/zlib1g_1.2.11.dfsg-1_armhf.deb ${CMAKE_SOURCE_DIR}/rootfs
|
||||
COMMAND sudo dpkg-deb -x ${CMAKE_SOURCE_DIR}/rootfs/libssl-dev_1.1.1m-1_armhf.deb ${CMAKE_SOURCE_DIR}/rootfs
|
||||
COMMAND sudo dpkg-deb -x ${CMAKE_SOURCE_DIR}/rootfs/libssl1.1_1.1.1m-1_armhf.deb ${CMAKE_SOURCE_DIR}/rootfs)
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
SET(CMAKE_SYSTEM_NAME Linux)
|
||||
# Possibly needed tweak
|
||||
#SET(CMAKE_SYSTEM_PROCESSOR armhf)
|
||||
|
||||
SET(CMAKE_C_COMPILER ${COMPILER_ROOT}/arm-linux-gnueabihf-gcc-8)
|
||||
SET(CMAKE_CXX_COMPILER ${COMPILER_ROOT}/arm-linux-gnueabihf-g++-8)
|
||||
|
||||
# Below call is necessary to avoid non-RT problem.
|
||||
SET(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf)
|
||||
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf)
|
||||
SET(CPACK_RPM_PACKAGE_ARCHITECTURE armhf)
|
||||
|
||||
SET(RASPBERRY_ROOT_PATH ${CMAKE_SOURCE_DIR}/arm_raspberry)
|
||||
SET(RASPBERRY_KINETIC_PATH ${RASPBERRY_ROOT_PATH}/opt/ros/kinetic)
|
||||
|
||||
SET(CMAKE_FIND_ROOT_PATH ${RASPBERRY_ROOT_PATH} ${CATKIN_DEVEL_PREFIX})
|
||||
|
||||
#If you have installed cross compiler to somewhere else, please specify that path.
|
||||
SET(COMPILER_ROOT /usr/bin)
|
||||
|
||||
#Have to set this one to BOTH, to allow CMake to find rospack
|
||||
#This set of variables controls whether the CMAKE_FIND_ROOT_PATH and CMAKE_SYSROOT are used for find_xxx() operations.
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
#SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
/usr/include/arm-linux-gnueabihf)
|
||||
|
||||
SET(ZLIB_LIBRARY /lib/arm-linux-gnueabihf/libz.so.1.2.11)
|
||||
SET(OPENSSL_CRYPTO_LIBRARY /usr/lib/arm-linux-gnueabihf/libcrypto.so.1.1)
|
||||
SET(OPENSSL_SSL_LIBRARY /usr/lib/arm-linux-gnueabihf/libssl.so.1.1)
|
||||
|
||||
SET(CMAKE_PREFIX_PATH ${RASPBERRY_KINETIC_PATH} ${RASPBERRY_ROOT_PATH}/usr)
|
||||
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -Wno-psabi" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -Wno-psabi" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -ldl" CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --sysroot=${RASPBERRY_ROOT_PATH} -ldl" CACHE INTERNAL "" FORCE)
|
||||
|
||||
SET(LD_LIBRARY_PATH ${RASPBERRY_KINETIC_PATH}/lib)
|
||||
|
||||
EXECUTE_PROCESS(COMMAND printf "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main multiverse restricted universe\ndeb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ focal main multiverse restricted universe\ndeb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main multiverse restricted universe\ndeb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main multiverse restricted universe\ndeb [arch=amd64] http://security.ubuntu.com/ubuntu/ focal-security main multiverse restricted universe"
|
||||
OUTPUT_FILE TMPFILE)
|
||||
EXECUTE_PROCESS(COMMAND sudo mv TMPFILE /etc/apt/sources.list)
|
||||
EXECUTE_PROCESS(COMMAND sudo dpkg --add-architecture armhf)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt update)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt install -y cmake ninja-build gcc-8-arm-linux-gnueabihf g++-8-arm-linux-gnueabihf zlib1g-dev:armhf libssl-dev:armhf libopus-dev:armhf libsodium-dev:armhf)
|
||||
EXECUTE_PROCESS(COMMAND sudo mv /usr/lib/arm-linux-gnueabihf/pkgconfig/libsodium.pc /usr/lib/pkgconfig/)
|
||||
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
include(GNUInstallDirs)
|
||||
set(DPP_EXPORT_NAME dpp)
|
||||
set(DPP_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${DPP_EXPORT_NAME})
|
||||
set(DPP_VERSION_FILE ${PROJECT_BINARY_DIR}/${DPP_EXPORT_NAME}-config-version.cmake)
|
||||
|
||||
# The three lines below are only used for windows builds
|
||||
set(DPP_VERSIONED ${DPP_EXPORT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
|
||||
set(DPP_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${DPP_VERSIONED})
|
||||
set(DPP_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}/${DPP_VERSIONED})
|
||||
|
||||
|
||||
## Pack the binary output
|
||||
if (WIN32)
|
||||
install(TARGETS dpp
|
||||
EXPORT ${DPP_EXPORT_NAME}
|
||||
LIBRARY DESTINATION ${DPP_INSTALL_LIBRARY_DIR}
|
||||
ARCHIVE DESTINATION ${DPP_INSTALL_LIBRARY_DIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
INCLUDES DESTINATION ${DPP_INSTALL_INCLUDE_DIR})
|
||||
install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/" DESTINATION "${DPP_INSTALL_INCLUDE_DIR}")
|
||||
else()
|
||||
install(TARGETS dpp
|
||||
EXPORT ${DPP_EXPORT_NAME}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBRARY_DIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBRARY_DIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
## Allow for a specific version to be chosen in the `find_package` command
|
||||
include(CMakePackageConfigHelpers)
|
||||
write_basic_package_version_file(${DPP_VERSION_FILE}
|
||||
VERSION ${PROJECT_VERSION}
|
||||
COMPATIBILITY SameMajorVersion)
|
||||
|
||||
## Include the file which allows `find_package(dpp)` to function.
|
||||
install(FILES "${CMAKE_SOURCE_DIR}/cmake/dpp-config.cmake" "${DPP_VERSION_FILE}" DESTINATION "${DPP_CMAKE_DIR}")
|
||||
|
||||
## Export the targets to allow other projects to easily include this project
|
||||
install(EXPORT "${DPP_EXPORT_NAME}" DESTINATION "${DPP_CMAKE_DIR}" NAMESPACE dpp::)
|
||||
|
||||
# Prepare information for packaging into .zip, .deb, .rpm
|
||||
## Project installation metadata
|
||||
set(CPACK_PACKAGE_NAME libdpp) # Name of generated file
|
||||
set(CPACK_PACKAGE_VENDOR Brainbox.cc) # Maker of the application
|
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An incredibly lightweight C++ Discord library")
|
||||
set(CPACK_PACKAGE_DESCRIPTION "An incredibly lightweight C++ Discord library")
|
||||
set(CPACK_PACKAGE_HOMEPAGE_URL "https://dpp.dev/")
|
||||
set(CPACK_FREEBSD_PACKAGE_MAINTAINER "bsd@dpp.dev")
|
||||
set(CPACK_FREEBSD_PACKAGE_ORIGIN "misc/libdpp")
|
||||
set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0")
|
||||
set(CPACK_PACKAGE_CONTACT "https://discord.gg/dpp") # D++ Development Discord
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsodium23 (>= 1.0.17-1), libopus0 (>= 1.3-1)")
|
||||
set(CPACK_RPM_PACKAGE_REQUIRES "libsodium >= 1.0.17, opus >= 1.3.1")
|
||||
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "An incredibly lightweight C++ Discord library")
|
||||
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
|
||||
set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
|
||||
|
||||
## Select generated based on what operating system
|
||||
if(WIN32)
|
||||
set(CPACK_GENERATOR ZIP)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(CPACK_GENERATOR "DEB;RPM")
|
||||
else()
|
||||
set(CPACK_GENERATOR "TBZ2")
|
||||
endif()
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
# OPUS_FOUND - system has opus
|
||||
# OPUS_INCLUDE_DIRS - the opus include directory
|
||||
# OPUS_LIBRARIES - The libraries needed to use opus
|
||||
|
||||
find_path(OPUS_INCLUDE_DIRS
|
||||
NAMES opus/opus.h
|
||||
PATH_SUFFIXES include
|
||||
)
|
||||
if(OPUS_INCLUDE_DIRS)
|
||||
set(HAVE_OPUS_OPUS_H 1)
|
||||
endif()
|
||||
|
||||
if(OPUS_USE_STATIC_LIBS)
|
||||
find_library(OPUS_LIBRARIES NAMES "libopus.a")
|
||||
else()
|
||||
find_library(OPUS_LIBRARIES NAMES opus)
|
||||
endif()
|
||||
|
||||
if(OPUS_LIBRARIES)
|
||||
if(OPUS_USE_STATIC_LIBS)
|
||||
find_library(LIBM NAMES "libm.a" "libm.tbd")
|
||||
else()
|
||||
find_library(LIBM NAMES m)
|
||||
endif()
|
||||
if(LIBM)
|
||||
list(APPEND OPUS_LIBRARIES ${LIBM})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(Opus
|
||||
DEFAULT_MSG
|
||||
OPUS_INCLUDE_DIRS OPUS_LIBRARIES HAVE_OPUS_OPUS_H
|
||||
)
|
||||
|
||||
mark_as_advanced(OPUS_INCLUDE_DIRS OPUS_LIBRARIES HAVE_OPUS_OPUS_H)
|
||||
|
|
@ -1,293 +0,0 @@
|
|||
# Written in 2016 by Henrik Steffen Gaßmann <henrik@gassmann.onl>
|
||||
#
|
||||
# To the extent possible under law, the author(s) have dedicated all copyright
|
||||
# and related and neighboring rights to this software to the public domain
|
||||
# worldwide. This software is distributed without any warranty.
|
||||
#
|
||||
# You should have received a copy of the CC0 Public Domain Dedication along with
|
||||
# this software. If not, see
|
||||
#
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/
|
||||
#
|
||||
# ##############################################################################
|
||||
# Tries to find the local libsodium installation.
|
||||
#
|
||||
# On Windows the sodium_DIR environment variable is used as a default hint which
|
||||
# can be overridden by setting the corresponding cmake variable.
|
||||
#
|
||||
# Once done the following variables will be defined:
|
||||
#
|
||||
# sodium_FOUND sodium_INCLUDE_DIR sodium_LIBRARY_DEBUG sodium_LIBRARY_RELEASE
|
||||
# sodium_VERSION_STRING
|
||||
#
|
||||
# Furthermore an imported "sodium" target is created.
|
||||
#
|
||||
|
||||
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
|
||||
set(_GCC_COMPATIBLE 1)
|
||||
endif()
|
||||
|
||||
# static library option
|
||||
if(NOT DEFINED sodium_USE_STATIC_LIBS)
|
||||
option(sodium_USE_STATIC_LIBS "enable to statically link against sodium" OFF)
|
||||
endif()
|
||||
if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
|
||||
unset(sodium_LIBRARY CACHE)
|
||||
unset(sodium_LIBRARY_DEBUG CACHE)
|
||||
unset(sodium_LIBRARY_RELEASE CACHE)
|
||||
unset(sodium_DLL_DEBUG CACHE)
|
||||
unset(sodium_DLL_RELEASE CACHE)
|
||||
set(sodium_USE_STATIC_LIBS_LAST
|
||||
${sodium_USE_STATIC_LIBS}
|
||||
CACHE INTERNAL "internal change tracking variable")
|
||||
endif()
|
||||
|
||||
# ##############################################################################
|
||||
# UNIX
|
||||
if(UNIX)
|
||||
# import pkg-config
|
||||
find_package(PkgConfig)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(sodium_PKG QUIET libsodium)
|
||||
endif()
|
||||
|
||||
if(sodium_USE_STATIC_LIBS)
|
||||
if(sodium_PKG_STATIC_LIBRARIES)
|
||||
foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
|
||||
if(NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending
|
||||
# with .a
|
||||
list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
|
||||
endif()
|
||||
endforeach()
|
||||
list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
|
||||
else()
|
||||
# if pkgconfig for libsodium doesn't provide static lib info, then
|
||||
# override PKG_STATIC here..
|
||||
set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
|
||||
endif()
|
||||
|
||||
set(XPREFIX sodium_PKG_STATIC)
|
||||
else()
|
||||
if(sodium_PKG_LIBRARIES STREQUAL "")
|
||||
set(sodium_PKG_LIBRARIES sodium)
|
||||
endif()
|
||||
|
||||
set(XPREFIX sodium_PKG)
|
||||
endif()
|
||||
|
||||
find_path(sodium_INCLUDE_DIR sodium.h HINTS ${${XPREFIX}_INCLUDE_DIRS})
|
||||
find_library(sodium_LIBRARY_DEBUG
|
||||
NAMES ${${XPREFIX}_LIBRARIES}
|
||||
HINTS ${${XPREFIX}_LIBRARY_DIRS})
|
||||
find_library(sodium_LIBRARY_RELEASE
|
||||
NAMES ${${XPREFIX}_LIBRARIES}
|
||||
HINTS ${${XPREFIX}_LIBRARY_DIRS})
|
||||
|
||||
# ############################################################################
|
||||
# Windows
|
||||
elseif(WIN32)
|
||||
set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory")
|
||||
mark_as_advanced(sodium_DIR)
|
||||
|
||||
find_path(sodium_INCLUDE_DIR sodium.h
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES include)
|
||||
|
||||
if(MSVC)
|
||||
# detect target architecture
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
|
||||
#if defined _M_IX86
|
||||
#error ARCH_VALUE x86_32
|
||||
#elif defined _M_X64
|
||||
#error ARCH_VALUE x86_64
|
||||
#endif
|
||||
#error ARCH_VALUE unknown
|
||||
]=])
|
||||
try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
|
||||
OUTPUT_VARIABLE _COMPILATION_LOG)
|
||||
string(REGEX
|
||||
REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*"
|
||||
"\\1"
|
||||
_TARGET_ARCH
|
||||
"${_COMPILATION_LOG}")
|
||||
|
||||
# construct library path
|
||||
if(_TARGET_ARCH STREQUAL "x86_32")
|
||||
string(APPEND _PLATFORM_PATH "Win32")
|
||||
elseif(_TARGET_ARCH STREQUAL "x86_64")
|
||||
string(APPEND _PLATFORM_PATH "x64")
|
||||
else()
|
||||
message(
|
||||
FATAL_ERROR
|
||||
"the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake."
|
||||
)
|
||||
endif()
|
||||
string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
|
||||
|
||||
if(MSVC_VERSION LESS 1900)
|
||||
math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
|
||||
else()
|
||||
math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
|
||||
endif()
|
||||
string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
|
||||
|
||||
if(sodium_USE_STATIC_LIBS)
|
||||
string(APPEND _PLATFORM_PATH "/static")
|
||||
else()
|
||||
string(APPEND _PLATFORM_PATH "/dynamic")
|
||||
endif()
|
||||
|
||||
string(REPLACE "$$CONFIG$$"
|
||||
"Debug"
|
||||
_DEBUG_PATH_SUFFIX
|
||||
"${_PLATFORM_PATH}")
|
||||
string(REPLACE "$$CONFIG$$"
|
||||
"Release"
|
||||
_RELEASE_PATH_SUFFIX
|
||||
"${_PLATFORM_PATH}")
|
||||
|
||||
find_library(sodium_LIBRARY_DEBUG libsodium.lib
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX})
|
||||
find_library(sodium_LIBRARY_RELEASE libsodium.lib
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX})
|
||||
if(NOT sodium_USE_STATIC_LIBS)
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES_BCK ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
|
||||
find_library(sodium_DLL_DEBUG libsodium
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX})
|
||||
find_library(sodium_DLL_RELEASE libsodium
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX})
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK})
|
||||
endif()
|
||||
|
||||
elseif(_GCC_COMPATIBLE)
|
||||
if(sodium_USE_STATIC_LIBS)
|
||||
find_library(sodium_LIBRARY_DEBUG libsodium.a
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES lib)
|
||||
find_library(sodium_LIBRARY_RELEASE libsodium.a
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES lib)
|
||||
else()
|
||||
find_library(sodium_LIBRARY_DEBUG libsodium.dll.a
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES lib)
|
||||
find_library(sodium_LIBRARY_RELEASE libsodium.dll.a
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES lib)
|
||||
|
||||
file(GLOB _DLL
|
||||
LIST_DIRECTORIES false
|
||||
RELATIVE "${sodium_DIR}/bin"
|
||||
"${sodium_DIR}/bin/libsodium*.dll")
|
||||
find_library(sodium_DLL_DEBUG ${_DLL} libsodium
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES bin)
|
||||
find_library(sodium_DLL_RELEASE ${_DLL} libsodium
|
||||
HINTS ${sodium_DIR}
|
||||
PATH_SUFFIXES bin)
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
|
||||
endif()
|
||||
|
||||
# ############################################################################
|
||||
# unsupported
|
||||
else()
|
||||
message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
|
||||
endif()
|
||||
|
||||
# ##############################################################################
|
||||
# common stuff
|
||||
|
||||
# extract sodium version
|
||||
if(sodium_INCLUDE_DIR)
|
||||
set(_VERSION_HEADER "${sodium_INCLUDE_DIR}/sodium/version.h")
|
||||
if(EXISTS "${_VERSION_HEADER}")
|
||||
file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
|
||||
string(
|
||||
REGEX
|
||||
REPLACE
|
||||
".*#define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*"
|
||||
"\\1"
|
||||
sodium_VERSION_STRING
|
||||
"${_VERSION_HEADER_CONTENT}")
|
||||
set(sodium_VERSION_STRING "${sodium_VERSION_STRING}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# communicate results
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(sodium
|
||||
REQUIRED_VARS
|
||||
sodium_LIBRARY_RELEASE
|
||||
sodium_LIBRARY_DEBUG
|
||||
sodium_INCLUDE_DIR
|
||||
VERSION_VAR
|
||||
sodium_VERSION_STRING)
|
||||
|
||||
# mark file paths as advanced
|
||||
mark_as_advanced(sodium_INCLUDE_DIR)
|
||||
mark_as_advanced(sodium_LIBRARY_DEBUG)
|
||||
mark_as_advanced(sodium_LIBRARY_RELEASE)
|
||||
if(WIN32)
|
||||
mark_as_advanced(sodium_DLL_DEBUG)
|
||||
mark_as_advanced(sodium_DLL_RELEASE)
|
||||
endif()
|
||||
|
||||
# create imported target
|
||||
if(sodium_USE_STATIC_LIBS)
|
||||
set(_LIB_TYPE STATIC)
|
||||
else()
|
||||
set(_LIB_TYPE SHARED)
|
||||
endif()
|
||||
add_library(sodium ${_LIB_TYPE} IMPORTED)
|
||||
|
||||
set_target_properties(sodium
|
||||
PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
|
||||
"${sodium_INCLUDE_DIR}"
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES
|
||||
"C")
|
||||
|
||||
if(sodium_USE_STATIC_LIBS)
|
||||
set_target_properties(sodium
|
||||
PROPERTIES INTERFACE_COMPILE_DEFINITIONS
|
||||
"SODIUM_STATIC"
|
||||
IMPORTED_LOCATION
|
||||
"${sodium_LIBRARY_RELEASE}"
|
||||
IMPORTED_LOCATION_DEBUG
|
||||
"${sodium_LIBRARY_DEBUG}")
|
||||
else()
|
||||
if(UNIX)
|
||||
set_target_properties(sodium
|
||||
PROPERTIES IMPORTED_LOCATION
|
||||
"${sodium_LIBRARY_RELEASE}"
|
||||
IMPORTED_LOCATION_DEBUG
|
||||
"${sodium_LIBRARY_DEBUG}")
|
||||
elseif(WIN32)
|
||||
set_target_properties(sodium
|
||||
PROPERTIES IMPORTED_IMPLIB
|
||||
"${sodium_LIBRARY_RELEASE}"
|
||||
IMPORTED_IMPLIB_DEBUG
|
||||
"${sodium_LIBRARY_DEBUG}")
|
||||
if(NOT (sodium_DLL_DEBUG MATCHES ".*-NOTFOUND"))
|
||||
set_target_properties(sodium
|
||||
PROPERTIES IMPORTED_LOCATION_DEBUG
|
||||
"${sodium_DLL_DEBUG}")
|
||||
endif()
|
||||
if(NOT (sodium_DLL_RELEASE MATCHES ".*-NOTFOUND"))
|
||||
set_target_properties(sodium
|
||||
PROPERTIES IMPORTED_LOCATION_RELWITHDEBINFO
|
||||
"${sodium_DLL_RELEASE}"
|
||||
IMPORTED_LOCATION_MINSIZEREL
|
||||
"${sodium_DLL_RELEASE}"
|
||||
IMPORTED_LOCATION_RELEASE
|
||||
"${sodium_DLL_RELEASE}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
SET(CMAKE_SYSTEM_NAME Linux)
|
||||
# Possibly needed tweak
|
||||
#SET(CMAKE_SYSTEM_PROCESSOR i386)
|
||||
|
||||
SET(CMAKE_C_COMPILER gcc-10)
|
||||
SET(CMAKE_CXX_COMPILER g++-10)
|
||||
|
||||
# Below call is necessary to avoid non-RT problem.
|
||||
SET(CMAKE_LIBRARY_ARCHITECTURE i386-linux-gnu)
|
||||
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
|
||||
SET(CPACK_RPM_PACKAGE_ARCHITECTURE i686)
|
||||
|
||||
#If you have installed cross compiler to somewhere else, please specify that path.
|
||||
SET(COMPILER_ROOT /usr/bin)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
/usr/include/i386-linux-gnu)
|
||||
|
||||
SET(ZLIB_LIBRARY /lib/i386-linux-gnu/libz.so.1.2.11)
|
||||
SET(OPENSSL_CRYPTO_LIBRARY /usr/lib/i386-linux-gnu/libcrypto.so)
|
||||
SET(OPENSSL_SSL_LIBRARY /usr/lib/i386-linux-gnu/libssl.so)
|
||||
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 " CACHE INTERNAL "" FORCE)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 " CACHE INTERNAL "" FORCE)
|
||||
|
||||
EXECUTE_PROCESS(COMMAND sudo dpkg --add-architecture i386)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt update)
|
||||
EXECUTE_PROCESS(COMMAND sudo apt install -y g++-10 gcc-10-multilib glibc-*:i386 libc6-dev-i386 g++-10-multilib zlib1g-dev:i386 libssl-dev:i386 libopus-dev:i386 libsodium-dev:i386)
|
||||
EXECUTE_PROCESS(COMMAND sudo mv /usr/lib/i386-linux-gnu/pkgconfig/libsodium.pc /usr/lib/pkgconfig/)
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
string(ASCII 27 Esc)
|
||||
set(ColourReset "${Esc}[m")
|
||||
set(ColourBold "${Esc}[1m")
|
||||
set(Red "${Esc}[31m")
|
||||
set(Green "${Esc}[32m")
|
||||
set(Yellow "${Esc}[33m")
|
||||
set(Blue "${Esc}[34m")
|
||||
set(Magenta "${Esc}[35m")
|
||||
set(Cyan "${Esc}[36m")
|
||||
set(White "${Esc}[37m")
|
||||
set(BoldRed "${Esc}[1;31m")
|
||||
set(BoldGreen "${Esc}[1;32m")
|
||||
set(BoldYellow "${Esc}[1;33m")
|
||||
set(BoldBlue "${Esc}[1;34m")
|
||||
set(BoldMagenta "${Esc}[1;35m")
|
||||
set(BoldCyan "${Esc}[1;36m")
|
||||
set(BoldWhite "${Esc}[1;37m")
|
||||
|
||||
message("Type ${Green}sudo make install${ColourReset} to install D++")
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
if (RUN_LDCONFIG)
|
||||
if(LDCONFIG_EXECUTABLE)
|
||||
message(STATUS "Running ldconfig")
|
||||
|
||||
execute_process(COMMAND ${LDCONFIG_EXECUTABLE} RESULT_VARIABLE ldconfig_result)
|
||||
|
||||
if (NOT ldconfig_result EQUAL 0)
|
||||
message(WARNING "ldconfig failed")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
HEAD_REF master
|
||||
PATCHES
|
||||
make-pkgconfig-required.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/dpp")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
file(
|
||||
INSTALL "${SOURCE_PATH}/LICENSE"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||
RENAME copyright
|
||||
)
|
||||
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
,
|
||||
"description": "D++ Extremely Lightweight C++ Discord Library.",
|
||||
"homepage": "https://dpp.dev/",
|
||||
"license": "Apache-2.0",
|
||||
"supports": "((windows & !static & !uwp) | linux | osx)",
|
||||
"dependencies": [
|
||||
"libsodium",
|
||||
"nlohmann-json",
|
||||
"openssl",
|
||||
"opus",
|
||||
"zlib",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
SHA512
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO brainboxdotcc/DPP
|
||||
REF
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"name": "dpp",
|
||||
"version":
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"versions": [
|
||||
]
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
message("-- Building for windows (x86) with precompiled packaged dependencies")
|
||||
|
||||
#set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
|
||||
set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/win32/32/lib")
|
||||
set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/win32/include")
|
||||
set(OPENSSL_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/win32/include")
|
||||
set(OPENSSL_LIBRARIES "${PROJECT_SOURCE_DIR}/win32/32/lib")
|
||||
ADD_DEFINITIONS(/bigobj)
|
||||
|
||||
link_libraries("${PROJECT_SOURCE_DIR}/win32/32/lib/libssl.lib")
|
||||
link_libraries("${PROJECT_SOURCE_DIR}/win32/32/lib/libcrypto.lib")
|
||||
link_libraries("${PROJECT_SOURCE_DIR}/win32/32/lib/zlib.lib")
|
||||
link_libraries("${PROJECT_SOURCE_DIR}/win32/32/lib/libsodium.lib")
|
||||
link_libraries("${PROJECT_SOURCE_DIR}/win32/32/lib/opus.lib")
|
||||
|
||||
set(OPUS_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/win32/include")
|
||||
set(OPUS_LIBRARIES "${PROJECT_SOURCE_DIR}/win32/32/lib/opus.lib")
|
||||
set(sodium_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/win32/include")
|
||||
set(sodium_LIBRARY_DEBUG "${PROJECT_SOURCE_DIR}/win32/32/lib/libsodium.lib")
|
||||
set(sodium_LIBRARY_RELEASE "${PROJECT_SOURCE_DIR}/win32/32/lib/libsodium.lib")
|
||||
set(HAVE_OPUS_OPUS_H "${PROJECT_SOURCE_DIR}/win32/include/opus/opus.h")
|
||||
set(OPUS_FOUND 1)
|
||||
SET(sodium_VERSION_STRING "win32 bundled")
|
||||
|
||||
include_directories("${PROJECT_SOURCE_DIR}/win32/include")
|
||||
|
||||
add_compile_definitions(OPENSSL_SYS_WIN32)
|
||||
add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS)
|
||||
add_compile_definitions(WIN32_LEAN_AND_MEAN)
|
||||
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
|
||||
add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE)
|
||||
|
||||
SET(WINDOWS_32_BIT 1)
|
||||
|
||||
# BIG FAT STINKY KLUDGE
|
||||
SET(CMAKE_CXX_COMPILER_WORKS 1)
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
if(NOT WIN32)
|
||||
string(ASCII 27 Esc)
|
||||
set(ColourReset "${Esc}[m")
|
||||
set(ColourBold "${Esc}[1m")
|
||||
set(Red "${Esc}[31m")
|
||||
set(Green "${Esc}[32m")
|
||||
set(Yellow "${Esc}[33m")
|
||||
set(Blue "${Esc}[34m")
|
||||
set(Magenta "${Esc}[35m")
|
||||
set(Cyan "${Esc}[36m")
|
||||
set(White "${Esc}[37m")
|
||||
set(BoldRed "${Esc}[1;31m")
|
||||
set(BoldGreen "${Esc}[1;32m")
|
||||
set(BoldYellow "${Esc}[1;33m")
|
||||
set(BoldBlue "${Esc}[1;34m")
|
||||
set(BoldMagenta "${Esc}[1;35m")
|
||||
set(BoldCyan "${Esc}[1;36m")
|
||||
set(BoldWhite "${Esc}[1;37m")
|
||||
endif()
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# dpp-config.cmake - package configuration file
|
||||
|
||||
## Get current filesystem path (will a prefixed by where this package was installed)
|
||||
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
|
||||
## Use this directory to include dpp which has the rest of the project targets
|
||||
include(${SELF_DIR}/dpp.cmake)
|
||||
|
||||
## Set OpenSSl directory for macos. It is also in our main CMakeLists.txt, but this file is independent from that.
|
||||
if(APPLE)
|
||||
if(CMAKE_APPLE_SILICON_PROCESSOR)
|
||||
set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl")
|
||||
else()
|
||||
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
|
||||
endif()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
endif()
|
||||
|
||||
# Search for libdpp dependencies
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(OpenSSL REQUIRED)
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
@PACKAGE_INIT@
|
||||
|
||||
set_and_check(EXPORT_TARGETS_FILE_NEW "@PACKAGE_EXPORTED_TARGETS_FILE_PATH@")
|
||||
|
||||
include("${EXPORT_TARGETS_FILE_NEW}")
|
||||
|
||||
if (WIN32)
|
||||
if (EXISTS "@PACKAGE_RELEASE_PDB_FILE_PATH@")
|
||||
set_and_check(RELEASE_PDB_FILE_PATH "@PACKAGE_RELEASE_PDB_FILE_PATH@")
|
||||
cmake_path(GET RELEASE_PDB_FILE_PATH FILENAME RELEASE_PDB_FILE_NAME)
|
||||
endif()
|
||||
if (EXISTS "@PACKAGE_DEBUG_PDB_FILE_PATH@")
|
||||
set_and_check(DEBUG_PDB_FILE_PATH "@PACKAGE_DEBUG_PDB_FILE_PATH@")
|
||||
cmake_path(GET DEBUG_PDB_FILE_PATH FILENAME DEBUG_PDB_FILE_NAME)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
check_required_components("@PROJECT_NAME@")
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
# Frequently Asked Questions (FAQ)
|
||||
|
||||
[TOC]
|
||||
|
||||
## Is this library in production use?
|
||||
This library powers the bot [TriviaBot](https://triviabot.co.uk) which has over **151,000 servers**, and [Sporks](https://sporks.gg) which has over **3,500 severs**. The library's use in these bots shows that the library is production ready for bots of all sizes.
|
||||
|
||||
## How much RAM does this library use?
|
||||
In production on TriviaBot, the bot takes approximately 2gb of ram to run 18 separate processes (this is approximately **140mb** per process) on a production bot with 36 million users and 151,000 guilds. Each process takes under 1% CPU. This is less than a quarter of the memory of a similar C++ Discord library, **Aegis.cpp** (version 2).
|
||||
|
||||
For a very small bot, you can get the memory usage as low as **6 megabytes** on a Raspberry Pi.
|
||||
|
||||
## How do I use this library in Windows?
|
||||
The easiest way is to use our [template project](https://github.com/brainboxdotcc/windows-bot-template). If you are unable to do this, download the precompiled latest release from our GitHub releases, and take the dlls, .lib file, and header files (`bin`, `lib` and `include` directories), placing them in a easily accessible place on your computer. Go into Visual Studio project settings in a new project, and point the project directories (notably the library directories and and include directories) at the correct locations. Add the `include` folder you extracted to your include directories, and add `dpp.lib` to your library directories. Ensure the project is set to C++17 standard in the settings. You should then be able to compile example programs within that project. When you run the program you have compiled you must ensure that all the dll files from the `bin` directory exist in the same directory as your executable.
|
||||
|
||||
## Does this library support Visual Studio 2022?
|
||||
Yes! The master branch comes with pre-built binaries for Visual Studio 2022 and our windows bot template has a [vs2022 branch](https://github.com/brainboxdotcc/windows-bot-template/tree/vs2022) which you can clone to get Visual Studio 2022 specific code. For the time being we support both Visual Studio 2019 and 2022. At some point in the future only 2022 may be supported as 2019 becomes outdated.
|
||||
|
||||
## How much of the library is completed?
|
||||
All REST calls (outbound commands) are completed including all currently available interactions, and all Discord events are available. The library also has voice support.
|
||||
|
||||
## How do I chat with the developers or get help?
|
||||
The best place to do this is on the [Discord server](https://discord.gg/dpp). You most likely won't get an answer immediately (we have lives, and need to sleep sometimes), but we will be willing to help!
|
||||
|
||||
## How can I contribute to development?
|
||||
Just star and fork a copy of the repository, and submit a Pull Request! We won't bite! Authors of accepted pull requests get a special role on our [Discord server](https://discord.gg/dpp).
|
||||
|
||||
## Whats the best way to learn C++?
|
||||
A simple search can find some learning tools, however not all are good. Here is a list of some (good) learning resources:
|
||||
|
||||
* [CodeAcademy](https://www.codecademy.com/learn/c-plus-plus)
|
||||
* [Learn CPP](https://www.learncpp.com/)
|
||||
* [Learn CPP (Very Basic)](https://www.learn-cpp.org/)
|
||||
|
||||
If you don't understand something then feel free to ask in the [Discord server](https://discord.gg/dpp) ...*we don't bite!*
|
||||
|
||||
## Do I need to be an expert in C++ to use this library?
|
||||
NO! Definitely not! We have tried to keep things as simple as possible. We only use language features where they make sense, not just because they exist. Take a look at the example program (`test.cpp` and you'll see just how simple it is to get up and running quickly). We use a small subset of C++17 and C++14 features.
|
||||
|
||||
## Why is D++ also called DPP
|
||||
DPP is short for *D Plus Plus* (D++), a play on the Discord and C++ names. You'll see the library referred to as `dpp` within source code as `d++` is not a valid symbol so we couldn't exactly use that as our namespace name.
|
||||
|
||||
## Is D++ a single header library?
|
||||
No, D++ is a classically designed library which installs itself to your library directory/system directory as a shared object or dll. You must link to its .lib file and include its header files to make use of it. We have no plans for a single-header build.
|
||||
|
||||
## Does this library support slash commands/interactions?
|
||||
Yes! This library supports slash commands and interactions. For more information please see \ref slashcommands "Using Slash Commands and Interactions".
|
||||
|
||||
## Does this library support buttons/drop down menus (message components)?
|
||||
Yes! This library supports button message components, e.g. interactive buttons on the bottom of messages. For more information please see our \ref components "Using component interactions" and \ref components2 "Using component interactions (advanced)" examples.
|
||||
|
||||
## Is the library asynchronous?
|
||||
All functions within D++ are multi-threaded. You should still avoid doing long operations within event handlers or within callbacks, to prevent starvation of the threads managing each shard. Various blocking operations such as running files and making HTTP requests are offered as library functions (for example dpp::utility::exec)
|
||||
|
||||
## Does this library support voice?
|
||||
Yes! This library supports voice and will automatically enable voice if your system has the libopus and libsodium libraries. When running `cmake` the script will identify if these libraries are found. See the example programs for information on how to send audio.
|
||||
|
||||
## Does this library support sharding?
|
||||
Yes! D++ supports sharding and also clustering (grouping of shards into one process) to ensure it is scalable for small and large bots alike.
|
||||
|
||||
## How do I contribute to the documentation and website?
|
||||
The documentation and website are built using Doxygen. To contribute to site pages, submit a Pull Request to the main repository. The site pages can be found within the `docpages` directory. Details of classes, variables, namespaces etc are auto generated from Doxygen comments within the library source code in the `include` and `src` folders.
|
||||
|
||||
## What version of the Discord API does this library support?
|
||||
D++ only supports Discord API v10, the latest version. D++ major version numbers match the supported Discord API version.
|
||||
|
||||
## Does this Discord library support the threads feature?
|
||||
Yes! D++ supports Discord threads. You can create, edit and delete threads and also attach events watching for messages within threads.
|
||||
|
||||
## Does D++ require C++20 support?
|
||||
No, at the current time we do not use any C++20 features. Some C++17 features are used, which are available in all recent compilers.
|
||||
|
||||
## When I start my bot i get an error: "error while loading shared libraries: libdpp.so: cannot open shared object file: No such file or directory"
|
||||
To fix this issue, run `ldconfig`: `sudo ldconfig` as root. Log out if your SSH session and log back in, and the bot should be able to find the library.
|
||||
|
||||
## When compiling with voice support, i get an error: "No rule to make target 'sodium_LIBRARY_DEBUG-NOTFOUND', needed by 'libdpp.so'. Stop."
|
||||
The libsodium package requires pkg-config, but does not check for it when installed. Install it as root, e.g. `sudo apt install pkg-config`. Rerun cmake, and rebuild the library.
|
||||
|
||||
## When I try to instantiate a dpp::cluster in windows, a std::bad_alloc exception is thrown
|
||||
If this happens, ensure you are using the correct precompiled build of the library. Our precompiled binaries are built in two forms, **release mode** and **debug mode** for Visual Studio 2019/2022. These two versions of the library are not cross-compatible due to differences in the debug and release libstdc++. You should not need to build your own copy, but please see the section about \ref buildwindows for more information on how to build your own copy, if needed.
|
||||
|
||||
## Does this library build/run on Raspberry Pi?
|
||||
Yes! This project will build and run on Raspberry Pi and is very much suited to this kind of system. It may take some time (read: hours) to compile the project on your Raspberry Pi unless you build it using a cross compiler. We offer pre-built `.deb` files for arm6, arm7 and arm64, you should use these where possible to avoid having to compile it by hand, or you can use a cross-compiler to build it on your PC then transfer the compiled binaries across.
|
||||
|
||||
## There are so many versions! Which deb file do i need for my Raspberry Pi?
|
||||
Depending on which Raspberry Pi version you have, you will need to download a different release binary:
|
||||
<table>
|
||||
<tr>
|
||||
<th>Raspberry Pi Model</th>
|
||||
<th>Deb file to install</th>
|
||||
<th>Arch</th>
|
||||
</tr>
|
||||
<tr><td>Raspberry Pi Zero/Zero W</td><td>`libdpp-x.x.x-linux-rpi-arm6.deb`</td><td>ARMv6</td></tr>
|
||||
<tr><td>Raspberry Pi 3</td><td>`libdpp-x.x.x-linux-rpi-arm7hf.deb`</td><td>ARMv7HF</td></tr>
|
||||
<tr><td>Raspberry Pi 4</td><td>`libdpp-x.x.x-linux-rpi-arm7hf.deb`</td><td>ARMv7HF</td></tr>
|
||||
<tr><td>Raspberry Pi 4 with 64 Bit Linux</td><td>`libdpp-x.x.x-linux-rpi-arm64.deb`</td><td>ARM64</td></tr>
|
||||
</table>
|
||||
|
||||
## Are other ARM devices supported?
|
||||
Yes! We have confirmed that the D++ deb file will successfully install and operate on various forms of cellphone or non-pi ARM devices. If you get it working on any other devices please let us know and we can build a compatibility chart.
|
||||
|
||||
## Can I run a D++ bot in repl.it?
|
||||
Yes! You can indeed run your bot in a repl.it container. [You can find a ready to go demo repl here](https://replit.com/@braindigitalis/dpp-demo-bot). We also have a [guide showing how to do this](https://dpp.dev/building-a-cpp-discord-bot-in-repl.html).
|
||||
|
||||
## Why do the "get" functions like "messages_get" return void rather than what I'm after?
|
||||
All the functions that obtain data directly from Discord (as opposed to the cache) perform HTTPS requests and may have to wait, either for the request itself or for their turn in a queue to respect rate limits. As such, it does not make sense that they should return a value, as this would mean they block execution of your event. Instead, each has a lambda, a function handler which receives the result of the request, which you can then read from within that function to get the data you are interested in. Note that this result will arrive on a different thread to the one which made the request. If you instead want the function to return a value, use the methods ending with `_sync` that will block until they have a response. Note that these forms of call will throw an exception on failure.
|
||||
|
||||
## Can i use a user token with this library (as opposed to a bot token)?
|
||||
No. This feature is not supported as it is against the Discord Terms Of Service, and therefore we have no plans to ever support it. You should not automate any user token. Some libraries used to support this but it is a legacy feature of those libraries (where still available) dating back to before Discord offered an official public API. Please be aware that if Discord ever catch you automating a user token (or making a user client that uses a bot token) they can and do ban people for this.
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Installing D++
|
||||
|
||||
There are many ways to install D++, either from a package manager, or from source. Please choose your desired option from the list below:
|
||||
|
||||
* \subpage install-linux-deb
|
||||
* \subpage install-linux-rpm
|
||||
* \subpage install-vcpkg
|
||||
* \subpage install-arch-aur
|
||||
* \subpage install-windows-zip
|
||||
* \subpage install-xmake
|
||||
* \subpage install-from-source
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# Creating a Discord Bot
|
||||
|
||||
If you are wanting to build a bot using C++, you're in the right place! The fast and easy tutorials below will guide you through how to build a bot using the D++ library on either a UNIX-like (e.g. Linux) system with CMake or with Windows using Visual Studio 2019.
|
||||
|
||||
Click on a link below for a guide specifically for your system:
|
||||
|
||||
* \subpage creating-a-bot-application "Creating a Bot Token"
|
||||
* \subpage build-a-discord-bot-windows-visual-studio "Building a discord bot in Windows using Visual Studio"
|
||||
* \subpage build-a-discord-bot-windows-wsl "Building a discord bot in Windows using WSL (Windows Subsystem for Linux)"
|
||||
* \subpage build-a-discord-bot-linux-clion "Building a discord bot in Linux using CLion"
|
||||
* \subpage buildcmake "Building a Discord Bot using CMake/UNIX"
|
||||
* \subpage buildmeson "Building a Discord Bot using Meson"
|
||||
* \subpage building-a-cpp-discord-bot-in-repl "Creating a Discord bot in Repl.it"
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Example Programs
|
||||
|
||||
There are example programs here for all skill levels demonstrating a great many features of the bot. New examples are added frequently, please check regularly for new content.
|
||||
|
||||
* \subpage the-basics
|
||||
* \subpage interactions-and-components
|
||||
* \subpage music-and-audio
|
||||
* \subpage misc
|
||||
|
||||
Is the example you are looking for missing from these sections? Pop over to our [discord server](https://discord.com/dpp) and let us know what you need... Or, even better, if you know how to do something and want to contribute an example of your own, just submit a PR!
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
# Advanced Reference
|
||||
|
||||
* \subpage clusters-shards-guilds "Clusters, Shards and Guilds"
|
||||
* \subpage thread-model "Thread Model"
|
||||
* \subpage coding-standards "Coding Style Standards"
|
||||
* \subpage unit-tests "Unit Tests"
|
||||
* \subpage lambdas-and-locals "Ownership of local variables and safely transferring into a lambda"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.6 KiB |
|
|
@ -1,77 +0,0 @@
|
|||
# D++: A C++ Discord API Library for Bots
|
||||
|
||||
## What is D++ (DPP)?
|
||||
|
||||
D++ is a lightweight and simple library for Discord written in modern C++. It is designed to cover as much of the API specification as possible and to have a incredibly small memory footprint, even when caching large amounts of data.
|
||||
|
||||
It is created by the developer of [TriviaBot](https://triviabot.co.uk) and contributed to by a dedicated team of developers.
|
||||
|
||||
*This project is in stable development and accepting PRs and feature requests — Don't be a stranger! If you want to contribute, just get in touch via [GitHub](https://github.com/brainboxdotcc/DPP) or our official [Discord server](https://discord.gg/dpp)!*
|
||||
|
||||
<img src="code_editor.png" style="margin-top: 2rem; margin-bottom: 2rem"/><br />
|
||||
|
||||
## Downloads
|
||||
|
||||
The following downloads are for the most recent version:
|
||||
|
||||
* [Source Code](https://github.com/brainboxdotcc/DPP)
|
||||
* [x64 Linux .deb (64 bit Debian, Ubuntu etc)](https://dl.dpp.dev/latest)
|
||||
* [x86 Linux .deb (32 bit Debian, Ubuntu etc)](https://dl.dpp.dev/latest/linux-i386)
|
||||
* [x64 Linux .rpm (64 bit Redhat, CentOS etc)](https://dl.dpp.dev/latest/linux-x64/rpm)
|
||||
* [x86 Linux .rpm (32 bit Redhat, CentOS etc)](https://dl.dpp.dev/latest/linux-i386/rpm)
|
||||
* [x64 Windows (64 bit vs2019 release build)](https://dl.dpp.dev/latest/win64-release-vs2019)
|
||||
* [x64 Windows (64 bit vs2022 release build)](https://dl.dpp.dev/latest/win64-release-vs2022)
|
||||
* [x64 Windows (64 bit vs2019 debug build)](https://dl.dpp.dev/latest/win64-debug-vs2019)
|
||||
* [x64 Windows (64 bit vs2022 debug build)](https://dl.dpp.dev/latest/win64-debug-vs2022)
|
||||
* [ARM6 Linux .deb (32 bit Raspberry Pi 1, 2)](https://dl.dpp.dev/latest/linux-rpi-arm6)
|
||||
* [ARM7 Linux .deb (32 bit Raspberry Pi 3, 4)](https://dl.dpp.dev/latest/linux-rpi-arm7hf)
|
||||
* [ARM64 Linux .deb (64 bit Raspberry Pi 4, Smartphones)](https://dl.dpp.dev/latest/linux-rpi-arm64)
|
||||
|
||||
You can find further releases in other architectures and formats or the source code on the [GitHub Repository](https://github.com/brainboxdotcc/DPP/releases). For a realtime JSON format list of all download links, click [here](https://dl.dpp.dev/json)
|
||||
|
||||
## Library features
|
||||
|
||||
* Support for Discord API v10
|
||||
* Really small memory footprint
|
||||
* Efficient caching system for guilds, channels, guild members, roles, users
|
||||
* Sharding and clustering (Many shards, one process: specify the number of shards, or let the library decide)
|
||||
* Highly optimised ETF (Erlang Term Format) support for very fast websocket throughput (*no other C++ Discord library has this!*)
|
||||
* [Slash Commands/Interactions support](https://dpp.dev/slashcommands.html)
|
||||
* [Voice support](https://dpp.dev/soundboard.html) (sending **and** receiving audio)
|
||||
* The entire Discord API is available for use in the library
|
||||
* Stable [Windows support](https://dpp.dev/buildwindows.html)
|
||||
* Ready-made compiled packages for Windows, Raspberry Pi (ARM64/ARM7/ARMv6), Debian x86/x64 and RPM based distributions
|
||||
* Highly scalable for large amounts of guilds and users
|
||||
|
||||
## Supported Operating Systems
|
||||
|
||||
### Linux
|
||||
The library runs ideally on **Linux**.
|
||||
|
||||
### Mac OS X and FreeBSD
|
||||
The library is well-functional and stable on **Mac OS X** and **FreeBSD** too.
|
||||
|
||||
### Raspberry Pi
|
||||
For running your bot on a **Raspberry Pi**, we offer a prebuilt .deb package for ARM64, ARM6, and ARM7 so that you do not have to wait for it to compile.
|
||||
|
||||
### Windows
|
||||
**Windows** is well-supported with ready-made compiled DLL and LIB files, please check out our [Windows Bot Template repository](https://github.com/brainboxdotcc/windows-bot-template). The Windows Bot repository can be cloned and integrated immediately into any Visual Studio 2019 and 2022 project in a matter of minutes.
|
||||
|
||||
### Other OS
|
||||
The library should work fine on other operating systems as well, and if you run a D++ bot on something not listed here, please let us know!
|
||||
|
||||
## Getting started
|
||||
* [GitHub Repository](https://github.com/brainboxdotcc/DPP)
|
||||
* [Discord Server](https://discord.gg/dpp)
|
||||
* [Frequently Asked Questions](/md_docpages_01_frequently_asked_questions.html)
|
||||
* [Installing D++](/md_docpages_01_installing.html)
|
||||
* [Example Programs](/md_docpages_03_example_programs.html)
|
||||
|
||||
## Architecture
|
||||
* \ref clusters-shards-guilds
|
||||
* \ref thread-model
|
||||
|
||||
## Learning Resources
|
||||
* [C++ for JavaScript Developers](https://pawelgrzybek.com/cpp-for-javascript-developers/)
|
||||
* [C++ In Four Hours](https://www.youtube.com/watch?v=vLnPwxZdW4Y&vl=en)
|
||||
|
||||
|
|
@ -1,178 +0,0 @@
|
|||
\page clusters-shards-guilds Clusters, Shards and Guilds
|
||||
|
||||
D++ takes a three-tiered highly scalable approach to bots, with three levels known as Clusters, Shards and Guilds as documented below.
|
||||
|
||||
\dot
|
||||
digraph "Clusters, Shards and Guilds" {
|
||||
node [colorscheme="blues9",fontname="helvetica"];
|
||||
subgraph Bot {
|
||||
node [style=filled, color=1];
|
||||
label = "Bot"
|
||||
"Bot" [shape=folder, label="Bot", bordercolor=black];
|
||||
};
|
||||
subgraph Processes {
|
||||
node [style=filled, color=2];
|
||||
label = "Processes"
|
||||
"Bot" -> "Process 1"
|
||||
"Bot" -> "Process 2"
|
||||
"Process 1" [shape=record, label="Process"];
|
||||
"Process 2" [shape=record, label="Process"];
|
||||
};
|
||||
subgraph Clusters {
|
||||
node [style=filled, color=3];
|
||||
label = "Clusters"
|
||||
"Process 1" -> "Cluster 1"
|
||||
"Process 2" -> "Cluster 2"
|
||||
"Cluster 1" [shape=record, label="Cluster"];
|
||||
"Cluster 2" [shape=record, label="Cluster"];
|
||||
};
|
||||
subgraph Shards {
|
||||
node [style=filled, color=4];
|
||||
label = "Shards"
|
||||
"Shard 1" [shape=record, label="Shard"];
|
||||
"Shard 2" [shape=record, label="Shard"];
|
||||
"Shard 3" [shape=record, label="Shard"];
|
||||
"Shard 4" [shape=record, label="Shard"];
|
||||
"Shard 5" [shape=record, label="Shard"];
|
||||
"Shard 6" [shape=record, label="Shard"];
|
||||
"Shard 7" [shape=record, label="Shard"];
|
||||
"Shard 8" [shape=record, label="Shard"];
|
||||
"Cluster 1" -> "Shard 1"
|
||||
"Cluster 1" -> "Shard 3"
|
||||
"Cluster 2" -> "Shard 2"
|
||||
"Cluster 2" -> "Shard 4"
|
||||
"Cluster 1" -> "Shard 5"
|
||||
"Cluster 1" -> "Shard 7"
|
||||
"Cluster 2" -> "Shard 6"
|
||||
"Cluster 2" -> "Shard 8"
|
||||
};
|
||||
subgraph Guilds {
|
||||
node [style=filled, color=5];
|
||||
label = "Guilds";
|
||||
"Guild 1" [shape=record, label="Guild"];
|
||||
"Guild 2" [shape=record, label="Guild"];
|
||||
"Guild 3" [shape=record, label="Guild"];
|
||||
"Guild 4" [shape=record, label="Guild"];
|
||||
"Guild 5" [shape=record, label="Guild"];
|
||||
"Guild 6" [shape=record, label="Guild"];
|
||||
"Guild 7" [shape=record, label="Guild"];
|
||||
"Guild 8" [shape=record, label="Guild"];
|
||||
"Guild 9" [shape=record, label="Guild"];
|
||||
"Guild 10" [shape=record, label="Guild"];
|
||||
"Guild 11" [shape=record, label="Guild"];
|
||||
"Guild 12" [shape=record, label="Guild"];
|
||||
"Guild 13" [shape=record, label="Guild"];
|
||||
"Guild 14" [shape=record, label="Guild"];
|
||||
"Guild 15" [shape=record, label="Guild"];
|
||||
"Guild 16" [shape=record, label="Guild"];
|
||||
"Shard 1" -> "Guild 1"
|
||||
"Shard 1" -> "Guild 5"
|
||||
"Shard 2" -> "Guild 2"
|
||||
"Shard 2" -> "Guild 6"
|
||||
"Shard 3" -> "Guild 3"
|
||||
"Shard 3" -> "Guild 7"
|
||||
"Shard 4" -> "Guild 4"
|
||||
"Shard 4" -> "Guild 8"
|
||||
"Shard 5" -> "Guild 9"
|
||||
"Shard 5" -> "Guild 11"
|
||||
"Shard 6" -> "Guild 10"
|
||||
"Shard 6" -> "Guild 12"
|
||||
"Shard 7" -> "Guild 13"
|
||||
"Shard 7" -> "Guild 15"
|
||||
"Shard 8" -> "Guild 14"
|
||||
"Shard 8" -> "Guild 16"
|
||||
};
|
||||
}
|
||||
\enddot
|
||||
|
||||
## Clusters
|
||||
|
||||
A bot may be made of one or more clusters. Each cluster maintains a queue of commands waiting to be sent to Discord, a queue of replies from Discord for all commands executed, and zero or more **shards**. Usually, each process has one cluster, but the D++ library does not enforce this as a restriction. Small bots will require just one cluster. Clusters will split the required number of shards equally across themselves. There is no communication between clusters unless you add some yourself, they all remain independent without any central "controller" process. This ensures that there is no single point of failure in the design. Whenever you instantiate the library, you generally instantiate a cluster:
|
||||
|
||||
```cpp
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
/* This is a cluster */
|
||||
dpp::cluster bot("Token goes here");
|
||||
}
|
||||
```
|
||||
|
||||
## Shards
|
||||
|
||||
A cluster contains zero or more shards. Each shard maintains a persistent websocket connection to Discord via a websocket, which receives all events the bot is made aware of, e.g. messages, channel edits, etc. Requests to the API on the other hand go out to Discord as separate HTTP requests.
|
||||
|
||||
Small bots will require only one shard and this is the default when you instantiate a cluster. The library will automatically determine and create the correct number of shards needed, if you do not configure it by hand. If you do want to specify a number of shards, you can specify this when creating a cluster:
|
||||
|
||||
```cpp
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
/* This is a cluster */
|
||||
int total_shards = 10;
|
||||
dpp::cluster bot("Token goes here", dpp::i_default_intents, total_shards);
|
||||
}
|
||||
```
|
||||
|
||||
Remember that if there are multiple clusters, the number of shards you request will be split equally across these clusters!
|
||||
|
||||
@note To spawn multiple clusters, you can specify this as the 4th and 5th parameter of the dpp::cluster constructor. You must do this, if you want this functionality. The library will not create additional clusters for you, as what you require is dependent upon your system specifications. It is your responsibility to somehow get the cluster id and total clusters into the process, e.g. via a command line argument. An example of this is shown below based on the cluster setup code of **TriviaBot**:
|
||||
```cpp
|
||||
#include <dpp/dpp.h>
|
||||
#include <iostream>
|
||||
#include <stdlib.h>
|
||||
#include <getopt.h>
|
||||
#include <string>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
int total_shards = 64;
|
||||
int index;
|
||||
char arg;
|
||||
bool clusters_defined = false;
|
||||
uint32_t clusterid = 0;
|
||||
uint32_t maxclusters = 1;
|
||||
|
||||
/* Parse command line parameters using getopt() */
|
||||
struct option longopts[] =
|
||||
{
|
||||
{ "clusterid", required_argument, NULL, 'c' },
|
||||
{ "maxclusters", required_argument, NULL, 'm' },
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
opterr = 0;
|
||||
while ((arg = getopt_long_only(argc, argv, "", longopts, &index)) != -1) {
|
||||
switch (arg) {
|
||||
case 'c':
|
||||
clusterid = std::stoul(optarg);
|
||||
clusters_defined = true;
|
||||
break;
|
||||
case 'm':
|
||||
maxclusters = std::stoul(optarg);
|
||||
break;
|
||||
default:
|
||||
std::cerr << "Unknown parameter '" << argv[optind - 1] << "'\n";
|
||||
exit(1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (clusters_defined && maxclusters == 0) {
|
||||
std::cerr << "ERROR: You have defined a cluster id with -clusterid but no cluster count with -maxclusters.\n";
|
||||
exit(2);
|
||||
}
|
||||
|
||||
dpp::cluster bot("Token goes here", dpp::default_intents, total_shards, clusterid, maxclusters);
|
||||
}
|
||||
```
|
||||
|
||||
### Large Bot Sharding
|
||||
|
||||
Discord restricts how many shards you can connect to at any one time to one per five seconds, unless your bot is in at least 150,000 guilds. Once you reach 150,000 guilds, Discord allow your bot to connect to more guilds concurrently, and your number of shards must divide cleanly into this value. By default, at 150,000 guilds this concurrency value is 16 meaning D++ will attempt to connect 16 shards in parallel, then wait for all these to connect and then connect another 16, until all shards are connected. In practice, this means a large bot with many shards (read: hundreds!) will connect significantly faster after a full restart. **You do not need to manually configure large bot sharding and connection concurrency, the D++ library will handle this for you if you are able to use it**.
|
||||
|
||||
|
||||
## Guilds
|
||||
|
||||
Guilds are what servers are known as to the Discord API. There can be up to **2500** of these per shard. Once you reach 2500 guilds on your bot, Discord force your bot to shard, the D++ library will automatically create additional shards to accomodate if not explicitly configured with a larger number. Discord *does not restrict sharding* to bots on 2500 guilds or above. You can shard at any size of bot, although it would be a waste of resources to do so unless it is required.
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
\page coding-standards Coding Style Standards
|
||||
|
||||
This page lists the coding style we stick to when maintaining the D++ library. If you are submitting a pull request or other code contribution to the library, you should stick to the styles listed below. If something is not covered here, ask on the [official discord server](https://discord.gg/dpp)!
|
||||
|
||||
## Class names, function names and method names
|
||||
All class, variable/member, function and method names should use `snake_case`, similar to the style of the C++ standard library.
|
||||
|
||||
## Enums
|
||||
Enums and their values should be `snake_case` as with class, function and method names. You do not need to use `enum class`, so make sure that enum values are prefixed with a prefix to make them unique and grouped within the IDE, e.g. `ll_debug`, `ll_trace` etc.
|
||||
|
||||
|
||||
## Curly Braces, Brackets etc
|
||||
|
||||
Open curly braces on the same line as the keyword, for example:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
if (a == b) {
|
||||
c();
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Use a space after the comma in parameter lists, and after opening brackets and before closing brackets except when calling a function, e.g.:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
std::vector<std::string> clowns = { "pennywise", "bobo" };
|
||||
|
||||
evaluate_clown(clowns[0], evilness(2.5, factor));
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
## Indentation
|
||||
Indentation should always be tab characters. It is up to you how wide you set tab characters in your editor for your personal tastes. All code blocks delimited within curly braces should be indented neatly and uniformly.
|
||||
|
||||
## Constants and \#define macros
|
||||
Constants and macros should be all `UPPERCASE` with `SNAKE_CASE` to separate words. Macros should not have any unexpected side effects.
|
||||
|
||||
## Comments
|
||||
All comments should be in `doxygen` format (similar to javadoc). Please see existing class definitions for an example. You should use doxygen style comments in a class definition inside a header file, and can use any other comment types within the .cpp file. Be liberal with comments, especially if your code makes any assumptions!
|
||||
|
||||
## Symbol exporting
|
||||
If you export a class which is to be accessible to users, be sure to prefix it with the `DPP_EXPORT` macro, for example:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
class DPP_EXPORT my_new_class {
|
||||
public:
|
||||
int hats;
|
||||
int clowns;
|
||||
};
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The `DPP_EXPORT` macro ensures that on certain platforms (notably Windows) the symbol is exported to be available to the library user.
|
||||
|
||||
## Public vs private vs protected
|
||||
It is a design philosophy of D++ that everything possible in a class should be public, unless the user really does not need it (you should consider justifying in comments why) or user adjustment of the variable could badly break the functioning of the library. Avoid the use of accessors for setting/getting values in a class, except for bit fields, where you should provide accessors for setting and getting individual bits (for example, see `user.h`), or in the event you want to provide a "fluent" interface. The exception to this is where you want to provide a logic validation of a field, for example if you have a string field with a minimum and maximum length, you can provide a setter the user can *optionally use* which will validate their input.
|
||||
|
||||
## Exceptions
|
||||
All exceptions thrown should derive from dpp::exception (see dpp/exception.h) - when validating string lengths, a string which is too long should be truncated using dpp::utility::utf8substr and any strings that are too short should throw a dpp::length_exception.
|
||||
|
||||
## Inheritance
|
||||
Keep levels of inheritance low. If you need to inherit more than 3 levels deep, it is probable that the design could be simplified. Remember that at scale, there can be tens of millions of certain classes and each level of virtual nesting adds to the `vtable` of that object's instance in RAM.
|
||||
|
||||
## Bit field packing
|
||||
Where discord provides boolean flags, if the user is expected to store many of the object in RAM, or in cache, you should pack all these booleans into bit fields (see `user.h` and `channel.h` for examples). In the event that the object is transient, such as an interaction or a message, packing the data into bit fields is counter intuitive. Remember that you should provide specific accessors for bit field values!
|
||||
|
||||
## Keep dependencies internal!
|
||||
Where you are making use of an external dependency such as `opus` or `libssl`, do not place references to the types/structs, or the header files of these external libraries within the header files of D++. Doing so adds that library as a public dependency to the project (which is bad!). Instead make an opaque class, and/or forward-declare the structs (for examples see `sslclient.h` and `discordvoiceclient.h`).
|
||||
|
||||
## API type names
|
||||
Where discord provide a name in PascalCase we should stick as closely to that name as possible but convert it to `snake_case`. For example, GuildMember would become `guild_member`.
|
||||
|
||||
## Don't introduce any platform-specific code
|
||||
Do not introduce platform specific (e.g. windows only) code or libc functions. If you really must use these functions safely wrap them e.g. in `#ifdef _WIN32` and provide a cross-platform alternative so that it works for everyone.
|
||||
|
||||
## Select the right size type for numeric types
|
||||
If a value will only hold values up to 255, use `uint8_t`. If a value cannot hold over 65536, use `uint16_t`. These types can help use a lot less ram at scale.
|
||||
|
||||
## Fluent design
|
||||
Where possible, if you are adding methods to a class you should consider fluent design. Fluent design is the use of class methods tha return a reference to self (via `return *this`), so that you can chain object method calls together (in the way `dpp::message` and `dpp::embed` do). For example:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
class DPP_EXPORT my_new_class {
|
||||
public:
|
||||
int hats;
|
||||
int clowns;
|
||||
|
||||
my_new_class& set_hats(int new_hats);
|
||||
my_new_class& set_clowns(int new_clowns);
|
||||
};
|
||||
|
||||
my_new_class& my_new_class::set_hats(int new_hats) {
|
||||
hats = new_hats;
|
||||
return *this;
|
||||
}
|
||||
|
||||
my_new_class& my_new_class::set_clowns(int new_clowns) {
|
||||
clowns = new_clowns;
|
||||
return *this;
|
||||
}
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
This would allow the user to do this:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
dpp::my_new_class nc;
|
||||
nc.set_hats(3).set_clowns(9001);
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
## Keep all D++ related types in the dpp namespace
|
||||
|
||||
All types for the library should be within the `dpp` namespace. There are a couple of additional namespaces, e.g. `dpp::utility` for static standalone helper functions and helper classes, and `dpp::events` for internal websocket event handlers.
|
||||
|
||||
## Commit messages and Git
|
||||
|
||||
All pull requests ("PRs") should be submitted against the `dev` branch in GitHub. It’s good to have descriptive commit messages, or PR titles so that other contributors can understand about your commit or the PR Created. Read [conventional commits](https://www.conventionalcommits.org/en/v1.0.0-beta.3/) for information on how we like to format commit messages.
|
||||
|
||||
All PRs must pass the [GitHub Actions](https://github.com/brainboxdotcc/DPP/actions) tests before being allowed to be merged. This is to ensure that no code committed into the project fails to compile on any of our officially supported platforms or architectures.
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
\page lambdas-and-locals Ownership of local variables and safely transferring into a lambda
|
||||
|
||||
If you are reading this page, you have likely been sent here by someone helping you diagnose why your bot is crashing or why seemingly invalid values are being passed into lambdas within your program that uses D++.
|
||||
|
||||
It is important to remember that when you put a lambda callback onto a function in D++, that this lambda will execute at some point in the **future**. As with all things in the future and as 80s Sci Fi movies will tell you, when you reach the future things may well have changed!
|
||||
|
||||
\image html delorean-time-travel.gif
|
||||
|
||||
To explain this situation and how it causes issues i'd like you to imagine the age old magic trick, where a magician sets a fine table full of cutlery, pots, pans and wine. He indicates to the audience that this is authentic, then with a whip of his wrist, he whips the tablecloth away, leaving the cutlery and other tableware in place (if he is any good as a magician!)
|
||||
|
||||
Now imagine the following code scenario. We will describe this code scenario as the magic trick above, in the steps below:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
bot.on_message_create([&bot](const dpp::message_create_t & event) {
|
||||
int myvar = 0;
|
||||
bot.message_create(dpp::message(event.msg.channel_id, "foobar"), [&](const auto & cc) {
|
||||
myvar = 42;
|
||||
});
|
||||
});
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
In this scenario, the outer event, `on_message_create` is your tablecloth. The lambda inside the `bot.message_create` is the tableware and cutlery. The following chain of events happens in this code:
|
||||
|
||||
* The magician executes his magic trick (D++ the `bot.on_message_create entering` the outer lambda)
|
||||
* Your code executes `bot.message_create()` inside this outer lambda
|
||||
* D++ inserts your request to send a message into its queue, in another thread. The inner lambda, where you might later set `myvar = 42` is safely copied into the queue for later calling.
|
||||
* The tablecloth is whipped away... in other words, `bot.on_message_create` ends, and all local variables including `myvar` become invalid
|
||||
* At a later time (usually 80ms through to anything up to 4 seconds depending on rate limits!) the message is sent, and your inner lambda which was saved at the earlier step is called.
|
||||
* Your inner lambda attempts to set `myvar` to 42... but `myvar` no longer exists, as the outer lambda has been destroyed....
|
||||
* The table wobbles... the cutlery shakes... and...
|
||||
* Best case scenario: you access invalid RAM no longer owned by your program by trying to write to `myvar`, and [your bot outright crashes horribly](https://www.youtube.com/watch?v=sm8qb2kP-fQ)!
|
||||
* Worse case scenario: you silently corrupt ram and end up spending days trying to track down a bug that subtly breaks your bot...
|
||||
|
||||
The situation i am trying to describe here is one of object and variable ownership. When you call a lambda, **always assume that every non global reference outside of that lambda will be invalid when the lambda is called**! For any non-global variable always take a **copy** of the variable (not reference, or pointer). Global variables or those declared directly in `main()` are safe to pass as references.
|
||||
|
||||
For example, if we were to fix the broken code above, we could rewrite it like this:
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
bot.on_message_create([&bot](const dpp::message_create_t & event) {
|
||||
int myvar = 0;
|
||||
bot.message_create(dpp::message(event.msg.channel_id, "foobar"), [myvar](const auto & cc) {
|
||||
myvar = 42;
|
||||
});
|
||||
std::cout << "here\n";
|
||||
});
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Note however that when you set myvar within the inner lambda, this does **not effect** the value of the var outside it. Lambdas should be considered self-contained silos, and as they execute in other threads should not be relied upon to set anything that exists **outside of that lambda**.
|
||||
|
||||
\warning Always avoid just using `[&]` in a lambda to access all in the scope above. It is unlikely that half of this scope will still even be valid by the time you get a look at it!
|
||||
|
||||
Similarly, and important to note, your program **will not wait for bot.message_create to send its message and call its lambda** before continuing on to print `here`. It will instantly insert the request into its queue and bail straight back out (see the steps above) and immediately print the text.
|
||||
|
||||
If you do want to get variables out of your lambda, create a class, or call a separate function, and pass what you need into that function from the lambda **by value** or alternatively, you can use `std::bind` to bind a lambda directly to an object's method instead (this is great for modular bots).
|
||||
|
||||
If you are stuck, as this is a complex subject please do feel free to ask on the [official support server](https://discord.gg/dpp)!
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
\page thread-model Thread Model
|
||||
|
||||
\dot
|
||||
digraph "Thread Model" {
|
||||
graph [ranksep=1];
|
||||
node [colorscheme="blues9",fontname="helvetica"];
|
||||
"Discord Events" -> "Your Program"
|
||||
|
||||
"Your Program" [style=filled, color=1, shape=rect]
|
||||
"Cluster" [style=filled, color=1, shape=rect]
|
||||
|
||||
subgraph cluster_4 {
|
||||
style=filled;
|
||||
color=lightgrey;
|
||||
node [style=filled,color=2]
|
||||
"Your Program"
|
||||
"Cluster"
|
||||
label = "User Code";
|
||||
}
|
||||
|
||||
subgraph cluster_0 {
|
||||
style=filled;
|
||||
color=lightgrey;
|
||||
node [style=filled,color=4]
|
||||
"Shard 1" [style=filled, color=4]
|
||||
"Shard 2"
|
||||
"Shard 3..."
|
||||
label = "Shards (Each is a thread, one per 2500 discord guilds)";
|
||||
}
|
||||
|
||||
subgraph cluster_1 {
|
||||
style=filled
|
||||
color=lightgrey;
|
||||
node [style=filled,color=4]
|
||||
"REST Requests"
|
||||
"Request In Queue 1"
|
||||
"Request In Queue 2"
|
||||
"Request In Queue 3..."
|
||||
"Request Out Queue"
|
||||
label = "REST Requests (Each in queue, and the out queue, are threads)"
|
||||
}
|
||||
|
||||
subgraph cluster_3 {
|
||||
style=filled
|
||||
color=lightgrey;
|
||||
node [style=filled,color=4]
|
||||
"Discord Events" [style=filled,color=4]
|
||||
"User Callback Functions"
|
||||
label = "Events and Callbacks"
|
||||
}
|
||||
|
||||
"Cluster" [shape=rect]
|
||||
"REST Requests" [shape=rect]
|
||||
"Request In Queue 1" [shape=rect]
|
||||
"Request In Queue 2" [shape=rect]
|
||||
"Request In Queue 3..." [shape=rect]
|
||||
"Shard 1" [shape=rect]
|
||||
"Shard 2" [shape=rect]
|
||||
"Shard 3..." [shape=rect]
|
||||
"Request Out Queue" [shape=rect]
|
||||
"Discord Events" [shape=rect]
|
||||
"User Callback Functions" [shape=rect]
|
||||
|
||||
"Cluster" -> "REST Requests"
|
||||
"Shard 1" -> "Discord Events"
|
||||
"Shard 2" -> "Discord Events"
|
||||
"Shard 3..." -> "Discord Events"
|
||||
"Your Program" -> "Cluster"
|
||||
"Cluster" -> "Shard 1"
|
||||
"Cluster" -> "Shard 2"
|
||||
"Cluster" -> "Shard 3..."
|
||||
"REST Requests" -> "Request In Queue 1"
|
||||
"REST Requests" -> "Request In Queue 2"
|
||||
"REST Requests" -> "Request In Queue 3..."
|
||||
"Request In Queue 1" -> "Request Out Queue"
|
||||
"Request In Queue 2" -> "Request Out Queue"
|
||||
"Request In Queue 3..." -> "Request Out Queue"
|
||||
"Request Out Queue" -> "User Callback Functions"
|
||||
"User Callback Functions" -> "Your Program"
|
||||
}
|
||||
\enddot
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
\page unit-tests Unit Tests
|
||||
|
||||
## Running Unit Tests
|
||||
|
||||
If you are adding functionality to DPP, make sure to run unit tests. This makes sure that the changes do not break anything. All pull requests must pass all unit tests before merging.
|
||||
|
||||
Before running test cases, create a test server for your test bot. You should:
|
||||
|
||||
* Make sure that the server only has you and your test bot, and no one else
|
||||
* Give your bot the administrator permission
|
||||
* Enable community for the server
|
||||
* Make an event
|
||||
* Create at least one voice channel
|
||||
* Create at least one text channel
|
||||
|
||||
Then, set the following variables to the appropriate values. (Below is a fake token, don't bother trying to use it)
|
||||
|
||||
export DPP_UNIT_TEST_TOKEN="ODI2ZSQ4CFYyMzgxUzkzzACy.HPL5PA.9qKR4uh8po63-pjYVrPAvQQO4ln"
|
||||
export TEST_GUILD_ID="907951970017480704"
|
||||
export TEST_TEXT_CHANNEL_ID="907951970017480707"
|
||||
export TEST_VC_ID="907951970017480708"
|
||||
export TEST_USER_ID="826535422381391913"
|
||||
export TEST_EVENT_ID="909928577951203360"
|
||||
|
||||
Then, after cloning and building DPP, run `cd build && ctest -VV` for unit test cases.
|
||||
|
||||
If you do not specify the `DPP_UNIT_TEST_TOKEN` environment variable, a subset of the tests will run which do not require discord connectivity.
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
\page install-from-source Building D++ From Source
|
||||
|
||||
The way you build D++ varies from system to system. Please follow the guide below for your OS:
|
||||
|
||||
* \subpage buildlinux "Building on Linux"
|
||||
* \subpage buildwindows "Building on Windows"
|
||||
* \subpage buildosx "Building on OSX"
|
||||
* \subpage buildfreebsd "Building on FreeBSD"
|
||||
|
||||
@warning Note that you most likely don't need to build D++ from source if you're on Linux or Windows. We offer prebuilt binaries for these platforms and are listed in package managers! Check the downloads in the releases section on github.
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
\page buildfreebsd Building on FreeBSD
|
||||
|
||||
## 1. Toolchain
|
||||
This project uses CMake. Install it with `pkg install cmake`
|
||||
|
||||
## 2. Install External Dependencies
|
||||
Your FreeBSD base system should have all the required dependencies installed by default.
|
||||
|
||||
For voice support, additional dependencies are required
|
||||
|
||||
pkg install libsodium opus pkgconf
|
||||
|
||||
## 3. Build Source Code
|
||||
|
||||
cmake -B ./build
|
||||
cmake --build ./build -j8
|
||||
|
||||
Replace the number after -j with a number suitable for your setup, usually the same as the number of cores on your machine. `cmake` will fetch any dependencies that are required for you and ensure they are compiled alongside the library.
|
||||
|
||||
## 4. Install globally
|
||||
|
||||
cd build; make install
|
||||
|
||||
## 5. Installation to a different directory
|
||||
|
||||
If you want to install the library, its dependencies and header files to a different directory, specify this directory when running `cmake`:
|
||||
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install
|
||||
|
||||
Then once the build is complete, run `make install` to install to the location you specified.
|
||||
|
||||
## 7. Using the library
|
||||
|
||||
Once installed, you can make use of the library in standalone programs simply by including it and linking to it:
|
||||
|
||||
clang++ -std=c++17 -ldpp mydppbot.cpp -o dppbot
|
||||
|
||||
The important flags in this command-line are:
|
||||
|
||||
* `-std=c++17` - Required to compile the headers
|
||||
* `-ldpp` - Link to libdpp.dylib
|
||||
* `mydppbot.cpp` - Your source code
|
||||
* `dppbot` - The name of the executable to make
|
||||
|
||||
Of course, this is just a proof of concept - you should really use a more robust build system like [`cmake`](@ref buildcmake).
|
||||
|
||||
If you are having trouble setting up CMake, you can try [our template bot](https://github.com/brainboxdotcc/templatebot).
|
||||
|
||||
**Have fun!**
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
\page buildlinux Building on Linux
|
||||
|
||||
\note You might not need to build a copy of the library for Linux - precompiled deb files for 64 bit and 32 bit Debian and Ubuntu are provided in the GitHub version releases. Unless you are on a different Linux distribution which does not support the installation of deb files, or wish to submit fixes and enhancements to the library itself you should have an easier time installing the precompiled version instead.
|
||||
|
||||
## 1. Build Source Code
|
||||
|
||||
cmake -B ./build
|
||||
cmake --build ./build -j8
|
||||
|
||||
Replace the number after -j with a number suitable for your setup, usually the same as the number of cores on your machine. `cmake` will fetch any dependencies that are required for you and ensure they are compiled alongside the library.
|
||||
|
||||
## 2. Install to /usr/local/include and /usr/local/lib
|
||||
|
||||
cd build; sudo make install
|
||||
|
||||
## 3. Installation to a different directory
|
||||
|
||||
If you want to install the library, its dependencies and header files to a different directory, specify this directory when running `cmake`:
|
||||
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install
|
||||
|
||||
Then once the build is complete, run `make install` to install to the location you specified.
|
||||
|
||||
## 4. Using the library
|
||||
|
||||
Once installed to the /usr/local directory, you can make use of the library in standalone programs simply by including it and linking to it:
|
||||
|
||||
g++ -std=c++17 mydppbot.cpp -o dppbot -ldpp
|
||||
|
||||
The important flags in this command-line are:
|
||||
|
||||
* `-std=c++17` - Required to compile the headers
|
||||
* `mydppbot.cpp` - Your source code
|
||||
* `dppbot` - The name of the executable to make
|
||||
|
||||
Of course, this is just a proof of concept — you should really use a more robust build system like GNU `make` or [`cmake`](@ref buildcmake).
|
||||
|
||||
If you are having trouble setting up CMake, you can try [our template bot](https://github.com/brainboxdotcc/templatebot).
|
||||
|
||||
**Have fun!**
|
||||
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
\page buildosx Building on OSX
|
||||
|
||||
## 1. Toolchain
|
||||
Before compiling make sure you have all the tools installed.
|
||||
|
||||
1. To install the dependencies, this guide will use homebrew which has [installation instructions on their project page](https://brew.sh/).
|
||||
|
||||
2. This project uses CMake to generate the makefiles. Install it with `brew install cmake`.
|
||||
|
||||
## 2. Install External Dependencies
|
||||
|
||||
brew install openssl
|
||||
|
||||
For voice support, additional dependencies are required:
|
||||
|
||||
brew install libsodium opus
|
||||
|
||||
## 3. Build Source Code
|
||||
|
||||
cmake -B ./build
|
||||
cmake --build ./build -j8
|
||||
|
||||
Replace the number after -j with a number suitable for your setup, usually the same as the number of cores on your machine. `cmake` will fetch any dependencies that are required for you and ensure they are compiled alongside the library.
|
||||
|
||||
## 4. Install globally
|
||||
|
||||
cd build; sudo make install
|
||||
|
||||
## 5. Installation to a different directory
|
||||
|
||||
If you want to install the library, its dependencies and header files to a different directory, specify this directory when running `cmake`:
|
||||
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install
|
||||
|
||||
Then once the build is complete, run `make install` to install to the location you specified.
|
||||
|
||||
## 6. Using the library
|
||||
|
||||
Once installed, you can make use of the library in standalone programs simply by including it and linking to it:
|
||||
|
||||
clang++ -std=c++17 -ldpp mydppbot.cpp -o dppbot
|
||||
|
||||
The important flags in this command-line are:
|
||||
|
||||
* `-std=c++17` - Required to compile the headers
|
||||
* `-ldpp` - Link to libdpp.dylib
|
||||
* `mydppbot.cpp` - Your source code
|
||||
* `dppbot` - The name of the executable to make
|
||||
|
||||
Of course, this is just a proof of concept - you should really use a more robust build system like GNU `make` or [`cmake`](@ref buildcmake).
|
||||
|
||||
If you are having trouble setting up CMake, you can try [our template bot](https://github.com/brainboxdotcc/templatebot).
|
||||
|
||||
**Have fun!**
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
\page buildwindows Building on Windows
|
||||
|
||||
To build on windows follow these steps *exactly*. The build process depends on specific libraries being installed on your system in specific locations.
|
||||
|
||||
## Wait a minute! Read this first!
|
||||
|
||||
\warning **You do not need to follow this tutorial unless you plan to contribute to or modify the library itself**. Unless you consider yourself an **advanced user** with a specific **requirement to build from source** you should [obtain a pre-made visual studio template containing the latest D++ build (for 32 and 64 bit, release and debug profiles) by clicking here](https://github.com/brainboxdotcc/windows-bot-template/) and completely skip this guide! Instead, read \ref build-a-discord-bot-windows-visual-studio.
|
||||
|
||||
## If you are absolutely sure you need this guide, read on:
|
||||
|
||||
1. Make sure you have Visual Studio 2019 or Visual Studio 2022. The Community, Professional or Enterprise versions all work, however you will probably want to install Community. You do **NOT** want to use *Visual Studio Code* for this. You can [download the correct version here](https://visualstudio.microsoft.com/downloads/).
|
||||
2. Check out the DPP project source using git
|
||||
3. From within Visual Studio 2019, click the "File" menu, choose "Open" then "CMake", and select the CMakeLists.txt within the project folder
|
||||
\image html winbuild_1.png
|
||||
\image html winbuild_2.png
|
||||
4. Go to the "Build" menu and choose "Build all" or just press F7
|
||||
\image html winbuild_3.png
|
||||
5. Check that compilation succeeded. You may now use the library in your projects!
|
||||
\image html winbuild_4.png
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
* If you do not have an option to open the CMakeLists.txt, ensure that you have installed the C++ development portions of visual studio (not just web development portions) with at least the default options.
|
||||
* If the project does not build, please ask for help on the [official discord server](https://discord.gg/dpp).
|
||||
|
||||
## After compiling
|
||||
|
||||
After compilation you can directly reference the compiled project in your own CMakeLists.txt as a library or use the lib/dll/headers as you wish. Note that `openssl` and `zlib` will also be an indirect dependency of your program (as `DLL` files) and should be copied alongside `dpp.dll`.
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
ErrorDocument 404 /index.php
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
<?php
|
||||
$githubApi = "https://api.github.com/repos/brainboxdotcc/dpp/releases";
|
||||
$json = json_decode(
|
||||
file_get_contents(
|
||||
$githubApi,
|
||||
false,
|
||||
stream_context_create(
|
||||
[
|
||||
"http" => [
|
||||
"method" => "GET",
|
||||
"header" => "User-Agent: DPP/Website"
|
||||
]
|
||||
]
|
||||
)
|
||||
)
|
||||
);
|
||||
$downloads = 0;
|
||||
foreach ($json as $index => $release) {
|
||||
$releaseDownloads = 0;
|
||||
foreach ($release->assets as $asset) {
|
||||
$releaseDownloads += $asset->download_count;
|
||||
}
|
||||
$downloads += $releaseDownloads;
|
||||
}
|
||||
|
||||
header("Content-Type: image/svg+xml");
|
||||
echo <<<IMG
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="106" height="20" role="img" aria-label="downloads: {$downloads}">
|
||||
<title>downloads: {$downloads}</title>
|
||||
<linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
</linearGradient>
|
||||
<clipPath id="r">
|
||||
<rect width="106" height="20" rx="3" fill="#fff"/>
|
||||
</clipPath>
|
||||
<g clip-path="url(#r)">
|
||||
<rect width="69" height="20" fill="#555"/><rect x="69" width="37" height="20" fill="#97ca00"/>
|
||||
<rect width="106" height="20" fill="url(#s)"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
||||
<text aria-hidden="true" x="355" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="590">downloads</text>
|
||||
<text x="355" y="140" transform="scale(.1)" fill="#fff" textLength="590">downloads</text>
|
||||
<text aria-hidden="true" x="865" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="270">{$downloads}</text>
|
||||
<text x="865" y="140" transform="scale(.1)" fill="#fff" textLength="270">{$downloads}</text>
|
||||
</g>
|
||||
</svg>
|
||||
IMG;
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
<?php
|
||||
// Force no caching of the download
|
||||
header("Expires: Tue, 03 Jul 2001 06:00:00 GMT");
|
||||
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
|
||||
header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
|
||||
header("Cache-Control: post-check=0, pre-check=0", false);
|
||||
header("Pragma: no-cache");
|
||||
header("Status: 200 OK");
|
||||
|
||||
// Split up url and set defaults
|
||||
list($version, $arch, $type) = explode('/', preg_replace('/https:\/\/dl\.dpp\.dev\//', '', $_SERVER['REDIRECT_SCRIPT_URI']), 3);
|
||||
$version = !empty($version) ? $version : 'latest';
|
||||
$arch = !empty($arch) ? $arch : 'linux-x64';
|
||||
$type = !empty($type) ? $type : 'deb';
|
||||
$urls = [];
|
||||
|
||||
// All windows downloads are of type 'zip', if not specified, it is defaulted
|
||||
if (preg_match('/^win/i', $arch) && $type === 'deb') {
|
||||
$type = 'zip';
|
||||
}
|
||||
// the short word 'win' is a shorthand for the vs2019 release build
|
||||
if ($arch === 'win') {
|
||||
$arch = 'win32-release-vs2019';
|
||||
}
|
||||
|
||||
// A crontab keeps this updated so we only perform one github api request per 5 minutes
|
||||
$json = json_decode(file_get_contents('release.json'));
|
||||
|
||||
// If the user asked for 'latest', we find out what the latest release tag name is
|
||||
if ($version === 'latest') {
|
||||
$version = $json[0]->tag_name;
|
||||
}
|
||||
|
||||
// Build search filename
|
||||
$searchName = 'libdpp-' . preg_replace('/^v/', '', $version) . '-' . $arch . '.' . $type;
|
||||
|
||||
// Iterate list of release artifacts across all releases
|
||||
foreach ($json as $index => $release) {
|
||||
foreach ($release->assets as $index2 => $asset) {
|
||||
$url = $asset->browser_download_url;
|
||||
$name = $asset->name;
|
||||
$thisVersion = $release->tag_name;
|
||||
// We found a matching file, stream it to the user
|
||||
if (strtoupper($searchName) == strtoupper($name)) {
|
||||
header('Content-Type: application/octet-stream');
|
||||
header('Content-Disposition: attachment; filename="' . $name . '"');
|
||||
readfile($url);
|
||||
exit;
|
||||
}
|
||||
$urls[] = [
|
||||
'name' => $name,
|
||||
'url' => $url,
|
||||
'version' => $thisVersion,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($version === 'json') {
|
||||
header('Content-Type: application/json');
|
||||
echo json_encode($urls);
|
||||
} else {
|
||||
// Nothing found, offer up some useful info
|
||||
foreach ($urls as $thisUrl) {
|
||||
printf("%s - <a href='%s' target='_blank'>%s</a><br />", $thisUrl['version'], $thisUrl['url'], $thisUrl['name']);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
\page interactions-and-components Interactions And Components
|
||||
|
||||
The example programs listed here demonstrate lots of things to do with interactions, application commands (slash commands) and message components. If you're looking to make your bot **modern and user friendly** these examples are what you need.
|
||||
|
||||
* \subpage slashcommands "Using Slash Commands and Interactions"
|
||||
* \subpage context-menu "Context Menus"
|
||||
* \subpage subcommands "Slash command sub-commands"
|
||||
* \subpage components "Using button components"
|
||||
* \subpage components3 "Using select menu components"
|
||||
* \subpage components2 "Advanced components"
|
||||
* \subpage modal-dialog-interactions "Modal Dialogs"
|
||||
* \subpage commandhandler "Unified message/slash command handler"
|
||||
* \subpage application-command-autocomplete "Slash command auto completion"
|
||||
* \subpage discord-application-command-file-upload "Using file parameters in slash commands"
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
\page application-command-autocomplete Slash command auto completion
|
||||
|
||||
Discord now supports sending auto completion lists for slash command choices. To use this feature you can use code such as the example below:
|
||||
|
||||
~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
dpp::cluster bot("token");
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
bot.on_ready([&bot](const dpp::ready_t & event) {
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
/* Create a new global command once on ready event */
|
||||
bot.global_command_create(dpp::slashcommand("blep", "Send a random adorable animal photo", bot.me.id)
|
||||
.add_option(
|
||||
/* If you set the auto complete setting on a command option, it will trigger the on_autocomplete
|
||||
* event whenever discord needs to fill information for the choices. You cannot set any choices
|
||||
* here if you set the auto complete value to true.
|
||||
*/
|
||||
dpp::command_option(dpp::co_string, "animal", "The type of animal").set_auto_complete(true)
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
/* The interaction create event is fired when someone issues your commands */
|
||||
bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
|
||||
/* Check which command they ran */
|
||||
if (event.command.get_command_name() == "blep") {
|
||||
/* Fetch a parameter value from the command parameters */
|
||||
std::string animal = std::get<std::string>(event.get_parameter("animal"));
|
||||
/* Reply to the command. There is an overloaded version of this
|
||||
* call that accepts a dpp::message so you can send embeds.
|
||||
*/
|
||||
event.reply("Blep! You chose " + animal);
|
||||
}
|
||||
});
|
||||
|
||||
/* The on_autocomplete event is fired whenever discord needs information to fill in a command options's choices.
|
||||
* You must reply with a REST event within 500ms, so make it snappy!
|
||||
*/
|
||||
bot.on_autocomplete([&bot](const dpp::autocomplete_t & event) {
|
||||
for (auto & opt : event.options) {
|
||||
/* The option which has focused set to true is the one the user is typing in */
|
||||
if (opt.focused) {
|
||||
/* In a real world usage of this function you should return values that loosely match
|
||||
* opt.value, which contains what the user has typed so far. The opt.value is a variant
|
||||
* and will contain the type identical to that of the slash command parameter.
|
||||
* Here we can safely know it is string.
|
||||
*/
|
||||
std::string uservalue = std::get<std::string>(opt.value);
|
||||
bot.interaction_response_create(event.command.id, event.command.token, dpp::interaction_response(dpp::ir_autocomplete_reply)
|
||||
.add_autocomplete_choice(dpp::command_option_choice("squids", "lots of squids"))
|
||||
.add_autocomplete_choice(dpp::command_option_choice("cats", "a few cats"))
|
||||
.add_autocomplete_choice(dpp::command_option_choice("dogs", "bucket of dogs"))
|
||||
.add_autocomplete_choice(dpp::command_option_choice("elephants", "bottle of elephants"))
|
||||
);
|
||||
bot.log(dpp::ll_debug, "Autocomplete " + opt.name + " with value '" + uservalue + "' in field " + event.name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~
|
||||
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
\page commandhandler Using a command handler object
|
||||
|
||||
If you have many commands in your bot, and want to handle commands from multiple sources (for example modern slash commands, and more regular
|
||||
prefixed channel messages) you should consider instantiating a dpp::commandhandler object. This object can be used to automatically route
|
||||
commands and their parameters to functions in your program. A simple example of using this object to route commands is shown below, and will
|
||||
route both the /ping (global slash command) and .ping (prefixed channel message command) to a lambda where a reply can be generated.
|
||||
|
||||
\note This example automatically hooks the dpp::cluster::on_message_create and dpp::cluster::on_slashcommand events. This can be overridden if needed to allow you to still make use of these functions for your own code, if you need to do this please see the constructor documentation for dpp::commandhandler.
|
||||
|
||||
Note that because the dpp::commandhandler::add_command method accepts a std::function as the command handler, you may point a command handler
|
||||
at a simple lambda (as shown in this example), a function pointer, or an instantiated class method of an object. This is extremely flexible
|
||||
and allows you to decide how and where commands should be routed, either to an object oriented system or to a lambda based system.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
dpp::cluster bot("token");
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
/* Create command handler, and specify prefixes */
|
||||
dpp::commandhandler command_handler(&bot);
|
||||
/* Specifying a prefix of "/" tells the command handler it should also expect slash commands */
|
||||
command_handler.add_prefix(".").add_prefix("/");
|
||||
|
||||
bot.on_ready([&command_handler](const dpp::ready_t &event) {
|
||||
|
||||
command_handler.add_command(
|
||||
/* Command name */
|
||||
"ping",
|
||||
|
||||
/* Parameters */
|
||||
{
|
||||
{"testparameter", dpp::param_info(dpp::pt_string, true, "Optional test parameter") }
|
||||
},
|
||||
|
||||
/* Command handler */
|
||||
[&command_handler](const std::string& command, const dpp::parameter_list_t& parameters, dpp::command_source src) {
|
||||
std::string got_param;
|
||||
if (!parameters.empty()) {
|
||||
got_param = std::get<std::string>(parameters[0].second);
|
||||
}
|
||||
command_handler.reply(dpp::message("Pong! -> " + got_param), src);
|
||||
},
|
||||
|
||||
/* Command description */
|
||||
"A test ping command",
|
||||
|
||||
/* Guild id (omit for a global command) */
|
||||
819556414099554344
|
||||
);
|
||||
|
||||
/* NOTE: We must call this to ensure slash commands are registered.
|
||||
* This does a bulk register, which will replace other commands
|
||||
* that are registered already!
|
||||
*/
|
||||
command_handler.register_commands();
|
||||
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
\page components Using button components
|
||||
|
||||
Discord's newest features support sending buttons alongside messages, which when clicked by the user trigger an interaction which is routed by
|
||||
D++ as an on_button_click event. To make use of this, use code as in this example.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
#include <iostream>
|
||||
#include <dpp/message.h>
|
||||
|
||||
int main() {
|
||||
|
||||
dpp::cluster bot("token", dpp::i_default_intents | dpp::i_message_content);
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
/* Message handler to look for a command called !button */
|
||||
bot.on_message_create([&bot](const dpp::message_create_t & event) {
|
||||
if (event.msg.content == "!button") {
|
||||
/* Create a message containing an action row, and a button within the action row. */
|
||||
bot.message_create(
|
||||
dpp::message(event.msg.channel_id, "this text has buttons").add_component(
|
||||
dpp::component().add_component(
|
||||
dpp::component().set_label("Click me!").
|
||||
set_type(dpp::cot_button).
|
||||
set_emoji(u8"😄").
|
||||
set_style(dpp::cos_danger).
|
||||
set_id("myid")
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
/* When a user clicks your button, the on_button_click event will fire,
|
||||
* containing the custom_id you defined in your button.
|
||||
*/
|
||||
bot.on_button_click([&bot](const dpp::button_click_t & event) {
|
||||
/* Button clicks are still interactions, and must be replied to in some form to
|
||||
* prevent the "this interaction has failed" message from Discord to the user.
|
||||
*/
|
||||
event.reply("You clicked: " + event.custom_id);
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
When the feature is functioning, the code below will produce buttons on the reply message like in the image below:
|
||||
|
||||
\image html button.png
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
\page components2 Advanced components
|
||||
|
||||
This example demonstrates receiving button clicks and sending response messages.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
int main() {
|
||||
|
||||
dpp::cluster bot("token", dpp::i_default_intents | dpp::i_message_content); // Privileged intent required to receive message content
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
bot.on_button_click([&bot](const dpp::button_click_t & event) {
|
||||
if (event.custom_id == "10") {
|
||||
event.reply(dpp::message("Correct").set_flags(dpp::m_ephemeral));
|
||||
} else {
|
||||
event.reply(dpp::message("Incorrect").set_flags(dpp::m_ephemeral));
|
||||
}
|
||||
});
|
||||
|
||||
bot.on_message_create([&bot](const dpp::message_create_t & event) {
|
||||
if (event.msg.content == "!ping2") {
|
||||
bot.message_create(
|
||||
dpp::message(event.msg.channel_id, "What is 5+5?").add_component(
|
||||
dpp::component().add_component(
|
||||
dpp::component().set_label("9").
|
||||
set_style(dpp::cos_primary).
|
||||
set_id("9")
|
||||
).add_component(
|
||||
dpp::component().set_label("10").
|
||||
set_style(dpp::cos_primary).
|
||||
set_id("10")
|
||||
).add_component(
|
||||
dpp::component().set_label("11").
|
||||
set_style(dpp::cos_primary).
|
||||
set_id("11")
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
This code will send a different message for correct and incorrect answers.
|
||||
|
||||
\image html button_2.png
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
\page components3 Using select menu components
|
||||
|
||||
This example demonstrates receiving select menu clicks and sending response messages.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
int main() {
|
||||
|
||||
dpp::cluster bot("token", dpp::i_default_intents | dpp::i_message_content);
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
/* Message handler to look for a command called !select */
|
||||
bot.on_message_create([&bot](const dpp::message_create_t & event) {
|
||||
if (event.msg.content == "!select") {
|
||||
/* Create a message containing an action row, and a select menu within the action row. */
|
||||
dpp::message m(event.msg.channel_id, "this text has a select menu");
|
||||
m.add_component(
|
||||
dpp::component().add_component(
|
||||
dpp::component().set_type(dpp::cot_selectmenu).
|
||||
set_placeholder("Pick something").
|
||||
add_select_option(dpp::select_option("label1","value1","description1").set_emoji(u8"😄")).
|
||||
add_select_option(dpp::select_option("label2","value2","description2").set_emoji(u8"🙂")).
|
||||
set_id("myselid")
|
||||
)
|
||||
);
|
||||
bot.message_create(m);
|
||||
}
|
||||
});
|
||||
/* When a user clicks your select menu , the on_select_click event will fire,
|
||||
* containing the custom_id you defined in your select menu.
|
||||
*/
|
||||
bot.on_select_click([&bot](const dpp::select_click_t & event) {
|
||||
/* Select clicks are still interactions, and must be replied to in some form to
|
||||
* prevent the "this interaction has failed" message from Discord to the user.
|
||||
*/
|
||||
event.reply("You clicked " + event.custom_id + " and chose: " + event.values[0]);
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
\page context-menu Context Menus
|
||||
|
||||
Context menus are application commands that appear on the context menu (right click or tap) of users or messages to perform context-specific actions. They can be created using `dpp::slashcommand`. Once you create a context menu, try right-clicking either a user or message to see it in your server!
|
||||
|
||||
\image html context_menu_user_command.png
|
||||
|
||||
The following example shows how to create and handle **user context menus**.
|
||||
|
||||
~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
#include <iostream>
|
||||
|
||||
int main()
|
||||
{
|
||||
dpp::cluster bot("token");
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
bot.on_ready([&bot](const dpp::ready_t &event) {
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
/* Register the command */
|
||||
bot.guild_command_create(
|
||||
dpp::slashcommand()
|
||||
.set_type(dpp::ctxm_user)
|
||||
.set_name("High Five")
|
||||
.set_application_id(bot.me.id),
|
||||
857692897221033129 // you need to put your guild-id in here
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
/* Use the on_user_context_menu event to look for user context menu actions */
|
||||
bot.on_user_context_menu([&](const dpp::user_context_menu_t &event) {
|
||||
/* check if the context menu name is High Five */
|
||||
if (event.command.get_command_name() == "High Five") {
|
||||
dpp::user user = event.get_user(); // the user who the command has been issued on
|
||||
dpp::user author = event.command.get_issuing_user(); // the user who clicked on the context menu
|
||||
event.reply(author.get_mention() + " slapped " + user.get_mention());
|
||||
}
|
||||
});
|
||||
|
||||
/* Start bot */
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~
|
||||
|
||||
It registers a guild command that can be called by right-click a user and click on the created menu.
|
||||
|
||||
\image html context_menu_user_command_showcase.png
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
\page modal-dialog-interactions Modal Dialog Interactions
|
||||
|
||||
Modal dialog interactions are a new Discord API feature that allow you to have pop-up windows which prompt the user to input information. Once the user has filled in this information, your program will receive an `on_form_submit` event which will contain the data which was input. You must use a slash command interaction response to submit your modal form data to Discord, via the `on_slashcommand` event. From here calling the `dialog` method of the `interaction_create_t` event object will trigger the dialog to appear.
|
||||
|
||||
Each dialog box may have up to five rows of input fields. The example below demonstrates a simple setup with just one text input:
|
||||
|
||||
~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
#include <iostream>
|
||||
|
||||
int main(int argc, char const *argv[])
|
||||
{
|
||||
dpp::cluster bot("token");
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
bot.on_ready([&](const dpp::ready_t & event) {
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
/* Create a slash command and register it as a global command */
|
||||
bot.global_command_create(dpp::slashcommand("dialog", "Make a modal dialog box", bot.me.id));
|
||||
}
|
||||
});
|
||||
|
||||
bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
|
||||
/* Check for our /dialog command */
|
||||
if (event.command.get_command_name() == "dialog") {
|
||||
/* Instantiate an interaction_modal_response object */
|
||||
dpp::interaction_modal_response modal("my_modal", "Please enter stuff");
|
||||
/* Add a text component */
|
||||
modal.add_component(
|
||||
dpp::component().
|
||||
set_label("Short type rammel").
|
||||
set_id("field_id").
|
||||
set_type(dpp::cot_text).
|
||||
set_placeholder("gumd").
|
||||
set_min_length(5).
|
||||
set_max_length(50).
|
||||
set_text_style(dpp::text_short)
|
||||
);
|
||||
/* Add another text component in the next row, as required by Discord */
|
||||
modal.add_row();
|
||||
modal.add_component(
|
||||
dpp::component().
|
||||
set_label("Type rammel").
|
||||
set_id("field_id2").
|
||||
set_type(dpp::cot_text).
|
||||
set_placeholder("gumf").
|
||||
set_min_length(1).
|
||||
set_max_length(2000).
|
||||
set_text_style(dpp::text_paragraph)
|
||||
);
|
||||
/* Trigger the dialog box. All dialog boxes are ephemeral */
|
||||
event.dialog(modal);
|
||||
}
|
||||
});
|
||||
|
||||
/* This event handles form submission for the modal dialog we create above */
|
||||
bot.on_form_submit([&](const dpp::form_submit_t & event) {
|
||||
/* For this simple example we know the first element of the first row ([0][0]) is value type string.
|
||||
* In the real world it may not be safe to make such assumptions!
|
||||
*/
|
||||
std::string v = std::get<std::string>(event.components[0].components[0].value);
|
||||
dpp::message m;
|
||||
m.set_content("You entered: " + v).set_flags(dpp::m_ephemeral);
|
||||
/* Emit a reply. Form submission is still an interaction and must generate some form of reply! */
|
||||
event.reply(m);
|
||||
});
|
||||
|
||||
/* Start bot */
|
||||
bot.start(dpp::st_wait);
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~
|
||||
|
||||
If you compile and run this program and wait for the global command to register, typing `/dialog` will present you with a dialog box like the one below:
|
||||
|
||||
\image html modal_dialog.png
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
\page slashcommands Using Slash Commands and Interactions
|
||||
|
||||
Slash commands and interactions are a newer feature of Discord which allow bot's commands to be registered centrally within the system and for users to easily explore and get help with available commands through the client itself.
|
||||
|
||||
To add a slash command you should use the dpp::cluster::global_command_create method for global commands (available to all guilds) or dpp::cluster::guild_command_create to create a local command (available only to one guild).
|
||||
|
||||
When a user issues these commands the reply will arrive via the `on_slashcommand` event which you can hook, and take action when you see your commands. It is possible to reply to an interaction by using either the dpp::interaction_create_t::reply method, or by manually instantiating an object of type dpp::interaction_response and attaching a dpp::message object to it.
|
||||
|
||||
dpp::interaction_create_t::reply has two overloaded versions of the method, one of which accepts simple std::string replies, for basic text-only messages (if your message is 'ephemeral' you must use this) and one which accepts a dpp::message for more advanced replies. Please note that at present, Discord only supports a small subset of message and embed features within an interaction response object.
|
||||
|
||||
\note You can also use the unified command handler, which lets you combine channel based message commands and slash commands under the same lambda with the same code like they were one and the same. Note that after August of 2022 Discord will be discouraging bots from using commands that are prefixed messages via means of a privileged message intent. It is advised that you exclusively use slash commands, or the unified handler with only a prefix of "/" going forward for any new bots you create and look to migrating existing bots to this setup.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
dpp::cluster bot("token");
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
/* The event is fired when someone issues your commands */
|
||||
bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
|
||||
/* Check which command they ran */
|
||||
if (event.command.get_command_name() == "blep") {
|
||||
/* Fetch a parameter value from the command parameters */
|
||||
std::string animal = std::get<std::string>(event.get_parameter("animal"));
|
||||
/* Reply to the command. There is an overloaded version of this
|
||||
* call that accepts a dpp::message so you can send embeds.
|
||||
*/
|
||||
event.reply(std::string("Blep! You chose") + animal);
|
||||
}
|
||||
});
|
||||
|
||||
bot.on_ready([&bot](const dpp::ready_t & event) {
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
|
||||
/* Create a new global command on ready event */
|
||||
dpp::slashcommand newcommand("blep", "Send a random adorable animal photo", bot.me.id);
|
||||
newcommand.add_option(
|
||||
dpp::command_option(dpp::co_string, "animal", "The type of animal", true).
|
||||
add_choice(dpp::command_option_choice("Dog", std::string("animal_dog"))).
|
||||
add_choice(dpp::command_option_choice("Cat", std::string("animal_cat"))).
|
||||
add_choice(dpp::command_option_choice("Penguin", std::string("animal_penguin")
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
/* Register the command */
|
||||
bot.global_command_create(newcommand);
|
||||
}
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
\note For demonstration purposes, and small bots, this code is OK, but in the real world once your bot gets big, it's not recommended to create slash commands in the `on_ready` event because it gets called often (discord forces reconnections and sometimes these do not resume). You could for example add a commandline parameter to your bot (`argc`, `argv`) so that if you want the bot to register commands it must be launched with a specific command line argument.
|
||||
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
\page subcommands Using sub-commands in slash commands
|
||||
|
||||
This demonstrates how to use sub-commands within slash commands. Also shown below is an example of how to get a "resolved" parameter without having to use the cache or an extra API call.
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
|
||||
#include <dpp/dpp.h>
|
||||
#include <iostream>
|
||||
|
||||
int main() {
|
||||
|
||||
dpp::cluster bot("token");
|
||||
|
||||
bot.on_log(dpp::utility::cout_logger());
|
||||
|
||||
/* Executes on ready. */
|
||||
bot.on_ready([&bot](const dpp::ready_t & event) {
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
/* Define a slash command. */
|
||||
dpp::slashcommand image("image", "Send a specific image.", bot.me.id);
|
||||
image.add_option(
|
||||
/* Create a subcommand type option for "dog". */
|
||||
dpp::command_option(dpp::co_sub_command, "dog", "Send a picture of a dog.").
|
||||
add_option(dpp::command_option(dpp::co_user, "user", "User to turn into a dog.", false))
|
||||
);
|
||||
image.add_option(
|
||||
/* Create another subcommand type option for "cat". */
|
||||
dpp::command_option(dpp::co_sub_command, "cat", "Send a picture of a cat.").
|
||||
add_option(dpp::command_option(dpp::co_user, "user", "User to turn into a cat.", false))
|
||||
);
|
||||
/* Create command */
|
||||
bot.global_command_create(image);
|
||||
}
|
||||
});
|
||||
|
||||
/* Use the on_slashcommand event to look for commands */
|
||||
bot.on_slashcommand([&bot](const dpp::slashcommand_t & event) {
|
||||
dpp::interaction interaction = event.command;
|
||||
dpp::command_interaction cmd_data = interaction.get_command_interaction();
|
||||
/* Check if the command is the image command. */
|
||||
if (interaction.get_command_name() == "image") {
|
||||
/* Get the sub command */
|
||||
auto subcommand = cmd_data.options[0];
|
||||
/* Check if the subcommand is "dog" */
|
||||
if (subcommand.name == "dog") {
|
||||
/* Checks if the subcommand has any options. */
|
||||
if (!subcommand.options.empty()) {
|
||||
/* Get the user from the parameter */
|
||||
dpp::user user = interaction.get_resolved_user(
|
||||
subcommand.get_value<dpp::snowflake>(0)
|
||||
);
|
||||
event.reply(user.get_mention() + " has now been turned into a dog.");
|
||||
} else {
|
||||
/* Reply if there were no options.. */
|
||||
event.reply("No user specified");
|
||||
}
|
||||
}
|
||||
/* Check if the subcommand is "cat" */
|
||||
if (subcommand.name == "cat") {
|
||||
/* Checks if the subcommand has any options. */
|
||||
if (!subcommand.options.empty()) {
|
||||
/* Get the user from the parameter */
|
||||
dpp::user user = interaction.get_resolved_user(
|
||||
subcommand.get_value<dpp::snowflake>(0)
|
||||
);
|
||||
event.reply(user.get_mention() + " has now been turned into a cat.");
|
||||
} else {
|
||||
/* Reply if there were no options.. */
|
||||
event.reply("No user specified");
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
bot.start(dpp::st_wait);
|
||||
|
||||
return 0;
|
||||
}
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue