Skip to content

fix: make RSS description nullable to prevent crashes on null values #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tlaster merged 1 commit into from
Dec 11, 2025
Merged

fix: make RSS description nullable to prevent crashes on null values #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rc/commonMain/kotlin/dev/dimension/flare/data/datasource/rss/RssTimelineRemoteMediator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ internal class RssTimelineRemoteMediator(
content = StatusContent.Rss(it),
text =
it.data.description
.let { html -> parseHtml(html) }
.wholeText(),
?.let { html -> parseHtml(html) }
?.wholeText(),
createdAt =
it.data.date?.let { parseRssDateToInstant(it) }
?: Clock.System.now(),
Expand Down
29 changes: 9 additions & 20 deletions shared/src/commonMain/kotlin/dev/dimension/flare/data/network/rss/RssService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ import dev.dimension.flare.data.network.ktorClient
import dev.dimension.flare.data.network.rss.model.Feed
import dev.dimension.flare.data.repository.tryRun
import dev.dimension.flare.ui.model.mapper.link
import io.ktor.client.call.body
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.request.get
import io.ktor.client.statement.bodyAsText
import io.ktor.http.ContentType
import io.ktor.http.Url
import io.ktor.serialization.kotlinx.xml.xml
import kotlinx.serialization.decodeFromString
import nl.adaptivity.xmlutil.serialization.XML

Expand All @@ -25,16 +21,15 @@ internal object RssService {
defaultToGenericParser = true
}
}
private val client = ktorClient { }

suspend fun fetch(url: String): Feed =
ktorClient(config = {
install(ContentNegotiation) {
xml(xml, contentType = ContentType.Any)
}
}).get(url).body()
suspend fun fetch(url: String): Feed {
val response = client.get(url).bodyAsText()
return xml.decodeFromString(response)
}

suspend fun detectLinkSources(url: String): List<String> =
ktorClient()
client
.get(url)
.bodyAsText()
.let(Ksoup::parse)
Expand All @@ -53,9 +48,7 @@ internal object RssService {
suspend fun fetchIcon(url: String): String? {
val webContent =
tryRun {
ktorClient(
config = {},
).get(url).bodyAsText()
client.get(url).bodyAsText()
}.getOrNull() ?: return null
val feed =
tryRun {
Expand All @@ -76,9 +69,7 @@ internal object RssService {
val html =
if (feed?.link != null && feed.link != url) {
tryRun {
ktorClient(
config = {},
).get(feedLink).bodyAsText()
client.get(feedLink).bodyAsText()
}.getOrNull() ?: return null
} else {
webContent
Expand Down Expand Up @@ -106,9 +97,7 @@ internal object RssService {
val hasFavIcon =
tryRun {
val response =
ktorClient(
config = {},
).get(favIcon)
client.get(favIcon)
if (response.status.value !in 200..299) {
throw Exception("Failed to fetch favicon: ${response.status}")
}
Expand Down
6 changes: 3 additions & 3 deletions shared/src/commonMain/kotlin/dev/dimension/flare/data/network/rss/model/Feed.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ internal sealed interface Feed {
@XmlElement(true)
val link: String,
@XmlElement(true)
val description: String,
val description: String? = null,
@XmlElement(true)
val language: String? = null,
@XmlElement(true)
Expand Down Expand Up @@ -404,7 +404,7 @@ internal sealed interface Feed {
@XmlElement(true)
val link: String,
@XmlElement(true)
val description: String,
val description: String? = null,
@XmlElement(true)
@XmlSerialName(value = "date", namespace = "http://purl.org/dc/elements/1.1/", prefix = "dc")
val date: String? = null,
Expand All @@ -417,7 +417,7 @@ internal sealed interface Feed {
@XmlElement(true)
val link: String,
@XmlElement(true)
val description: String,
val description: String? = null,
@XmlElement(true)
@XmlSerialName(value = "date", namespace = "http://purl.org/dc/elements/1.1/", prefix = "dc")
val date: String? = null,
Expand Down
6 changes: 3 additions & 3 deletions shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Rss.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ internal fun StatusContent.Rss.RssContent.Rss20.render(): UiTimeline =
internal fun StatusContent.Rss.RssContent.RDF.render(): UiTimeline =
with(data) {
val descHtml =
description.let {
description?.let {
Ksoup.parse(it)
}
val img = descHtml.select("img").firstOrNull()
val img = descHtml?.select("img")?.firstOrNull()
return UiTimeline(
topMessage = null,
content =
UiTimeline.ItemContent.Feed(
title = title,
description = descHtml.text(),
description = descHtml?.text(),
url = link.replace("http://", "https://"),
image = img?.attr("src"),
source = source,
Expand Down
Loading