From defb16aa1c7cdf0b2ebfe9d71799f4d507d3a763 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Thu, 17 Oct 2024 15:21:22 -0700 Subject: [PATCH] Add hide sensitive content setting --- src/app/components/Content.svelte | 109 +++++++++++++++----------- src/lib/components/Field.svelte | 16 ++-- src/lib/components/FieldInline.svelte | 13 +++ src/routes/settings/+page.svelte | 8 +- 4 files changed, 94 insertions(+), 52 deletions(-) create mode 100644 src/lib/components/FieldInline.svelte diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte index 46ee9e68..15904b00 100644 --- a/src/app/components/Content.svelte +++ b/src/app/components/Content.svelte @@ -1,5 +1,6 @@
-
- {#each shortContent as parsed, i} - {#if isNewline(parsed)} - - {:else if isTopic(parsed)} - - {:else if isCode(parsed)} - - {:else if isCashu(parsed) || isInvoice(parsed)} - - {:else if isLink(parsed)} - {#if isStartOrEnd(i) && !hideMedia} - - {:else} - - {/if} - {:else if isProfile(parsed)} - - {:else if isEvent(parsed) || isAddress(parsed)} - {#if isStartOrEnd(i) && depth < 2 && !hideMedia} - -
- -
-
- {:else} - - {fromNostrURI(parsed.raw).slice(0, 16) + "…"} - - {/if} - {:else} - {@html renderParsed(parsed)} - {/if} - {/each} -
- {#if ellipsize} -
- + {#if warning} +
+ +

+ This note has been flagged by the author as "{warning}".
+ +

+ {:else} +
+ {#each shortContent as parsed, i} + {#if isNewline(parsed)} + + {:else if isTopic(parsed)} + + {:else if isCode(parsed)} + + {:else if isCashu(parsed) || isInvoice(parsed)} + + {:else if isLink(parsed)} + {#if isStartOrEnd(i) && !hideMedia} + + {:else} + + {/if} + {:else if isProfile(parsed)} + + {:else if isEvent(parsed) || isAddress(parsed)} + {#if isStartOrEnd(i) && depth < 2 && !hideMedia} + +
+ +
+
+ {:else} + + {fromNostrURI(parsed.raw).slice(0, 16) + "…"} + + {/if} + {:else} + {@html renderParsed(parsed)} + {/if} + {/each} +
+ {#if ellipsize} +
+ +
+ {/if} {/if}
diff --git a/src/lib/components/Field.svelte b/src/lib/components/Field.svelte index b60cddba..bf102735 100644 --- a/src/lib/components/Field.svelte +++ b/src/lib/components/Field.svelte @@ -1,9 +1,13 @@
- + {#if $$slots.label} + + {/if} -

- -

+ {#if $$slots.info} +

+ +

+ {/if}
diff --git a/src/lib/components/FieldInline.svelte b/src/lib/components/FieldInline.svelte new file mode 100644 index 00000000..7ccaf925 --- /dev/null +++ b/src/lib/components/FieldInline.svelte @@ -0,0 +1,13 @@ +
+
+ + +
+ {#if $$slots.info} +

+ +

+ {/if} +
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index c6d34c62..d2389bb5 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -3,6 +3,7 @@ import {getListTags, createEvent, getPubkeyTagValues, MUTES} from "@welshman/util" import {userMutes, tagPubkey, publishThunk} from "@welshman/app" import Field from "@lib/components/Field.svelte" + import FieldInline from "@lib/components/FieldInline.svelte" import Button from "@lib/components/Button.svelte" import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte" import {pushToast} from "@app/toast" @@ -24,13 +25,18 @@
-
+

Muted Accounts

+ +

Hide sensitive content?

+ +

If content is marked by the author as sensitive, flotilla will hide it by default.

+