diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-18 13:25:46 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-18 13:25:46 -0400 |
commit | ee2f62a9f8a9a12409cc881ea0e1d747ff20dc13 (patch) | |
tree | 52925b8521dd4b8c8291499f76c2ed3c278271f8 /model | |
parent | 6d586c7309cb0ddaca6580dd1520aef4ff554fb5 (diff) | |
parent | 35320efe1afad87419992275ba555ddcbfcdf46b (diff) | |
download | chat-ee2f62a9f8a9a12409cc881ea0e1d747ff20dc13.tar.gz chat-ee2f62a9f8a9a12409cc881ea0e1d747ff20dc13.tar.bz2 chat-ee2f62a9f8a9a12409cc881ea0e1d747ff20dc13.zip |
Merge pull request #2476 from mattermost/revert-2169-external-slashcommands-management
Revert "PLT-2183 Slash command auto-complete"
Diffstat (limited to 'model')
-rw-r--r-- | model/client.go | 7 | ||||
-rw-r--r-- | model/command.go | 33 |
2 files changed, 18 insertions, 22 deletions
diff --git a/model/client.go b/model/client.go index 68cf11414..f5c8ad641 100644 --- a/model/client.go +++ b/model/client.go @@ -363,11 +363,8 @@ func (c *Client) Command(channelId string, command string, suggest bool) (*Resul } } -func (c *Client) ListCommands(channelId string, command string) (*Result, *AppError) { - m := make(map[string]string) - m["command"] = command - m["channelId"] = channelId - if r, err := c.DoApiPost("/commands/list", MapToJson(m)); err != nil { +func (c *Client) ListCommands() (*Result, *AppError) { + if r, err := c.DoApiGet("/commands/list", "", ""); err != nil { return nil, err } else { return &Result{r.Header.Get(HEADER_REQUEST_ID), diff --git a/model/command.go b/model/command.go index 8e0b31583..56d88f13c 100644 --- a/model/command.go +++ b/model/command.go @@ -14,23 +14,22 @@ const ( ) type Command struct { - Id string `json:"id"` - Token string `json:"token"` - CreateAt int64 `json:"create_at"` - UpdateAt int64 `json:"update_at"` - DeleteAt int64 `json:"delete_at"` - CreatorId string `json:"creator_id"` - TeamId string `json:"team_id"` - ExternalManagement bool `json:"external_management"` - Trigger string `json:"trigger"` - Method string `json:"method"` - Username string `json:"username"` - IconURL string `json:"icon_url"` - AutoComplete bool `json:"auto_complete"` - AutoCompleteDesc string `json:"auto_complete_desc"` - AutoCompleteHint string `json:"auto_complete_hint"` - DisplayName string `json:"display_name"` - URL string `json:"url"` + Id string `json:"id"` + Token string `json:"token"` + CreateAt int64 `json:"create_at"` + UpdateAt int64 `json:"update_at"` + DeleteAt int64 `json:"delete_at"` + CreatorId string `json:"creator_id"` + TeamId string `json:"team_id"` + Trigger string `json:"trigger"` + Method string `json:"method"` + Username string `json:"username"` + IconURL string `json:"icon_url"` + AutoComplete bool `json:"auto_complete"` + AutoCompleteDesc string `json:"auto_complete_desc"` + AutoCompleteHint string `json:"auto_complete_hint"` + DisplayName string `json:"display_name"` + URL string `json:"url"` } func (o *Command) ToJson() string { |