Add support for more image uploader services (#1741)
The list of links that have been uploaded is now also stored in the json format instead of csv
This commit is contained in:
@@ -57,10 +57,6 @@ Env::Env()
|
||||
, twitchEmoteSetResolverUrl(readStringEnv(
|
||||
"CHATTERINO2_TWITCH_EMOTE_SET_RESOLVER_URL",
|
||||
"https://braize.pajlada.com/chatterino/twitchemotes/set/%1/"))
|
||||
, imageUploaderUrl(readStringEnv("CHATTERINO2_IMAGE_UPLOADER_URL",
|
||||
"https://i.nuuls.com/upload"))
|
||||
, imageUploaderFormBody(
|
||||
readStringEnv("CHATTERINO2_IMAGE_UPLOADER_FORM_BODY", "attachment"))
|
||||
, twitchServerHost(
|
||||
readStringEnv("CHATTERINO2_TWITCH_SERVER_HOST", "irc.chat.twitch.tv"))
|
||||
, twitchServerPort(readPortEnv("CHATTERINO2_TWITCH_SERVER_PORT", 443))
|
||||
|
||||
@@ -14,8 +14,6 @@ public:
|
||||
const QString recentMessagesApiUrl;
|
||||
const QString linkResolverUrl;
|
||||
const QString twitchEmoteSetResolverUrl;
|
||||
const QString imageUploaderUrl;
|
||||
const QString imageUploaderFormBody;
|
||||
const QString twitchServerHost;
|
||||
const uint16_t twitchServerPort;
|
||||
const bool twitchServerSecure;
|
||||
|
||||
@@ -99,6 +99,20 @@ NetworkRequest NetworkRequest::header(const char *headerName,
|
||||
return std::move(*this);
|
||||
}
|
||||
|
||||
NetworkRequest NetworkRequest::headerList(const QStringList &headers) &&
|
||||
{
|
||||
for (const QString &header : headers)
|
||||
{
|
||||
const QStringList thisHeader = header.trimmed().split(":");
|
||||
if (thisHeader.size() == 2)
|
||||
{
|
||||
this->data->request_.setRawHeader(thisHeader[0].trimmed().toUtf8(),
|
||||
thisHeader[1].trimmed().toUtf8());
|
||||
}
|
||||
}
|
||||
return std::move(*this);
|
||||
}
|
||||
|
||||
NetworkRequest NetworkRequest::timeout(int ms) &&
|
||||
{
|
||||
this->data->hasTimeout_ = true;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "common/NetworkCommon.hpp"
|
||||
#include "common/NetworkResult.hpp"
|
||||
|
||||
#include <QHttpMultiPart>
|
||||
#include <memory>
|
||||
|
||||
namespace chatterino {
|
||||
@@ -52,6 +53,7 @@ public:
|
||||
NetworkRequest header(const char *headerName, const char *value) &&;
|
||||
NetworkRequest header(const char *headerName, const QByteArray &value) &&;
|
||||
NetworkRequest header(const char *headerName, const QString &value) &&;
|
||||
NetworkRequest headerList(const QStringList &headers) &&;
|
||||
NetworkRequest timeout(int ms) &&;
|
||||
NetworkRequest concurrent() &&;
|
||||
NetworkRequest authorizeTwitchV5(const QString &clientID,
|
||||
|
||||
Reference in New Issue
Block a user