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

Clean up code a bit

Browse source
This commit is contained in:
Andrew Morgan 2019-07-11 16:34:59 +01:00
parent fd52f44658
commit 7813b019fd
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clientapi/routing/membership.go
View file

@ -58,12 +58,12 @@ func SendMembership(
}
}
inviteStored, errRes := checkAndProcessThreepid(
inviteStored, jsonErrResp := checkAndProcessThreepid(
req, device, &body, cfg, queryAPI, accountDB, producer,
membership, roomID, evTime,
)
if errRes != nil {
return *errRes
if jsonErrResp != nil {
return *jsonErrResp
}
// If an invite has been stored on an identity server, it means that a
@ -211,9 +211,15 @@ func getMembershipStateKey(
}
func checkAndProcessThreepid(
req *http.Request, device *authtypes.Device, body *threepid.MembershipRequest,
cfg config.Dendrite, queryAPI roomserverAPI.RoomserverQueryAPI, accountDB *accounts.Database,
producer *producers.RoomserverProducer, membership string, roomID string, evTime time.Time,
req *http.Request,
device *authtypes.Device,
body *threepid.MembershipRequest,
cfg config.Dendrite,
queryAPI roomserverAPI.RoomserverQueryAPI,
accountDB *accounts.Database,
producer *producers.RoomserverProducer,
membership, roomID string,
evTime time.Time,
) (inviteStored bool, errRes *util.JSONResponse) {
inviteStored, err := threepid.CheckAndProcessInvite(