shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 76 Pull Requests Releases Wiki Activity

Prevent attempting to add an attachment when the possibility would be 

invalid
This commit is contained in:
Shadowfacts 2020-09-07 14:43:39 -04:00
parent fe95cb9e1a
commit 39c8162931
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tusker/Screens/Compose/ComposeAttachmentsList.swift
View File

@ -95,8 +95,7 @@ struct ComposeAttachmentsList: View {
case .pleroma:
return true
case .mastodon:
// todo: this technically allows invalid image/video combinations
return draft.attachments.count < 4
return draft.attachments.count < 4 && draft.attachments.allSatisfy { $0.data.type == .image }
}
}

3
Tusker/Screens/Compose/ComposeHostingController.swift
View File

@ -199,7 +199,8 @@ class ComposeHostingController: UIHostingController<ComposeContainerView> {
case .pleroma:
return true
case .mastodon:
// todo: this technically allows invalid video/image combinations
guard draft.attachments.allSatisfy({ $0.data.type == .image }) else { return false }
// todo: if providers are videos, this technically allows invalid video/image combinations
return itemProviders.count + draft.attachments.count <= 4
}
}