Fixes #1241

vitorpamplona · Jan 2, 2025 · 9f147f0 · 9f147f0
1 parent 0ceccb2
commit 9f147f0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
@@ -30,6 +30,7 @@ import com.vitorpamplona.quartz.events.AudioTrackEvent
 import com.vitorpamplona.quartz.events.BadgeAwardEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
@@ -106,9 +107,10 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
                                 TorrentEvent.KIND,
                                 TorrentCommentEvent.KIND,
                                 InteractiveStoryPrologueEvent.KIND,
+                                CommentEvent.KIND,
                             ),
                         authors = listOf(it.pubkeyHex),
-                        limit = 20,
+                        limit = 50,
                     ),
             )
         }

diff --git a/...yst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileConversationsFeedFilter.kt b/...yst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileConversationsFeedFilter.kt
@@ -25,6 +25,7 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
@@ -61,6 +62,7 @@ class UserProfileConversationsFeedFilter(
                     it.event is PollNoteEvent ||
                     it.event is ChannelMessageEvent ||
                     it.event is LiveActivitiesChatMessageEvent ||
+                    it.event is CommentEvent ||
                     it.event is TorrentCommentEvent
             ) &&
             !it.isNewThread() &&

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt
@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.ui.note.types
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -55,6 +56,7 @@ import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageHeader
 import com.vitorpamplona.amethyst.ui.note.elements.DisplayUncitedHashtags
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.amethyst.ui.theme.Size5dp
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import com.vitorpamplona.quartz.events.EmptyTagList
 import com.vitorpamplona.quartz.events.VideoEvent
@@ -119,6 +121,7 @@ fun VideoDisplay(
                     .fillMaxWidth()
                     .padding(top = 5.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = spacedBy(Size5dp),
         ) {
             if (isYouTube) {
                 val uri = LocalUriHandler.current
@@ -157,8 +160,7 @@ fun VideoDisplay(
                     overflow = TextOverflow.Ellipsis,
                     modifier =
                         Modifier
-                            .fillMaxWidth()
-                            .padding(top = 5.dp),
+                            .fillMaxWidth(),
                 )
             }