formatting
This commit is contained in:
1 parent
c20479b689
commit
f24bcb1bf5
4 files changed
+67
-34
No files matched your search
@@ -114,16 +114,17 @@ function RenderMessageContentInternal({
|
||||
|
||||
return (
|
||||
<UrlPreviewHolder>
|
||||
{toRender.map(({ url, type }) => (!!type ? (
|
||||
<UrlPreviewCard key={url} url={url} ts={ts} mediaType={type} />
|
||||
) : (clientUrlPreview ? (
|
||||
<ClientPreview url={url} />
|
||||
) : undefined)
|
||||
))}
|
||||
{toRender.map(({ url, type }) =>
|
||||
type ? (
|
||||
<UrlPreviewCard key={url} url={url} ts={ts} mediaType={type} />
|
||||
) : clientUrlPreview ? (
|
||||
<ClientPreview url={url} />
|
||||
) : undefined
|
||||
)}
|
||||
</UrlPreviewHolder>
|
||||
);
|
||||
},
|
||||
[ts]
|
||||
[ts, clientUrlPreview]
|
||||
);
|
||||
|
||||
const renderCaption = () => {
|
||||
|
||||
@@ -144,7 +144,9 @@ export function RoomTimeline({
|
||||
const [hideMemberInReadOnly] = useSetting(settingsAtom, 'hideMembershipInReadOnly');
|
||||
|
||||
const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
|
||||
const showClientUrlPreview = room.hasEncryptionStateEvent() ? encClientUrlPreview : clientUrlPreview;
|
||||
const showClientUrlPreview = room.hasEncryptionStateEvent()
|
||||
? encClientUrlPreview
|
||||
: clientUrlPreview;
|
||||
|
||||
const nicknames = useAtomValue(nicknamesAtom);
|
||||
const globalProfiles = useAtomValue(profilesCacheAtom);
|
||||
@@ -486,7 +488,7 @@ export function RoomTimeline({
|
||||
dateFormatString,
|
||||
mediaAutoLoad,
|
||||
showUrlPreview,
|
||||
showClientUrlPreview,
|
||||
showClientUrlPreview,
|
||||
autoplayStickers,
|
||||
hideMemberInReadOnly,
|
||||
isReadOnly,
|
||||
|
||||
@@ -871,8 +871,14 @@ function Messages() {
|
||||
const [urlPreview, setUrlPreview] = useSetting(settingsAtom, 'urlPreview');
|
||||
const [encUrlPreview, setEncUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
|
||||
const [clientUrlPreview, setClientUrlPreview] = useSetting(settingsAtom, 'clientUrlPreview');
|
||||
const [encClientUrlPreview, setEncClientUrlPreview] = useSetting(settingsAtom, 'encClientUrlPreview');
|
||||
const [clientPreviewYoutube, setClientPreviewYoutube] = useSetting(settingsAtom, 'clientPreviewYoutube');
|
||||
const [encClientUrlPreview, setEncClientUrlPreview] = useSetting(
|
||||
settingsAtom,
|
||||
'encClientUrlPreview'
|
||||
);
|
||||
const [clientPreviewYoutube, setClientPreviewYoutube] = useSetting(
|
||||
settingsAtom,
|
||||
'clientPreviewYoutube'
|
||||
);
|
||||
const [showHiddenEvents, setShowHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
|
||||
const [showTombstoneEvents, setShowTombstoneEvents] = useSetting(
|
||||
settingsAtom,
|
||||
@@ -960,27 +966,51 @@ function Messages() {
|
||||
after={<Switch variant="Primary" value={encUrlPreview} onChange={setEncUrlPreview} />}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||
<SettingTile
|
||||
title="Client Side Embeds"
|
||||
description={
|
||||
"Attempt to preview unsupported urls (e.g. YouTube) on the client, without involving the homeserver. This will expose your IP Address to third party services."
|
||||
}
|
||||
after={<Switch variant="Primary" value={clientUrlPreview} onChange={setClientUrlPreview} />}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column" style={clientUrlPreview ? {} : {display: 'none'}}>
|
||||
<SettingTile
|
||||
title="Client Embeds in Encrypted Rooms"
|
||||
after={<Switch variant="Primary" value={encClientUrlPreview} onChange={setEncClientUrlPreview} />}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column" style={clientUrlPreview ? {} : {display: 'none'}}>
|
||||
<SettingTile
|
||||
title="Embed YouTube Links"
|
||||
after={<Switch variant="Primary" value={clientPreviewYoutube} onChange={setClientPreviewYoutube} />}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||
<SettingTile
|
||||
title="Client Side Embeds"
|
||||
description={
|
||||
'Attempt to preview unsupported urls (e.g. YouTube) on the client, without involving the homeserver. This will expose your IP Address to third party services.'
|
||||
}
|
||||
after={
|
||||
<Switch variant="Primary" value={clientUrlPreview} onChange={setClientUrlPreview} />
|
||||
}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard
|
||||
className={SequenceCardStyle}
|
||||
variant="SurfaceVariant"
|
||||
direction="Column"
|
||||
style={clientUrlPreview ? {} : { display: 'none' }}
|
||||
>
|
||||
<SettingTile
|
||||
title="Client Embeds in Encrypted Rooms"
|
||||
after={
|
||||
<Switch
|
||||
variant="Primary"
|
||||
value={encClientUrlPreview}
|
||||
onChange={setEncClientUrlPreview}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard
|
||||
className={SequenceCardStyle}
|
||||
variant="SurfaceVariant"
|
||||
direction="Column"
|
||||
style={clientUrlPreview ? {} : { display: 'none' }}
|
||||
>
|
||||
<SettingTile
|
||||
title="Embed YouTube Links"
|
||||
after={
|
||||
<Switch
|
||||
variant="Primary"
|
||||
value={clientPreviewYoutube}
|
||||
onChange={setClientPreviewYoutube}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||
<SettingTile
|
||||
title="Hide Member Events in Read-Only Rooms"
|
||||
|
||||
@@ -251,7 +251,7 @@ export function useTimelineEventRenderer({
|
||||
dateFormatString,
|
||||
mediaAutoLoad,
|
||||
showUrlPreview,
|
||||
showClientUrlPreview,
|
||||
showClientUrlPreview,
|
||||
autoplayStickers,
|
||||
hideMemberInReadOnly,
|
||||
isReadOnly,
|
||||
@@ -592,7 +592,7 @@ export function useTimelineEventRenderer({
|
||||
getContent={getContent}
|
||||
mediaAutoLoad={mediaAutoLoad}
|
||||
urlPreview={showUrlPreview}
|
||||
clientUrlPreview={showClientUrlPreview}
|
||||
clientUrlPreview={showClientUrlPreview}
|
||||
htmlReactParserOptions={htmlReactParserOptions}
|
||||
linkifyOpts={linkifyOpts}
|
||||
outlineAttachment={messageLayout === MessageLayout.Bubble}
|
||||
|
||||
Reference in new issue
Block a user