[NEW] Show emojis and file uploads on notifications #7559
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I would love to see this on push notifications as well |
|
Update: Added Push notification support |
sampaiodiego
previously requested changes
Jul 25, 2017
| @@ -32,6 +32,9 @@ function replaceMentionedUsernamesWithFullNames(message, mentions) { | |||
| */ | |||
| function notifyUser(userId, user, message, room, duration) { | |||
| const UI_Use_Real_Name = RocketChat.settings.get('UI_Use_Real_Name') === true; | |||
| if (!message.msg && message.attachments[0]) { | |||
| message.msg = message.attachments[0].image_type ? TAPi18n.__('User_uploaded_image') : TAPi18n.__('User_uploaded_file'); | |||
There was a problem hiding this comment.
this is not using user's language
| @@ -159,7 +162,11 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { | |||
| let push_message; | |||
| //Set variables depending on Push Notification settings | |||
| if (RocketChat.settings.get('Push_show_message')) { | |||
| push_message = message.msg; | |||
| if (message.msg === '' && message.attachments[0]) { | |||
| push_message = message.attachments[0].image_type ? TAPi18n.__('User_uploaded_image') : TAPi18n.__('User_uploaded_file'); | |||
There was a problem hiding this comment.
this is not using user's language
…to add-file-upload-notification
|
Added Support for emojis in notifications and pushes. It renders the unicode emojis in the notification, so it should be compatible with most browsers. |
MartinSchoeler
changed the title
rodrigok
requested changes
Jul 26, 2017
| @@ -13,9 +13,10 @@ Package.onUse(function(api) { | |||
| 'rocketchat:lib' | |||
| ]); | |||
|
|
|||
| api.addFiles('emojiPicker.js', 'client'); | |||
| api.addFiles('emojiPicker.js', ['client', 'server']); | |||
There was a problem hiding this comment.
Use api.addFiles('emojiPicker.js'); instead of api.addFiles('emojiPicker.js', ['client', 'server']);
|
|
||
| api.addFiles('sprites.css', 'client'); | ||
| api.addFiles('callBacks.js', 'server'); |
rodrigok
approved these changes
Jul 26, 2017
rodrigok
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add text to file messages notifications
@RocketChat/core