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

PLT-7300: Add use_user_icon prop to allow bots to just use their user icon (#7381)

Browse Source 
* add use_user_icon prop to allow bots to just use their user icon

* revert unintentional change
This commit is contained in:
Chris
2017-09-05 19:20:47 -05:00
committed by GitHub
parent df085d273d
commit 7cee7b3342
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/plugin/jira/plugin.go
View File

@@ -69,8 +69,9 @@ func (p *Plugin) handleWebhook(w http.ResponseWriter, r *http.Request) {
Type: model.POST_SLACK_ATTACHMENT,
UserId: user.Id,
Props: map[string]interface{}{
"from_webhook": "true",
"attachments": []*model.SlackAttachment{attachment},
"from_webhook": "true",
"use_user_icon": "true",
"attachments": []*model.SlackAttachment{attachment},
},
}); err != nil {
http.Error(w, p.api.I18n(err.Message, r), err.StatusCode)

2
webapp/utils/post_utils.jsx
View File

@@ -39,7 +39,7 @@ export function getProfilePicSrcForPost(post, user) {
src = Utils.imageURLForUser(post.user_id);
}
if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') {
if (post.props && post.props.from_webhook && !post.props.use_user_icon && global.window.mm_config.EnablePostIconOverride === 'true') {
if (post.props.override_icon_url) {
src = post.props.override_icon_url;
} else {