Skip to content

Make width/height optional in MediaAttachment's meta.original #663

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
PattaFeuFeu merged 1 commit into from
Feb 18, 2026
Merged

Make width/height optional in MediaAttachment's meta.original #663

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 bigbone/src/main/kotlin/social/bigbone/api/entity/MediaAttachment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ data class MediaAttachment(
* Width of this media attachment.
*/
@SerialName("width")
val width: Int,
val width: Int? = null,

/**
* Height of this media attachment.
*/
@SerialName("height")
val height: Int,
val height: Int? = null,

/**
* Size of this media attachment.
Expand Down
21 changes: 21 additions & 0 deletions bigbone/src/test/assets/media_attachment_audio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"id": "21165404",
"type": "audio",
"url": "https://files.mastodon.social/media_attachments/files/021/165/404/original/a31a4a46cd713cd2.mp3",
"preview_url": "https://files.mastodon.social/media_attachments/files/021/165/404/small/a31a4a46cd713cd2.mp3",
"remote_url": null,
"text_url": "https://mastodon.social/media/5O4uILClVqBWx0NNgvo",
"meta": {
"length": "0:06:42.86",
"duration": 402.86,
"audio_encode": "mp3",
"audio_bitrate": "44100 Hz",
"audio_channels": "stereo",
"original": {
"duration": 402.860408,
"bitrate": 166290
}
},
"description": null,
"blurhash": null
}
13 changes: 13 additions & 0 deletions bigbone/src/test/kotlin/social/bigbone/api/entity/MediaAttachmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,17 @@ class MediaAttachmentTest {
mediaAttachment.previewUrl shouldBeEqualTo "preview"
mediaAttachment.type shouldBeEqualTo MediaAttachment.MediaType.VIDEO
}

@Test
fun deserializeAudio() {
val json = AssetsUtil.readFromAssets("media_attachment_audio.json")
val mediaAttachment: MediaAttachment = JSON_SERIALIZER.decodeFromString(json)
mediaAttachment.id shouldBeEqualTo "21165404"
mediaAttachment.url shouldBeEqualTo "https://files.mastodon.social/media_attachments/files/021/165/404/original/a31a4a46cd713cd2.mp3"
mediaAttachment.previewUrl shouldBeEqualTo "https://files.mastodon.social/media_attachments/files/021/165/404/small/a31a4a46cd713cd2.mp3"
mediaAttachment.type shouldBeEqualTo MediaAttachment.MediaType.AUDIO
mediaAttachment.meta?.length shouldBeEqualTo "0:06:42.86"
mediaAttachment.meta?.original?.width shouldBeEqualTo null
mediaAttachment.meta?.original?.height shouldBeEqualTo null
}
}
Loading