diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-20 13:12:19 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-20 13:12:19 -0600 |
commit | 0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (patch) | |
tree | 47735a3dd609e025837df4460b0d030454358cf1 /api/import.go | |
parent | 1acd38b7b19521d06d274c42c00ce7072cd92196 (diff) | |
parent | 75f8729e2d25467500778e633c45c97e78a8f7a0 (diff) | |
download | chat-0b1aff3b24b4ac2df8e963c83d6e52b127c603f9.tar.gz chat-0b1aff3b24b4ac2df8e963c83d6e52b127c603f9.tar.bz2 chat-0b1aff3b24b4ac2df8e963c83d6e52b127c603f9.zip |
Merge pull request #1930 from mattermost/PLT-7-server-db
PLT-7 adding loc for db calls
Diffstat (limited to 'api/import.go')
-rw-r--r-- | api/import.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/api/import.go b/api/import.go index 5c8f99348..e94e83e9a 100644 --- a/api/import.go +++ b/api/import.go @@ -6,6 +6,7 @@ package api import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/model" + goi18n "github.com/nicksnyder/go-i18n/i18n" ) // @@ -13,28 +14,28 @@ import ( // some of the usual checks. (IsValid is still run) // -func ImportPost(post *model.Post) { +func ImportPost(T goi18n.TranslateFunc, post *model.Post) { post.Hashtags, _ = model.ParseHashtags(post.Message) - if result := <-Srv.Store.Post().Save(post); result.Err != nil { + if result := <-Srv.Store.Post().Save(T, post); result.Err != nil { l4g.Debug("Error saving post. user=" + post.UserId + ", message=" + post.Message) } } -func ImportUser(user *model.User) *model.User { +func ImportUser(T goi18n.TranslateFunc, user *model.User) *model.User { user.MakeNonNil() - if result := <-Srv.Store.User().Save(user); result.Err != nil { + if result := <-Srv.Store.User().Save(T, user); result.Err != nil { l4g.Error("Error saving user. err=%v", result.Err) return nil } else { ruser := result.Data.(*model.User) - if err := JoinDefaultChannels(ruser, ""); err != nil { + if err := JoinDefaultChannels(T, ruser, ""); err != nil { l4g.Error("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", ruser.Id, ruser.TeamId, err) } - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { + if cresult := <-Srv.Store.User().VerifyEmail(T, ruser.Id); cresult.Err != nil { l4g.Error("Failed to set email verified err=%v", cresult.Err) } @@ -42,8 +43,8 @@ func ImportUser(user *model.User) *model.User { } } -func ImportChannel(channel *model.Channel) *model.Channel { - if result := <-Srv.Store.Channel().Save(channel); result.Err != nil { +func ImportChannel(T goi18n.TranslateFunc, channel *model.Channel) *model.Channel { + if result := <-Srv.Store.Channel().Save(T, channel); result.Err != nil { return nil } else { sc := result.Data.(*model.Channel) |