diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index 0d6f2c697..ca20bf549 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -348,7 +348,12 @@ object LocalCache { val channel = getOrCreateChannel(note.idHex) { LiveActivitiesChannel(note.address) } as? LiveActivitiesChannel - channel?.updateChannelInfo(author, event, event.createdAt) + + val creator = event.host()?.ifBlank { null }?.let { + checkGetOrCreateUser(it) + } ?: author + + channel?.updateChannelInfo(creator, event, event.createdAt) refreshObservers(note) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt index bc389312a..338cddc9e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt @@ -61,6 +61,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.OfflineFlag import com.vitorpamplona.amethyst.ui.screen.loggedIn.ScheduledFlag import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer +import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer import com.vitorpamplona.amethyst.ui.theme.QuoteBorder import com.vitorpamplona.amethyst.ui.theme.Size35dp import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer @@ -504,6 +505,8 @@ fun RenderLiveActivityThumb( } } + Spacer(modifier = DoubleVertSpacer) + ChannelHeader( channelHex = remember { baseNote.idHex }, showVideo = false, @@ -710,7 +713,9 @@ fun RenderChannelThumb(baseNote: Note, channel: Channel, accountViewModel: Accou Spacer(modifier = DoubleHorzSpacer) Column( - modifier = Modifier.fillMaxWidth().fillMaxHeight() + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight() ) { Row(verticalAlignment = Alignment.CenterVertically) { Text( diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/LiveActivitiesEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/LiveActivitiesEvent.kt index 9dde93029..3cfc08d10 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/events/LiveActivitiesEvent.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/LiveActivitiesEvent.kt @@ -28,6 +28,8 @@ class LiveActivitiesEvent( fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(3)) } + fun host() = tags.firstOrNull { it.size > 3 && it[0] == "p" && it[3].equals("Host", true) }?.get(1) + fun checkStatus(eventStatus: String?): String? { return if (eventStatus == STATUS_LIVE && createdAt < TimeUtils.eightHoursAgo()) { STATUS_ENDED