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

Fix linter errors

Browse source
This commit is contained in:
Devon Hudson 2023-05-31 08:32:25 -06:00
parent fa34785cc2
commit 6cdf10edd9
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/internal/perform/perform_create_room.go
View file

@ -55,7 +55,7 @@ func (c *Creator) PerformCreateRoom(ctx context.Context, userID spec.UserID, roo
createContent := map[string]interface{}{} createContent := map[string]interface{}{}
if len(createRequest.CreationContent) > 0 { if len(createRequest.CreationContent) > 0 {
if err := json.Unmarshal(createRequest.CreationContent, &createContent); err != nil { if err = json.Unmarshal(createRequest.CreationContent, &createContent); err != nil {
util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for creation_content failed") util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for creation_content failed")
return "", &util.JSONResponse{ return "", &util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
@ -75,7 +75,7 @@ func (c *Creator) PerformCreateRoom(ctx context.Context, userID spec.UserID, roo
if createRequest.PowerLevelContentOverride != nil { if createRequest.PowerLevelContentOverride != nil {
// Merge powerLevelContentOverride fields by unmarshalling it atop the defaults // Merge powerLevelContentOverride fields by unmarshalling it atop the defaults
err := json.Unmarshal(createRequest.PowerLevelContentOverride, &powerLevelContent) err = json.Unmarshal(createRequest.PowerLevelContentOverride, &powerLevelContent)
if err != nil { if err != nil {
util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for power_level_content_override failed") util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for power_level_content_override failed")
return "", &util.JSONResponse{ return "", &util.JSONResponse{
@ -172,7 +172,7 @@ func (c *Creator) PerformCreateRoom(ctx context.Context, userID spec.UserID, roo
} }
var aliasResp api.GetRoomIDForAliasResponse var aliasResp api.GetRoomIDForAliasResponse
err := c.RSAPI.GetRoomIDForAlias(ctx, &hasAliasReq, &aliasResp) err = c.RSAPI.GetRoomIDForAlias(ctx, &hasAliasReq, &aliasResp)
if err != nil { if err != nil {
util.GetLogger(ctx).WithError(err).Error("aliasAPI.GetRoomIDForAlias failed") util.GetLogger(ctx).WithError(err).Error("aliasAPI.GetRoomIDForAlias failed")
return "", &util.JSONResponse{ return "", &util.JSONResponse{