diff --git a/packages/app/src/Element/Event/HiddenNote.tsx b/packages/app/src/Element/Event/HiddenNote.tsx index 50b380f4..ae1cfe6b 100644 --- a/packages/app/src/Element/Event/HiddenNote.tsx +++ b/packages/app/src/Element/Event/HiddenNote.tsx @@ -7,12 +7,12 @@ const HiddenNote = ({ children }: { children: React.ReactNode }) => { return show ? ( children ) : ( -
+

-
diff --git a/packages/app/src/Element/Event/NoteInner.tsx b/packages/app/src/Element/Event/NoteInner.tsx index 54b3aa12..67f5d0b7 100644 --- a/packages/app/src/Element/Event/NoteInner.tsx +++ b/packages/app/src/Element/Event/NoteInner.tsx @@ -47,6 +47,9 @@ export function NoteInner(props: NoteProps) { const [showTranslation, setShowTranslation] = useState(true); const { formatMessage } = useIntl(); const [showMore, setShowMore] = useState(false); + const { hideMutedNotes } = useLogin(s => ({ + hideMutedNotes: s.appData.item.preferences.hideMutedNotes, + })); const totalReactions = reactions.positive.length + reactions.negative.length + reposts.length + zaps.length; @@ -410,5 +413,5 @@ export function NoteInner(props: NoteProps) {
); - return !ignoreModeration && isEventMuted(ev) ? {note} : note; + return !ignoreModeration && isEventMuted(ev) ? hideMutedNotes ? <> : {note} : note; } diff --git a/packages/app/src/Login/Preferences.ts b/packages/app/src/Login/Preferences.ts index 61543055..4bcf5199 100644 --- a/packages/app/src/Login/Preferences.ts +++ b/packages/app/src/Login/Preferences.ts @@ -96,6 +96,12 @@ export interface UserPreferences { * Auto-translate when available */ autoTranslate?: boolean; + + /** + * Hides muted notes when selected + */ + hideMutedNotes: boolean; + } export const DefaultPreferences = { @@ -116,4 +122,5 @@ export const DefaultPreferences = { showStatus: true, checkSigs: CONFIG.defaultPreferences.checkSigs, autoTranslate: true, + hideMutedNotes:false } as UserPreferences; diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index f30ac428..368630ed 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -497,6 +497,23 @@ const PreferencesPage = () => { />
+
+
+

+ +

+ + + +
+
+ updatePreferences(id, { ...perf, hideMutedNotes: e.target.checked })} + /> +
+
); }; diff --git a/packages/app/src/Pages/settings/messages.ts b/packages/app/src/Pages/settings/messages.ts index 81e98bea..de5daea0 100644 --- a/packages/app/src/Pages/settings/messages.ts +++ b/packages/app/src/Pages/settings/messages.ts @@ -76,4 +76,9 @@ export default defineMessages({ ServiceWorkerNotRunning: { defaultMessage: "Service Worker Not Running", id: "RDha9y" }, SubscribedToPush: { defaultMessage: "Subscribed to Push", id: "G3A56c" }, NotSubscribedToPush: { defaultMessage: "Not Subscribed to Push", id: "d2ebEu" }, + HideMutedNotes: { defaultMessage: "Hide Muted Notes", id: "M3Oira" }, + HideMutedNotesHelp: { + defaultMessage: "Muted notes will not be shown", + id: "MBAYRA", + }, });