From 41ee259196c1ff5a1d625a4421dafd06c4a901d8 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 20 May 2020 16:21:50 +0300 Subject: [PATCH] ComposeViewModel: add Markdown/HTML support for glitch-soc(untested), fix file size limits for Pixelfed --- .../tusky/components/compose/ComposeViewModel.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt index 4ced5c6b..29547f31 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt @@ -100,15 +100,15 @@ class ComposeViewModel supportsMarkdown = false, supportsBBcode = false, supportsHTML = false, - videoLimit = nodeinfo?.metadata?.config?.uploader?.maxPhotoSize ?: STATUS_VIDEO_SIZE_LIMIT, - imageLimit = nodeinfo?.metadata?.config?.uploader?.maxPhotoSize ?: STATUS_IMAGE_SIZE_LIMIT + videoLimit = nodeinfo?.metadata?.config?.uploader?.maxPhotoSize?.let { it * 1024 } ?: STATUS_VIDEO_SIZE_LIMIT, + imageLimit = nodeinfo?.metadata?.config?.uploader?.maxPhotoSize?.let { it * 1024 } ?: STATUS_IMAGE_SIZE_LIMIT ) } else { ComposeInstanceMetadata( software = "mastodon", - supportsMarkdown = false, + supportsMarkdown = nodeinfo?.software?.version?.contains("+glitch") ?: false, supportsBBcode = false, - supportsHTML = false, + supportsHTML = nodeinfo?.software?.version?.contains("+glitch") ?: false, videoLimit = STATUS_VIDEO_SIZE_LIMIT, imageLimit = STATUS_IMAGE_SIZE_LIMIT )