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

Change return type of createInviteFrom3PIDInvite

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-07 11:26:36 +01:00
parent 148ebbf37b
commit 79b4edd88e
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
View file

@ -59,7 +59,7 @@ func CreateInvitesFrom3PIDInvites(
for _, inv := range body.Invites { for _, inv := range body.Invites {
event, err := createInviteFrom3PIDInvite(req, queryAPI, cfg, inv) event, err := createInviteFrom3PIDInvite(req, queryAPI, cfg, inv)
if err != nil { if err != nil {
return *err return httputil.LogThenError(req, err)
} }
if event != nil { if event != nil {
evs = append(evs, *event) evs = append(evs, *event)
@ -78,11 +78,11 @@ func CreateInvitesFrom3PIDInvites(
} }
// createInviteFrom3PIDInvite processes an invite provided by the identity server // createInviteFrom3PIDInvite processes an invite provided by the identity server
// and creates a m.room.member event (with "invite" membership) from it // and creates a m.room.member event (with "invite" membership) from it.
func createInviteFrom3PIDInvite( func createInviteFrom3PIDInvite(
req *http.Request, queryAPI api.RoomserverQueryAPI, cfg config.Dendrite, req *http.Request, queryAPI api.RoomserverQueryAPI, cfg config.Dendrite,
inv invite, inv invite,
) (*gomatrixserverlib.Event, *util.JSONResponse) { ) (*gomatrixserverlib.Event, error) {
// Build the event // Build the event
builder := &gomatrixserverlib.EventBuilder{ builder := &gomatrixserverlib.EventBuilder{
Type: "m.room.member", Type: "m.room.member",
@ -100,14 +100,12 @@ func createInviteFrom3PIDInvite(
} }
if err := builder.SetContent(content); err != nil { if err := builder.SetContent(content); err != nil {
resErr := httputil.LogThenError(req, err) return nil, err
return nil, &resErr
} }
eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(builder) eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(builder)
if err != nil { if err != nil {
resErr := httputil.LogThenError(req, err) return nil, err
return nil, &resErr
} }
// Ask the roomserver for information about this room // Ask the roomserver for information about this room
@ -117,8 +115,7 @@ func createInviteFrom3PIDInvite(
} }
var queryRes api.QueryLatestEventsAndStateResponse var queryRes api.QueryLatestEventsAndStateResponse
if err = queryAPI.QueryLatestEventsAndState(&queryReq, &queryRes); err != nil { if err = queryAPI.QueryLatestEventsAndState(&queryReq, &queryRes); err != nil {
resErr := httputil.LogThenError(req, err) return nil, err
return nil, &resErr
} }
if !queryRes.RoomExists { if !queryRes.RoomExists {
@ -127,8 +124,7 @@ func createInviteFrom3PIDInvite(
} }
if err = fillDisplayName(builder, content, queryRes.StateEvents); err != nil { if err = fillDisplayName(builder, content, queryRes.StateEvents); err != nil {
resErr := httputil.LogThenError(req, err) return nil, err
return nil, &resErr
} }
// Finish building the event // Finish building the event
@ -143,8 +139,7 @@ func createInviteFrom3PIDInvite(
refs, err := eventsNeeded.AuthEventReferences(&authEvents) refs, err := eventsNeeded.AuthEventReferences(&authEvents)
if err != nil { if err != nil {
resErr := httputil.LogThenError(req, err) return nil, err
return nil, &resErr
} }
builder.AuthEvents = refs builder.AuthEvents = refs
@ -152,8 +147,7 @@ func createInviteFrom3PIDInvite(
now := time.Now() now := time.Now()
event, err := builder.Build(eventID, now, cfg.Matrix.ServerName, cfg.Matrix.KeyID, cfg.Matrix.PrivateKey) event, err := builder.Build(eventID, now, cfg.Matrix.ServerName, cfg.Matrix.KeyID, cfg.Matrix.PrivateKey)
if err != nil { if err != nil {
resErr := httputil.LogThenError(req, err) return nil, err
return nil, &resErr
} }
return &event, nil return &event, nil