ttrss: fix downloading icons, now uses more proper relative URL detec…

…tion
martinrotter · Jan 24, 2023 · 2e76ae5 · 2e76ae5
1 parent ebdde96
commit 2e76ae5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp
@@ -471,7 +471,6 @@ QString Application::userDataAppFolder() const {
   // In "app" folder, we would like to separate all user data into own subfolder,
   // therefore stick to "data" folder in this mode.
   return QDir::toNativeSeparators(applicationDirPath() + QDir::separator() + QSL("data4"));
-  ;
 }
 
 QString Application::userDataFolder() {

diff --git a/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp b/src/librssguard/services/tt-rss/ttrssnetworkfactory.cpp
@@ -926,11 +926,10 @@ RootItem* TtRssGetFeedsCategoriesResponse::feedsCategories(TtRssNetworkFactory*
 
           if (obtain_icons) {
             QString icon_path =
-              item[QSL("icon")].type() == QJsonValue::String ? item[QSL("icon")].toString() : QString();
+              item[QSL("icon")].type() == QJsonValue::Type::String ? item[QSL("icon")].toString() : QString();
 
             if (!icon_path.isEmpty()) {
-              // Chop the "api/" suffix out and append
-              QString full_icon_address = base_address + QL1C('/') + icon_path;
+              QString full_icon_address = QUrl(base_address).resolved(icon_path).toString();
               QPixmap icon;
               QList<QPair<QByteArray, QByteArray>> headers;
 
@@ -941,7 +940,7 @@ RootItem* TtRssGetFeedsCategoriesResponse::feedsCategories(TtRssNetworkFactory*
               auto res =
                 NetworkFactory::downloadIcon({{full_icon_address, true}}, DOWNLOAD_TIMEOUT, icon, headers, proxy);
 
-              if (res == QNetworkReply::NoError) {
+              if (res == QNetworkReply::NetworkError::NoError) {
                 feed->setIcon(icon);
               }
               else {