From 24d8df664c21fa8bd68d80b5585a496e264c410a Mon Sep 17 00:00:00 2001 From: Kegsay Date: Thu, 21 May 2020 14:40:13 +0100 Subject: Fix #897 and shuffle directory around (#1054) * Fix #897 and shuffle directory around * Update find-lint * goimports Co-authored-by: Neil Alexander --- clientapi/routing/membership.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'clientapi/routing/membership.go') 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()), -- cgit v1.2.3