fix: filter if reblogged post

cutls · Sep 20, 2024 · b6056b2 · b6056b2
1 parent 969abfd
commit b6056b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/renderer/components/timelines/Timeline.tsx b/renderer/components/timelines/Timeline.tsx
@@ -487,11 +487,12 @@ export default function TimelineColumn(props: Props) {
 							overscan={TIMELINE_STATUSES_COUNT}
 							defaultItemHeight={44}
 							itemContent={(_, status) => {
-								if (props.timeline.mediaOnly && status.media_attachments.length === 0) return null
+								const statusHasContent = status.reblog ? status.reblog : status
+								if (props.timeline.mediaOnly && statusHasContent.media_attachments.length === 0) return null
 								if (
 									filters
 										?.map((f) => [f.phrase, f.irreversible] as [string, boolean])
-										.findIndex(([keyword, irreversible]) => (irreversible ? status.content.toLowerCase().includes(keyword.toLowerCase()) : false)) > 0
+										.findIndex(([keyword, irreversible]) => (irreversible ? statusHasContent.content.toLowerCase().includes(keyword.toLowerCase()) : false)) >= 0
 								)
 									return null
 								return (

diff --git a/renderer/components/timelines/status/Status.tsx b/renderer/components/timelines/status/Status.tsx
@@ -142,7 +142,7 @@ const Status: React.FC<Props> = (props) => {
 		const res = await props.client.getStatus(props.status.id)
 		props.updateStatus(res.data)
 	}
-	if (!ignoreFilter && props.filters?.map((f) => f.phrase).filter((keyword) => props.status.content.toLowerCase().includes(keyword.toLowerCase())).length > 0) {
+	if (!ignoreFilter && props.filters?.map((f) => f.phrase).filter((keyword) => status.content.toLowerCase().includes(keyword.toLowerCase())).length > 0) {
 		return (
 			<div className="status" style={{ textAlign: 'center', paddingTop: '0.5em', paddingBottom: '0.5em' }}>
 				<FormattedMessage id="timeline.status.filtered" />