upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MM-62086] Don't include deleted DMs/GMs when returning archived channels (#29572)

Browse source
This commit is contained in:
Devin Binnie 2024-12-12 10:19:21 -05:00 committed by GitHub
parent 57372bd06b
commit 3eb95af974
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/channels/store/sqlstore/channel_store.go
View file

@ -1507,7 +1507,7 @@ func (s SqlChannelStore) GetDeleted(teamId string, offset int, limit int, userId
if !skipTeamMembershipCheck {
builder = builder.Where(sq.Or{
sq.NotEq{"Type": model.ChannelTypePrivate},
sq.Eq{"Type": model.ChannelTypeOpen},
sq.And{
sq.Eq{"Type": model.ChannelTypePrivate},
sq.Expr("Id IN (?)", sq.Select("ChannelId").From("ChannelMembers").Where(sq.Eq{"UserId": userId})),