opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[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 15:19:21 +00:00
committed by GitHub
parent 57372bd06b
commit 3eb95af974
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/channels/store/sqlstore/channel_store.go
+1 -1
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})),