Syping/dtranslatebot
1
0
Fork 0
mirror of https://github.com/Syping/dtranslatebot.git synced 2025-09-07 17:32:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix DPP 10.1.0 or newer build errors

Browse source
This commit is contained in:
Syping 2025-08-06 18:33:46 +02:00
parent 13d384b14e
commit b2da36e576
8 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/translator/deepl/deepl.cpp
View file

@ -42,7 +42,7 @@ const std::vector<language> deepl::get_languages()
} }
try { try {
dpp::https_client http_request(m_hostname, 443, "/v2/languages?type=target", "GET", {}, { {"Authorization"s, "DeepL-Auth-Key " + m_apiKey} }, false); dpp::https_client http_request(&m_cluster, m_hostname, 443, "/v2/languages?type=target", "GET", {}, { {"Authorization"s, "DeepL-Auth-Key " + m_apiKey} }, false);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_array()) { if (response.is_array()) {
@ -93,7 +93,7 @@ const std::string deepl::translate(const std::string &text, const std::string &s
}; };
try { try {
dpp::https_client http_request(m_hostname, 443, "/v2/translate", "POST", json_body.dump(), http_headers, false); dpp::https_client http_request(&m_cluster, m_hostname, 443, "/v2/translate", "POST", json_body.dump(), http_headers, false);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_object()) { if (response.is_object()) {

2
src/translator/deepl/deepl.h
View file

@ -19,6 +19,7 @@
#ifndef TRANSLATOR_DEEPL_H #ifndef TRANSLATOR_DEEPL_H
#define TRANSLATOR_DEEPL_H #define TRANSLATOR_DEEPL_H
#include <dpp/cluster.h>
#include "../../core/translator.h" #include "../../core/translator.h"
namespace bot { namespace bot {
@ -31,6 +32,7 @@ namespace bot {
const std::string translate(const std::string &text, const std::string &source, const std::string &target) override; const std::string translate(const std::string &text, const std::string &source, const std::string &target) override;
private: private:
dpp::cluster m_cluster;
std::string m_apiKey; std::string m_apiKey;
std::string m_hostname; std::string m_hostname;
supported_languages m_languages; supported_languages m_languages;

4
src/translator/libretranslate/libretranslate.cpp
View file

@ -42,7 +42,7 @@ const std::vector<language> libretranslate::get_languages()
} }
try { try {
dpp::https_client http_request(m_hostname, m_port, m_url + "languages", "GET", {}, {}, !m_tls); dpp::https_client http_request(&m_cluster, m_hostname, m_port, m_url + "languages", "GET", {}, {}, !m_tls);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_array()) { if (response.is_array()) {
@ -91,7 +91,7 @@ const std::string libretranslate::translate(const std::string &text, const std::
json_body["apiKey"] = m_apiKey; json_body["apiKey"] = m_apiKey;
try { try {
dpp::https_client http_request(m_hostname, m_port, m_url + "translate", "POST", json_body.dump(), http_headers, !m_tls); dpp::https_client http_request(&m_cluster, m_hostname, m_port, m_url + "translate", "POST", json_body.dump(), http_headers, !m_tls);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_object()) { if (response.is_object()) {

2
src/translator/libretranslate/libretranslate.h
View file

@ -20,6 +20,7 @@
#define TRANSLATOR_LIBRETRANSLATE_H #define TRANSLATOR_LIBRETRANSLATE_H
#include <cstdint> #include <cstdint>
#include <dpp/cluster.h>
#include "../../core/translator.h" #include "../../core/translator.h"
namespace bot { namespace bot {
@ -33,6 +34,7 @@ namespace bot {
const std::string translate(const std::string &text, const std::string &source, const std::string &target) override; const std::string translate(const std::string &text, const std::string &source, const std::string &target) override;
private: private:
dpp::cluster m_cluster;
std::string m_apiKey; std::string m_apiKey;
std::string m_hostname; std::string m_hostname;
supported_languages m_languages; supported_languages m_languages;

4
src/translator/lingvatranslate/lingvatranslate.cpp
View file

@ -43,7 +43,7 @@ const std::vector<language> lingvatranslate::get_languages()
} }
try { try {
dpp::https_client http_request(m_hostname, m_port, m_url + "api/v1/languages/target", "GET", {}, {}, !m_tls); dpp::https_client http_request(&m_cluster, m_hostname, m_port, m_url + "api/v1/languages/target", "GET", {}, {}, !m_tls);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_object()) { if (response.is_object()) {
@ -81,7 +81,7 @@ const std::vector<language> lingvatranslate::get_languages()
const std::string lingvatranslate::translate(const std::string &text, const std::string &source, const std::string &target) const std::string lingvatranslate::translate(const std::string &text, const std::string &source, const std::string &target)
{ {
try { try {
dpp::https_client http_request(m_hostname, m_port, m_url + "api/v1/" + source + "/" + target + "/" + dpp::utility::url_encode(text), "GET", {}, {}, !m_tls); dpp::https_client http_request(&m_cluster, m_hostname, m_port, m_url + "api/v1/" + source + "/" + target + "/" + dpp::utility::url_encode(text), "GET", {}, {}, !m_tls);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_object()) { if (response.is_object()) {

2
src/translator/lingvatranslate/lingvatranslate.h
View file

@ -20,6 +20,7 @@
#define TRANSLATOR_LINGVATRANSLATE_H #define TRANSLATOR_LINGVATRANSLATE_H
#include <cstdint> #include <cstdint>
#include <dpp/cluster.h>
#include "../../core/translator.h" #include "../../core/translator.h"
namespace bot { namespace bot {
@ -33,6 +34,7 @@ namespace bot {
const std::string translate(const std::string &text, const std::string &source, const std::string &target) override; const std::string translate(const std::string &text, const std::string &source, const std::string &target) override;
private: private:
dpp::cluster m_cluster;
std::string m_hostname; std::string m_hostname;
supported_languages m_languages; supported_languages m_languages;
uint16_t m_port; uint16_t m_port;

4
src/translator/mozhi/mozhi.cpp
View file

@ -46,7 +46,7 @@ const std::vector<language> mozhi::get_languages()
const std::string parameters = dpp::utility::make_url_parameters({ const std::string parameters = dpp::utility::make_url_parameters({
{"engine"s, m_engine} {"engine"s, m_engine}
}); });
dpp::https_client http_request(m_hostname, m_port, m_url + "api/target_languages" + parameters, "GET", {}, {}, !m_tls); dpp::https_client http_request(&m_cluster, m_hostname, m_port, m_url + "api/target_languages" + parameters, "GET", {}, {}, !m_tls);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_array()) { if (response.is_array()) {
@ -87,7 +87,7 @@ const std::string mozhi::translate(const std::string &text, const std::string &s
{"to"s, target}, {"to"s, target},
{"text"s, text}, {"text"s, text},
}); });
dpp::https_client http_request(m_hostname, m_port, m_url + "api/translate" + parameters, "GET", {}, {}, !m_tls); dpp::https_client http_request(&m_cluster, m_hostname, m_port, m_url + "api/translate" + parameters, "GET", {}, {}, !m_tls);
if (http_request.get_status() == 200) { if (http_request.get_status() == 200) {
const dpp::json response = dpp::json::parse(http_request.get_content()); const dpp::json response = dpp::json::parse(http_request.get_content());
if (response.is_object()) { if (response.is_object()) {

2
src/translator/mozhi/mozhi.h
View file

@ -20,6 +20,7 @@
#define TRANSLATOR_MOZHI_H #define TRANSLATOR_MOZHI_H
#include <cstdint> #include <cstdint>
#include <dpp/cluster.h>
#include "../../core/translator.h" #include "../../core/translator.h"
namespace bot { namespace bot {
@ -33,6 +34,7 @@ namespace bot {
const std::string translate(const std::string &text, const std::string &source, const std::string &target) override; const std::string translate(const std::string &text, const std::string &source, const std::string &target) override;
private: private:
dpp::cluster m_cluster;
std::string m_engine; std::string m_engine;
std::string m_hostname; std::string m_hostname;
supported_languages m_languages; supported_languages m_languages;