diff options
| author | Kegsay <kegan@matrix.org> | 2020-05-21 14:40:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 14:40:13 +0100 |
| commit | 24d8df664c21fa8bd68d80b5585a496e264c410a (patch) | |
| tree | 0a176d6dfd7f81522c5739b53313366b552b0ce1 /clientapi/routing/membership.go | |
| parent | 3fdb045116c9cd2f2a3badfebec0645d0381bacb (diff) | |
Fix #897 and shuffle directory around (#1054)
* Fix #897 and shuffle directory around
* Update find-lint
* goimports
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'clientapi/routing/membership.go')
| -rw-r--r-- | clientapi/routing/membership.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go index 0a56eec5..cd0ce732 100644 --- a/clientapi/routing/membership.go +++ b/clientapi/routing/membership.go @@ -27,8 +27,8 @@ import ( "github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/clientapi/producers" "github.com/matrix-org/dendrite/clientapi/threepid" - "github.com/matrix-org/dendrite/common" - "github.com/matrix-org/dendrite/common/config" + "github.com/matrix-org/dendrite/internal" + "github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/roomserver/api" roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" @@ -97,7 +97,7 @@ func SendMembership( Code: http.StatusBadRequest, JSON: jsonerror.BadJSON(err.Error()), } - } else if err == common.ErrRoomNoExists { + } else if err == internal.ErrRoomNoExists { return util.JSONResponse{ Code: http.StatusNotFound, JSON: jsonerror.NotFound(err.Error()), @@ -190,7 +190,7 @@ func buildMembershipEvent( return nil, err } - return common.BuildEvent(ctx, &builder, cfg, evTime, rsAPI, nil) + return internal.BuildEvent(ctx, &builder, cfg, evTime, rsAPI, nil) } // loadProfile lookups the profile of a given user from the database and returns @@ -271,7 +271,7 @@ func checkAndProcessThreepid( Code: http.StatusBadRequest, JSON: jsonerror.NotTrusted(body.IDServer), } - } else if err == common.ErrRoomNoExists { + } else if err == internal.ErrRoomNoExists { return inviteStored, &util.JSONResponse{ Code: http.StatusNotFound, JSON: jsonerror.NotFound(err.Error()), |