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

Linter fixes

Browse source
This commit is contained in:
Till Faelligen 2023-04-25 10:19:28 +02:00
parent f400acbf44
commit 6b7fd96dfd
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clientapi/routing/createroom.go
View file

@ -542,9 +542,10 @@ func createRoom(
} }
// Process the invites. // Process the invites.
var inviteEvent *gomatrixserverlib.HeaderedEvent
for _, invitee := range r.Invite { for _, invitee := range r.Invite {
// Build the invite event. // Build the invite event.
inviteEvent, err := buildMembershipEvent( inviteEvent, err = buildMembershipEvent(
ctx, invitee, "", profileAPI, device, spec.Invite, ctx, invitee, "", profileAPI, device, spec.Invite,
roomID, r.IsDirect, cfg, evTime, rsAPI, asAPI, roomID, r.IsDirect, cfg, evTime, rsAPI, asAPI,
) )

2
federationapi/routing/invite.go
View file

@ -206,7 +206,7 @@ func processInvite(
TransactionID: nil, TransactionID: nil,
} }
if err := rsAPI.PerformInvite(ctx, request); err != nil { if err = rsAPI.PerformInvite(ctx, request); err != nil {
util.GetLogger(ctx).WithError(err).Error("PerformInvite failed") util.GetLogger(ctx).WithError(err).Error("PerformInvite failed")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,

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

@ -28,6 +28,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/roomserver/storage"
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/gomatrixserverlib/fclient"
"github.com/matrix-org/gomatrixserverlib/spec" "github.com/matrix-org/gomatrixserverlib/spec"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -74,6 +75,10 @@ func (r *Admin) PerformAdminEvacuateRoom(
} }
prevEvents := latestRes.LatestEvents prevEvents := latestRes.LatestEvents
var senderDomain spec.ServerName
var eventsNeeded gomatrixserverlib.StateNeeded
var identity *fclient.SigningIdentity
var event *gomatrixserverlib.HeaderedEvent
for _, memberEvent := range memberEvents { for _, memberEvent := range memberEvents {
if memberEvent.StateKey() == nil { if memberEvent.StateKey() == nil {
continue continue
@ -94,7 +99,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
PrevEvents: prevEvents, PrevEvents: prevEvents,
} }
_, senderDomain, err := gomatrixserverlib.SplitID('@', fledglingEvent.Sender) _, senderDomain, err = gomatrixserverlib.SplitID('@', fledglingEvent.Sender)
if err != nil { if err != nil {
continue continue
} }
@ -103,17 +108,17 @@ func (r *Admin) PerformAdminEvacuateRoom(
return nil, err return nil, err
} }
eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(fledglingEvent) eventsNeeded, err = gomatrixserverlib.StateNeededForEventBuilder(fledglingEvent)
if err != nil { if err != nil {
return nil, err return nil, err
} }
identity, err := r.Cfg.Matrix.SigningIdentityFor(senderDomain) identity, err = r.Cfg.Matrix.SigningIdentityFor(senderDomain)
if err != nil { if err != nil {
continue continue
} }
event, err := eventutil.BuildEvent(ctx, fledglingEvent, r.Cfg.Matrix, identity, time.Now(), &eventsNeeded, latestRes) event, err = eventutil.BuildEvent(ctx, fledglingEvent, r.Cfg.Matrix, identity, time.Now(), &eventsNeeded, latestRes)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
userapi/internal/user_api.go
View file

@ -634,14 +634,14 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a
UserID: fmt.Sprintf("@%s:%s", req.Localpart, serverName), UserID: fmt.Sprintf("@%s:%s", req.Localpart, serverName),
} }
deviceRes := &api.PerformDeviceDeletionResponse{} deviceRes := &api.PerformDeviceDeletionResponse{}
if err := a.PerformDeviceDeletion(ctx, deviceReq, deviceRes); err != nil { if err = a.PerformDeviceDeletion(ctx, deviceReq, deviceRes); err != nil {
return err return err
} }
pusherReq := &api.PerformPusherDeletionRequest{ pusherReq := &api.PerformPusherDeletionRequest{
Localpart: req.Localpart, Localpart: req.Localpart,
} }
if err := a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil { if err = a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil {
return err return err
} }