Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-31 09:44:50 +01:00
Code Issues Releases Wiki Activity

Use protected kApiUrl

Browse Source
This commit is contained in:
Jonas Kvinge 2021-06-28 00:21:33 +02:00
parent bb134ee7ac
commit fdc9a71f9e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tidal/tidalbaserequest.h
View File

@ -71,7 +71,6 @@ class TidalBaseRequest : public QObject {
virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0;
static QString ErrorsToHTML(const QStringList &errors); static QString ErrorsToHTML(const QStringList &errors);
QString api_url() { return QString(kApiUrl); }
bool oauth() { return service_->oauth(); } bool oauth() { return service_->oauth(); }
QString client_id() { return service_->client_id(); } QString client_id() { return service_->client_id(); }
QString api_token() { return service_->api_token(); } QString api_token() { return service_->api_token(); }
@ -97,9 +96,10 @@ class TidalBaseRequest : public QObject {
private slots: private slots:
void HandleSSLErrors(const QList<QSslError> &ssl_errors); void HandleSSLErrors(const QList<QSslError> &ssl_errors);
private: protected:
static const char *kApiUrl; static const char *kApiUrl;
private:
TidalService *service_; TidalService *service_;
NetworkAccessManager *network_; NetworkAccessManager *network_;

4
src/tidal/tidalfavoriterequest.cpp
View File

@ -133,7 +133,7 @@ void TidalFavoriteRequest::AddFavorites(const FavoriteType type, const SongList
url_query.addQueryItem(QUrl::toPercentEncoding(param.first), QUrl::toPercentEncoding(param.second)); url_query.addQueryItem(QUrl::toPercentEncoding(param.first), QUrl::toPercentEncoding(param.second));
} }
QUrl url(api_url() + QString("/") + "users/" + QString::number(service_->user_id()) + "/favorites/" + FavoriteText(type)); QUrl url(kApiUrl + QString("/") + "users/" + QString::number(service_->user_id()) + "/favorites/" + FavoriteText(type));
QNetworkRequest req(url); QNetworkRequest req(url);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy); req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
@ -239,7 +239,7 @@ void TidalFavoriteRequest::RemoveFavorites(const FavoriteType type, const QStrin
url_query.addQueryItem(QUrl::toPercentEncoding(param.first), QUrl::toPercentEncoding(param.second)); url_query.addQueryItem(QUrl::toPercentEncoding(param.first), QUrl::toPercentEncoding(param.second));
} }
QUrl url(api_url() + QString("/") + "users/" + QString::number(service_->user_id()) + "/favorites/" + FavoriteText(type) + QString("/") + id); QUrl url(kApiUrl + QString("/") + "users/" + QString::number(service_->user_id()) + "/favorites/" + FavoriteText(type) + QString("/") + id);
url.setQuery(url_query); url.setQuery(url_query);
QNetworkRequest req(url); QNetworkRequest req(url);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)