summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/command.go1
-rw-r--r--api/command_shortcuts.go22
2 files changed, 19 insertions, 4 deletions
diff --git a/api/command.go b/api/command.go
index 45355f092..7e0708a4d 100644
--- a/api/command.go
+++ b/api/command.go
@@ -254,6 +254,7 @@ func handleResponse(c *Context, w http.ResponseWriter, response *model.CommandRe
} else if response.ResponseType == model.COMMAND_RESPONSE_TYPE_EPHEMERAL && response.Text != "" {
post.Message = response.Text
post.CreateAt = model.GetMillis()
+ post.UserId = c.Session.UserId
SendEphemeralPost(
c.TeamId,
c.Session.UserId,
diff --git a/api/command_shortcuts.go b/api/command_shortcuts.go
index 0cdf821c8..dfbb7071d 100644
--- a/api/command_shortcuts.go
+++ b/api/command_shortcuts.go
@@ -4,8 +4,10 @@
package api
import (
- "github.com/mattermost/platform/model"
+ "bytes"
"strings"
+
+ "github.com/mattermost/platform/model"
)
type ShortcutsProvider struct {
@@ -34,11 +36,23 @@ func (me *ShortcutsProvider) GetCommand(c *Context) *model.Command {
}
func (me *ShortcutsProvider) DoCommand(c *Context, channelId string, message string) *model.CommandResponse {
- stringId := "api.command_shortcuts.list"
+ shortcutIds := [4]string{
+ "api.command_shortcuts.nav",
+ "api.command_shortcuts.files",
+ "api.command_shortcuts.msgs",
+ "api.command_shortcuts.browser",
+ }
+ var buffer bytes.Buffer
if strings.Contains(message, "mac") {
- stringId = "api.command_shortcuts.list_mac"
+ for _, element := range shortcutIds {
+ buffer.WriteString(c.T(element + "_mac"))
+ }
+ } else {
+ for _, element := range shortcutIds {
+ buffer.WriteString(c.T(element))
+ }
}
- return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T(stringId)}
+ return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: buffer.String()}
}