From 3fba8e42b140c1189bf3c06882cce5e2231e63da Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Fri, 8 Jan 2016 12:41:26 -0600 Subject: partial fix for UI --- api/command_echo.go | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 api/command_echo.go (limited to 'api/command_echo.go') diff --git a/api/command_echo.go b/api/command_echo.go new file mode 100644 index 000000000..5d34578c8 --- /dev/null +++ b/api/command_echo.go @@ -0,0 +1,81 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api + +import ( + "strconv" + "strings" + "time" + + l4g "code.google.com/p/log4go" + "github.com/mattermost/platform/model" +) + +var echoSem chan bool + +type EchoProvider struct { +} + +func init() { + RegisterCommandProvider(&EchoProvider{}) +} + +func (me *EchoProvider) GetCommand() *model.Command { + return &model.Command{ + Trigger: "echo", + AutoComplete: true, + AutoCompleteDesc: "Echo back text from your account", + AutoCompleteHint: "\"message\" [delay in seconds]", + DisplayName: "echo", + } +} + +func (me *EchoProvider) DoCommand(c *Context, channelId string, message string) *model.CommandResponse { + maxThreads := 100 + + delay := 0 + if endMsg := strings.LastIndex(message, "\""); string(message[0]) == "\"" && endMsg > 1 { + if checkDelay, err := strconv.Atoi(strings.Trim(message[endMsg:], " \"")); err == nil { + delay = checkDelay + } + message = message[1:endMsg] + } else if strings.Index(message, " ") > -1 { + delayIdx := strings.LastIndex(message, " ") + delayStr := strings.Trim(message[delayIdx:], " ") + + if checkDelay, err := strconv.Atoi(delayStr); err == nil { + delay = checkDelay + message = message[:delayIdx] + } + } + + if delay > 10000 { + return &model.CommandResponse{Text: "Delays must be under 10000 seconds", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + } + + if echoSem == nil { + // We want one additional thread allowed so we never reach channel lockup + echoSem = make(chan bool, maxThreads+1) + } + + if len(echoSem) >= maxThreads { + return &model.CommandResponse{Text: "High volume of echo request, cannot process request", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + } + + echoSem <- true + go func() { + defer func() { <-echoSem }() + post := &model.Post{} + post.ChannelId = channelId + post.Message = message + + time.Sleep(time.Duration(delay) * time.Second) + + if _, err := CreatePost(c, post, true); err != nil { + l4g.Error("Unable to create /echo post, err=%v", err) + } + }() + + return &model.CommandResponse{} +} -- cgit v1.2.3-1-g7c22 From 586967b757a869dbb5f3677e605009a1f5c61005 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 14 Jan 2016 10:52:14 -0600 Subject: finishing up commands UI --- api/command_echo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/command_echo.go') diff --git a/api/command_echo.go b/api/command_echo.go index 5d34578c8..a5042c9ea 100644 --- a/api/command_echo.go +++ b/api/command_echo.go @@ -8,7 +8,7 @@ import ( "strings" "time" - l4g "code.google.com/p/log4go" + l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/model" ) -- cgit v1.2.3-1-g7c22 From 27586a320add265f3e032d2cb21b27e93b51a2b0 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 1 Feb 2016 18:52:43 -0800 Subject: Adding loc to new command backend --- api/command_echo.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'api/command_echo.go') diff --git a/api/command_echo.go b/api/command_echo.go index a5042c9ea..805db7ad2 100644 --- a/api/command_echo.go +++ b/api/command_echo.go @@ -17,17 +17,25 @@ var echoSem chan bool type EchoProvider struct { } +const ( + CMD_ECHO = "echo" +) + func init() { RegisterCommandProvider(&EchoProvider{}) } -func (me *EchoProvider) GetCommand() *model.Command { +func (me *EchoProvider) GetTrigger() string { + return CMD_ECHO +} + +func (me *EchoProvider) GetCommand(c *Context) *model.Command { return &model.Command{ - Trigger: "echo", + Trigger: CMD_ECHO, AutoComplete: true, - AutoCompleteDesc: "Echo back text from your account", - AutoCompleteHint: "\"message\" [delay in seconds]", - DisplayName: "echo", + AutoCompleteDesc: c.T("api.command_echo.desc"), + AutoCompleteHint: c.T("api.command_echo.hint"), + DisplayName: c.T("api.command_echo.name"), } } @@ -51,7 +59,7 @@ func (me *EchoProvider) DoCommand(c *Context, channelId string, message string) } if delay > 10000 { - return &model.CommandResponse{Text: "Delays must be under 10000 seconds", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + return &model.CommandResponse{Text: c.T("api.command_echo.delay.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } if echoSem == nil { @@ -60,7 +68,7 @@ func (me *EchoProvider) DoCommand(c *Context, channelId string, message string) } if len(echoSem) >= maxThreads { - return &model.CommandResponse{Text: "High volume of echo request, cannot process request", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} + return &model.CommandResponse{Text: c.T("api.command_echo.high_volume.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } echoSem <- true @@ -73,7 +81,7 @@ func (me *EchoProvider) DoCommand(c *Context, channelId string, message string) time.Sleep(time.Duration(delay) * time.Second) if _, err := CreatePost(c, post, true); err != nil { - l4g.Error("Unable to create /echo post, err=%v", err) + l4g.Error(c.T("api.command_echo.create.app_error"), err) } }() -- cgit v1.2.3-1-g7c22