hide subscription dvms for now
This commit is contained in:
@@ -528,7 +528,6 @@ data class DVMCard(
|
|||||||
val name: String,
|
val name: String,
|
||||||
val description: String?,
|
val description: String?,
|
||||||
val cover: String?,
|
val cover: String?,
|
||||||
val moderators: ImmutableList<Participant>,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
@@ -749,7 +748,6 @@ fun RenderContentDVMThumb(
|
|||||||
name = noteEvent?.appMetaData()?.name ?: "",
|
name = noteEvent?.appMetaData()?.name ?: "",
|
||||||
description = noteEvent?.appMetaData()?.about ?: "",
|
description = noteEvent?.appMetaData()?.about ?: "",
|
||||||
cover = noteEvent?.appMetaData()?.image?.ifBlank { null },
|
cover = noteEvent?.appMetaData()?.image?.ifBlank { null },
|
||||||
moderators = persistentListOf(),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
@@ -758,7 +756,6 @@ fun RenderContentDVMThumb(
|
|||||||
name = noteEvent.appMetaData()?.name ?: "",
|
name = noteEvent.appMetaData()?.name ?: "",
|
||||||
description = noteEvent.appMetaData()?.about ?: "",
|
description = noteEvent.appMetaData()?.about ?: "",
|
||||||
cover = noteEvent.appMetaData()?.image?.ifBlank { null },
|
cover = noteEvent.appMetaData()?.image?.ifBlank { null },
|
||||||
moderators = persistentListOf(),
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ object ScrollStateKeys {
|
|||||||
val HOME_FOLLOWS = Route.Home.base + "Follows"
|
val HOME_FOLLOWS = Route.Home.base + "Follows"
|
||||||
val HOME_REPLIES = Route.Home.base + "FollowsReplies"
|
val HOME_REPLIES = Route.Home.base + "FollowsReplies"
|
||||||
|
|
||||||
val DISCOVER_CONTENT = Route.Home.base + "Content"
|
val DISCOVER_CONTENT = Route.Home.base + "DiscoverContent"
|
||||||
val DISCOVER_MARKETPLACE = Route.Home.base + "Marketplace"
|
val DISCOVER_MARKETPLACE = Route.Home.base + "Marketplace"
|
||||||
val DISCOVER_LIVE = Route.Home.base + "Live"
|
val DISCOVER_LIVE = Route.Home.base + "Live"
|
||||||
val DISCOVER_COMMUNITY = Route.Home.base + "Communities"
|
val DISCOVER_COMMUNITY = Route.Home.base + "Communities"
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ fun DiscoverScreen(
|
|||||||
TabItem(
|
TabItem(
|
||||||
R.string.discover_content,
|
R.string.discover_content,
|
||||||
discoveryContentNIP89FeedViewModel,
|
discoveryContentNIP89FeedViewModel,
|
||||||
Route.Discover.base + "Content",
|
Route.Discover.base + "DiscoverContent",
|
||||||
ScrollStateKeys.DISCOVER_CONTENT,
|
ScrollStateKeys.DISCOVER_CONTENT,
|
||||||
AppDefinitionEvent.KIND,
|
AppDefinitionEvent.KIND,
|
||||||
),
|
),
|
||||||
@@ -152,6 +152,7 @@ fun DiscoverScreen(
|
|||||||
val pagerState = rememberForeverPagerState(key = PagerStateKeys.DISCOVER_SCREEN) { tabs.size }
|
val pagerState = rememberForeverPagerState(key = PagerStateKeys.DISCOVER_SCREEN) { tabs.size }
|
||||||
|
|
||||||
WatchAccountForDiscoveryScreen(
|
WatchAccountForDiscoveryScreen(
|
||||||
|
discoverNIP89FeedViewModel = discoveryContentNIP89FeedViewModel,
|
||||||
discoverMarketplaceFeedViewModel = discoveryMarketplaceFeedViewModel,
|
discoverMarketplaceFeedViewModel = discoveryMarketplaceFeedViewModel,
|
||||||
discoveryLiveFeedViewModel = discoveryLiveFeedViewModel,
|
discoveryLiveFeedViewModel = discoveryLiveFeedViewModel,
|
||||||
discoveryCommunityFeedViewModel = discoveryCommunityFeedViewModel,
|
discoveryCommunityFeedViewModel = discoveryCommunityFeedViewModel,
|
||||||
@@ -320,6 +321,7 @@ private fun RenderDiscoverFeed(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun WatchAccountForDiscoveryScreen(
|
fun WatchAccountForDiscoveryScreen(
|
||||||
|
discoverNIP89FeedViewModel: NostrDiscoverNIP89FeedViewModel,
|
||||||
discoverMarketplaceFeedViewModel: NostrDiscoverMarketplaceFeedViewModel,
|
discoverMarketplaceFeedViewModel: NostrDiscoverMarketplaceFeedViewModel,
|
||||||
discoveryLiveFeedViewModel: NostrDiscoverLiveFeedViewModel,
|
discoveryLiveFeedViewModel: NostrDiscoverLiveFeedViewModel,
|
||||||
discoveryCommunityFeedViewModel: NostrDiscoverCommunityFeedViewModel,
|
discoveryCommunityFeedViewModel: NostrDiscoverCommunityFeedViewModel,
|
||||||
@@ -330,6 +332,7 @@ fun WatchAccountForDiscoveryScreen(
|
|||||||
|
|
||||||
LaunchedEffect(accountViewModel, listState) {
|
LaunchedEffect(accountViewModel, listState) {
|
||||||
NostrDiscoveryDataSource.resetFilters()
|
NostrDiscoveryDataSource.resetFilters()
|
||||||
|
discoverNIP89FeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
||||||
discoverMarketplaceFeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
discoverMarketplaceFeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
||||||
discoveryLiveFeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
discoveryLiveFeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
||||||
discoveryCommunityFeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
discoveryCommunityFeedViewModel.checkKeysInvalidateDataAndSendToTop()
|
||||||
@@ -354,6 +357,15 @@ private fun DiscoverFeedLoaded(
|
|||||||
itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { _, item ->
|
itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { _, item ->
|
||||||
val defaultModifier = remember { Modifier.fillMaxWidth().animateItemPlacement() }
|
val defaultModifier = remember { Modifier.fillMaxWidth().animateItemPlacement() }
|
||||||
|
|
||||||
|
// TODO For now we avoid subscription based DVMs, as we need logic for these first if a user is not subscribed already.
|
||||||
|
var avoid = false
|
||||||
|
if (item.event is AppDefinitionEvent) {
|
||||||
|
if ((item.event as AppDefinitionEvent).appMetaData()?.subscription == true) {
|
||||||
|
avoid = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// TODO End
|
||||||
|
if (!avoid) {
|
||||||
Row(defaultModifier) {
|
Row(defaultModifier) {
|
||||||
ChannelCardCompose(
|
ChannelCardCompose(
|
||||||
baseNote = item,
|
baseNote = item,
|
||||||
@@ -371,6 +383,7 @@ private fun DiscoverFeedLoaded(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class)
|
@OptIn(ExperimentalFoundationApi::class)
|
||||||
@Composable
|
@Composable
|
||||||
|
|||||||
Reference in New Issue
Block a user