From: Olaf Wintermann Date: Thu, 27 Nov 2025 19:49:22 +0000 (+0100) Subject: fix feed group item sorting X-Git-Url: https://uap-core.de/gitweb/?a=commitdiff_plain;h=1caaa4e0897064fc1233c9b4ccd18b04659f82f2;p=rssreader.git fix feed group item sorting --- diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt index ac69e1e..1943dd1 100644 --- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt +++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt @@ -113,7 +113,7 @@ class FeedList(window: MainWindow) : Document() { collection.items.add(item) } } - collection.items.sortByDescending { it.pubDate } + collection.items.sortByDescending { it.date } collection.itemsLoaded = true loadFeed(collection) diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Item.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Item.kt index 30431fa..b70bd0d 100644 --- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Item.kt +++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Item.kt @@ -22,6 +22,8 @@ class Item(id: Int) { var feedName: String? = null var feedUrl: String? = null + val date: Instant? get() = updated ?: pubDate + var collection: FeedCollection? = null fun getContent(): Content { diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt index cd6211b..a9abfe1 100644 --- a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt +++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt @@ -270,7 +270,7 @@ class MainWindow() { when(col) { 0 -> result = elm.title 1 -> { - val date = elm.updated ?: elm.pubDate + val date = elm.date date?.let { val localDate = date.atZone(ZoneId.systemDefault()).toLocalDate() val now = LocalDate.now()