summaryrefslogtreecommitdiffstats
path: root/api/apitestlib.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-02-27 17:43:23 -0500
committerChristopher Speller <crspeller@gmail.com>2017-02-27 17:43:23 -0500
commit83c113595ace467ad34f05e35fb2282fa8631a17 (patch)
treecb69e0bf9d2a04e0d622e5151181c65527bc90bc /api/apitestlib.go
parent55752fb359f805196e9acc1497cee658d30fa6ed (diff)
downloadchat-83c113595ace467ad34f05e35fb2282fa8631a17.tar.gz
chat-83c113595ace467ad34f05e35fb2282fa8631a17.tar.bz2
chat-83c113595ace467ad34f05e35fb2282fa8631a17.zip
Revert "Adding caching to get channel member (#5518)"
This reverts commit ba028ed74b69bd1dd902344663fbf8ba4f1dfb87.
Diffstat (limited to 'api/apitestlib.go')
-rw-r--r--api/apitestlib.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go
index 6c4952b3f..475469a36 100644
--- a/api/apitestlib.go
+++ b/api/apitestlib.go
@@ -194,15 +194,13 @@ func UpdateUserToNonTeamAdmin(user *model.User, team *model.Team) {
func MakeUserChannelAdmin(user *model.User, channel *model.Channel) {
utils.DisableDebugLogForTest()
- if cmr := <-app.Srv.Store.Channel().GetMember(channel.Id, user.Id, true); cmr.Err == nil {
+ if cmr := <-app.Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil {
cm := cmr.Data.(*model.ChannelMember)
cm.Roles = "channel_admin channel_user"
if sr := <-app.Srv.Store.Channel().UpdateMember(cm); sr.Err != nil {
utils.EnableDebugLogForTest()
panic(sr.Err)
}
-
- app.InvalidateCacheForChannelMember(cm.ChannelId, cm.UserId)
} else {
utils.EnableDebugLogForTest()
panic(cmr.Err)
@@ -214,15 +212,13 @@ func MakeUserChannelAdmin(user *model.User, channel *model.Channel) {
func MakeUserChannelUser(user *model.User, channel *model.Channel) {
utils.DisableDebugLogForTest()
- if cmr := <-app.Srv.Store.Channel().GetMember(channel.Id, user.Id, true); cmr.Err == nil {
+ if cmr := <-app.Srv.Store.Channel().GetMember(channel.Id, user.Id); cmr.Err == nil {
cm := cmr.Data.(*model.ChannelMember)
cm.Roles = "channel_user"
if sr := <-app.Srv.Store.Channel().UpdateMember(cm); sr.Err != nil {
utils.EnableDebugLogForTest()
panic(sr.Err)
}
-
- app.InvalidateCacheForChannelMember(cm.ChannelId, cm.UserId)
} else {
utils.EnableDebugLogForTest()
panic(cmr.Err)