Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Prevent crashes with bugs in Friendica and Pleroma servers (#441) 

Neither server type implements the Mastodon API correctly, see

- https://github.com/friendica/friendica/issues/13887
- https://git.pleroma.social/pleroma/pleroma/-/issues/3238

Prevent crashes when parsing their broken JSON by providing default
values for properties they omit.

Fixes #433
This commit is contained in:
Nik Clayton 2024-02-14 12:36:06 +01:00 committed by GitHub
parent 913f366a41
commit 6c33204569
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/network/src/main/kotlin/app/pachli/core/network/model/Card.kt
View File

@ -26,15 +26,24 @@ data class Card(
override val title: String, override val title: String,
override val description: String, override val description: String,
@Json(name = "type") override val kind: PreviewCardKind, @Json(name = "type") override val kind: PreviewCardKind,
@Json(name = "author_name") override val authorName: String, // Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
@Json(name = "author_url") override val authorUrl: String, @Json(name = "author_name") override val authorName: String = "",
// Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
@Json(name = "author_url") override val authorUrl: String = "",
@Json(name = "provider_name") override val providerName: String, @Json(name = "provider_name") override val providerName: String,
@Json(name = "provider_url") override val providerUrl: String, @Json(name = "provider_url") override val providerUrl: String,
override val html: String, // Missing from Friendica, https://github.com/friendica/friendica/issues/13887
override val width: Int, // Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
override val height: Int, override val html: String = "",
// Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
override val width: Int = 0,
// Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
override val height: Int = 0,
override val image: String? = null, override val image: String? = null,
@Json(name = "embed_url") override val embedUrl: String, // Missing from Friendica, https://github.com/friendica/friendica/issues/13887
// Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
@Json(name = "embed_url") override val embedUrl: String = "",
// Missing from Pleroma, https://git.pleroma.social/pleroma/pleroma/-/issues/3238
override val blurhash: String? = null, override val blurhash: String? = null,
) : PreviewCard { ) : PreviewCard {

4
core/network/src/main/kotlin/app/pachli/core/network/model/TrendsLink.kt
View File

@ -42,7 +42,7 @@ interface PreviewCard {
val title: String val title: String
val description: String val description: String
val kind: PreviewCardKind val kind: PreviewCardKind
val authorName: String? // Not supposed to be null, per API, but seen null in the wild val authorName: String
val authorUrl: String val authorUrl: String
val providerName: String val providerName: String
val providerUrl: String val providerUrl: String
@ -68,7 +68,7 @@ data class TrendsLink(
override val title: String, override val title: String,
override val description: String, override val description: String,
@Json(name = "type") override val kind: PreviewCardKind, @Json(name = "type") override val kind: PreviewCardKind,
@Json(name = "author_name") override val authorName: String, @Json(name = "author_name") override val authorName: String = "",
@Json(name = "author_url") override val authorUrl: String, @Json(name = "author_url") override val authorUrl: String,
@Json(name = "provider_name") override val providerName: String, @Json(name = "provider_name") override val providerName: String,
@Json(name = "provider_url") override val providerUrl: String, @Json(name = "provider_url") override val providerUrl: String,