diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-05 19:20:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 19:20:47 -0500 |
| commit | 7cee7b3342afa4b6845b0574f90c9fdc586c3c34 (patch) | |
| tree | b494d626944706a2aa672d09b61cca604d26193f | |
| parent | df085d273d7ed3fe0d53b78364da46cdd6429c53 (diff) | |
| download | chat-7cee7b3342afa4b6845b0574f90c9fdc586c3c34.tar.gz chat-7cee7b3342afa4b6845b0574f90c9fdc586c3c34.tar.bz2 chat-7cee7b3342afa4b6845b0574f90c9fdc586c3c34.zip | |
PLT-7300: Add use_user_icon prop to allow bots to just use their user icon (#7381)
* add use_user_icon prop to allow bots to just use their user icon
* revert unintentional change
| -rw-r--r-- | app/plugin/jira/plugin.go | 5 | ||||
| -rw-r--r-- | webapp/utils/post_utils.jsx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/plugin/jira/plugin.go b/app/plugin/jira/plugin.go index 94922321c..ad4ef6ac0 100644 --- a/app/plugin/jira/plugin.go +++ b/app/plugin/jira/plugin.go @@ -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) diff --git a/webapp/utils/post_utils.jsx b/webapp/utils/post_utils.jsx index d37e6c26d..670dfbaaf 100644 --- a/webapp/utils/post_utils.jsx +++ b/webapp/utils/post_utils.jsx @@ -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 { |