Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Inhibit url previews on MXIDs containing slashes same as those without #11160

Merged
merged 2 commits into from
Jul 3, 2023
Merged

Inhibit url previews on MXIDs containing slashes same as those without #11160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
081dbec
Inhibit url previews on MXIDs containing slashes same as those without
t3chguy Jun 29, 2023
4319858
Merge branch 'develop' into t3chguy/slash-mxid-preview
t3chguy Jun 29, 2023
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
16 changes: 8 additions & 8 deletions src/components/views/messages/TextualBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,14 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
return false;
}

const url = node.getAttribute("href");
const host = url?.match(/^https?:\/\/(.*?)(\/|$)/)?.[1];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why a regex rather than new URL(url).host?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the existing implementation, didn't fancy poking the bear. I just swapped the order of 2 blocks of code

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, fair enough


// never preview permalinks (if anything we should give a smart
// preview of the room/user they point to: nobody needs to be reminded
// what the matrix.to site looks like).
if (!host || isPermalinkHost(host)) return false;

// as a random heuristic to avoid highlighting things like "foo.pl"
// we require the linked text to either include a / (either from http://
// or from a full foo.bar/baz style schemeless URL) - or be a markdown-style
Expand All @@ -397,14 +405,6 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
return true;
}

const url = node.getAttribute("href");
const host = url?.match(/^https?:\/\/(.*?)(\/|$)/)?.[1];

// never preview permalinks (if anything we should give a smart
// preview of the room/user they point to: nobody needs to be reminded
// what the matrix.to site looks like).
if (!host || isPermalinkHost(host)) return false;

if (node.textContent?.toLowerCase().trim().startsWith(host.toLowerCase())) {
// it's a "foo.pl" style link
return false;
Expand Down