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.

Sign up for GitHub

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

Jump to bottom

Add support for sending room-local emoji #209

Merged
merged 5 commits into from
Dec 29, 2021
Merged

Add support for sending room-local emoji #209

merged 5 commits into from
Dec 29, 2021

Conversation

Alch-Emi
Copy link
Contributor

@Alch-Emi Alch-Emi commented Dec 28, 2021 •
edited by github-actions bot
Loading

Description

This pull request:

  • Extends the available emoji to include emoji from emoji packs defined in the current room
  • Performs some minor refactoring to embrace the Image Pack structuring of emoji, which will make the addition of this change and coming changes easier
    • In doing so, filters out stickers from the emoji picker

This pull request does not:

  • Add support for use of packs external to the current room (e.g. packs in spaces)
  • Allow users to use room emoji outside of the room they are defined in
  • Do anything with stickers

Related issue #83

Tips for reviewing

You may want to check out the room #blobcats:the-apothecary.club for an example of an emoji pack in a room. This certainly doesn't utilize all of the features of image packs (doesn't contain stickers, doesn't set a pack name / avi besides the inherited ones), but it works good enough for testing.

Type of change

Please delete options that are not relevant.

  • New feature (non-breaking change which adds functionality)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

Preview: https://61cbe28f1fd3346e45318820--pr-cinny.netlify.app
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.

@Alch-Emi
Add support for sending room-local emoji
cf35282 
Does not add support for sending a room's emoji outside of that room, but enables users to
send an emoji if the packs in a room support it.  Does not include room emoji in the
picker YET.
@Alch-Emi
Amend PR cinnyapp#209: Don't freak out if the pack tag is missing
4a2b1a5
ajbura
ajbura reviewed Dec 29, 2021
View reviewed changes
src/app/organisms/emoji-board/custom-emoji.js Outdated Show resolved Hide resolved
src/app/organisms/emoji-board/custom-emoji.js Outdated Show resolved Hide resolved
src/client/state/RoomsInput.js Outdated Show resolved Hide resolved
@ajbura ajbura merged commit 9ea9bf4 into cinnyapp:dev Dec 29, 2021
@Alch-Emi Alch-Emi deleted the room-emoji branch December 29, 2021 04:27
@ajbura ajbura added this to the v1.7.0 milestone Dec 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajbura ajbura ajbura approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@Alch-Emi @ajbura