mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unknownRoomError, use unmarshalError when unable to get room ID

Browse source
This commit is contained in:
Neil Alexander 2020-04-16 14:54:50 +01:00
parent e66344587b
commit e55bc08c92
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
federationapi/routing/send.go
View file

@ -79,7 +79,6 @@ func Send(
JSON: resp, JSON: resp,
} }
// Handle known error cases as we will return a 400 error for these. // Handle known error cases as we will return a 400 error for these.
case unknownRoomError:
case roomNotFoundError: case roomNotFoundError:
case unmarshalError: case unmarshalError:
case verifySigError: case verifySigError:
@ -117,7 +116,7 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, error) {
} }
if err := json.Unmarshal(pdu, &header); err != nil { if err := json.Unmarshal(pdu, &header); err != nil {
util.GetLogger(t.context).WithError(err).Warn("Transaction: Failed to extract room ID from event") util.GetLogger(t.context).WithError(err).Warn("Transaction: Failed to extract room ID from event")
return nil, unknownRoomError{} return nil, unmarshalError{err}
} }
verReq := api.QueryRoomVersionForRoomRequest{RoomID: header.RoomID} verReq := api.QueryRoomVersionForRoomRequest{RoomID: header.RoomID}
verRes := api.QueryRoomVersionForRoomResponse{} verRes := api.QueryRoomVersionForRoomResponse{}
@ -178,7 +177,6 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, error) {
return &gomatrixserverlib.RespSend{PDUs: results}, nil return &gomatrixserverlib.RespSend{PDUs: results}, nil
} }
type unknownRoomError struct{}
type roomNotFoundError struct { type roomNotFoundError struct {
roomID string roomID string
} }
@ -190,7 +188,6 @@ type verifySigError struct {
err error err error
} }
func (e unknownRoomError) Error() string { return "unable to extract room ID" }
func (e roomNotFoundError) Error() string { return fmt.Sprintf("room %q not found", e.roomID) } func (e roomNotFoundError) Error() string { return fmt.Sprintf("room %q not found", e.roomID) }
func (e unmarshalError) Error() string { return fmt.Sprintf("unable to parse event: %s", e.err) } func (e unmarshalError) Error() string { return fmt.Sprintf("unable to parse event: %s", e.err) }
func (e verifySigError) Error() string { func (e verifySigError) Error() string {