Removing unused param and unneeded query (#13792)

Этот коммит содержится в:
Jesús Espino
2020-01-30 16:12:37 +01:00
коммит произвёл GitHub
родитель 9de8283077
Коммит d66a2f90c6

Просмотреть файл

@@ -525,10 +525,10 @@ func (s SqlChannelStore) SaveDirectChannel(directchannel *model.Channel, member1
member1.ChannelId = newChannel.Id member1.ChannelId = newChannel.Id
member2.ChannelId = newChannel.Id member2.ChannelId = newChannel.Id
_, member1SaveErr := s.saveMemberT(transaction, member1, newChannel) _, member1SaveErr := s.saveMemberT(transaction, member1)
member2SaveErr := member1SaveErr member2SaveErr := member1SaveErr
if member1.UserId != member2.UserId { if member1.UserId != member2.UserId {
_, member2SaveErr = s.saveMemberT(transaction, member2, newChannel) _, member2SaveErr = s.saveMemberT(transaction, member2)
} }
if member1SaveErr != nil || member2SaveErr != nil { 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) { func (s SqlChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) {
defer s.InvalidateAllChannelMembersForUser(member.UserId) 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() transaction, err := s.GetMaster().Begin()
if err != nil { if err != nil {
return nil, model.NewAppError("SqlChannelStore.SaveMember", "store.sql_channel.save_member.open_transaction.app_error", nil, err.Error(), http.StatusInternalServerError) return nil, model.NewAppError("SqlChannelStore.SaveMember", "store.sql_channel.save_member.open_transaction.app_error", nil, err.Error(), http.StatusInternalServerError)
} }
defer finalizeTransaction(transaction) defer finalizeTransaction(transaction)
newMember, appErr := s.saveMemberT(transaction, member, channel) newMember, appErr := s.saveMemberT(transaction, member)
if appErr != nil { if appErr != nil {
return nil, appErr return nil, appErr
} }
@@ -1278,7 +1272,7 @@ func (s SqlChannelStore) SaveMember(member *model.ChannelMember) (*model.Channel
return newMember, nil 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() member.PreSave()
if err := member.IsValid(); err != nil { if err := member.IsValid(); err != nil {
return nil, err return nil, err