summaryrefslogtreecommitdiffstats
path: root/api/command.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-20 13:36:27 -0600
committerCorey Hulen <corey@hulen.com>2016-01-20 13:36:27 -0600
commitd703d09063538fb91baa5a21b1001216c43d848a (patch)
treed87809ff2a306e5428b0ab6973d05509baa21abd /api/command.go
parent0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (diff)
parentaefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b (diff)
downloadchat-d703d09063538fb91baa5a21b1001216c43d848a.tar.gz
chat-d703d09063538fb91baa5a21b1001216c43d848a.tar.bz2
chat-d703d09063538fb91baa5a21b1001216c43d848a.zip
Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-db
Revert " PLT-7 adding loc for db calls"
Diffstat (limited to 'api/command.go')
-rw-r--r--api/command.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/command.go b/api/command.go
index e041797a6..00293cf16 100644
--- a/api/command.go
+++ b/api/command.go
@@ -79,7 +79,7 @@ func checkCommand(c *Context, command *model.Command) bool {
}
if len(command.ChannelId) > 0 {
- cchan := Srv.Store.Channel().CheckPermissionsTo(c.T, c.Session.TeamId, command.ChannelId, c.Session.UserId)
+ cchan := Srv.Store.Channel().CheckPermissionsTo(c.Session.TeamId, command.ChannelId, c.Session.UserId)
if !c.HasPermissionsToChannel(cchan, "checkCommand") {
return true
@@ -269,7 +269,7 @@ func joinCommand(c *Context, command *model.Command) bool {
startsWith = parts[1]
}
- if result := <-Srv.Store.Channel().GetMoreChannels(c.T, c.Session.TeamId, c.Session.UserId); result.Err != nil {
+ if result := <-Srv.Store.Channel().GetMoreChannels(c.Session.TeamId, c.Session.UserId); result.Err != nil {
c.Err = result.Err
return false
} else {
@@ -544,7 +544,7 @@ func loadTestPostsCommand(c *Context, command *model.Command) bool {
}
var usernames []string
- if result := <-Srv.Store.User().GetProfiles(c.T, c.Session.TeamId); result.Err == nil {
+ if result := <-Srv.Store.User().GetProfiles(c.Session.TeamId); result.Err == nil {
profileUsers := result.Data.(map[string]*model.User)
usernames = make([]string, len(profileUsers))
i := 0