aboutsummaryrefslogtreecommitdiff
path: root/roomserver/internal/query
diff options
context:
space:
mode:
authorTill <2353100+S7evinK@users.noreply.github.com>2022-10-07 16:00:12 +0200
committerGitHub <noreply@github.com>2022-10-07 16:00:12 +0200
commit1ca3f3efb512db4c1827eb571588ec31258782a5 (patch)
tree6df45c6b24e30064e34055464dd514a58eae837a /roomserver/internal/query
parent8e231130e97ce716357bbb4af8f82159dc6e684e (diff)
Fix issue with DMs shown as normal rooms (#2776)
Fixes #2121, test added in https://github.com/matrix-org/complement/pull/494
Diffstat (limited to 'roomserver/internal/query')
-rw-r--r--roomserver/internal/query/query.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go
index ee8e1cfe..7a424a33 100644
--- a/roomserver/internal/query/query.go
+++ b/roomserver/internal/query/query.go
@@ -872,7 +872,7 @@ func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.Query
// but we don't specify an authorised via user, since the event auth
// will allow the join anyway.
var pending bool
- if pending, _, _, err = helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID); err != nil {
+ if pending, _, _, _, err = helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID); err != nil {
return fmt.Errorf("helpers.IsInvitePending: %w", err)
} else if pending {
res.Allowed = true