🐛 Bug fixes on adding duplicate people into channel
This commit is contained in:
parent
397386be12
commit
2228f5054d
@ -60,13 +60,7 @@ func AddChannelMemberWithCheck(user, op authm.Account, target models.Channel) er
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
member := models.ChannelMember{
|
return AddChannelMember(user, target)
|
||||||
ChannelID: target.ID,
|
|
||||||
AccountID: user.ID,
|
|
||||||
}
|
|
||||||
|
|
||||||
err := database.C.Save(&member).Error
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddChannelMember(user authm.Account, target models.Channel) error {
|
func AddChannelMember(user authm.Account, target models.Channel) error {
|
||||||
@ -75,7 +69,7 @@ func AddChannelMember(user authm.Account, target models.Channel) error {
|
|||||||
AccountID: user.ID,
|
AccountID: user.ID,
|
||||||
ChannelID: target.ID,
|
ChannelID: target.ID,
|
||||||
}).First(&member).Error; err == nil || !errors.Is(err, gorm.ErrRecordNotFound) {
|
}).First(&member).Error; err == nil || !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
return fmt.Errorf("the user is already in the channel")
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
member = models.ChannelMember{
|
member = models.ChannelMember{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user