nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Adds support for Instagram feeds. https://github.com/nostr-protocol/nips/pull/1551

Browse Source
This commit is contained in:
Vitor Pamplona
2024-11-19 15:36:30 -05:00
parent 248848799c
commit 4db6f5531c
23 changed files with 791 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/MediaContentModels.kt
+8 -7
View File
@@ -21,12 +21,13 @@
package com.vitorpamplona.amethyst.commons.richtext
import androidx.compose.runtime.Immutable
import com.vitorpamplona.quartz.events.Dimension
import java.io.File
@Immutable
abstract class BaseMediaContent(
val description: String? = null,
val dim: String? = null,
val dim: Dimension? = null,
val blurhash: String? = null,
)
@@ -35,7 +36,7 @@ abstract class MediaUrlContent(
val url: String,
description: String? = null,
val hash: String? = null,
dim: String? = null,
dim: Dimension? = null,
blurhash: String? = null,
val uri: String? = null,
val mimeType: String? = null,
@@ -47,7 +48,7 @@ class MediaUrlImage(
description: String? = null,
hash: String? = null,
blurhash: String? = null,
dim: String? = null,
dim: Dimension? = null,
uri: String? = null,
val contentWarning: String? = null,
mimeType: String? = null,
@@ -58,7 +59,7 @@ class MediaUrlVideo(
url: String,
description: String? = null,
hash: String? = null,
dim: String? = null,
dim: Dimension? = null,
uri: String? = null,
val artworkUri: String? = null,
val authorName: String? = null,
@@ -73,7 +74,7 @@ abstract class MediaPreloadedContent(
description: String? = null,
val mimeType: String? = null,
val isVerified: Boolean? = null,
dim: String? = null,
dim: Dimension? = null,
blurhash: String? = null,
val uri: String,
val id: String? = null,
@@ -86,7 +87,7 @@ class MediaLocalImage(
localFile: File?,
mimeType: String? = null,
description: String? = null,
dim: String? = null,
dim: Dimension? = null,
blurhash: String? = null,
isVerified: Boolean? = null,
uri: String,
@@ -97,7 +98,7 @@ class MediaLocalVideo(
localFile: File?,
mimeType: String? = null,
description: String? = null,
dim: String? = null,
dim: Dimension? = null,
blurhash: String? = null,
isVerified: Boolean? = null,
uri: String,
commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt
+3 -2
View File
@@ -27,6 +27,7 @@ import com.linkedin.urls.detection.UrlDetectorOptions
import com.vitorpamplona.quartz.encoders.Nip30CustomEmoji
import com.vitorpamplona.quartz.encoders.Nip54InlineMetadata
import com.vitorpamplona.quartz.encoders.Nip92MediaAttachments
import com.vitorpamplona.quartz.events.Dimension
import com.vitorpamplona.quartz.events.FileHeaderEvent
import com.vitorpamplona.quartz.events.ImmutableListOfLists
import kotlinx.collections.immutable.ImmutableList
@@ -56,7 +57,7 @@ class RichTextParser {
description = description ?: frags[FileHeaderEvent.ALT] ?: tags[FileHeaderEvent.ALT],
hash = frags[FileHeaderEvent.HASH] ?: tags[FileHeaderEvent.HASH],
blurhash = frags[FileHeaderEvent.BLUR_HASH] ?: tags[FileHeaderEvent.BLUR_HASH],
dim = frags[FileHeaderEvent.DIMENSION] ?: tags[FileHeaderEvent.DIMENSION],
dim = frags[FileHeaderEvent.DIMENSION]?.let { Dimension.parse(it) } ?: tags[FileHeaderEvent.DIMENSION]?.let { Dimension.parse(it) },
contentWarning = frags["content-warning"] ?: tags["content-warning"],
uri = callbackUri,
mimeType = frags[FileHeaderEvent.MIME_TYPE] ?: tags[FileHeaderEvent.MIME_TYPE],
@@ -76,7 +77,7 @@ class RichTextParser {
description = description ?: frags[FileHeaderEvent.ALT] ?: tags[FileHeaderEvent.ALT],
hash = frags[FileHeaderEvent.HASH] ?: tags[FileHeaderEvent.HASH],
blurhash = frags[FileHeaderEvent.BLUR_HASH] ?: tags[FileHeaderEvent.BLUR_HASH],
dim = frags[FileHeaderEvent.DIMENSION] ?: tags[FileHeaderEvent.DIMENSION],
dim = frags[FileHeaderEvent.DIMENSION]?.let { Dimension.parse(it) } ?: tags[FileHeaderEvent.DIMENSION]?.let { Dimension.parse(it) },
contentWarning = frags["content-warning"] ?: tags["content-warning"],
uri = callbackUri,
mimeType = frags[FileHeaderEvent.MIME_TYPE] ?: tags[FileHeaderEvent.MIME_TYPE],