Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Custom emojis to override default #20359

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Conversation

aKn1ghtOut
Copy link
Contributor

Checklist

  • I have read the Contributing Guide
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Proposed changes (including videos or screenshots)

Due to the sequence of the imports and how the emojiRenderer prioritizes lists, the custom emojis could not override the emojione emojis. Making two small changes fixed the issue.

With the custom emoji for :facepalm: added, you can check out the result below:

Before

Screenshot from 2021-01-25 02-20-04

After

Screenshot from 2021-01-25 02-18-58

Issue(s)

Closes #15973

Steps to test or reproduce

  1. Add a custom emoji with the name or alias same as an existing emoji.
  2. Use the emoji. [ Custom emojis can not override default emojis right now ]

Further comments

All changes are non-breaking

@ggazzo ggazzo merged commit 6e97e36 into RocketChat:develop Mar 23, 2021
@sampaiodiego sampaiodiego mentioned this pull request Apr 3, 2021
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom emojis are being replaced with an internal with similar name
2 participants