From 713fc3cb0243b361819aa77a13d776878c599db2 Mon Sep 17 00:00:00 2001 From: nxshock Date: Sat, 3 Aug 2019 19:19:18 +0500 Subject: [PATCH] Update imports --- cmd/main.go | 4 ++-- internal/backend.go | 10 ++++----- internal/backends/memory/backend.go | 9 ++++---- internal/backends/memory/backend_test.go | 2 +- internal/backends/memory/roomevents.go | 4 ++-- internal/backends/memory/rooms.go | 6 ++--- internal/backends/memory/rooms_test.go | 2 +- internal/backends/memory/roomsort.go | 2 +- internal/backends/memory/user.go | 10 ++++----- internal/backends/memory/user_test.go | 5 ++--- internal/errors.go | 2 +- internal/handlers.go | 28 ++++++++++++------------ internal/models/createroom/request.go | 2 +- internal/models/listroom/listroom.go | 2 +- internal/models/login/reply.go | 2 +- internal/models/login/request.go | 2 +- internal/models/rooms/rooms.go | 2 +- internal/models/sendmessage/request.go | 2 +- internal/models/sync/reply.go | 2 +- internal/server.go | 2 +- internal/utils.go | 2 +- 21 files changed, 50 insertions(+), 52 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 978b5b2..f21e7b4 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,8 +4,8 @@ import ( "log" "strconv" - "github.com/nxshock/signaller/internal" - "github.com/nxshock/signaller/internal/backends/memory" + "github.com/signaller-matrix/signaller/internal" + "github.com/signaller-matrix/signaller/internal/backends/memory" ) var ( diff --git a/internal/backend.go b/internal/backend.go index 30a72bf..14bdfbf 100644 --- a/internal/backend.go +++ b/internal/backend.go @@ -1,11 +1,11 @@ package internal import ( - "github.com/nxshock/signaller/internal/models" - "github.com/nxshock/signaller/internal/models/createroom" - "github.com/nxshock/signaller/internal/models/devices" - "github.com/nxshock/signaller/internal/models/rooms" - "github.com/nxshock/signaller/internal/models/sync" + "github.com/signaller-matrix/signaller/internal/models" + "github.com/signaller-matrix/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal/models/devices" + "github.com/signaller-matrix/signaller/internal/models/rooms" + "github.com/signaller-matrix/signaller/internal/models/sync" ) type Backend interface { diff --git a/internal/backends/memory/backend.go b/internal/backends/memory/backend.go index 2403f9d..64c9391 100644 --- a/internal/backends/memory/backend.go +++ b/internal/backends/memory/backend.go @@ -6,11 +6,10 @@ import ( "sort" "sync" - "github.com/nxshock/signaller/internal/models/createroom" - - "github.com/nxshock/signaller/internal" - "github.com/nxshock/signaller/internal/models" - mSync "github.com/nxshock/signaller/internal/models/sync" + "github.com/signaller-matrix/signaller/internal" + "github.com/signaller-matrix/signaller/internal/models" + "github.com/signaller-matrix/signaller/internal/models/createroom" + mSync "github.com/signaller-matrix/signaller/internal/models/sync" ) type Backend struct { diff --git a/internal/backends/memory/backend_test.go b/internal/backends/memory/backend_test.go index 1f625f8..608f9e1 100644 --- a/internal/backends/memory/backend_test.go +++ b/internal/backends/memory/backend_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/nxshock/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal/models/createroom" ) func TestRegisterUser(t *testing.T) { diff --git a/internal/backends/memory/roomevents.go b/internal/backends/memory/roomevents.go index e3b622f..b09892c 100644 --- a/internal/backends/memory/roomevents.go +++ b/internal/backends/memory/roomevents.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/nxshock/signaller/internal" - "github.com/nxshock/signaller/internal/models/rooms" + "github.com/signaller-matrix/signaller/internal" + "github.com/signaller-matrix/signaller/internal/models/rooms" ) type RoomEvent struct { diff --git a/internal/backends/memory/rooms.go b/internal/backends/memory/rooms.go index 202a401..7131f37 100644 --- a/internal/backends/memory/rooms.go +++ b/internal/backends/memory/rooms.go @@ -3,9 +3,9 @@ package memory import ( "sync" - "github.com/nxshock/signaller/internal" - "github.com/nxshock/signaller/internal/models/createroom" - "github.com/nxshock/signaller/internal/models/rooms" + "github.com/signaller-matrix/signaller/internal" + "github.com/signaller-matrix/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal/models/rooms" ) type Room struct { diff --git a/internal/backends/memory/rooms_test.go b/internal/backends/memory/rooms_test.go index a633057..52cdde4 100644 --- a/internal/backends/memory/rooms_test.go +++ b/internal/backends/memory/rooms_test.go @@ -3,7 +3,7 @@ package memory import ( "testing" - "github.com/nxshock/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal/models/createroom" "github.com/stretchr/testify/assert" ) diff --git a/internal/backends/memory/roomsort.go b/internal/backends/memory/roomsort.go index a72097f..05eb070 100644 --- a/internal/backends/memory/roomsort.go +++ b/internal/backends/memory/roomsort.go @@ -1,7 +1,7 @@ package memory import ( - "github.com/nxshock/signaller/internal" + "github.com/signaller-matrix/signaller/internal" ) type BySize []internal.Room diff --git a/internal/backends/memory/user.go b/internal/backends/memory/user.go index 49f5b85..9766654 100644 --- a/internal/backends/memory/user.go +++ b/internal/backends/memory/user.go @@ -4,11 +4,11 @@ import ( "sync" "time" - "github.com/nxshock/signaller/internal" - "github.com/nxshock/signaller/internal/models" - "github.com/nxshock/signaller/internal/models/createroom" - "github.com/nxshock/signaller/internal/models/devices" - "github.com/nxshock/signaller/internal/models/rooms" + "github.com/signaller-matrix/signaller/internal" + "github.com/signaller-matrix/signaller/internal/models" + "github.com/signaller-matrix/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal/models/devices" + "github.com/signaller-matrix/signaller/internal/models/rooms" ) type User struct { diff --git a/internal/backends/memory/user_test.go b/internal/backends/memory/user_test.go index 1cc06cc..27ac421 100644 --- a/internal/backends/memory/user_test.go +++ b/internal/backends/memory/user_test.go @@ -3,11 +3,10 @@ package memory import ( "testing" - "github.com/nxshock/signaller/internal" - "github.com/stretchr/testify/assert" - "github.com/nxshock/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal" + "github.com/signaller-matrix/signaller/internal/models/createroom" ) func TestUserID(t *testing.T) { diff --git a/internal/errors.go b/internal/errors.go index 99c6ece..b4a9984 100644 --- a/internal/errors.go +++ b/internal/errors.go @@ -3,7 +3,7 @@ package internal import ( "net/http" - "github.com/nxshock/signaller/internal/models" + "github.com/signaller-matrix/signaller/internal/models" ) func errorResponse(w http.ResponseWriter, code models.ApiError, httpCode int, messageOverride string) { diff --git a/internal/handlers.go b/internal/handlers.go index f458c95..f55d87c 100644 --- a/internal/handlers.go +++ b/internal/handlers.go @@ -10,20 +10,20 @@ import ( "github.com/gorilla/mux" - "github.com/nxshock/signaller/internal/models" - "github.com/nxshock/signaller/internal/models/capabilities" - "github.com/nxshock/signaller/internal/models/common" - "github.com/nxshock/signaller/internal/models/devices" - "github.com/nxshock/signaller/internal/models/joinedrooms" - "github.com/nxshock/signaller/internal/models/listroom" - login "github.com/nxshock/signaller/internal/models/login" - "github.com/nxshock/signaller/internal/models/password" - "github.com/nxshock/signaller/internal/models/publicrooms" - register "github.com/nxshock/signaller/internal/models/register" - "github.com/nxshock/signaller/internal/models/registeravailable" - mSync "github.com/nxshock/signaller/internal/models/sync" - "github.com/nxshock/signaller/internal/models/versions" - "github.com/nxshock/signaller/internal/models/whoami" + "github.com/signaller-matrix/signaller/internal/models" + "github.com/signaller-matrix/signaller/internal/models/capabilities" + "github.com/signaller-matrix/signaller/internal/models/common" + "github.com/signaller-matrix/signaller/internal/models/devices" + "github.com/signaller-matrix/signaller/internal/models/joinedrooms" + "github.com/signaller-matrix/signaller/internal/models/listroom" + "github.com/signaller-matrix/signaller/internal/models/login" + "github.com/signaller-matrix/signaller/internal/models/password" + "github.com/signaller-matrix/signaller/internal/models/publicrooms" + "github.com/signaller-matrix/signaller/internal/models/register" + "github.com/signaller-matrix/signaller/internal/models/registeravailable" + mSync "github.com/signaller-matrix/signaller/internal/models/sync" + "github.com/signaller-matrix/signaller/internal/models/versions" + "github.com/signaller-matrix/signaller/internal/models/whoami" ) func RootHandler(w http.ResponseWriter, r *http.Request) { diff --git a/internal/models/createroom/request.go b/internal/models/createroom/request.go index 3115cc6..1839de7 100644 --- a/internal/models/createroom/request.go +++ b/internal/models/createroom/request.go @@ -1,7 +1,7 @@ package createroom import ( - common "github.com/nxshock/signaller/internal/models/common" + common "github.com/signaller-matrix/signaller/internal/models/common" ) // https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-createroom diff --git a/internal/models/listroom/listroom.go b/internal/models/listroom/listroom.go index 010a407..0f44797 100644 --- a/internal/models/listroom/listroom.go +++ b/internal/models/listroom/listroom.go @@ -1,7 +1,7 @@ package listroom import ( - "github.com/nxshock/signaller/internal/models/createroom" + "github.com/signaller-matrix/signaller/internal/models/createroom" ) type Request struct { diff --git a/internal/models/login/reply.go b/internal/models/login/reply.go index 87d655d..2a56d14 100644 --- a/internal/models/login/reply.go +++ b/internal/models/login/reply.go @@ -1,7 +1,7 @@ package login import ( - common "github.com/nxshock/signaller/internal/models/common" + common "github.com/signaller-matrix/signaller/internal/models/common" ) // PostReply is returned reply from POST login method diff --git a/internal/models/login/request.go b/internal/models/login/request.go index 7bbb529..a13db39 100644 --- a/internal/models/login/request.go +++ b/internal/models/login/request.go @@ -1,7 +1,7 @@ package login import ( - common "github.com/nxshock/signaller/internal/models/common" + "github.com/signaller-matrix/signaller/internal/models/common" ) // PostRequest represents POST login request diff --git a/internal/models/rooms/rooms.go b/internal/models/rooms/rooms.go index a1a5d34..912e47e 100644 --- a/internal/models/rooms/rooms.go +++ b/internal/models/rooms/rooms.go @@ -3,7 +3,7 @@ package rooms import ( "encoding/json" - "github.com/nxshock/signaller/internal/models/events" + "github.com/signaller-matrix/signaller/internal/models/events" ) // Type is type of event diff --git a/internal/models/sendmessage/request.go b/internal/models/sendmessage/request.go index ead9d15..b46228d 100644 --- a/internal/models/sendmessage/request.go +++ b/internal/models/sendmessage/request.go @@ -1,7 +1,7 @@ package sendmessage import ( - common "github.com/nxshock/signaller/internal/models/common" + common "github.com/signaller-matrix/signaller/internal/models/common" ) type SendMessageRequest struct { diff --git a/internal/models/sync/reply.go b/internal/models/sync/reply.go index 44cb4b7..6331271 100644 --- a/internal/models/sync/reply.go +++ b/internal/models/sync/reply.go @@ -1,7 +1,7 @@ package sync import ( - common "github.com/nxshock/signaller/internal/models/common" + common "github.com/signaller-matrix/signaller/internal/models/common" ) type SyncReply struct { diff --git a/internal/server.go b/internal/server.go index 5d8a849..2efbefa 100644 --- a/internal/server.go +++ b/internal/server.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/mux" - "github.com/nxshock/signaller/internal/models/capabilities" + "github.com/signaller-matrix/signaller/internal/models/capabilities" ) var currServer *Server diff --git a/internal/utils.go b/internal/utils.go index 3ccd128..fd91de7 100644 --- a/internal/utils.go +++ b/internal/utils.go @@ -1,6 +1,6 @@ package internal -import "github.com/nxshock/signaller/internal/models/publicrooms" +import "github.com/signaller-matrix/signaller/internal/models/publicrooms" func roomsToPublicRoomsChunks(rooms []Room) []publicrooms.PublicRoomsChunk { var chunks []publicrooms.PublicRoomsChunk