1 files changed, 110 insertions, 20 deletions

diff --git a/model/command.go b/model/command.go
index 5aec5f534..56d88f13c 100644
--- a/model/command.go
+++ b/model/command.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
 package model
@@ -9,28 +9,27 @@ import (
 )
 
 const (
-	RESP_EXECUTED        = "executed"
-	RESP_NOT_IMPLEMENTED = "not implemented"
+	COMMAND_METHOD_POST = "P"
+	COMMAND_METHOD_GET  = "G"
 )
 
 type Command struct {
-	Command      string            `json:"command"`
-	Response     string            `json:"response"`
-	GotoLocation string            `json:"goto_location"`
-	ChannelId    string            `json:"channel_id"`
-	Suggest      bool              `json:"-"`
-	Suggestions  []*SuggestCommand `json:"suggestions"`
-}
-
-func (o *Command) AddSuggestion(suggest *SuggestCommand) {
-
-	if o.Suggest {
-		if o.Suggestions == nil {
-			o.Suggestions = make([]*SuggestCommand, 0, 128)
-		}
-
-		o.Suggestions = append(o.Suggestions, suggest)
-	}
+	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 {
@@ -52,3 +51,94 @@ func CommandFromJson(data io.Reader) *Command {
 		return nil
 	}
 }
+
+func CommandListToJson(l []*Command) string {
+	b, err := json.Marshal(l)
+	if err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
+
+func CommandListFromJson(data io.Reader) []*Command {
+	decoder := json.NewDecoder(data)
+	var o []*Command
+	err := decoder.Decode(&o)
+	if err == nil {
+		return o
+	} else {
+		return nil
+	}
+}
+
+func (o *Command) IsValid() *AppError {
+
+	if len(o.Id) != 26 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.id.app_error", nil, "")
+	}
+
+	if len(o.Token) != 26 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.token.app_error", nil, "")
+	}
+
+	if o.CreateAt == 0 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.create_at.app_error", nil, "")
+	}
+
+	if o.UpdateAt == 0 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.update_at.app_error", nil, "")
+	}
+
+	if len(o.CreatorId) != 26 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.user_id.app_error", nil, "")
+	}
+
+	if len(o.TeamId) != 26 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.team_id.app_error", nil, "")
+	}
+
+	if len(o.Trigger) > 1024 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.trigger.app_error", nil, "")
+	}
+
+	if len(o.URL) == 0 || len(o.URL) > 1024 {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.url.app_error", nil, "")
+	}
+
+	if !IsValidHttpUrl(o.URL) {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.url_http.app_error", nil, "")
+	}
+
+	if !(o.Method == COMMAND_METHOD_GET || o.Method == COMMAND_METHOD_POST) {
+		return NewLocAppError("Command.IsValid", "model.command.is_valid.method.app_error", nil, "")
+	}
+
+	return nil
+}
+
+func (o *Command) PreSave() {
+	if o.Id == "" {
+		o.Id = NewId()
+	}
+
+	if o.Token == "" {
+		o.Token = NewId()
+	}
+
+	o.CreateAt = GetMillis()
+	o.UpdateAt = o.CreateAt
+}
+
+func (o *Command) PreUpdate() {
+	o.UpdateAt = GetMillis()
+}
+
+func (o *Command) Sanitize() {
+	o.Token = ""
+	o.CreatorId = ""
+	o.Method = ""
+	o.URL = ""
+	o.Username = ""
+	o.IconURL = ""
+}