Merge pull request #2052 from mattermost/PLT-1429

	PLT-1429 adding user created slash commands

1 files changed, 13 insertions, 6 deletions

diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index d615e02c7..328a7a7f2 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -774,20 +774,27 @@ export function savePreferences(preferences, success, error) {
 }
 
 export function getSuggestedCommands(command, suggestionId, component) {
-    client.executeCommand(
-        '',
-        command,
-        true,
+    client.listCommands(
         (data) => {
+            var matches = [];
+            data.forEach((cmd) => {
+                if (('/' + cmd.trigger).indexOf(command) === 0) {
+                    matches.push({
+                        suggestion: '/' + cmd.trigger + ' ' + cmd.auto_complete_hint,
+                        description: cmd.auto_complete_desc
+                    });
+                }
+            });
+
             // pull out the suggested commands from the returned data
-            const terms = data.suggestions.map((suggestion) => suggestion.suggestion);
+            const terms = matches.map((suggestion) => suggestion.suggestion);
 
             AppDispatcher.handleServerAction({
                 type: ActionTypes.SUGGESTION_RECEIVED_SUGGESTIONS,
                 id: suggestionId,
                 matchedPretext: command,
                 terms,
-                items: data.suggestions,
+                items: matches,
                 component
             });
         },