FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Martin Rotter 2021-02-15 20:09:47 +01:00
parent 01240dda24
commit 8aa9c19cdf
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librssguard/services/feedly/definitions.h
View File

@ -19,5 +19,6 @@
#define FEEDLY_API_URL_TOKEN "auth/token"
#define FEEDLY_API_URL_PROFILE "profile"
#define FEEDLY_API_URL_COLLETIONS "collections"
#define FEEDLY_API_URL_TAGS "tags"
#endif // FEEDLY_DEFINITIONS_H

34
src/librssguard/services/feedly/feedlynetwork.cpp
View File

@ -142,14 +142,14 @@ QVariantHash FeedlyNetwork::profile(const QNetworkProxy& network_proxy) {
QString target_url = fullUrl(Service::Profile);
int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray output_msgs;
QByteArray output;
// This method uses proxy via parameter,
// not via "m_service" field.
auto result = NetworkFactory::performNetworkOperation(target_url,
timeout,
{},
output_msgs,
output,
QNetworkAccessManager::Operation::GetOperation,
{ bearerHeader(bear) },
false,
@ -161,10 +161,35 @@ QVariantHash FeedlyNetwork::profile(const QNetworkProxy& network_proxy) {
throw NetworkException(result.first);
}
return QJsonDocument::fromJson(output_msgs).object().toVariantHash();
return QJsonDocument::fromJson(output).object().toVariantHash();
}
QList<RootItem*> FeedlyNetwork::tags() {
QString bear = bearer();
if (bear.isEmpty()) {
qCriticalNN << LOGSEC_FEEDLY << "Cannot obtain tags, because bearer is empty.";
throw NetworkException(QNetworkReply::NetworkError::AuthenticationRequiredError);
}
QString target_url = fullUrl(Service::Tags);
int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray output;
auto result = NetworkFactory::performNetworkOperation(target_url,
timeout,
{},
output,
QNetworkAccessManager::Operation::GetOperation,
{ bearerHeader(bear) },
false,
{},
{},
m_service->networkProxy());
if (result.first != QNetworkReply::NetworkError::NoError) {
throw NetworkException(result.first);
}
return {};
}
@ -250,6 +275,9 @@ QString FeedlyNetwork::fullUrl(FeedlyNetwork::Service service) const {
case Service::Collections:
return QSL(FEEDLY_API_URL_BASE) + FEEDLY_API_URL_COLLETIONS;
case Service::Tags:
return QSL(FEEDLY_API_URL_BASE) + FEEDLY_API_URL_TAGS;
default:
return FEEDLY_API_URL_BASE;
}

3
src/librssguard/services/feedly/feedlynetwork.h
View File

@ -50,7 +50,8 @@ class FeedlyNetwork : public QObject {
private:
enum class Service {
Profile,
Collections
Collections,
Tags
};
QString fullUrl(Service service) const;