Skip to content

[FIX] Fixed custom emoji add and update issues. #20318

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

Closed
Darshilp326 wants to merge 2 commits into from
Closed

[FIX] Fixed custom emoji add and update issues. #20318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b5cb4
Fixed custom emoji add and update issues
Darshilp326 Jan 22, 2021
0807738
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
Darshilp326 Jan 22, 2021
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
4 changes: 3 additions & 1 deletion app/emoji-custom/server/methods/insertOrUpdateEmoji.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ Meteor.methods({
if (!s.trim(emojiData.name)) {
throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', { method: 'insertOrUpdateEmoji', field: 'Name' });
}

if (emojiData.emoji === 'undefined' && emojiData.newFile) {
throw new Meteor.Error('error-the-field-is-required', ' Emoji file is required', { method: 'insertOrUpdateEmoji', field: 'File' });
}
emojiData.name = limax(emojiData.name, { replacement: '_' });
emojiData.aliases = limax(emojiData.aliases, { replacement: '_' });

Expand Down
6 changes: 3 additions & 3 deletions client/views/admin/customEmoji/EditCustomEmoji.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ const EditCustomEmoji: FC<EditCustomEmojiProps> = ({ close, onChange, data, ...p
const saveAction = useEndpointUpload('emoji-custom.update', {}, t('Custom_Emoji_Updated_Successfully'));

const handleSave = useCallback(async () => {
if (!emojiFile) {
if (!emojiFile && !newEmojiPreview) {
return;
}

const formData = new FormData();
formData.append('emoji', emojiFile);
if (emojiFile) { formData.append('emoji', emojiFile); }
formData.append('_id', _id);
formData.append('name', name);
formData.append('aliases', aliases);
const result = (await saveAction(formData)) as { success: boolean };
if (result.success) {
onChange();
}
}, [emojiFile, _id, name, aliases, saveAction, onChange]);
}, [emojiFile, _id, name, aliases, saveAction, onChange, newEmojiPreview]);

const deleteAction = useEndpointAction('POST', 'emoji-custom.delete', useMemo(() => ({ emojiId: _id }), [_id]));

Expand Down