mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-10-10 07:33:32 +02:00
Adds Hashtag search and display to Reposted Notes.
This commit is contained in:
@@ -120,6 +120,8 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
|
|||||||
kinds =
|
kinds =
|
||||||
listOf(
|
listOf(
|
||||||
TextNoteEvent.KIND,
|
TextNoteEvent.KIND,
|
||||||
|
RepostEvent.KIND,
|
||||||
|
GenericRepostEvent.KIND,
|
||||||
LongTextNoteEvent.KIND,
|
LongTextNoteEvent.KIND,
|
||||||
ClassifiedsEvent.KIND,
|
ClassifiedsEvent.KIND,
|
||||||
HighlightEvent.KIND,
|
HighlightEvent.KIND,
|
||||||
@@ -157,6 +159,8 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
|
|||||||
kinds =
|
kinds =
|
||||||
listOf(
|
listOf(
|
||||||
TextNoteEvent.KIND,
|
TextNoteEvent.KIND,
|
||||||
|
RepostEvent.KIND,
|
||||||
|
GenericRepostEvent.KIND,
|
||||||
LongTextNoteEvent.KIND,
|
LongTextNoteEvent.KIND,
|
||||||
ClassifiedsEvent.KIND,
|
ClassifiedsEvent.KIND,
|
||||||
HighlightEvent.KIND,
|
HighlightEvent.KIND,
|
||||||
|
@@ -25,9 +25,11 @@ import com.vitorpamplona.amethyst.model.LocalCache
|
|||||||
import com.vitorpamplona.amethyst.model.Note
|
import com.vitorpamplona.amethyst.model.Note
|
||||||
import com.vitorpamplona.quartz.events.AudioHeaderEvent
|
import com.vitorpamplona.quartz.events.AudioHeaderEvent
|
||||||
import com.vitorpamplona.quartz.events.ChannelMessageEvent
|
import com.vitorpamplona.quartz.events.ChannelMessageEvent
|
||||||
|
import com.vitorpamplona.quartz.events.GenericRepostEvent
|
||||||
import com.vitorpamplona.quartz.events.LongTextNoteEvent
|
import com.vitorpamplona.quartz.events.LongTextNoteEvent
|
||||||
import com.vitorpamplona.quartz.events.PollNoteEvent
|
import com.vitorpamplona.quartz.events.PollNoteEvent
|
||||||
import com.vitorpamplona.quartz.events.PrivateDmEvent
|
import com.vitorpamplona.quartz.events.PrivateDmEvent
|
||||||
|
import com.vitorpamplona.quartz.events.RepostEvent
|
||||||
import com.vitorpamplona.quartz.events.TextNoteEvent
|
import com.vitorpamplona.quartz.events.TextNoteEvent
|
||||||
import com.vitorpamplona.quartz.events.WikiNoteEvent
|
import com.vitorpamplona.quartz.events.WikiNoteEvent
|
||||||
|
|
||||||
@@ -59,6 +61,8 @@ class HashtagFeedFilter(val tag: String, val account: Account) : AdditiveFeedFil
|
|||||||
): Boolean {
|
): Boolean {
|
||||||
return (
|
return (
|
||||||
it.event is TextNoteEvent ||
|
it.event is TextNoteEvent ||
|
||||||
|
it.event is RepostEvent ||
|
||||||
|
it.event is GenericRepostEvent ||
|
||||||
it.event is LongTextNoteEvent ||
|
it.event is LongTextNoteEvent ||
|
||||||
it.event is WikiNoteEvent ||
|
it.event is WikiNoteEvent ||
|
||||||
it.event is ChannelMessageEvent ||
|
it.event is ChannelMessageEvent ||
|
||||||
|
@@ -980,14 +980,16 @@ fun FirstUserInfoRow(
|
|||||||
NoteUsernameDisplay(baseNote, Modifier.weight(1f), textColor = textColor)
|
NoteUsernameDisplay(baseNote, Modifier.weight(1f), textColor = textColor)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isRepost) {
|
if (isCommunityPost) {
|
||||||
BoostedMark()
|
|
||||||
} else if (isCommunityPost) {
|
|
||||||
DisplayFollowingCommunityInPost(baseNote, accountViewModel, nav)
|
DisplayFollowingCommunityInPost(baseNote, accountViewModel, nav)
|
||||||
} else {
|
} else {
|
||||||
DisplayFollowingHashtagsInPost(baseNote, accountViewModel, nav)
|
DisplayFollowingHashtagsInPost(baseNote, accountViewModel, nav)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isRepost) {
|
||||||
|
BoostedMark()
|
||||||
|
}
|
||||||
|
|
||||||
if (editState.value is GenericLoadable.Loaded) {
|
if (editState.value is GenericLoadable.Loaded) {
|
||||||
(editState.value as? GenericLoadable.Loaded<EditState>)?.loaded?.let {
|
(editState.value as? GenericLoadable.Loaded<EditState>)?.loaded?.let {
|
||||||
DisplayEditStatus(it)
|
DisplayEditStatus(it)
|
||||||
|
Reference in New Issue
Block a user