remove notifications for NIP90 Content events
This commit is contained in:
@@ -37,6 +37,9 @@ import com.vitorpamplona.quartz.events.HighlightEvent
|
|||||||
import com.vitorpamplona.quartz.events.LnZapEvent
|
import com.vitorpamplona.quartz.events.LnZapEvent
|
||||||
import com.vitorpamplona.quartz.events.LnZapRequestEvent
|
import com.vitorpamplona.quartz.events.LnZapRequestEvent
|
||||||
import com.vitorpamplona.quartz.events.MuteListEvent
|
import com.vitorpamplona.quartz.events.MuteListEvent
|
||||||
|
import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
|
||||||
|
import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
|
||||||
|
import com.vitorpamplona.quartz.events.NIP90StatusEvent
|
||||||
import com.vitorpamplona.quartz.events.PeopleListEvent
|
import com.vitorpamplona.quartz.events.PeopleListEvent
|
||||||
import com.vitorpamplona.quartz.events.ReactionEvent
|
import com.vitorpamplona.quartz.events.ReactionEvent
|
||||||
import com.vitorpamplona.quartz.events.RepostEvent
|
import com.vitorpamplona.quartz.events.RepostEvent
|
||||||
@@ -111,6 +114,7 @@ class NotificationFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
|
|||||||
it.event !is LnZapRequestEvent &&
|
it.event !is LnZapRequestEvent &&
|
||||||
it.event !is BadgeDefinitionEvent &&
|
it.event !is BadgeDefinitionEvent &&
|
||||||
it.event !is BadgeProfilesEvent &&
|
it.event !is BadgeProfilesEvent &&
|
||||||
|
it.event !is NIP90ContentDiscoveryResponseEvent && it.event !is NIP90StatusEvent && it.event !is NIP90ContentDiscoveryRequestEvent &&
|
||||||
it.event !is GiftWrapEvent &&
|
it.event !is GiftWrapEvent &&
|
||||||
(it.event is LnZapEvent || notifAuthor != loggedInUserHex) &&
|
(it.event is LnZapEvent || notifAuthor != loggedInUserHex) &&
|
||||||
(filterParams.isGlobal || filterParams.followLists?.users?.contains(notifAuthor) == true) &&
|
(filterParams.isGlobal || filterParams.followLists?.users?.contains(notifAuthor) == true) &&
|
||||||
|
|||||||
+16
-10
@@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.Column
|
|||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
import androidx.compose.foundation.pager.HorizontalPager
|
import androidx.compose.foundation.pager.HorizontalPager
|
||||||
import androidx.compose.foundation.pager.rememberPagerState
|
import androidx.compose.foundation.pager.rememberPagerState
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@@ -72,12 +71,24 @@ private fun RenderNostrNIP90ContentDiscoveryScreen(
|
|||||||
val pagerState = rememberPagerState { 2 }
|
val pagerState = rememberPagerState { 2 }
|
||||||
val coroutineScope = rememberCoroutineScope()
|
val coroutineScope = rememberCoroutineScope()
|
||||||
|
|
||||||
if (DVMID != null) {
|
// TODO Render a nice header with image and DVM name from the id
|
||||||
Text(text = "Debug: DVM KEY:\n " + DVMID)
|
|
||||||
}
|
/* if (DVMID != null) {
|
||||||
|
LoadNote(baseNoteHex = DVMID, accountViewModel = accountViewModel) {
|
||||||
|
if (it != null) {
|
||||||
|
NoteCompose(baseNote = it, quotesLeft = 0, accountViewModel = accountViewModel ) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (it != null) {
|
||||||
|
Text(text = (it.event as AppDefinitionEvent).content())
|
||||||
|
} else {
|
||||||
|
Text(text = "yo")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} */
|
||||||
|
|
||||||
if (DVMID != null) {
|
if (DVMID != null) {
|
||||||
// TODO 1 Send KIND 5300 Event with p tag = DVMID (crashes, because cant map to event)
|
|
||||||
val thread =
|
val thread =
|
||||||
Thread {
|
Thread {
|
||||||
try {
|
try {
|
||||||
@@ -92,11 +103,6 @@ private fun RenderNostrNIP90ContentDiscoveryScreen(
|
|||||||
|
|
||||||
thread.start()
|
thread.start()
|
||||||
}
|
}
|
||||||
// var keyPair = accountViewModel.account.keyPair
|
|
||||||
|
|
||||||
// TODO 2 PARSE AND LOAD RESULTS FROM KIND 6300 REPLY to resultfeedmodel (RN this doesnt show events)
|
|
||||||
|
|
||||||
// TODO 3 Render Results (hopefully works when 2 is working)
|
|
||||||
|
|
||||||
HorizontalPager(state = pagerState) {
|
HorizontalPager(state = pagerState) {
|
||||||
RefresheableFeedView(
|
RefresheableFeedView(
|
||||||
|
|||||||
Reference in New Issue
Block a user