hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak error handling some more

Browse source
This commit is contained in:
Neil Alexander 2021-11-11 15:42:58 +00:00
parent 9fb7b59648
commit 9ad0a85df9
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/perform/perform_join.go
View file

@ -25,6 +25,7 @@ import (
"github.com/getsentry/sentry-go" "github.com/getsentry/sentry-go"
fsAPI "github.com/matrix-org/dendrite/federationsender/api" fsAPI "github.com/matrix-org/dendrite/federationsender/api"
"github.com/matrix-org/dendrite/internal/eventutil" "github.com/matrix-org/dendrite/internal/eventutil"
"github.com/matrix-org/dendrite/roomserver/api"
rsAPI "github.com/matrix-org/dendrite/roomserver/api" rsAPI "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/roomserver/internal/helpers" "github.com/matrix-org/dendrite/roomserver/internal/helpers"
"github.com/matrix-org/dendrite/roomserver/internal/input" "github.com/matrix-org/dendrite/roomserver/internal/input"
@ -60,7 +61,8 @@ func (r *Joiner) PerformJoin(
res.Error = perr res.Error = perr
} else { } else {
res.Error = &rsAPI.PerformError{ res.Error = &rsAPI.PerformError{
Msg: err.Error(), Code: api.PerformErrorNotAllowed, // TODO: fix this when cross-boundary handling is better.
Msg: err.Error(),
} }
} }
} }