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

Directly convert Matrix and room Ids to pills #10267

Merged
merged 5 commits into from
Mar 2, 2023

Conversation

weeman1337
Copy link
Contributor

@weeman1337 weeman1337 commented Mar 1, 2023

Should be reviewed commit-wise.

Before After
pill_user_before pill_user

closes element-hq/element-web#21867

PSF-1927

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:

🐛 Bug Fixes

@weeman1337 weeman1337 added the T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems label Mar 1, 2023
@@ -89,11 +89,8 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
const showLineNumbers = SettingsStore.getValue("showCodeLineNumbers");
this.activateSpoilers([this.contentRef.current]);

// pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer
Copy link
Contributor Author

Choose a reason for hiding this comment

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

From element-hq/element-meta#1030

The RTE team have their own issue tracking this version of the work - we will not implement anything in the RTE, instead they will aim to match the behaviour we're implementing. As both composers will likely live alongside each other - this feels like the best approach

@weeman1337 weeman1337 force-pushed the weeman1337/pillify-everything-directly branch from f75f82b to 0a154f5 Compare March 2, 2023 08:37
@weeman1337 weeman1337 marked this pull request as ready for review March 2, 2023 09:34
@weeman1337 weeman1337 requested a review from a team as a code owner March 2, 2023 09:34
Copy link
Contributor

@andybalaam andybalaam left a comment

Choose a reason for hiding this comment

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

Looks good, but I don't understand how this relates to the comment that you are deleting.

The comment says we should do this if the composer pillifies things. The compose doesn't pillify things as you type, but are you saying we should do this anyway? (I think I agree, just want to be clear)

@weeman1337
Copy link
Contributor Author

weeman1337 commented Mar 2, 2023

The comment says we should do this if the composer pillifies things. The compose doesn't pillify things as you type, but are you saying we should do this anyway? (I think I agree, just want to be clear)

Yes. I would refer to my comment in this PR. We do now pillify it if possible. The new composer will catch up on that.

@andybalaam
Copy link
Contributor

The comment says we should do this if the composer pillifies things. The compose doesn't pillify things as you type, but are you saying we should do this anyway? (I think I agree, just want to be clear)

Yes. I would refer to my comment in this PR. We do now pillify it if possible. The new composer will catch up on that.

Ah OK, now I understand the connection. Thanks, looks good!

@weeman1337 weeman1337 merged commit ac3c95f into develop Mar 2, 2023
@weeman1337 weeman1337 deleted the weeman1337/pillify-everything-directly branch March 2, 2023 10:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pills for users only appear after editing the message
2 participants