Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
sable: patch
---

added settings toggle in (General>Messages) to enable showing a tombstone for deleted messages without having to set all hidden events to visible
3 changes: 2 additions & 1 deletion src/app/features/room/RoomTimeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@ export function RoomTimeline({
const [encUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
const [showHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
const [showTombstoneEvents] = useSetting(settingsAtom, 'showTombstoneEvents');
const [showDeveloperTools] = useSetting(settingsAtom, 'developerTools');
const [reducedMotion] = useSetting(settingsAtom, 'reducedMotion');

Expand Down Expand Up @@ -2063,7 +2064,7 @@ export function RoomTimeline({
if (eventSender && ignoredUsersSet.has(eventSender)) {
return null;
}
if (mEvent.isRedacted() && !showHiddenEvents) {
if (mEvent.isRedacted() && !(showHiddenEvents || showTombstoneEvents)) {
return null;
}

Expand Down
39 changes: 38 additions & 1 deletion src/app/features/settings/general/General.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,16 @@ function SelectDateFormat() {
);
}

function getTombstoneSettingToggleTitle(showHidden: boolean, showTombstone: boolean): string {
if (showHidden) {
return 'Tombstone events are always shown when "Show Hidden Events" is enabled.';
}
if (showTombstone) {
return 'Disable to hide redacted messages entirely instead of showing a tombstone.';
}
return 'Enable to show tombstone events for redacted messages instead of hiding them entirely.';
}

function DateAndTime() {
const [hour24Clock, setHour24Clock] = useSetting(settingsAtom, 'hour24Clock');

Expand Down Expand Up @@ -826,6 +836,10 @@ function Messages() {
const [urlPreview, setUrlPreview] = useSetting(settingsAtom, 'urlPreview');
const [encUrlPreview, setEncUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
const [showHiddenEvents, setShowHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
const [showTombstoneEvents, setShowTombstoneEvents] = useSetting(
settingsAtom,
'showTombstoneEvents'
);
const [hideMembershipInReadOnly, setHideMembershipInReadOnly] = useSetting(
settingsAtom,
'hideMembershipInReadOnly'
Expand Down Expand Up @@ -924,7 +938,30 @@ function Messages() {
<SettingTile
title="Show Hidden Events"
after={
<Switch variant="Primary" value={showHiddenEvents} onChange={setShowHiddenEvents} />
<Switch
variant="Primary"
value={showHiddenEvents}
onChange={setShowHiddenEvents}
title={
showHiddenEvents
? 'Disable to hide hidden events'
: 'Enable to show hidden events, this will cause visual clutter in busy rooms.'
}
/>
}
/>
</SequenceCard>
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
<SettingTile
title="Show Tombstones for Redacted Messages"
after={
<Switch
variant="Primary"
value={showTombstoneEvents || showHiddenEvents}
onChange={setShowTombstoneEvents}
disabled={showHiddenEvents}
title={getTombstoneSettingToggleTitle(showHiddenEvents, showTombstoneEvents)}
/>
}
/>
</SequenceCard>
Expand Down
2 changes: 2 additions & 0 deletions src/app/state/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export interface Settings {
urlPreview: boolean;
encUrlPreview: boolean;
showHiddenEvents: boolean;
showTombstoneEvents: boolean;
legacyUsernameColor: boolean;
allowPipVideos: boolean;

Expand Down Expand Up @@ -123,6 +124,7 @@ const defaultSettings: Settings = {
urlPreview: true,
encUrlPreview: false,
showHiddenEvents: false,
showTombstoneEvents: false,
legacyUsernameColor: false,
allowPipVideos: false,

Expand Down
Loading