Clean up a bit

This commit is contained in:
Neil Alexander 2021-11-12 09:38:14 +00:00
parent 6016d378a0
commit e874853ed0
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 5 additions and 12 deletions

View file

@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"net/http"
"time"
"github.com/matrix-org/dendrite/federationsender/api"
@ -116,12 +115,6 @@ func (r *FederationSenderInternalAPI) PerformJoin(
// Clear the wrapped error, else serialising to JSON (in polylith mode) will fail
httpErr.WrappedError = nil
response.LastError = &httpErr
} else if errors.Is(lastErr, &gomatrixserverlib.NotAllowed{}) {
response.LastError = &gomatrix.HTTPError{
Code: http.StatusForbidden,
WrappedError: lastErr,
Message: lastErr.Error(),
}
} else {
response.LastError = &gomatrix.HTTPError{
Code: 0,