highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-10 14:32:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Parse base64 inside the wordIdentifier function

Browse Source
This commit is contained in:
greenart7c3
2024-07-01 15:07:18 -03:00
parent 2bd05d80b0
commit e96015bcbc
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt
View File

@@ -127,15 +127,13 @@ class RichTextParser {
): RichTextViewerState { ): RichTextViewerState {
val urlSet = parseValidUrls(content) val urlSet = parseValidUrls(content)
val base64Images = parseBase64Images(content)
val imagesForPager = val imagesForPager =
urlSet.mapNotNull { fullUrl -> parseMediaUrl(fullUrl, tags, content, callbackUri) }.associateBy { it.url } urlSet.mapNotNull { fullUrl -> parseMediaUrl(fullUrl, tags, content, callbackUri) }.associateBy { it.url }
val imageList = imagesForPager.values.toList() val imageList = imagesForPager.values.toList()
val emojiMap = Nip30CustomEmoji.createEmojiMap(tags) val emojiMap = Nip30CustomEmoji.createEmojiMap(tags)
val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags, base64Images) val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
return RichTextViewerState( return RichTextViewerState(
urlSet.toImmutableSet(), urlSet.toImmutableSet(),
@@ -143,7 +141,6 @@ class RichTextParser {
imageList.toImmutableList(), imageList.toImmutableList(),
emojiMap.toImmutableMap(), emojiMap.toImmutableMap(),
segments, segments,
base64Images.toImmutableSet(),
) )
} }
@@ -153,7 +150,6 @@ class RichTextParser {
urls: Set<String>, urls: Set<String>,
emojis: Map<String, String>, emojis: Map<String, String>,
tags: ImmutableListOfLists<String>, tags: ImmutableListOfLists<String>,
base64Images: Set<String>,
): ImmutableList<ParagraphState> { ): ImmutableList<ParagraphState> {
val lines = content.split('\n') val lines = content.split('\n')
val paragraphSegments = ArrayList<ParagraphState>(lines.size) val paragraphSegments = ArrayList<ParagraphState>(lines.size)
@@ -165,7 +161,7 @@ class RichTextParser {
val wordList = paragraph.trimEnd().split(' ') val wordList = paragraph.trimEnd().split(' ')
val segments = ArrayList<Segment>(wordList.size) val segments = ArrayList<Segment>(wordList.size)
wordList.forEach { word -> wordList.forEach { word ->
val wordSegment = wordIdentifier(word, images, urls, emojis, tags, base64Images) val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
if (wordSegment !is RegularTextSegment) { if (wordSegment !is RegularTextSegment) {
isDirty = true isDirty = true
} }
@@ -219,11 +215,15 @@ class RichTextParser {
urls: Set<String>, urls: Set<String>,
emojis: Map<String, String>, emojis: Map<String, String>,
tags: ImmutableListOfLists<String>, tags: ImmutableListOfLists<String>,
base64Images: Set<String>,
): Segment { ): Segment {
if (word.isEmpty()) return RegularTextSegment(word) if (word.isEmpty()) return RegularTextSegment(word)
if (base64Images.contains(word)) return Base64Segment(word) if (word.startsWith("data:image")) {
val base64Images = parseBase64Images(word)
if (base64Images.isNotEmpty()) {
return Base64Segment(word)
}
}
if (images.contains(word)) return ImageSegment(word) if (images.contains(word)) return ImageSegment(word)

1
commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParserSegments.kt
View File

@@ -32,7 +32,6 @@ data class RichTextViewerState(
val imageList: ImmutableList<MediaUrlContent>, val imageList: ImmutableList<MediaUrlContent>,
val customEmoji: ImmutableMap<String, String>, val customEmoji: ImmutableMap<String, String>,
val paragraphs: ImmutableList<ParagraphState>, val paragraphs: ImmutableList<ParagraphState>,
val base64Images: ImmutableSet<String>,
) )
@Immutable @Immutable