Count posts to DMs as mentions when from webhooks (#4676)

api/post.go

@@ -600,6 +600,9 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel *
 		}
 
 		mentionedUserIds[otherUserId] = true
+		if post.Props["from_webhook"] == "true" {
+			mentionedUserIds[post.UserId] = true
+		}
 	} else {
 		keywords := getMentionKeywordsInChannel(profileMap)
 

webapp/components/backstage/backstage_controller.jsx

@@ -14,7 +14,7 @@ export default class BackstageController extends React.Component {
         return {
             children: React.PropTypes.node.isRequired,
             params: React.PropTypes.object.isRequired,
-            user: React.PropTypes.user.isRequired
+            user: React.PropTypes.object.isRequired
         };
     }
 
@@ -68,4 +68,4 @@ export default class BackstageController extends React.Component {
             </div>
         );
     }
-}
+}

webapp/components/backstage/components/backstage_navbar.jsx

@@ -9,7 +9,7 @@ import {Link} from 'react-router/es6';
 export default class BackstageNavbar extends React.Component {
     static get propTypes() {
         return {
-            team: React.propTypes.object.isRequired
+            team: React.PropTypes.object.isRequired
         };
     }
 

webapp/components/integrations/components/add_incoming_webhook.jsx

@@ -15,7 +15,7 @@ import SpinnerButton from 'components/spinner_button.jsx';
 export default class AddIncomingWebhook extends React.Component {
     static get propTypes() {
         return {
-            team: React.propTypes.object.isRequired
+            team: React.PropTypes.object.isRequired
         };
     }
 

webapp/components/integrations/components/confirm_integration.jsx

@@ -15,7 +15,7 @@ import Constants from 'utils/constants.jsx';
 export default class ConfirmIntegration extends React.Component {
     static get propTypes() {
         return {
-            team: React.propTypes.object.isRequired,
+            team: React.PropTypes.object.isRequired,
             location: React.PropTypes.object,
             loading: React.PropTypes.bool
         };

webapp/components/integrations/components/installed_incoming_webhooks.jsx

@@ -19,7 +19,7 @@ import {FormattedMessage} from 'react-intl';
 export default class InstalledIncomingWebhooks extends React.Component {
     static get propTypes() {
         return {
-            team: React.propTypes.object.isRequired
+            team: React.PropTypes.object.isRequired
         };
     }
 

webapp/components/integrations/components/integrations.jsx

@@ -16,7 +16,7 @@ import * as Utils from 'utils/utils.jsx';
 export default class Integrations extends React.Component {
     static get propTypes() {
         return {
-            team: React.propTypes.object.isRequired,
+            team: React.PropTypes.object.isRequired,
             user: React.PropTypes.object.isRequired
         };
     }