bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix translating polls and spoilers (#4344)

Browse source 
The docs are wrong https://github.com/mastodon/documentation/pull/1423 🙄
This commit is contained in:
Konrad Pozniak 2024-03-29 21:13:57 +01:00 committed by GitHub
parent ba495f41a5
commit b022767ae6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/keylesspalace/tusky/entity/Translation.kt
View file

@ -14,12 +14,20 @@ data class MediaTranslation(
*/ */
data class Translation( data class Translation(
val content: String, val content: String,
@SerializedName("spoiler_warning") @SerializedName("spoiler_text")
val spoilerWarning: String?, val spoilerText: String?,
val poll: List<String>?, val poll: TranslatedPoll?,
@SerializedName("media_attachments") @SerializedName("media_attachments")
val mediaAttachments: List<MediaTranslation>, val mediaAttachments: List<MediaTranslation>,
@SerializedName("detected_source_language") @SerializedName("detected_source_language")
val detectedSourceLanguage: String, val detectedSourceLanguage: String,
val provider: String, val provider: String,
) )
data class TranslatedPoll(
val options: List<TranslatedPollOption>
)
data class TranslatedPollOption(
val title: String
)

6
app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.kt
View file

@ -67,10 +67,12 @@ sealed class StatusViewData {
actionable.attachments.translated { translation -> map { it.translated(translation) } } actionable.attachments.translated { translation -> map { it.translated(translation) } }
val spoilerText: String = val spoilerText: String =
actionable.spoilerText.translated { translation -> translation.spoilerWarning ?: this } actionable.spoilerText.translated { translation -> translation.spoilerText ?: this }
val poll = actionable.poll?.translated { translation -> val poll = actionable.poll?.translated { translation ->
val translatedOptionsText = translation.poll ?: return@translated this val translatedOptionsText = translation.poll?.options?.map { option ->
option.title
} ?: return@translated this
val translatedOptions = options.zip(translatedOptionsText) { option, translatedText -> val translatedOptions = options.zip(translatedOptionsText) { option, translatedText ->
option.copy(title = translatedText) option.copy(title = translatedText)
} }