MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-14 18:13:51 +01:00
Code Issues Releases Wiki Activity

Move BuildEvent to common package (#315)

Browse source 
This is in preperation for implementing various federation APIs that
need to build events.
This commit is contained in:
Erik Johnston 2017-10-25 14:44:33 +01:00 committed by Richard van der Hoff
parent 3790a8da40
commit e5944e0fdb
6 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/clientapi/routing/joinroom.go
View file

@ -22,10 +22,10 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/events"
"github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/clientapi/producers"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrix"
@ -215,7 +215,7 @@ func (r joinRoomReq) joinRoomUsingServers(
}
var queryRes api.QueryLatestEventsAndStateResponse
event, err := events.BuildEvent(r.req.Context(), &eb, r.cfg, r.queryAPI, &queryRes)
event, err := common.BuildEvent(r.req.Context(), &eb, r.cfg, r.queryAPI, &queryRes)
if err == nil {
if err = r.producer.SendEvents(r.req.Context(), []gomatrixserverlib.Event{*event}, r.cfg.Matrix.ServerName); err != nil {
return httputil.LogThenError(r.req, err)
@ -227,7 +227,7 @@ func (r joinRoomReq) joinRoomUsingServers(
}{roomID},
}
}
if err != events.ErrRoomNoExists {
if err != common.ErrRoomNoExists {
return httputil.LogThenError(r.req, err)
}

7
src/github.com/matrix-org/dendrite/clientapi/routing/membership.go
View file

@ -21,7 +21,6 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/events"
"github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/clientapi/producers"
@ -62,7 +61,7 @@ func SendMembership(
Code: 400,
JSON: jsonerror.NotTrusted(body.IDServer),
}
} else if err == events.ErrRoomNoExists {
} else if err == common.ErrRoomNoExists {
return util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound(err.Error()),
@ -89,7 +88,7 @@ func SendMembership(
Code: 400,
JSON: jsonerror.BadJSON(err.Error()),
}
} else if err == events.ErrRoomNoExists {
} else if err == common.ErrRoomNoExists {
return util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound(err.Error()),
@ -149,7 +148,7 @@ func buildMembershipEvent(
return nil, err
}
return events.BuildEvent(ctx, &builder, cfg, queryAPI, nil)
return common.BuildEvent(ctx, &builder, cfg, queryAPI, nil)
}
// loadProfile lookups the profile of a given user from the database and returns

3
src/github.com/matrix-org/dendrite/clientapi/routing/profile.go
View file

@ -20,7 +20,6 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/events"
"github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/clientapi/producers"
@ -285,7 +284,7 @@ func buildMembershipEvents(
return nil, err
}
event, err := events.BuildEvent(ctx, &builder, *cfg, queryAPI, nil)
event, err := common.BuildEvent(ctx, &builder, *cfg, queryAPI, nil)
if err != nil {
return nil, err
}

6
src/github.com/matrix-org/dendrite/clientapi/routing/sendevent.go
View file

@ -18,10 +18,10 @@ import (
"net/http"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/events"
"github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/clientapi/producers"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib"
@ -67,8 +67,8 @@ func SendEvent(
}
var queryRes api.QueryLatestEventsAndStateResponse
e, err := events.BuildEvent(req.Context(), &builder, cfg, queryAPI, &queryRes)
if err == events.ErrRoomNoExists {
e, err := common.BuildEvent(req.Context(), &builder, cfg, queryAPI, &queryRes)
if err == common.ErrRoomNoExists {
return util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound("Room does not exist"),

3
src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go
View file

@ -26,7 +26,6 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/events"
"github.com/matrix-org/dendrite/clientapi/producers"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/config"
@ -351,7 +350,7 @@ func emit3PIDInviteEvent(
}
var queryRes *api.QueryLatestEventsAndStateResponse
event, err := events.BuildEvent(ctx, builder, cfg, queryAPI, queryRes)
event, err := common.BuildEvent(ctx, builder, cfg, queryAPI, queryRes)
if err != nil {
return err
}

2
src/github.com/matrix-org/dendrite/clientapi/events/events.go → src/github.com/matrix-org/dendrite/common/events.go
View file

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package events
package common
import (
"context"