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

Fix: Reaction endpoint/api only working with regular emojis #10323

Merged
merged 1 commit into from
Apr 4, 2018
Merged

Fix: Reaction endpoint/api only working with regular emojis #10323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Strip the colons when searching
  • Loading branch information
@graywolf336
graywolf336 committed Apr 4, 2018
commit 95d01ac537632fcbc070c5483ba9de2aeec82de5
8 changes: 7 additions & 1 deletion packages/rocketchat-emoji-custom/server/models/EmojiCustom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ class EmojiCustom extends RocketChat.models._Base {
}

//find
findByNameOrAlias(name, options) {
findByNameOrAlias(emojiName, options) {
let name = emojiName;

if (typeof emojiName === 'string') {
name = emojiName.replace(/:/g, '');
}

const query = {
$or: [
{name},
Expand Down