fix(messages): keep spoilers on forwarded link embeds (#3124)

fluxer_app/src/features/channel/components/MessageAttachments.tsx

@@ -445,6 +445,7 @@ export const ForwardedMessageContent = observer(({message, snapshot, onDelete}:
 									message={message}
 									embedIndex={index}
 									contextualEmbeds={snapshot.embeds}
+									contextualContent={snapshot.content}
 									onDelete={onDelete}
 									isPreview={true}
 									data-flx="channel.message-attachments.forwarded-message-content.embed"

fluxer_app/src/features/channel/components/embeds/ChannelEmbed.tsx

@@ -70,7 +70,7 @@ function withFreshEmbedUrls(embed: MessageEmbed): MessageEmbed {
 }
 
 export const Embed: FC<EmbedProps> = observer((props: EmbedProps) => {
-	const {message, embedIndex, contextualEmbeds, onDelete, isPreview} = props;
+	const {message, embedIndex, contextualEmbeds, contextualContent, onDelete, isPreview} = props;
 	const embed = withFreshEmbedUrls(props.embed);
 	const {i18n} = useLingui();
 	const {enabled: isMobile} = MobileLayout;
@@ -120,7 +120,8 @@ export const Embed: FC<EmbedProps> = observer((props: EmbedProps) => {
 				'data-message-copy-text': copyText,
 			} as const)
 		: {};
-	const spoileredUrls = useMemo(() => extractSpoileredUrls(message.content), [message.content]);
+	const spoilerSourceContent = contextualContent ?? message.content;
+	const spoileredUrls = useMemo(() => extractSpoileredUrls(spoilerSourceContent), [spoilerSourceContent]);
 	const {isSpoilerEmbed, matchingSpoilerUrls} = useMemo(() => {
 		const urlsToCheck = [
 			embed.url,

fluxer_app/src/features/channel/components/embeds/channel_embed/ChannelEmbedShared.ts

@@ -32,6 +32,7 @@ export interface EmbedProps {
 	embedIndex?: number;
 	onDelete?: (bypassConfirm?: boolean) => void;
 	contextualEmbeds?: ReadonlyArray<MessageEmbed>;
+	contextualContent?: string;
 	isPreview?: boolean;
 }