mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2024-12-16 10:48:49 +01:00
Merge pull request #805 from marysaka/fix/reduce-attachment-constraints
Accept missing metadata on attachments
This commit is contained in:
commit
6c6978c524
@ -51,14 +51,28 @@ extension Mastodon.Entity.Status {
|
|||||||
guard let mediaAttachments = mediaAttachments else { return [] }
|
guard let mediaAttachments = mediaAttachments else { return [] }
|
||||||
|
|
||||||
let attachments = mediaAttachments.compactMap { media -> MastodonAttachment? in
|
let attachments = mediaAttachments.compactMap { media -> MastodonAttachment? in
|
||||||
guard let kind = media.attachmentKind,
|
guard let kind = media.attachmentKind
|
||||||
let meta = media.meta,
|
|
||||||
let original = meta.original,
|
|
||||||
let width = original.width, // audio has width/height
|
|
||||||
let height = original.height
|
|
||||||
else { return nil }
|
else { return nil }
|
||||||
|
|
||||||
let durationMS: Int? = original.duration.flatMap { Int($0 * 1000) }
|
let width: Int;
|
||||||
|
let height: Int;
|
||||||
|
let durationMS: Int?;
|
||||||
|
|
||||||
|
if let meta = media.meta,
|
||||||
|
let original = meta.original,
|
||||||
|
let originalWidth = original.width,
|
||||||
|
let originalHeight = original.height {
|
||||||
|
width = originalWidth // audio has width/height
|
||||||
|
height = originalHeight
|
||||||
|
durationMS = original.duration.map { Int($0 * 1000) }
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// In case metadata field is missing, use default values.
|
||||||
|
width = 32;
|
||||||
|
height = 32;
|
||||||
|
durationMS = nil;
|
||||||
|
}
|
||||||
|
|
||||||
return MastodonAttachment(
|
return MastodonAttachment(
|
||||||
id: media.id,
|
id: media.id,
|
||||||
kind: kind,
|
kind: kind,
|
||||||
|
Loading…
Reference in New Issue
Block a user