diff --git a/server/cmd/neko/main.go b/server/cmd/neko/main.go index 40523549..6c689110 100644 --- a/server/cmd/neko/main.go +++ b/server/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - "m1k1o/neko" - "m1k1o/neko/cmd" - "m1k1o/neko/pkg/utils" + neko "github.com/m1k1o/neko/server" + "github.com/m1k1o/neko/server/cmd" + "github.com/m1k1o/neko/server/pkg/utils" ) func main() { diff --git a/server/cmd/plugins.go b/server/cmd/plugins.go index b58961a7..22886fb3 100644 --- a/server/cmd/plugins.go +++ b/server/cmd/plugins.go @@ -4,8 +4,8 @@ import ( "encoding/json" "os" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/plugins" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/plugins" "github.com/rs/zerolog/log" "github.com/spf13/cobra" diff --git a/server/cmd/root.go b/server/cmd/root.go index c075a652..49a49c2c 100644 --- a/server/cmd/root.go +++ b/server/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko" - "m1k1o/neko/internal/config" + neko "github.com/m1k1o/neko/server" + "github.com/m1k1o/neko/server/internal/config" ) func Execute() error { diff --git a/server/cmd/serve.go b/server/cmd/serve.go index 22a2a1e6..b8ff37c4 100644 --- a/server/cmd/serve.go +++ b/server/cmd/serve.go @@ -9,16 +9,16 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko/internal/api" - "m1k1o/neko/internal/capture" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/desktop" - "m1k1o/neko/internal/http" - "m1k1o/neko/internal/member" - "m1k1o/neko/internal/plugins" - "m1k1o/neko/internal/session" - "m1k1o/neko/internal/webrtc" - "m1k1o/neko/internal/websocket" + "github.com/m1k1o/neko/server/internal/api" + "github.com/m1k1o/neko/server/internal/capture" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/desktop" + "github.com/m1k1o/neko/server/internal/http" + "github.com/m1k1o/neko/server/internal/member" + "github.com/m1k1o/neko/server/internal/plugins" + "github.com/m1k1o/neko/server/internal/session" + "github.com/m1k1o/neko/server/internal/webrtc" + "github.com/m1k1o/neko/server/internal/websocket" ) func init() { diff --git a/server/go.mod b/server/go.mod index b7e6f851..58ced248 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module m1k1o/neko +module github.com/m1k1o/neko/server go 1.21 diff --git a/server/internal/api/members/bluk.go b/server/internal/api/members/bluk.go index 44ee14cc..242849bb 100644 --- a/server/internal/api/members/bluk.go +++ b/server/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type MemberBulkUpdatePayload struct { diff --git a/server/internal/api/members/controler.go b/server/internal/api/members/controler.go index 74c793c2..0b0603cc 100644 --- a/server/internal/api/members/controler.go +++ b/server/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type MemberDataPayload struct { diff --git a/server/internal/api/members/handler.go b/server/internal/api/members/handler.go index 7e9b6ee9..0097b181 100644 --- a/server/internal/api/members/handler.go +++ b/server/internal/api/members/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type key int diff --git a/server/internal/api/room/broadcast.go b/server/internal/api/room/broadcast.go index c995f0f0..78efa8b2 100644 --- a/server/internal/api/room/broadcast.go +++ b/server/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) type BroadcastStatusPayload struct { diff --git a/server/internal/api/room/clipboard.go b/server/internal/api/room/clipboard.go index 57445acc..234c4ac6 100644 --- a/server/internal/api/room/clipboard.go +++ b/server/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type ClipboardPayload struct { diff --git a/server/internal/api/room/control.go b/server/internal/api/room/control.go index d13be6d3..71c181cc 100644 --- a/server/internal/api/room/control.go +++ b/server/internal/api/room/control.go @@ -5,10 +5,10 @@ import ( "github.com/go-chi/chi" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) type ControlStatusPayload struct { diff --git a/server/internal/api/room/handler.go b/server/internal/api/room/handler.go index d5d183d1..3c33a33f 100644 --- a/server/internal/api/room/handler.go +++ b/server/internal/api/room/handler.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type RoomHandler struct { diff --git a/server/internal/api/room/keyboard.go b/server/internal/api/room/keyboard.go index c0c52bdf..3164280c 100644 --- a/server/internal/api/room/keyboard.go +++ b/server/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) error { diff --git a/server/internal/api/room/screen.go b/server/internal/api/room/screen.go index 3351b910..14420693 100644 --- a/server/internal/api/room/screen.go +++ b/server/internal/api/room/screen.go @@ -4,11 +4,11 @@ import ( "net/http" "strconv" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) func (h *RoomHandler) screenConfiguration(w http.ResponseWriter, r *http.Request) error { diff --git a/server/internal/api/room/settings.go b/server/internal/api/room/settings.go index dc88a473..83344e47 100644 --- a/server/internal/api/room/settings.go +++ b/server/internal/api/room/settings.go @@ -5,9 +5,9 @@ import ( "io" "net/http" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) func (h *RoomHandler) settingsGet(w http.ResponseWriter, r *http.Request) error { diff --git a/server/internal/api/room/upload.go b/server/internal/api/room/upload.go index e7232159..3ff04616 100644 --- a/server/internal/api/room/upload.go +++ b/server/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/server/internal/api/router.go b/server/internal/api/router.go index 10d8563a..4c142b45 100644 --- a/server/internal/api/router.go +++ b/server/internal/api/router.go @@ -5,12 +5,12 @@ import ( "errors" "net/http" - "m1k1o/neko/internal/api/members" - "m1k1o/neko/internal/api/room" - "m1k1o/neko/internal/api/sessions" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/internal/api/members" + "github.com/m1k1o/neko/server/internal/api/room" + "github.com/m1k1o/neko/server/internal/api/sessions" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type ApiManagerCtx struct { diff --git a/server/internal/api/session.go b/server/internal/api/session.go index 1ed1ad63..50a279a6 100644 --- a/server/internal/api/session.go +++ b/server/internal/api/session.go @@ -4,9 +4,9 @@ import ( "errors" "net/http" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type SessionLoginPayload struct { diff --git a/server/internal/api/sessions/controller.go b/server/internal/api/sessions/controller.go index c3c57dab..3f58d5b0 100644 --- a/server/internal/api/sessions/controller.go +++ b/server/internal/api/sessions/controller.go @@ -4,9 +4,9 @@ import ( "errors" "net/http" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" "github.com/go-chi/chi" ) diff --git a/server/internal/api/sessions/handler.go b/server/internal/api/sessions/handler.go index 70060431..95d02c91 100644 --- a/server/internal/api/sessions/handler.go +++ b/server/internal/api/sessions/handler.go @@ -1,8 +1,8 @@ package sessions import ( - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" ) type SessionsHandler struct { diff --git a/server/internal/capture/broadcast.go b/server/internal/capture/broadcast.go index 536f1597..63cff6ee 100644 --- a/server/internal/capture/broadcast.go +++ b/server/internal/capture/broadcast.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/gst" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/gst" + "github.com/m1k1o/neko/server/pkg/types" ) type BroacastManagerCtx struct { diff --git a/server/internal/capture/manager.go b/server/internal/capture/manager.go index 511c55c4..0758f935 100644 --- a/server/internal/capture/manager.go +++ b/server/internal/capture/manager.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/internal/config" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" ) type CaptureManagerCtx struct { diff --git a/server/internal/capture/screencast.go b/server/internal/capture/screencast.go index 9547413c..efd54bfd 100644 --- a/server/internal/capture/screencast.go +++ b/server/internal/capture/screencast.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/gst" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/gst" + "github.com/m1k1o/neko/server/pkg/types" ) // timeout between intervals, when screencast pipeline is checked diff --git a/server/internal/capture/streamselector.go b/server/internal/capture/streamselector.go index bda1be1c..d646e56c 100644 --- a/server/internal/capture/streamselector.go +++ b/server/internal/capture/streamselector.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" ) type StreamSelectorManagerCtx struct { diff --git a/server/internal/capture/streamsink.go b/server/internal/capture/streamsink.go index 8464e50b..0d0905d5 100644 --- a/server/internal/capture/streamsink.go +++ b/server/internal/capture/streamsink.go @@ -12,9 +12,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/gst" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/gst" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/server/internal/capture/streamsrc.go b/server/internal/capture/streamsrc.go index 15b5b0b8..52ba44fa 100644 --- a/server/internal/capture/streamsrc.go +++ b/server/internal/capture/streamsrc.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/gst" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/gst" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/server/internal/config/capture.go b/server/internal/config/capture.go index bf3e5682..3d8025e0 100644 --- a/server/internal/config/capture.go +++ b/server/internal/config/capture.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/utils" ) // Legacy capture configuration diff --git a/server/internal/config/capture_pipeline.go b/server/internal/config/capture_pipeline.go index 707288d6..12019747 100644 --- a/server/internal/config/capture_pipeline.go +++ b/server/internal/config/capture_pipeline.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "m1k1o/neko/pkg/gst" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/gst" + "github.com/m1k1o/neko/server/pkg/types/codec" ) /* diff --git a/server/internal/config/desktop.go b/server/internal/config/desktop.go index 0d23f145..2814b697 100644 --- a/server/internal/config/desktop.go +++ b/server/internal/config/desktop.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) type Desktop struct { diff --git a/server/internal/config/member.go b/server/internal/config/member.go index df0b2e4a..c3a7d242 100644 --- a/server/internal/config/member.go +++ b/server/internal/config/member.go @@ -5,11 +5,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko/internal/member/file" - "m1k1o/neko/internal/member/multiuser" - "m1k1o/neko/internal/member/object" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/internal/member/file" + "github.com/m1k1o/neko/server/internal/member/multiuser" + "github.com/m1k1o/neko/server/internal/member/object" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type Member struct { diff --git a/server/internal/config/server.go b/server/internal/config/server.go index 77b4cc3a..8491d43c 100644 --- a/server/internal/config/server.go +++ b/server/internal/config/server.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/utils" ) type Server struct { diff --git a/server/internal/config/webrtc.go b/server/internal/config/webrtc.go index 7ff880c5..c28593df 100644 --- a/server/internal/config/webrtc.go +++ b/server/internal/config/webrtc.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) // default stun server diff --git a/server/internal/desktop/clipboard.go b/server/internal/desktop/clipboard.go index 26a8bfe2..49c2f00f 100644 --- a/server/internal/desktop/clipboard.go +++ b/server/internal/desktop/clipboard.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/xevent" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/xevent" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/server/internal/desktop/drop.go b/server/internal/desktop/drop.go index d222b820..ed102f98 100644 --- a/server/internal/desktop/drop.go +++ b/server/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "m1k1o/neko/pkg/drop" + "github.com/m1k1o/neko/server/pkg/drop" ) // repeat move event multiple times diff --git a/server/internal/desktop/filechooserdialog.go b/server/internal/desktop/filechooserdialog.go index bed84d5b..14c70217 100644 --- a/server/internal/desktop/filechooserdialog.go +++ b/server/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "m1k1o/neko/pkg/xorg" + "github.com/m1k1o/neko/server/pkg/xorg" ) // name of the window that is being controlled diff --git a/server/internal/desktop/manager.go b/server/internal/desktop/manager.go index 2831868a..0ffadd73 100644 --- a/server/internal/desktop/manager.go +++ b/server/internal/desktop/manager.go @@ -8,11 +8,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/internal/config" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/xevent" - "m1k1o/neko/pkg/xinput" - "m1k1o/neko/pkg/xorg" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/xevent" + "github.com/m1k1o/neko/server/pkg/xinput" + "github.com/m1k1o/neko/server/pkg/xorg" ) var mu = sync.Mutex{} diff --git a/server/internal/desktop/xevent.go b/server/internal/desktop/xevent.go index ae7fc99c..5118fb41 100644 --- a/server/internal/desktop/xevent.go +++ b/server/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "m1k1o/neko/pkg/xevent" + "github.com/m1k1o/neko/server/pkg/xevent" ) func (manager *DesktopManagerCtx) OnCursorChanged(listener func(serial uint64)) { diff --git a/server/internal/desktop/xinput.go b/server/internal/desktop/xinput.go index da1e5bf2..bc17461a 100644 --- a/server/internal/desktop/xinput.go +++ b/server/internal/desktop/xinput.go @@ -1,6 +1,6 @@ package desktop -import "m1k1o/neko/pkg/xinput" +import "github.com/m1k1o/neko/server/pkg/xinput" func (manager *DesktopManagerCtx) inputRelToAbs(x, y int) (int, int) { return (x * xinput.AbsX) / manager.screenSize.Width, (y * xinput.AbsY) / manager.screenSize.Height diff --git a/server/internal/desktop/xorg.go b/server/internal/desktop/xorg.go index 91a8bb8a..4fec40f0 100644 --- a/server/internal/desktop/xorg.go +++ b/server/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/xorg" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/xorg" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/server/internal/http/batch.go b/server/internal/http/batch.go index ffe7a792..6e008f5f 100644 --- a/server/internal/http/batch.go +++ b/server/internal/http/batch.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type BatchRequest struct { diff --git a/server/internal/http/debug.go b/server/internal/http/debug.go index f2226051..1b343b42 100644 --- a/server/internal/http/debug.go +++ b/server/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) func pprofHandler(r types.Router) { diff --git a/server/internal/http/legacy/handler.go b/server/internal/http/legacy/handler.go index 6aaa1dcd..65a0349b 100644 --- a/server/internal/http/legacy/handler.go +++ b/server/internal/http/legacy/handler.go @@ -10,15 +10,15 @@ import ( "net/url" "strings" - "m1k1o/neko/internal/api" - oldEvent "m1k1o/neko/internal/http/legacy/event" - oldMessage "m1k1o/neko/internal/http/legacy/message" - oldTypes "m1k1o/neko/internal/http/legacy/types" + "github.com/m1k1o/neko/server/internal/api" + oldEvent "github.com/m1k1o/neko/server/internal/http/legacy/event" + oldMessage "github.com/m1k1o/neko/server/internal/http/legacy/message" + oldTypes "github.com/m1k1o/neko/server/internal/http/legacy/types" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" "github.com/gorilla/websocket" "github.com/rs/zerolog" diff --git a/server/internal/http/legacy/message/messages.go b/server/internal/http/legacy/message/messages.go index 708f89a9..860a184a 100644 --- a/server/internal/http/legacy/message/messages.go +++ b/server/internal/http/legacy/message/messages.go @@ -1,7 +1,7 @@ package message import ( - "m1k1o/neko/internal/http/legacy/types" + "github.com/m1k1o/neko/server/internal/http/legacy/types" "github.com/pion/webrtc/v3" ) diff --git a/server/internal/http/legacy/session.go b/server/internal/http/legacy/session.go index 551fbf34..bd28aa03 100644 --- a/server/internal/http/legacy/session.go +++ b/server/internal/http/legacy/session.go @@ -9,10 +9,10 @@ import ( "strings" "sync" - oldTypes "m1k1o/neko/internal/http/legacy/types" + oldTypes "github.com/m1k1o/neko/server/internal/http/legacy/types" - "m1k1o/neko/internal/api" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/internal/api" + "github.com/m1k1o/neko/server/pkg/types" "github.com/gorilla/websocket" "github.com/rs/zerolog" diff --git a/server/internal/http/legacy/wstobackend.go b/server/internal/http/legacy/wstobackend.go index 114fd5fb..c2b7f134 100644 --- a/server/internal/http/legacy/wstobackend.go +++ b/server/internal/http/legacy/wstobackend.go @@ -7,15 +7,15 @@ import ( "github.com/pion/webrtc/v3" - oldEvent "m1k1o/neko/internal/http/legacy/event" - oldMessage "m1k1o/neko/internal/http/legacy/message" + oldEvent "github.com/m1k1o/neko/server/internal/http/legacy/event" + oldMessage "github.com/m1k1o/neko/server/internal/http/legacy/message" - "m1k1o/neko/internal/api/room" - "m1k1o/neko/internal/plugins/chat" - "m1k1o/neko/internal/plugins/filetransfer" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/internal/api/room" + "github.com/m1k1o/neko/server/internal/plugins/chat" + "github.com/m1k1o/neko/server/internal/plugins/filetransfer" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (s *session) wsToBackend(msg []byte) error { diff --git a/server/internal/http/legacy/wstoclient.go b/server/internal/http/legacy/wstoclient.go index 9e86d055..4533eaa7 100644 --- a/server/internal/http/legacy/wstoclient.go +++ b/server/internal/http/legacy/wstoclient.go @@ -8,15 +8,15 @@ import ( "github.com/pion/webrtc/v3" "github.com/spf13/viper" - oldEvent "m1k1o/neko/internal/http/legacy/event" - oldMessage "m1k1o/neko/internal/http/legacy/message" - oldTypes "m1k1o/neko/internal/http/legacy/types" + oldEvent "github.com/m1k1o/neko/server/internal/http/legacy/event" + oldMessage "github.com/m1k1o/neko/server/internal/http/legacy/message" + oldTypes "github.com/m1k1o/neko/server/internal/http/legacy/types" - "m1k1o/neko/internal/plugins/chat" - "m1k1o/neko/internal/plugins/filetransfer" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/internal/plugins/chat" + "github.com/m1k1o/neko/server/internal/plugins/filetransfer" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func profileToMember(id string, profile types.MemberProfile) (*oldTypes.Member, error) { diff --git a/server/internal/http/logger.go b/server/internal/http/logger.go index f39ad9a7..0a0efb20 100644 --- a/server/internal/http/logger.go +++ b/server/internal/http/logger.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/middleware" "github.com/rs/zerolog" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type logFormatter struct { diff --git a/server/internal/http/manager.go b/server/internal/http/manager.go index 2eb09277..8aadd086 100644 --- a/server/internal/http/manager.go +++ b/server/internal/http/manager.go @@ -10,9 +10,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/viper" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/http/legacy" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/http/legacy" + "github.com/m1k1o/neko/server/pkg/types" ) type HttpManagerCtx struct { diff --git a/server/internal/http/router.go b/server/internal/http/router.go index 55b0de0b..9cc52f8b 100644 --- a/server/internal/http/router.go +++ b/server/internal/http/router.go @@ -8,9 +8,9 @@ import ( "github.com/go-chi/cors" "github.com/rs/zerolog" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type RouterOption func(*router) diff --git a/server/internal/member/file/provider.go b/server/internal/member/file/provider.go index f5fcc642..44417f75 100644 --- a/server/internal/member/file/provider.go +++ b/server/internal/member/file/provider.go @@ -7,7 +7,7 @@ import ( "io" "os" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/server/internal/member/file/provider_test.go b/server/internal/member/file/provider_test.go index fc1e461b..438df034 100644 --- a/server/internal/member/file/provider_test.go +++ b/server/internal/member/file/provider_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/utils" ) // Ensure that hashes are the same after encoding and decoding using json diff --git a/server/internal/member/file/types.go b/server/internal/member/file/types.go index 979aa64b..bf49f0ee 100644 --- a/server/internal/member/file/types.go +++ b/server/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) type MemberEntry struct { diff --git a/server/internal/member/manager.go b/server/internal/member/manager.go index 86f23ee5..dca30abc 100644 --- a/server/internal/member/manager.go +++ b/server/internal/member/manager.go @@ -7,12 +7,12 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/member/file" - "m1k1o/neko/internal/member/multiuser" - "m1k1o/neko/internal/member/noauth" - "m1k1o/neko/internal/member/object" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/member/file" + "github.com/m1k1o/neko/server/internal/member/multiuser" + "github.com/m1k1o/neko/server/internal/member/noauth" + "github.com/m1k1o/neko/server/internal/member/object" + "github.com/m1k1o/neko/server/pkg/types" ) func New(sessions types.SessionManager, config *config.Member) *MemberManagerCtx { diff --git a/server/internal/member/multiuser/provider.go b/server/internal/member/multiuser/provider.go index fe1f258e..3b708cad 100644 --- a/server/internal/member/multiuser/provider.go +++ b/server/internal/member/multiuser/provider.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) func New(config Config) types.MemberProvider { diff --git a/server/internal/member/multiuser/types.go b/server/internal/member/multiuser/types.go index 98020962..3b25f661 100644 --- a/server/internal/member/multiuser/types.go +++ b/server/internal/member/multiuser/types.go @@ -1,6 +1,6 @@ package multiuser -import "m1k1o/neko/pkg/types" +import "github.com/m1k1o/neko/server/pkg/types" type Config struct { AdminPassword string diff --git a/server/internal/member/noauth/provider.go b/server/internal/member/noauth/provider.go index dc664c4e..97cf1137 100644 --- a/server/internal/member/noauth/provider.go +++ b/server/internal/member/noauth/provider.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) func New() types.MemberProvider { diff --git a/server/internal/member/object/provider.go b/server/internal/member/object/provider.go index e2f0c649..af52b841 100644 --- a/server/internal/member/object/provider.go +++ b/server/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) func New(config Config) types.MemberProvider { diff --git a/server/internal/member/object/types.go b/server/internal/member/object/types.go index ab7096d7..06095932 100644 --- a/server/internal/member/object/types.go +++ b/server/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) type memberEntry struct { diff --git a/server/internal/plugins/chat/manager.go b/server/internal/plugins/chat/manager.go index 37069725..0a20556e 100644 --- a/server/internal/plugins/chat/manager.go +++ b/server/internal/plugins/chat/manager.go @@ -10,9 +10,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) func NewManager( diff --git a/server/internal/plugins/chat/plugin.go b/server/internal/plugins/chat/plugin.go index 8e278ccc..17b58b26 100644 --- a/server/internal/plugins/chat/plugin.go +++ b/server/internal/plugins/chat/plugin.go @@ -1,7 +1,7 @@ package chat import ( - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) type Plugin struct { diff --git a/server/internal/plugins/dependency.go b/server/internal/plugins/dependency.go index ec4524ca..fc5ab96d 100644 --- a/server/internal/plugins/dependency.go +++ b/server/internal/plugins/dependency.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) type dependency struct { diff --git a/server/internal/plugins/dependency_test.go b/server/internal/plugins/dependency_test.go index dbeb959a..14a62dd5 100644 --- a/server/internal/plugins/dependency_test.go +++ b/server/internal/plugins/dependency_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) func Test_deps_addPlugin(t *testing.T) { diff --git a/server/internal/plugins/filetransfer/manager.go b/server/internal/plugins/filetransfer/manager.go index 555c8c9e..2c7d38fc 100644 --- a/server/internal/plugins/filetransfer/manager.go +++ b/server/internal/plugins/filetransfer/manager.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "m1k1o/neko/pkg/auth" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/auth" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" "github.com/fsnotify/fsnotify" "github.com/rs/zerolog" diff --git a/server/internal/plugins/filetransfer/plugin.go b/server/internal/plugins/filetransfer/plugin.go index 44cda501..8d730c6f 100644 --- a/server/internal/plugins/filetransfer/plugin.go +++ b/server/internal/plugins/filetransfer/plugin.go @@ -1,7 +1,7 @@ package filetransfer import ( - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) type Plugin struct { diff --git a/server/internal/plugins/manager.go b/server/internal/plugins/manager.go index 14f7f4af..5e18abf7 100644 --- a/server/internal/plugins/manager.go +++ b/server/internal/plugins/manager.go @@ -10,10 +10,10 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/plugins/chat" - "m1k1o/neko/internal/plugins/filetransfer" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/plugins/chat" + "github.com/m1k1o/neko/server/internal/plugins/filetransfer" + "github.com/m1k1o/neko/server/pkg/types" ) type ManagerCtx struct { diff --git a/server/internal/session/auth.go b/server/internal/session/auth.go index af4a4bd9..09fe5e4f 100644 --- a/server/internal/session/auth.go +++ b/server/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) func (manager *SessionManagerCtx) CookieSetToken(w http.ResponseWriter, token string) { diff --git a/server/internal/session/manager.go b/server/internal/session/manager.go index 22c5ddaa..a638595b 100644 --- a/server/internal/session/manager.go +++ b/server/internal/session/manager.go @@ -10,9 +10,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/internal/config" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/server/internal/session/serialize.go b/server/internal/session/serialize.go index 9d3b7607..ed4a6f2e 100644 --- a/server/internal/session/serialize.go +++ b/server/internal/session/serialize.go @@ -5,7 +5,7 @@ import ( "errors" "os" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) func (manager *SessionManagerCtx) save() { diff --git a/server/internal/session/session.go b/server/internal/session/session.go index d77c8ff5..95a5ad65 100644 --- a/server/internal/session/session.go +++ b/server/internal/session/session.go @@ -6,8 +6,8 @@ import ( "github.com/rs/zerolog" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" ) // client is expected to reconnect within 5 second diff --git a/server/internal/webrtc/cursor/image.go b/server/internal/webrtc/cursor/image.go index ba134b02..cd0c024b 100644 --- a/server/internal/webrtc/cursor/image.go +++ b/server/internal/webrtc/cursor/image.go @@ -6,8 +6,8 @@ import ( "github.com/rs/zerolog" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type ImageListener interface { diff --git a/server/internal/webrtc/handler.go b/server/internal/webrtc/handler.go index c7a69ce5..2a8e3d3c 100644 --- a/server/internal/webrtc/handler.go +++ b/server/internal/webrtc/handler.go @@ -6,8 +6,8 @@ import ( "math" "time" - "m1k1o/neko/internal/webrtc/payload" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/internal/webrtc/payload" + "github.com/m1k1o/neko/server/pkg/types" "github.com/pion/webrtc/v3" "github.com/rs/zerolog" diff --git a/server/internal/webrtc/legacyhandler.go b/server/internal/webrtc/legacyhandler.go index 01c5284a..e7d05c98 100644 --- a/server/internal/webrtc/legacyhandler.go +++ b/server/internal/webrtc/legacyhandler.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "strconv" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" "github.com/rs/zerolog" ) diff --git a/server/internal/webrtc/manager.go b/server/internal/webrtc/manager.go index 76665c27..541675f2 100644 --- a/server/internal/webrtc/manager.go +++ b/server/internal/webrtc/manager.go @@ -18,14 +18,14 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/viper" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/webrtc/cursor" - "m1k1o/neko/internal/webrtc/pionlog" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/webrtc/cursor" + "github.com/m1k1o/neko/server/internal/webrtc/pionlog" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) const ( diff --git a/server/internal/webrtc/metrics.go b/server/internal/webrtc/metrics.go index 0841cd10..8badadaa 100644 --- a/server/internal/webrtc/metrics.go +++ b/server/internal/webrtc/metrics.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" diff --git a/server/internal/webrtc/peer.go b/server/internal/webrtc/peer.go index 0439d5a1..3310b624 100644 --- a/server/internal/webrtc/peer.go +++ b/server/internal/webrtc/peer.go @@ -11,11 +11,11 @@ import ( "github.com/pion/webrtc/v3" "github.com/rs/zerolog" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/webrtc/payload" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/webrtc/payload" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/utils" ) type WebRTCPeerCtx struct { diff --git a/server/internal/webrtc/track.go b/server/internal/webrtc/track.go index 05e70ab0..8ddc7ea2 100644 --- a/server/internal/webrtc/track.go +++ b/server/internal/webrtc/track.go @@ -10,8 +10,8 @@ import ( "github.com/pion/webrtc/v3/pkg/media" "github.com/rs/zerolog" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/codec" ) type Track struct { diff --git a/server/internal/websocket/filechooserdialog.go b/server/internal/websocket/filechooserdialog.go index 1e3bc0a3..ad339abe 100644 --- a/server/internal/websocket/filechooserdialog.go +++ b/server/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/server/internal/websocket/handler/clipboard.go b/server/internal/websocket/handler/clipboard.go index 546c1341..18926ba7 100644 --- a/server/internal/websocket/handler/clipboard.go +++ b/server/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) clipboardSet(session types.Session, payload *message.ClipboardData) error { diff --git a/server/internal/websocket/handler/control.go b/server/internal/websocket/handler/control.go index 05592c65..1c721671 100644 --- a/server/internal/websocket/handler/control.go +++ b/server/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/xorg" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/xorg" ) var ( diff --git a/server/internal/websocket/handler/handler.go b/server/internal/websocket/handler/handler.go index 22634ec0..3657719f 100644 --- a/server/internal/websocket/handler/handler.go +++ b/server/internal/websocket/handler/handler.go @@ -4,10 +4,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) func New( diff --git a/server/internal/websocket/handler/keyboard.go b/server/internal/websocket/handler/keyboard.go index 7468b959..5d1564b9 100644 --- a/server/internal/websocket/handler/keyboard.go +++ b/server/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error { diff --git a/server/internal/websocket/handler/screen.go b/server/internal/websocket/handler/screen.go index 9eb03068..b65b554d 100644 --- a/server/internal/websocket/handler/screen.go +++ b/server/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenSize) error { diff --git a/server/internal/websocket/handler/send.go b/server/internal/websocket/handler/send.go index 19c3d51c..e31e122d 100644 --- a/server/internal/websocket/handler/send.go +++ b/server/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) sendUnicast(session types.Session, payload *message.SendUnicast) error { diff --git a/server/internal/websocket/handler/session.go b/server/internal/websocket/handler/session.go index ae1c0568..d4518937 100644 --- a/server/internal/websocket/handler/session.go +++ b/server/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) SessionCreated(session types.Session) error { diff --git a/server/internal/websocket/handler/signal.go b/server/internal/websocket/handler/signal.go index cb0ff4f1..ada0b215 100644 --- a/server/internal/websocket/handler/signal.go +++ b/server/internal/websocket/handler/signal.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" "github.com/pion/webrtc/v3" ) diff --git a/server/internal/websocket/handler/system.go b/server/internal/websocket/handler/system.go index 9b56beab..6863f080 100644 --- a/server/internal/websocket/handler/system.go +++ b/server/internal/websocket/handler/system.go @@ -4,9 +4,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" ) func (h *MessageHandlerCtx) systemInit(session types.Session) error { diff --git a/server/internal/websocket/manager.go b/server/internal/websocket/manager.go index b34e3eda..0f7baafd 100644 --- a/server/internal/websocket/manager.go +++ b/server/internal/websocket/manager.go @@ -11,11 +11,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/internal/websocket/handler" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/internal/websocket/handler" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) // send pings to peer with this period - must be less than pongWait diff --git a/server/internal/websocket/peer.go b/server/internal/websocket/peer.go index 7f40c963..3861e3a0 100644 --- a/server/internal/websocket/peer.go +++ b/server/internal/websocket/peer.go @@ -8,10 +8,10 @@ import ( "github.com/gorilla/websocket" "github.com/rs/zerolog" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/types/event" - "m1k1o/neko/pkg/types/message" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/types/event" + "github.com/m1k1o/neko/server/pkg/types/message" + "github.com/m1k1o/neko/server/pkg/utils" ) type WebSocketPeerCtx struct { diff --git a/server/pkg/auth/auth.go b/server/pkg/auth/auth.go index 834b344e..597a6e84 100644 --- a/server/pkg/auth/auth.go +++ b/server/pkg/auth/auth.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "m1k1o/neko/pkg/types" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/types" + "github.com/m1k1o/neko/server/pkg/utils" ) type key int diff --git a/server/pkg/auth/auth_test.go b/server/pkg/auth/auth_test.go index 7218c728..52e44acf 100644 --- a/server/pkg/auth/auth_test.go +++ b/server/pkg/auth/auth_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "m1k1o/neko/internal/config" - "m1k1o/neko/internal/session" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/internal/config" + "github.com/m1k1o/neko/server/internal/session" + "github.com/m1k1o/neko/server/pkg/types" ) var i = 0 diff --git a/server/pkg/gst/gst.go b/server/pkg/gst/gst.go index 29028860..a9aa6709 100644 --- a/server/pkg/gst/gst.go +++ b/server/pkg/gst/gst.go @@ -16,7 +16,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) var ( diff --git a/server/pkg/types/capture.go b/server/pkg/types/capture.go index b5c47496..febae9db 100644 --- a/server/pkg/types/capture.go +++ b/server/pkg/types/capture.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "m1k1o/neko/pkg/types/codec" + "github.com/m1k1o/neko/server/pkg/types/codec" "github.com/PaesslerAG/gval" ) diff --git a/server/pkg/types/message/messages.go b/server/pkg/types/message/messages.go index 1d6a2698..48a1afe9 100644 --- a/server/pkg/types/message/messages.go +++ b/server/pkg/types/message/messages.go @@ -3,7 +3,7 @@ package message import ( "github.com/pion/webrtc/v3" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) ///////////////////////////// diff --git a/server/pkg/types/plugins.go b/server/pkg/types/plugins.go index a5833045..8a8178c1 100644 --- a/server/pkg/types/plugins.go +++ b/server/pkg/types/plugins.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "m1k1o/neko/pkg/utils" + "github.com/m1k1o/neko/server/pkg/utils" "github.com/spf13/cobra" ) diff --git a/server/pkg/xorg/xorg.go b/server/pkg/xorg/xorg.go index 49074c1d..a6a38799 100644 --- a/server/pkg/xorg/xorg.go +++ b/server/pkg/xorg/xorg.go @@ -16,7 +16,7 @@ import ( "time" "unsafe" - "m1k1o/neko/pkg/types" + "github.com/m1k1o/neko/server/pkg/types" ) //go:generate ./keysymdef.sh