IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

add attachments notification (#6769)

Browse Source
This commit is contained in:
megos
2017-06-28 21:37:51 +09:00
committed by George Goldberg
parent c66799a839
commit 58b3231916
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webapp/actions/notification_actions.jsx
View File

@@ -73,7 +73,21 @@ export function sendDesktopNotification(post, msgProps) {
}
}
let notifyText = post.message.replace(/\n+/g, ' ');
let notifyText = post.message;
const msgPropsPost = JSON.parse(msgProps.post);
const attachments = msgPropsPost && msgPropsPost.props && msgPropsPost.props.attachments ? msgPropsPost.props.attachments : [];
let image = false;
attachments.forEach((attachment) => {
if (notifyText.length === 0) {
notifyText = attachment.fallback ||
attachment.pretext ||
attachment.text;
}
image |= attachment.image_url.length > 0;
});
notifyText.replace(/\n+/g, ' ');
if (notifyText.length > 50) {
notifyText = notifyText.substring(0, 49) + '...';
}
@@ -84,6 +98,8 @@ export function sendDesktopNotification(post, msgProps) {
body = username + Utils.localizeMessage('channel_loader.uploadedImage', ' uploaded an image');
} else if (msgProps.otherFile) {
body = username + Utils.localizeMessage('channel_loader.uploadedFile', ' uploaded a file');
} else if (image) {
body = username + Utils.localizeMessage('channel_loader.postedImage', ' posted an image');
} else {
body = username + Utils.localizeMessage('channel_loader.something', ' did something new');
}

1
webapp/i18n/en.json
View File

@@ -1127,6 +1127,7 @@
"channel_loader.unknown_error": "We received an unexpected status code from the server.",
"channel_loader.uploadedFile": " uploaded a file",
"channel_loader.uploadedImage": " uploaded an image",
"channel_loader.postedImage": " posted an image",
"channel_loader.wrote": " wrote: ",
"channel_members_dropdown.channel_admin": "Channel Admin",
"channel_members_dropdown.channel_member": "Channel Member",