Skip to content

Commit

Permalink
[MM-58505] Fix group channel expand (#489)
Browse files Browse the repository at this point in the history
Co-authored-by: Ben Schumacher <[email protected]>
  • Loading branch information
sblaisot and hanzei authored Aug 3, 2024
1 parent 5ed11cf commit 5b9e585
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion server/proxy/expand.go
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ func (e *expander) consistencyCheck() error {
}

if e.ExpandedContext.Channel != nil {
if e.UserAgentContext.TeamID != "" && e.ExpandedContext.Channel.Type != model.ChannelTypeDirect && e.ExpandedContext.Channel.TeamId != e.UserAgentContext.TeamID {
if e.UserAgentContext.TeamID != "" && e.ExpandedContext.Channel.Type != model.ChannelTypeDirect && e.ExpandedContext.Channel.Type != model.ChannelTypeGroup && e.ExpandedContext.Channel.TeamId != e.UserAgentContext.TeamID {
return errors.Errorf("expanded channel's team ID %s is different from user agent context %s",
e.ExpandedContext.Channel.TeamId, e.UserAgentContext.TeamID)
}
Expand Down

0 comments on commit 5b9e585

Please sign in to comment.