diff --git a/cmd/messaging/main.go b/cmd/messaging/main.go index c65b8a1fb..abd463e76 100644 --- a/cmd/messaging/main.go +++ b/cmd/messaging/main.go @@ -4,7 +4,7 @@ import ( "log" "os" - service "github.com/crusttech/crust/sam" + service "github.com/crusttech/crust/messaging" "github.com/crusttech/crust/internal/auth" "github.com/crusttech/crust/internal/rbac" diff --git a/cmd/system-cli/users.go b/cmd/system-cli/users.go index c59a16bb9..91625eedc 100644 --- a/cmd/system-cli/users.go +++ b/cmd/system-cli/users.go @@ -9,7 +9,7 @@ import ( crmRepository "github.com/crusttech/crust/crm/repository" "github.com/crusttech/crust/internal/payload" - messagingRepository "github.com/crusttech/crust/sam/repository" + messagingRepository "github.com/crusttech/crust/messaging/repository" "github.com/crusttech/crust/system/service" "github.com/crusttech/crust/system/types" ) diff --git a/internal/payload/outgoing.go b/internal/payload/outgoing.go index a84312cd5..6bd15fce9 100644 --- a/internal/payload/outgoing.go +++ b/internal/payload/outgoing.go @@ -7,7 +7,7 @@ import ( "github.com/crusttech/crust/internal/auth" "github.com/crusttech/crust/internal/payload/outgoing" - samTypes "github.com/crusttech/crust/sam/types" + samTypes "github.com/crusttech/crust/messaging/types" systemTypes "github.com/crusttech/crust/system/types" ) diff --git a/messaging/db/migrate.go b/messaging/db/migrate.go index d4a33d303..b9bb0f373 100644 --- a/messaging/db/migrate.go +++ b/messaging/db/migrate.go @@ -13,7 +13,7 @@ import ( "github.com/titpetric/factory" "github.com/titpetric/statik/fs" - "github.com/crusttech/crust/sam/db/mysql" + "github.com/crusttech/crust/messaging/db/mysql" ) func statements(contents []byte, err error) ([]string, error) { diff --git a/messaging/flags.go b/messaging/flags.go index 6d213de5d..6c857207f 100644 --- a/messaging/flags.go +++ b/messaging/flags.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/crusttech/crust/internal/config" - "github.com/crusttech/crust/sam/repository" + "github.com/crusttech/crust/messaging/repository" ) type ( diff --git a/messaging/repository/attachment.go b/messaging/repository/attachment.go index c312229f2..1bd089cbd 100644 --- a/messaging/repository/attachment.go +++ b/messaging/repository/attachment.go @@ -7,7 +7,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/repository/attachment_test.go b/messaging/repository/attachment_test.go index 5c5790414..1203a9652 100644 --- a/messaging/repository/attachment_test.go +++ b/messaging/repository/attachment_test.go @@ -7,7 +7,7 @@ import ( "testing" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func TestAttachment(t *testing.T) { diff --git a/messaging/repository/channel.go b/messaging/repository/channel.go index cdc1fe58f..48daa4aac 100644 --- a/messaging/repository/channel.go +++ b/messaging/repository/channel.go @@ -8,7 +8,7 @@ import ( "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/repository/channel_member.go b/messaging/repository/channel_member.go index cb97935b1..6eeb1a2ce 100644 --- a/messaging/repository/channel_member.go +++ b/messaging/repository/channel_member.go @@ -6,7 +6,7 @@ import ( "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/repository/channel_test.go b/messaging/repository/channel_test.go index ff1b6ed9b..c84a11d12 100644 --- a/messaging/repository/channel_test.go +++ b/messaging/repository/channel_test.go @@ -7,7 +7,7 @@ import ( "testing" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func TestChannel(t *testing.T) { diff --git a/messaging/repository/events.go b/messaging/repository/events.go index ad944e4cb..bd91ef398 100644 --- a/messaging/repository/events.go +++ b/messaging/repository/events.go @@ -5,7 +5,7 @@ import ( "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) /* diff --git a/messaging/repository/events_test.go b/messaging/repository/events_test.go index d162cff2f..d1bb53510 100644 --- a/messaging/repository/events_test.go +++ b/messaging/repository/events_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func TestEvents(t *testing.T) { diff --git a/messaging/repository/main_test.go b/messaging/repository/main_test.go index c803c8b58..ed417b9f7 100644 --- a/messaging/repository/main_test.go +++ b/messaging/repository/main_test.go @@ -11,7 +11,7 @@ import ( "github.com/namsral/flag" "github.com/titpetric/factory" - samMigrate "github.com/crusttech/crust/sam/db" + samMigrate "github.com/crusttech/crust/messaging/db" systemMigrate "github.com/crusttech/crust/system/db" ) diff --git a/messaging/repository/mention.go b/messaging/repository/mention.go index 30fcd534b..d84e24f8e 100644 --- a/messaging/repository/mention.go +++ b/messaging/repository/mention.go @@ -8,7 +8,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/repository/message.go b/messaging/repository/message.go index 6914811fa..2288d211f 100644 --- a/messaging/repository/message.go +++ b/messaging/repository/message.go @@ -8,7 +8,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/repository/message_flag.go b/messaging/repository/message_flag.go index 3552a2bd3..2fbd8acb2 100644 --- a/messaging/repository/message_flag.go +++ b/messaging/repository/message_flag.go @@ -7,7 +7,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/repository/message_flag_test.go b/messaging/repository/message_flag_test.go index 2dd1a621a..d5a17508f 100644 --- a/messaging/repository/message_flag_test.go +++ b/messaging/repository/message_flag_test.go @@ -7,7 +7,7 @@ import ( "testing" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func TestReaction(t *testing.T) { diff --git a/messaging/repository/message_test.go b/messaging/repository/message_test.go index 5cdae5a44..4f199ba09 100644 --- a/messaging/repository/message_test.go +++ b/messaging/repository/message_test.go @@ -7,7 +7,7 @@ import ( "testing" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func TestMessage(t *testing.T) { diff --git a/messaging/repository/unread.go b/messaging/repository/unread.go index 714119dbb..59f4b4707 100644 --- a/messaging/repository/unread.go +++ b/messaging/repository/unread.go @@ -5,7 +5,7 @@ import ( "github.com/titpetric/factory" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/rest/attachment.go b/messaging/rest/attachment.go index f05a52730..ae6db7918 100644 --- a/messaging/rest/attachment.go +++ b/messaging/rest/attachment.go @@ -2,10 +2,10 @@ package rest import ( "context" - "github.com/crusttech/crust/sam/rest/handlers" - "github.com/crusttech/crust/sam/rest/request" - "github.com/crusttech/crust/sam/service" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/rest/handlers" + "github.com/crusttech/crust/messaging/rest/request" + "github.com/crusttech/crust/messaging/service" + "github.com/crusttech/crust/messaging/types" "github.com/pkg/errors" "io" "time" diff --git a/messaging/rest/channel.go b/messaging/rest/channel.go index 3f0ea5bc3..426ddb893 100644 --- a/messaging/rest/channel.go +++ b/messaging/rest/channel.go @@ -5,9 +5,9 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/rest/request" - "github.com/crusttech/crust/sam/service" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/rest/request" + "github.com/crusttech/crust/messaging/service" + "github.com/crusttech/crust/messaging/types" "github.com/pkg/errors" ) diff --git a/messaging/rest/handlers/attachment.go b/messaging/rest/handlers/attachment.go index c4d3296b6..aee0618eb 100644 --- a/messaging/rest/handlers/attachment.go +++ b/messaging/rest/handlers/attachment.go @@ -22,7 +22,7 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/crusttech/crust/sam/rest/request" + "github.com/crusttech/crust/messaging/rest/request" ) // Internal API interface diff --git a/messaging/rest/handlers/attachment_custom.go b/messaging/rest/handlers/attachment_custom.go index 6d176c810..0c967d344 100644 --- a/messaging/rest/handlers/attachment_custom.go +++ b/messaging/rest/handlers/attachment_custom.go @@ -6,7 +6,7 @@ import ( "net/url" "time" - "github.com/crusttech/crust/sam/rest/request" + "github.com/crusttech/crust/messaging/rest/request" ) // HTTP API interface diff --git a/messaging/rest/handlers/channel.go b/messaging/rest/handlers/channel.go index 3364cf30d..7a0bf9903 100644 --- a/messaging/rest/handlers/channel.go +++ b/messaging/rest/handlers/channel.go @@ -22,7 +22,7 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/crusttech/crust/sam/rest/request" + "github.com/crusttech/crust/messaging/rest/request" ) // Internal API interface diff --git a/messaging/rest/handlers/message.go b/messaging/rest/handlers/message.go index 7292a0d20..ca061deb4 100644 --- a/messaging/rest/handlers/message.go +++ b/messaging/rest/handlers/message.go @@ -22,7 +22,7 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/crusttech/crust/sam/rest/request" + "github.com/crusttech/crust/messaging/rest/request" ) // Internal API interface diff --git a/messaging/rest/handlers/permissions.go b/messaging/rest/handlers/permissions.go index f714bb8fd..c5ee128b5 100644 --- a/messaging/rest/handlers/permissions.go +++ b/messaging/rest/handlers/permissions.go @@ -22,7 +22,7 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/crusttech/crust/sam/rest/request" + "github.com/crusttech/crust/messaging/rest/request" ) // Internal API interface diff --git a/messaging/rest/handlers/search.go b/messaging/rest/handlers/search.go index 19347018f..c32d46055 100644 --- a/messaging/rest/handlers/search.go +++ b/messaging/rest/handlers/search.go @@ -22,7 +22,7 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/crusttech/crust/sam/rest/request" + "github.com/crusttech/crust/messaging/rest/request" ) // Internal API interface diff --git a/messaging/rest/message.go b/messaging/rest/message.go index 99b17939f..24da6f5fe 100644 --- a/messaging/rest/message.go +++ b/messaging/rest/message.go @@ -7,9 +7,9 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/rest/request" - "github.com/crusttech/crust/sam/service" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/rest/request" + "github.com/crusttech/crust/messaging/service" + "github.com/crusttech/crust/messaging/types" ) var _ = errors.Wrap diff --git a/messaging/rest/permissions.go b/messaging/rest/permissions.go index ad2b007b4..160f95376 100644 --- a/messaging/rest/permissions.go +++ b/messaging/rest/permissions.go @@ -3,9 +3,9 @@ package rest import ( "context" - "github.com/crusttech/crust/sam/rest/request" - "github.com/crusttech/crust/sam/service" - _ "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/rest/request" + "github.com/crusttech/crust/messaging/service" + _ "github.com/crusttech/crust/messaging/types" ) type Permissions struct { diff --git a/messaging/rest/router.go b/messaging/rest/router.go index effed7bd1..10953ef28 100644 --- a/messaging/rest/router.go +++ b/messaging/rest/router.go @@ -4,7 +4,7 @@ import ( "github.com/go-chi/chi" "github.com/crusttech/crust/internal/auth" - "github.com/crusttech/crust/sam/rest/handlers" + "github.com/crusttech/crust/messaging/rest/handlers" ) func MountRoutes() func(chi.Router) { diff --git a/messaging/rest/search.go b/messaging/rest/search.go index 84d5fa9f9..6866c8fb7 100644 --- a/messaging/rest/search.go +++ b/messaging/rest/search.go @@ -5,9 +5,9 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/rest/request" - "github.com/crusttech/crust/sam/service" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/rest/request" + "github.com/crusttech/crust/messaging/service" + "github.com/crusttech/crust/messaging/types" "github.com/pkg/errors" ) diff --git a/messaging/routes.go b/messaging/routes.go index 282a19c45..42b8286fa 100644 --- a/messaging/routes.go +++ b/messaging/routes.go @@ -16,8 +16,8 @@ import ( "github.com/crusttech/crust/internal/config" "github.com/crusttech/crust/internal/metrics" "github.com/crusttech/crust/internal/version" - "github.com/crusttech/crust/sam/rest" - "github.com/crusttech/crust/sam/websocket" + "github.com/crusttech/crust/messaging/rest" + "github.com/crusttech/crust/messaging/websocket" ) func Routes(ctx context.Context) *chi.Mux { diff --git a/messaging/service/attachment.go b/messaging/service/attachment.go index 40543bf12..3c5175599 100644 --- a/messaging/service/attachment.go +++ b/messaging/service/attachment.go @@ -17,8 +17,8 @@ import ( "github.com/titpetric/factory" "github.com/crusttech/crust/internal/store" - "github.com/crusttech/crust/sam/repository" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + "github.com/crusttech/crust/messaging/types" systemService "github.com/crusttech/crust/system/service" ) diff --git a/messaging/service/attachment_mock_test.go b/messaging/service/attachment_mock_test.go index 65e6e8492..1c3c28015 100644 --- a/messaging/service/attachment_mock_test.go +++ b/messaging/service/attachment_mock_test.go @@ -6,7 +6,7 @@ package service import ( context "context" - types "github.com/crusttech/crust/sam/types" + types "github.com/crusttech/crust/messaging/types" gomock "github.com/golang/mock/gomock" io "io" reflect "reflect" diff --git a/messaging/service/channel.go b/messaging/service/channel.go index 09ea93674..2720ff2f8 100644 --- a/messaging/service/channel.go +++ b/messaging/service/channel.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/crusttech/crust/internal/auth" - "github.com/crusttech/crust/sam/repository" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + "github.com/crusttech/crust/messaging/types" systemService "github.com/crusttech/crust/system/service" ) diff --git a/messaging/service/channel_mock_test.go b/messaging/service/channel_mock_test.go index 8433f8654..6370cf5f8 100644 --- a/messaging/service/channel_mock_test.go +++ b/messaging/service/channel_mock_test.go @@ -6,7 +6,7 @@ package service import ( context "context" - types "github.com/crusttech/crust/sam/types" + types "github.com/crusttech/crust/messaging/types" gomock "github.com/golang/mock/gomock" reflect "reflect" ) diff --git a/messaging/service/channel_test.go b/messaging/service/channel_test.go index 11f7ac213..e0747f077 100644 --- a/messaging/service/channel_test.go +++ b/messaging/service/channel_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/crusttech/crust/internal/auth" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" systemTypes "github.com/crusttech/crust/system/types" ) diff --git a/messaging/service/events.go b/messaging/service/events.go index c0395c7bb..3687cdc47 100644 --- a/messaging/service/events.go +++ b/messaging/service/events.go @@ -5,8 +5,8 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/repository" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/service/message.go b/messaging/service/message.go index 4bb9c8ab5..f1ee3c3f0 100644 --- a/messaging/service/message.go +++ b/messaging/service/message.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/crusttech/crust/internal/payload" - "github.com/crusttech/crust/sam/repository" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + "github.com/crusttech/crust/messaging/types" systemService "github.com/crusttech/crust/system/service" systemTypes "github.com/crusttech/crust/system/types" ) diff --git a/messaging/service/message_mock_test.go b/messaging/service/message_mock_test.go index 8a5d09a07..96dbdc446 100644 --- a/messaging/service/message_mock_test.go +++ b/messaging/service/message_mock_test.go @@ -6,7 +6,7 @@ package service import ( context "context" - types "github.com/crusttech/crust/sam/types" + types "github.com/crusttech/crust/messaging/types" gomock "github.com/golang/mock/gomock" reflect "reflect" ) diff --git a/messaging/service/message_test.go b/messaging/service/message_test.go index 7b3e48321..40996110c 100644 --- a/messaging/service/message_test.go +++ b/messaging/service/message_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/crusttech/crust/internal/auth" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" systemTypes "github.com/crusttech/crust/system/types" ) diff --git a/messaging/service/permissions.go b/messaging/service/permissions.go index e80c2a903..580e987e7 100644 --- a/messaging/service/permissions.go +++ b/messaging/service/permissions.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/crusttech/crust/internal/rules" - "github.com/crusttech/crust/sam/repository" + "github.com/crusttech/crust/messaging/repository" ) type ( diff --git a/messaging/service/pubsub.go b/messaging/service/pubsub.go index 59c21438e..02d1f20e2 100644 --- a/messaging/service/pubsub.go +++ b/messaging/service/pubsub.go @@ -1,7 +1,7 @@ package service import ( - "github.com/crusttech/crust/sam/repository" + "github.com/crusttech/crust/messaging/repository" ) type pubSub struct { diff --git a/messaging/start.go b/messaging/start.go index 249bf486e..61c3bbb1b 100644 --- a/messaging/start.go +++ b/messaging/start.go @@ -13,14 +13,14 @@ import ( "github.com/titpetric/factory/resputil" "github.com/crusttech/crust/internal/db" - migrate "github.com/crusttech/crust/sam/db" + migrate "github.com/crusttech/crust/messaging/db" systemService "github.com/crusttech/crust/system/service" "github.com/crusttech/crust/internal/auth" "github.com/crusttech/crust/internal/mail" "github.com/crusttech/crust/internal/metrics" "github.com/crusttech/crust/internal/version" - "github.com/crusttech/crust/sam/service" + "github.com/crusttech/crust/messaging/service" ) var ( diff --git a/messaging/types/channel.perms.gen.go b/messaging/types/channel.perms.gen.go index 2fa2fb50a..ae4fd870a 100644 --- a/messaging/types/channel.perms.gen.go +++ b/messaging/types/channel.perms.gen.go @@ -2,7 +2,7 @@ package types import "github.com/crusttech/crust/internal/rules" -/* File is generated from sam/types/permissions/3-channel.json with permissions.go */ +/* File is generated from messaging/types/permissions/3-channel.json with permissions.go */ func (c *Channel) Permissions() []rules.OperationGroup { return []rules.OperationGroup{ diff --git a/messaging/types/organisation.perms.gen.go b/messaging/types/organisation.perms.gen.go index 67c9d7591..1e9139dff 100644 --- a/messaging/types/organisation.perms.gen.go +++ b/messaging/types/organisation.perms.gen.go @@ -2,7 +2,7 @@ package types import "github.com/crusttech/crust/internal/rules" -/* File is generated from sam/types/permissions/1-organisation.json with permissions.go */ +/* File is generated from messaging/types/permissions/1-organisation.json with permissions.go */ func (c *Organisation) Permissions() []rules.OperationGroup { return []rules.OperationGroup{ diff --git a/messaging/types/team.perms.gen.go b/messaging/types/team.perms.gen.go index ca6a0efa9..3cca62b97 100644 --- a/messaging/types/team.perms.gen.go +++ b/messaging/types/team.perms.gen.go @@ -2,7 +2,7 @@ package types import "github.com/crusttech/crust/internal/rules" -/* File is generated from sam/types/permissions/2-team.json with permissions.go */ +/* File is generated from messaging/types/permissions/2-team.json with permissions.go */ func (c *Team) Permissions() []rules.OperationGroup { return []rules.OperationGroup{ diff --git a/messaging/websocket/event_queue.go b/messaging/websocket/event_queue.go index 6a62d6ae8..ce87a76f2 100644 --- a/messaging/websocket/event_queue.go +++ b/messaging/websocket/event_queue.go @@ -8,8 +8,8 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/repository" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + "github.com/crusttech/crust/messaging/types" ) type ( diff --git a/messaging/websocket/router.go b/messaging/websocket/router.go index 938838167..9645e2c99 100644 --- a/messaging/websocket/router.go +++ b/messaging/websocket/router.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "github.com/crusttech/crust/sam/repository" + "github.com/crusttech/crust/messaging/repository" ) func MountRoutes(ctx context.Context, config *repository.Flags) func(chi.Router) { diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go index 3cadc8d03..32cbd18a7 100644 --- a/messaging/websocket/session.go +++ b/messaging/websocket/session.go @@ -12,9 +12,9 @@ import ( "github.com/crusttech/crust/internal/auth" "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/repository" - samService "github.com/crusttech/crust/sam/service" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + samService "github.com/crusttech/crust/messaging/service" + "github.com/crusttech/crust/messaging/types" systemService "github.com/crusttech/crust/system/service" systemTypes "github.com/crusttech/crust/system/types" ) diff --git a/messaging/websocket/session_incoming_channel.go b/messaging/websocket/session_incoming_channel.go index 5400ef370..cf877bc84 100644 --- a/messaging/websocket/session_incoming_channel.go +++ b/messaging/websocket/session_incoming_channel.go @@ -7,7 +7,7 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/incoming" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func (s *Session) channelJoin(ctx context.Context, p *incoming.ChannelJoin) error { diff --git a/messaging/websocket/session_incoming_command.go b/messaging/websocket/session_incoming_command.go index 24b487af0..6cf9388df 100644 --- a/messaging/websocket/session_incoming_command.go +++ b/messaging/websocket/session_incoming_command.go @@ -10,7 +10,7 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/incoming" "github.com/crusttech/crust/internal/payload/outgoing" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func (s *Session) execCommand(ctx context.Context, c *incoming.ExecCommand) error { diff --git a/messaging/websocket/session_incoming_message.go b/messaging/websocket/session_incoming_message.go index d9f5ffe7d..23fbbb9d9 100644 --- a/messaging/websocket/session_incoming_message.go +++ b/messaging/websocket/session_incoming_message.go @@ -5,7 +5,7 @@ import ( "github.com/crusttech/crust/internal/payload" "github.com/crusttech/crust/internal/payload/incoming" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/types" ) func (s *Session) messageCreate(ctx context.Context, p *incoming.MessageCreate) error { diff --git a/messaging/websocket/session_outgoing.go b/messaging/websocket/session_outgoing.go index 566ab5a17..196494000 100644 --- a/messaging/websocket/session_outgoing.go +++ b/messaging/websocket/session_outgoing.go @@ -4,8 +4,8 @@ import ( "log" "time" - "github.com/crusttech/crust/sam/repository" - "github.com/crusttech/crust/sam/types" + "github.com/crusttech/crust/messaging/repository" + "github.com/crusttech/crust/messaging/types" ) // Sends message to subscribers diff --git a/messaging/websocket/websocket.go b/messaging/websocket/websocket.go index 6ac725dbe..3b721aebb 100644 --- a/messaging/websocket/websocket.go +++ b/messaging/websocket/websocket.go @@ -9,7 +9,7 @@ import ( "github.com/titpetric/factory/resputil" "github.com/crusttech/crust/internal/auth" - "github.com/crusttech/crust/sam/repository" + "github.com/crusttech/crust/messaging/repository" systemService "github.com/crusttech/crust/system/service" )