From d66a2f90c62348df251e55b250a8c5bdf1f336b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 30 Jan 2020 16:12:37 +0100 Subject: [PATCH] Removing unused param and unneeded query (#13792) --- store/sqlstore/channel_store.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index f918df9998..e1527431a4 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -525,10 +525,10 @@ func (s SqlChannelStore) SaveDirectChannel(directchannel *model.Channel, member1 member1.ChannelId = newChannel.Id member2.ChannelId = newChannel.Id - _, member1SaveErr := s.saveMemberT(transaction, member1, newChannel) + _, member1SaveErr := s.saveMemberT(transaction, member1) member2SaveErr := member1SaveErr if member1.UserId != member2.UserId { - _, member2SaveErr = s.saveMemberT(transaction, member2, newChannel) + _, member2SaveErr = s.saveMemberT(transaction, member2) } if member1SaveErr != nil || member2SaveErr != nil { @@ -1254,19 +1254,13 @@ var CHANNEL_MEMBERS_WITH_SCHEME_SELECT_QUERY = ` func (s SqlChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { defer s.InvalidateAllChannelMembersForUser(member.UserId) - // Grab the channel we are saving this member to - channel, errCh := s.GetFromMaster(member.ChannelId) - if errCh != nil { - return nil, errCh - } - transaction, err := s.GetMaster().Begin() if err != nil { return nil, model.NewAppError("SqlChannelStore.SaveMember", "store.sql_channel.save_member.open_transaction.app_error", nil, err.Error(), http.StatusInternalServerError) } defer finalizeTransaction(transaction) - newMember, appErr := s.saveMemberT(transaction, member, channel) + newMember, appErr := s.saveMemberT(transaction, member) if appErr != nil { return nil, appErr } @@ -1278,7 +1272,7 @@ func (s SqlChannelStore) SaveMember(member *model.ChannelMember) (*model.Channel return newMember, nil } -func (s SqlChannelStore) saveMemberT(transaction *gorp.Transaction, member *model.ChannelMember, channel *model.Channel) (*model.ChannelMember, *model.AppError) { +func (s SqlChannelStore) saveMemberT(transaction *gorp.Transaction, member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { member.PreSave() if err := member.IsValid(); err != nil { return nil, err