degmods/degmods.com
6
1
Fork 0
Code Issues 33 Pull Requests Actions Packages Projects 3 Releases Wiki Activity

Feed feedback and fixes #231

Merged
enes merged 22 commits from feat/131-feed-issues into staging 2025-02-21 14:06:33 +00:00
Conversation 0 Commits 22 Files Changed 26 +40 -36
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 221b8b2050 - Show all commits

55
src/components/Filters/FeedFilter.tsx
View File

@ -47,34 +47,37 @@ export const FeedFilter = React.memo(
</Dropdown> </Dropdown>
{/* source filter options */} {/* source filter options */}
<Dropdown {/* show only if not posts tabs */}
label={ {tab !== 2 && (
filterOptions.source === window.location.host <Dropdown
? `Show From: ${filterOptions.source}` label={
: 'Show All' filterOptions.source === window.location.host
} ? `Show From: ${filterOptions.source}`
> : 'Show All'
<Option
onClick={() =>
setFilterOptions((prev) => ({
...prev,
source: window.location.host
}))
} }
> >
Show From: {window.location.host} <Option
</Option> onClick={() =>
<Option setFilterOptions((prev) => ({
onClick={() => ...prev,
setFilterOptions((prev) => ({ source: window.location.host
...prev, }))
source: 'Show All' }
})) >
} Show From: {window.location.host}
> </Option>
Show All <Option
</Option> onClick={() =>
</Dropdown> setFilterOptions((prev) => ({
...prev,
source: 'Show All'
}))
}
>
Show All
</Option>
</Dropdown>
)}
{children} {children}
</Filter> </Filter>

21
src/pages/feed/FeedTabPosts.tsx
View File

@ -68,15 +68,16 @@ export const FeedTabPosts = () => {
) )
// Filter source // Filter source
_notes = _notes.filter( // TODO: Enable source/client filter
(n) => // _notes = _notes.filter(
!( // (n) =>
filterOptions.source === window.location.host && // !(
n // filterOptions.source === window.location.host &&
.getMatchingTags('l') // n
.some((l) => l[1] === window.location.host && l[2] === 'source') // .getMatchingTags('l')
) // .some((l) => l[1] === window.location.host && l[2] === 'source')
) // )
// )
// Filter reply events // Filter reply events
_notes = _notes.filter((n) => n.getMatchingTags('e').length === 0) _notes = _notes.filter((n) => n.getMatchingTags('e').length === 0)
@ -85,7 +86,7 @@ export const FeedTabPosts = () => {
showing > 0 && _notes.splice(showing) showing > 0 && _notes.splice(showing)
return _notes return _notes
}, [filterOptions.nsfw, filterOptions.source, notes, showing]) }, [filterOptions.nsfw, notes, showing])
if (!userPubkey) return null if (!userPubkey) return null