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 /eduserver | |
| 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 'eduserver')
| -rw-r--r-- | eduserver/api/input.go | 4 | ||||
| -rw-r--r-- | eduserver/cache/cache_test.go | 2 | ||||
| -rw-r--r-- | eduserver/eduserver.go | 2 | ||||
| -rw-r--r-- | eduserver/input/input.go | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/eduserver/api/input.go b/eduserver/api/input.go index be2d4c56..999a5b41 100644 --- a/eduserver/api/input.go +++ b/eduserver/api/input.go @@ -18,7 +18,7 @@ import ( "errors" "net/http" - commonHTTP "github.com/matrix-org/dendrite/common/http" + internalHTTP "github.com/matrix-org/dendrite/internal/http" "github.com/matrix-org/gomatrixserverlib" opentracing "github.com/opentracing/opentracing-go" ) @@ -80,5 +80,5 @@ func (h *httpEDUServerInputAPI) InputTypingEvent( defer span.Finish() apiURL := h.eduServerURL + EDUServerInputTypingEventPath - return commonHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response) + return internalHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response) } diff --git a/eduserver/cache/cache_test.go b/eduserver/cache/cache_test.go index 8a1b6f79..d1b2f8bd 100644 --- a/eduserver/cache/cache_test.go +++ b/eduserver/cache/cache_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/matrix-org/dendrite/common/test" + "github.com/matrix-org/dendrite/internal/test" ) func TestEDUCache(t *testing.T) { diff --git a/eduserver/eduserver.go b/eduserver/eduserver.go index 2a209364..cba60b8e 100644 --- a/eduserver/eduserver.go +++ b/eduserver/eduserver.go @@ -15,10 +15,10 @@ package eduserver import ( "net/http" - "github.com/matrix-org/dendrite/common/basecomponent" "github.com/matrix-org/dendrite/eduserver/api" "github.com/matrix-org/dendrite/eduserver/cache" "github.com/matrix-org/dendrite/eduserver/input" + "github.com/matrix-org/dendrite/internal/basecomponent" ) // SetupEDUServerComponent sets up and registers HTTP handlers for the diff --git a/eduserver/input/input.go b/eduserver/input/input.go index 6a4a4bb4..50837154 100644 --- a/eduserver/input/input.go +++ b/eduserver/input/input.go @@ -19,9 +19,9 @@ import ( "time" "github.com/Shopify/sarama" - "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/eduserver/api" "github.com/matrix-org/dendrite/eduserver/cache" + "github.com/matrix-org/dendrite/internal" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) @@ -92,7 +92,7 @@ func (t *EDUServerInputAPI) sendEvent(ite *api.InputTypingEvent) error { // SetupHTTP adds the EDUServerInputAPI handlers to the http.ServeMux. func (t *EDUServerInputAPI) SetupHTTP(servMux *http.ServeMux) { servMux.Handle(api.EDUServerInputTypingEventPath, - common.MakeInternalAPI("inputTypingEvents", func(req *http.Request) util.JSONResponse { + internal.MakeInternalAPI("inputTypingEvents", func(req *http.Request) util.JSONResponse { var request api.InputTypingEventRequest var response api.InputTypingEventResponse if err := json.NewDecoder(req.Body).Decode(&request); err != nil { |