mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-15 10:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant nil check

Browse source
This commit is contained in:
Devon Hudson 2023-06-07 09:12:00 -06:00
parent 4403f95ca9
commit 51132f9e81
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/directory.go
View file

@ -339,7 +339,7 @@ func SetVisibility(
// NOTSPEC: Check if the user's power is greater than power required to change m.room.canonical_alias event // NOTSPEC: Check if the user's power is greater than power required to change m.room.canonical_alias event
power, _ := gomatrixserverlib.NewPowerLevelContentFromEvent(queryEventsRes.StateEvents[0].PDU) power, _ := gomatrixserverlib.NewPowerLevelContentFromEvent(queryEventsRes.StateEvents[0].PDU)
fullUserID, err := spec.NewUserID(dev.UserID, true) fullUserID, err := spec.NewUserID(dev.UserID, true)
if err != nil || fullUserID == nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusForbidden, Code: http.StatusForbidden,
JSON: spec.Forbidden("userID doesn't have power level to change visibility"), JSON: spec.Forbidden("userID doesn't have power level to change visibility"),

4
clientapi/routing/membership.go
View file

@ -67,7 +67,7 @@ func SendBan(
return *errRes return *errRes
} }
fullUserID, err := spec.NewUserID(device.UserID, true) fullUserID, err := spec.NewUserID(device.UserID, true)
if err != nil || fullUserID == nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusForbidden, Code: http.StatusForbidden,
JSON: spec.Forbidden("You don't have permission to ban this user, bad userID"), JSON: spec.Forbidden("You don't have permission to ban this user, bad userID"),
@ -157,7 +157,7 @@ func SendKick(
return *errRes return *errRes
} }
fullUserID, err := spec.NewUserID(device.UserID, true) fullUserID, err := spec.NewUserID(device.UserID, true)
if err != nil || fullUserID == nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusForbidden, Code: http.StatusForbidden,
JSON: spec.Forbidden("You don't have permission to kick this user, bad userID"), JSON: spec.Forbidden("You don't have permission to kick this user, bad userID"),

2
clientapi/routing/redaction.go
View file

@ -74,7 +74,7 @@ func SendRedaction(
} }
fullUserID, userIDErr := spec.NewUserID(device.UserID, true) fullUserID, userIDErr := spec.NewUserID(device.UserID, true)
if userIDErr != nil || fullUserID == nil { if userIDErr != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusForbidden, Code: http.StatusForbidden,
JSON: spec.Forbidden("userID doesn't have power level to redact"), JSON: spec.Forbidden("userID doesn't have power level to redact"),

2
clientapi/routing/sendevent.go
View file

@ -267,7 +267,7 @@ func generateSendEvent(
) (gomatrixserverlib.PDU, *util.JSONResponse) { ) (gomatrixserverlib.PDU, *util.JSONResponse) {
// parse the incoming http request // parse the incoming http request
fullUserID, err := spec.NewUserID(device.UserID, true) fullUserID, err := spec.NewUserID(device.UserID, true)
if err != nil || fullUserID == nil { if err != nil {
return nil, &util.JSONResponse{ return nil, &util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.BadJSON("Bad userID"), JSON: spec.BadJSON("Bad userID"),

2
federationapi/internal/perform.go
View file

@ -147,7 +147,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
} }
user, err := spec.NewUserID(userID, true) user, err := spec.NewUserID(userID, true)
if err != nil || user == nil { if err != nil {
return err return err
} }
room, err := spec.NewRoomID(roomID) room, err := spec.NewRoomID(roomID)

2
roomserver/internal/perform/perform_admin.go
View file

@ -235,7 +235,7 @@ func (r *Admin) PerformAdminDownloadState(
roomID, userID string, serverName spec.ServerName, roomID, userID string, serverName spec.ServerName,
) error { ) error {
fullUserID, err := spec.NewUserID(userID, true) fullUserID, err := spec.NewUserID(userID, true)
if err != nil || fullUserID == nil { if err != nil {
return err return err
} }
senderDomain := fullUserID.Domain() senderDomain := fullUserID.Domain()