pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some unwanted freshrss behavior

Browse source
This commit is contained in:
Martin Rotter 2021-05-18 14:00:43 +02:00
parent 792f269b5f
commit 158203ce2c
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.9.2" date="2021-05-17"/> <release version="3.9.2" date="2021-05-18"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

13
src/librssguard/services/greader/greadernetwork.cpp
View file

@ -333,16 +333,25 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
QString icon_url = subscription["iconUrl"].toString(); QString icon_url = subscription["iconUrl"].toString();
QList<QPair<QString, bool>> icon_urls; QList<QPair<QString, bool>> icon_urls;
icon_urls.append({ url, false });
if (!icon_url.isEmpty()) { if (!icon_url.isEmpty()) {
if (icon_url.startsWith(QSL("//"))) { if (icon_url.startsWith(QSL("//"))) {
icon_url = QUrl(baseUrl()).scheme() + QSL(":") + icon_url; icon_url = QUrl(baseUrl()).scheme() + QSL(":") + icon_url;
} }
else if (service() == GreaderServiceRoot::Service::FreshRss) {
QUrl icon_url_obj(icon_url);
QUrl base_url(baseUrl());
if (icon_url_obj.host() == base_url.host()) {
icon_url_obj.setPort(base_url.port());
icon_url = icon_url_obj.toString();
}
}
icon_urls.append({ icon_url, true }); icon_urls.append({ icon_url, true });
} }
icon_urls.append({ url, false });
QIcon icon; QIcon icon;
if (NetworkFactory::downloadIcon(icon_urls, if (NetworkFactory::downloadIcon(icon_urls,