From 11c035aef45fbc6dfbc360123611108a199eca79 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 20 Jan 2016 10:04:17 -0600 Subject: PLT-7 adding loc db calls for oauth table --- api/import.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'api/import.go') diff --git a/api/import.go b/api/import.go index 5c8f99348..7c4770327 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" ) // @@ -21,7 +22,7 @@ func ImportPost(post *model.Post) { } } -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 { @@ -30,7 +31,7 @@ func ImportUser(user *model.User) *model.User { } 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) } @@ -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) -- cgit v1.2.3-1-g7c22 From aac8d121a00922f007b9c67d890ea9dbcfbe4b8f Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 20 Jan 2016 10:34:31 -0600 Subject: PLT-7 adding loc db calls for posts table --- api/import.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api/import.go') diff --git a/api/import.go b/api/import.go index 7c4770327..0b31d05a3 100644 --- a/api/import.go +++ b/api/import.go @@ -14,10 +14,10 @@ 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) } } -- cgit v1.2.3-1-g7c22 From 75f8729e2d25467500778e633c45c97e78a8f7a0 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 20 Jan 2016 12:43:44 -0600 Subject: PLT-7 adding loc db calls for users table --- api/import.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api/import.go') diff --git a/api/import.go b/api/import.go index 0b31d05a3..e94e83e9a 100644 --- a/api/import.go +++ b/api/import.go @@ -25,7 +25,7 @@ func ImportPost(T goi18n.TranslateFunc, post *model.Post) { 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 { @@ -35,7 +35,7 @@ func ImportUser(T goi18n.TranslateFunc, user *model.User) *model.User { 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) } -- cgit v1.2.3-1-g7c22