toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add handling of posts with unsafe links. (#7815)

Browse source 
* Add handling of posts with unsafe links.

* Add more cases.
This commit is contained in:
Christopher Speller 2024-02-22 12:55:01 -08:00 committed by GitHub
parent c0b2c957e1
commit c6348ba63b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/components/markdown/markdown.tsx
View file

@ -73,6 +73,7 @@ type MarkdownProps = {
theme: Theme;
value?: string;
onLinkLongPress?: (url?: string) => void;
isUnsafeLinksPost?: boolean;
}
const getStyleSheet = makeStyleSheetFromTheme((theme) => {
@ -135,7 +136,7 @@ const Markdown = ({
enableInlineLatex, enableLatex, maxNodes,
imagesMetadata, isEdited, isReplyPost, isSearchResult, layoutHeight, layoutWidth,
location, mentionKeys, highlightKeys, minimumHashtagLength = 3, onPostPress, postId, searchPatterns,
textStyles = {}, theme, value = '', baseParagraphStyle, onLinkLongPress,
textStyles = {}, theme, value = '', baseParagraphStyle, onLinkLongPress, isUnsafeLinksPost,
}: MarkdownProps) => {
const style = getStyleSheet(theme);
const managedConfig = useManagedConfig<ManagedConfig>();
@ -187,7 +188,7 @@ const Markdown = ({
};
const renderChannelLink = ({context, channelName}: MarkdownChannelMentionRenderer) => {
if (disableChannelLink) {
if (disableChannelLink || isUnsafeLinksPost) {
return renderText({context, literal: `~${channelName}`});
}
@ -222,7 +223,7 @@ const Markdown = ({
// These sometimes include a trailing newline
const content = props.literal.replace(/\n$/, '');
if (enableLatex && props.language === 'latex') {
if (enableLatex && !isUnsafeLinksPost && props.language === 'latex') {
return (
<MarkdownLatexCodeBlock
content={content}
@ -286,7 +287,7 @@ const Markdown = ({
};
const renderHashtag = ({context, hashtag}: {context: string[]; hashtag: string}) => {
if (disableHashtags) {
if (disableHashtags || isUnsafeLinksPost) {
return renderText({context, literal: `#${hashtag}`});
}
@ -352,7 +353,7 @@ const Markdown = ({
};
const renderImage = ({linkDestination, context, src, size}: MarkdownImageRenderer) => {
if (!imagesMetadata) {
if (!imagesMetadata || isUnsafeLinksPost) {
return null;
}
@ -387,7 +388,7 @@ const Markdown = ({
};
const renderLatexInline = ({context, latexCode}: MarkdownLatexRenderer) => {
if (!enableInlineLatex) {
if (!enableInlineLatex || isUnsafeLinksPost) {
return renderText({context, literal: `$${latexCode}$`});
}
@ -403,6 +404,9 @@ const Markdown = ({
};
const renderLink = ({children, href}: {children: ReactElement; href: string}) => {
if (isUnsafeLinksPost) {
return renderText({context: [], literal: href});
}
return (
<MarkdownLink
href={href}

1
app/components/post_list/post/body/message/message.tsx
View file

@ -100,6 +100,7 @@ const Message = ({currentUser, isHighlightWithoutNotificationLicensed, highlight
highlightKeys={isHighlightWithoutNotificationLicensed ? (currentUser?.highlightKeys ?? EMPTY_HIGHLIGHT_KEYS) : EMPTY_HIGHLIGHT_KEYS}
searchPatterns={searchPatterns}
theme={theme}
isUnsafeLinksPost={post.props.unsafe_links && post.props.unsafe_links !== ''}
/>
</View>
</ScrollView>