diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 4c207153..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Create and publish a Docker image - -on: - push: - branches: - - 'master' - tags: - - 'v*' - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push-image: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/build_variants.yml b/.github/workflows/build_variants.yml deleted file mode 100644 index e104e164..00000000 --- a/.github/workflows/build_variants.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Create and publish a Docker image variant - -on: - push: - tags: - - 'v*' - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push-image-variant: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - strategy: - matrix: - include: - - variant: bookworm - dockerfile: Dockerfile.bookworm - - variant: nvidia - dockerfile: Dockerfile.nvidia - - variant: nvidia_bookworm - dockerfile: Dockerfile.nvidia.bookworm - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ matrix.variant }} - - - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - file: ${{ matrix.dockerfile }} - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml deleted file mode 100644 index f0740d0d..00000000 --- a/.github/workflows/pull_requests.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build a Docker image - -on: - pull_request: - branches: - - master - -jobs: - build-image: - runs-on: ubuntu-latest - permissions: - contents: read - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Build Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 4973993a..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "launch", - "type": "go", - "debugAdapter": "dlv-dap", - "request": "launch", - "mode": "debug", - "program": "${workspaceFolder}/cmd/neko", - "output": "${workspaceFolder}/bin/debug/neko", - "cwd": "${workspaceFolder}/", - "args": ["serve", "-d", "-c", "dev/runtime/config.yml"], - "envFile": "${workspaceFolder}/.env.development" - } - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json index c405326e..0967ef42 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,14 +1 @@ -{ - "go.formatTool": "goformat", - "go.inferGopath": false, - "go.autocompleteUnimportedPackages": true, - "go.delveConfig": { - "useApiV1": false - }, - "[go]": { - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.organizeImports": "explicit" - } - } -} +{} diff --git a/server/.vscode/launch.json b/server/.vscode/launch.json new file mode 100644 index 00000000..1d1b71f9 --- /dev/null +++ b/server/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "launch", + "type": "go", + "debugAdapter": "dlv-dap", + "request": "launch", + "mode": "debug", + "program": "${workspaceFolder}/cmd/neko", + "output": "${workspaceFolder}/bin/debug/neko", + "cwd": "${workspaceFolder}/", + "args": ["serve", "-d", "-c", "dev/runtime/config.yml"], + "envFile": "${workspaceFolder}/.env.development" + } + ] +} diff --git a/server/.vscode/settings.json b/server/.vscode/settings.json new file mode 100644 index 00000000..b67fb138 --- /dev/null +++ b/server/.vscode/settings.json @@ -0,0 +1,21 @@ +{ + "go.formatTool": "goformat", + "go.inferGopath": false, + "go.autocompleteUnimportedPackages": true, + "go.delveConfig": { + "useApiV1": false, + "dlvLoadConfig": { + "followPointers": true, + "maxVariableRecurse": 3, + "maxStringLen": 400, + "maxArrayValues": 400, + "maxStructFields": -1 + } + }, + "[go]": { + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + } + } +} diff --git a/server/build b/server/build index ee092a8c..6bf20bef 100755 --- a/server/build +++ b/server/build @@ -30,10 +30,10 @@ go build \ -o bin/neko \ -ldflags " -s -w - -X 'github.com/demodesk/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' - -X 'github.com/demodesk/neko.gitCommit=${GIT_COMMIT}' - -X 'github.com/demodesk/neko.gitBranch=${GIT_BRANCH}' - -X 'github.com/demodesk/neko.gitTag=${GIT_TAG}' + -X 'm1k1o/neko.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`' + -X 'm1k1o/neko.gitCommit=${GIT_COMMIT}' + -X 'm1k1o/neko.gitBranch=${GIT_BRANCH}' + -X 'm1k1o/neko.gitTag=${GIT_TAG}' " \ cmd/neko/main.go; diff --git a/server/cmd/neko/main.go b/server/cmd/neko/main.go index dec9df74..40523549 100644 --- a/server/cmd/neko/main.go +++ b/server/cmd/neko/main.go @@ -5,9 +5,9 @@ import ( "github.com/rs/zerolog/log" - "github.com/demodesk/neko" - "github.com/demodesk/neko/cmd" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko" + "m1k1o/neko/cmd" + "m1k1o/neko/pkg/utils" ) func main() { diff --git a/server/cmd/plugins.go b/server/cmd/plugins.go index ffee9775..b58961a7 100644 --- a/server/cmd/plugins.go +++ b/server/cmd/plugins.go @@ -4,8 +4,9 @@ import ( "encoding/json" "os" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/plugins" + "m1k1o/neko/internal/config" + "m1k1o/neko/internal/plugins" + "github.com/rs/zerolog/log" "github.com/spf13/cobra" ) diff --git a/server/cmd/root.go b/server/cmd/root.go index fb5b5d0e..0ab934bf 100644 --- a/server/cmd/root.go +++ b/server/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/demodesk/neko" - "github.com/demodesk/neko/internal/config" + "m1k1o/neko" + "m1k1o/neko/internal/config" ) func Execute() error { diff --git a/server/cmd/serve.go b/server/cmd/serve.go index 13f5de23..90947a65 100644 --- a/server/cmd/serve.go +++ b/server/cmd/serve.go @@ -8,16 +8,16 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/demodesk/neko/internal/api" - "github.com/demodesk/neko/internal/capture" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/desktop" - "github.com/demodesk/neko/internal/http" - "github.com/demodesk/neko/internal/member" - "github.com/demodesk/neko/internal/plugins" - "github.com/demodesk/neko/internal/session" - "github.com/demodesk/neko/internal/webrtc" - "github.com/demodesk/neko/internal/websocket" + "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" ) func init() { diff --git a/server/go.mod b/server/go.mod index eb971ff6..b7e6f851 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/demodesk/neko +module m1k1o/neko go 1.21 diff --git a/server/internal/api/members/bluk.go b/server/internal/api/members/bluk.go index ead74b88..44ee14cc 100644 --- a/server/internal/api/members/bluk.go +++ b/server/internal/api/members/bluk.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type MemberBulkUpdatePayload struct { diff --git a/server/internal/api/members/controler.go b/server/internal/api/members/controler.go index b1814ce3..74c793c2 100644 --- a/server/internal/api/members/controler.go +++ b/server/internal/api/members/controler.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type MemberDataPayload struct { diff --git a/server/internal/api/members/handler.go b/server/internal/api/members/handler.go index 79d469f5..7e9b6ee9 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" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type key int diff --git a/server/internal/api/room/broadcast.go b/server/internal/api/room/broadcast.go index 5f8319ee..c995f0f0 100644 --- a/server/internal/api/room/broadcast.go +++ b/server/internal/api/room/broadcast.go @@ -3,9 +3,9 @@ package room import ( "net/http" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/pkg/utils" ) type BroadcastStatusPayload struct { diff --git a/server/internal/api/room/clipboard.go b/server/internal/api/room/clipboard.go index 00cf8031..57445acc 100644 --- a/server/internal/api/room/clipboard.go +++ b/server/internal/api/room/clipboard.go @@ -7,8 +7,8 @@ import ( "net/http" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type ClipboardPayload struct { diff --git a/server/internal/api/room/control.go b/server/internal/api/room/control.go index 133af610..d13be6d3 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" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/pkg/utils" ) type ControlStatusPayload struct { diff --git a/server/internal/api/room/handler.go b/server/internal/api/room/handler.go index 75ca9a92..d5d183d1 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" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type RoomHandler struct { diff --git a/server/internal/api/room/keyboard.go b/server/internal/api/room/keyboard.go index f3765f56..c0c52bdf 100644 --- a/server/internal/api/room/keyboard.go +++ b/server/internal/api/room/keyboard.go @@ -3,8 +3,8 @@ package room import ( "net/http" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/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 12124bdc..3351b910 100644 --- a/server/internal/api/room/screen.go +++ b/server/internal/api/room/screen.go @@ -4,11 +4,11 @@ import ( "net/http" "strconv" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/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 c8e1816a..dc88a473 100644 --- a/server/internal/api/room/settings.go +++ b/server/internal/api/room/settings.go @@ -5,9 +5,9 @@ import ( "io" "net/http" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/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 f2fadd29..e7232159 100644 --- a/server/internal/api/room/upload.go +++ b/server/internal/api/room/upload.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/utils" ) // TODO: Extract file uploading to custom utility. diff --git a/server/internal/api/router.go b/server/internal/api/router.go index 24ada419..0144264b 100644 --- a/server/internal/api/router.go +++ b/server/internal/api/router.go @@ -5,12 +5,12 @@ import ( "errors" "net/http" - "github.com/demodesk/neko/internal/api/members" - "github.com/demodesk/neko/internal/api/room" - "github.com/demodesk/neko/internal/api/sessions" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "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" ) type ApiManagerCtx struct { diff --git a/server/internal/api/session.go b/server/internal/api/session.go index fbe85733..358521be 100644 --- a/server/internal/api/session.go +++ b/server/internal/api/session.go @@ -4,9 +4,9 @@ import ( "errors" "net/http" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type SessionLoginPayload struct { diff --git a/server/internal/api/sessions/controller.go b/server/internal/api/sessions/controller.go index c4ce44c0..c3c57dab 100644 --- a/server/internal/api/sessions/controller.go +++ b/server/internal/api/sessions/controller.go @@ -4,9 +4,10 @@ import ( "errors" "net/http" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" + "github.com/go-chi/chi" ) diff --git a/server/internal/api/sessions/handler.go b/server/internal/api/sessions/handler.go index 5f5b7711..70060431 100644 --- a/server/internal/api/sessions/handler.go +++ b/server/internal/api/sessions/handler.go @@ -1,8 +1,8 @@ package sessions import ( - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" ) type SessionsHandler struct { diff --git a/server/internal/capture/broadcast.go b/server/internal/capture/broadcast.go index 0b056c02..ea25b3b2 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" - "github.com/demodesk/neko/pkg/gst" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/gst" + "m1k1o/neko/pkg/types" ) type BroacastManagerCtx struct { diff --git a/server/internal/capture/manager.go b/server/internal/capture/manager.go index f4d004c0..d7c78db4 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" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" + "m1k1o/neko/internal/config" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/codec" ) type CaptureManagerCtx struct { diff --git a/server/internal/capture/screencast.go b/server/internal/capture/screencast.go index 272b3964..9547413c 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" - "github.com/demodesk/neko/pkg/gst" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/gst" + "m1k1o/neko/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 fd139032..bda1be1c 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/codec" ) type StreamSelectorManagerCtx struct { diff --git a/server/internal/capture/streamsink.go b/server/internal/capture/streamsink.go index 99703bba..850d90d7 100644 --- a/server/internal/capture/streamsink.go +++ b/server/internal/capture/streamsink.go @@ -13,9 +13,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/demodesk/neko/pkg/gst" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" + "m1k1o/neko/pkg/gst" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/codec" ) var moveSinkListenerMu = sync.Mutex{} diff --git a/server/internal/capture/streamsrc.go b/server/internal/capture/streamsrc.go index a3bec254..15b5b0b8 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" - "github.com/demodesk/neko/pkg/gst" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" + "m1k1o/neko/pkg/gst" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/codec" ) type StreamSrcManagerCtx struct { diff --git a/server/internal/config/capture.go b/server/internal/config/capture.go index 7cc389b3..591279f3 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/codec" + "m1k1o/neko/pkg/utils" ) // Legacy capture configuration diff --git a/server/internal/config/capture_pipeline.go b/server/internal/config/capture_pipeline.go index 35469cd6..c64c9fef 100644 --- a/server/internal/config/capture_pipeline.go +++ b/server/internal/config/capture_pipeline.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/demodesk/neko/pkg/gst" - "github.com/demodesk/neko/pkg/types/codec" + "m1k1o/neko/pkg/gst" + "m1k1o/neko/pkg/types/codec" ) /* diff --git a/server/internal/config/desktop.go b/server/internal/config/desktop.go index 41494e43..36dc664d 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" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) type Desktop struct { diff --git a/server/internal/config/member.go b/server/internal/config/member.go index 56d903a1..8fc98e14 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" - "github.com/demodesk/neko/internal/member/file" - "github.com/demodesk/neko/internal/member/multiuser" - "github.com/demodesk/neko/internal/member/object" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/internal/member/file" + "m1k1o/neko/internal/member/multiuser" + "m1k1o/neko/internal/member/object" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type Member struct { diff --git a/server/internal/config/server.go b/server/internal/config/server.go index 72b891d5..087b2485 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" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/utils" ) type Server struct { diff --git a/server/internal/config/webrtc.go b/server/internal/config/webrtc.go index 0b421134..df7dc08b 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) // default stun server diff --git a/server/internal/desktop/clipboard.go b/server/internal/desktop/clipboard.go index f354fe38..26a8bfe2 100644 --- a/server/internal/desktop/clipboard.go +++ b/server/internal/desktop/clipboard.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/xevent" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/xevent" ) func (manager *DesktopManagerCtx) ClipboardGetText() (*types.ClipboardText, error) { diff --git a/server/internal/desktop/drop.go b/server/internal/desktop/drop.go index cee81a6b..d222b820 100644 --- a/server/internal/desktop/drop.go +++ b/server/internal/desktop/drop.go @@ -3,7 +3,7 @@ package desktop import ( "time" - "github.com/demodesk/neko/pkg/drop" + "m1k1o/neko/pkg/drop" ) // repeat move event multiple times diff --git a/server/internal/desktop/filechooserdialog.go b/server/internal/desktop/filechooserdialog.go index 32e9f7d5..bed84d5b 100644 --- a/server/internal/desktop/filechooserdialog.go +++ b/server/internal/desktop/filechooserdialog.go @@ -4,7 +4,7 @@ import ( "errors" "os/exec" - "github.com/demodesk/neko/pkg/xorg" + "m1k1o/neko/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 da998df2..2831868a 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" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/xevent" - "github.com/demodesk/neko/pkg/xinput" - "github.com/demodesk/neko/pkg/xorg" + "m1k1o/neko/internal/config" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/xevent" + "m1k1o/neko/pkg/xinput" + "m1k1o/neko/pkg/xorg" ) var mu = sync.Mutex{} diff --git a/server/internal/desktop/xevent.go b/server/internal/desktop/xevent.go index 59df1d7e..ae7fc99c 100644 --- a/server/internal/desktop/xevent.go +++ b/server/internal/desktop/xevent.go @@ -1,7 +1,7 @@ package desktop import ( - "github.com/demodesk/neko/pkg/xevent" + "m1k1o/neko/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 69f78c60..da1e5bf2 100644 --- a/server/internal/desktop/xinput.go +++ b/server/internal/desktop/xinput.go @@ -1,6 +1,6 @@ package desktop -import "github.com/demodesk/neko/pkg/xinput" +import "m1k1o/neko/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 c0feb5dc..91a8bb8a 100644 --- a/server/internal/desktop/xorg.go +++ b/server/internal/desktop/xorg.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/xorg" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/xorg" ) func (manager *DesktopManagerCtx) Move(x, y int) { diff --git a/server/internal/http/batch.go b/server/internal/http/batch.go index 8b199901..ffe7a792 100644 --- a/server/internal/http/batch.go +++ b/server/internal/http/batch.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type BatchRequest struct { diff --git a/server/internal/http/debug.go b/server/internal/http/debug.go index 5e40e147..f2226051 100644 --- a/server/internal/http/debug.go +++ b/server/internal/http/debug.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) func pprofHandler(r types.Router) { diff --git a/server/internal/http/legacy/handler.go b/server/internal/http/legacy/handler.go index 5fdf08b6..7b2006ae 100644 --- a/server/internal/http/legacy/handler.go +++ b/server/internal/http/legacy/handler.go @@ -5,13 +5,14 @@ import ( "fmt" "net/http" - oldEvent "github.com/demodesk/neko/internal/http/legacy/event" - oldMessage "github.com/demodesk/neko/internal/http/legacy/message" + oldEvent "m1k1o/neko/internal/http/legacy/event" + oldMessage "m1k1o/neko/internal/http/legacy/message" + + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/pkg/utils" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" "github.com/gorilla/websocket" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/server/internal/http/legacy/message/messages.go b/server/internal/http/legacy/message/messages.go index 7db65f45..de5cdc79 100644 --- a/server/internal/http/legacy/message/messages.go +++ b/server/internal/http/legacy/message/messages.go @@ -1,7 +1,7 @@ package message import ( - "github.com/demodesk/neko/internal/http/legacy/types" + "m1k1o/neko/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 fd361b88..0e7d7273 100644 --- a/server/internal/http/legacy/session.go +++ b/server/internal/http/legacy/session.go @@ -8,10 +8,11 @@ import ( "net/http" "strings" - oldTypes "github.com/demodesk/neko/internal/http/legacy/types" + oldTypes "m1k1o/neko/internal/http/legacy/types" + + "m1k1o/neko/internal/api" + "m1k1o/neko/pkg/types" - "github.com/demodesk/neko/internal/api" - "github.com/demodesk/neko/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 db0528f7..61b8e1db 100644 --- a/server/internal/http/legacy/wstobackend.go +++ b/server/internal/http/legacy/wstobackend.go @@ -8,15 +8,15 @@ import ( "github.com/gorilla/websocket" "github.com/pion/webrtc/v3" - oldEvent "github.com/demodesk/neko/internal/http/legacy/event" - oldMessage "github.com/demodesk/neko/internal/http/legacy/message" + oldEvent "m1k1o/neko/internal/http/legacy/event" + oldMessage "m1k1o/neko/internal/http/legacy/message" - "github.com/demodesk/neko/internal/api/room" - "github.com/demodesk/neko/internal/plugins/chat" - "github.com/demodesk/neko/internal/plugins/filetransfer" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/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" ) func (s *session) wsToBackend(msg []byte) error { diff --git a/server/internal/http/legacy/wstoclient.go b/server/internal/http/legacy/wstoclient.go index b5a59ee8..06bb96ae 100644 --- a/server/internal/http/legacy/wstoclient.go +++ b/server/internal/http/legacy/wstoclient.go @@ -7,15 +7,15 @@ import ( "github.com/pion/webrtc/v3" - oldEvent "github.com/demodesk/neko/internal/http/legacy/event" - oldMessage "github.com/demodesk/neko/internal/http/legacy/message" - oldTypes "github.com/demodesk/neko/internal/http/legacy/types" + oldEvent "m1k1o/neko/internal/http/legacy/event" + oldMessage "m1k1o/neko/internal/http/legacy/message" + oldTypes "m1k1o/neko/internal/http/legacy/types" - "github.com/demodesk/neko/internal/plugins/chat" - "github.com/demodesk/neko/internal/plugins/filetransfer" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/internal/plugins/chat" + "m1k1o/neko/internal/plugins/filetransfer" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/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 258eec54..f39ad9a7 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type logFormatter struct { diff --git a/server/internal/http/manager.go b/server/internal/http/manager.go index fdb630b7..558794a5 100644 --- a/server/internal/http/manager.go +++ b/server/internal/http/manager.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/http/legacy" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/internal/config" + "m1k1o/neko/internal/http/legacy" + "m1k1o/neko/pkg/types" ) type HttpManagerCtx struct { diff --git a/server/internal/http/router.go b/server/internal/http/router.go index 02196252..55b0de0b 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" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type RouterOption func(*router) diff --git a/server/internal/member/file/provider.go b/server/internal/member/file/provider.go index a7a95c6c..f5fcc642 100644 --- a/server/internal/member/file/provider.go +++ b/server/internal/member/file/provider.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/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 7e25439b..fc1e461b 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" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/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 5dcb42df..979aa64b 100644 --- a/server/internal/member/file/types.go +++ b/server/internal/member/file/types.go @@ -1,7 +1,7 @@ package file import ( - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) type MemberEntry struct { diff --git a/server/internal/member/manager.go b/server/internal/member/manager.go index ccf32b22..86f23ee5 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" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/member/file" - "github.com/demodesk/neko/internal/member/multiuser" - "github.com/demodesk/neko/internal/member/noauth" - "github.com/demodesk/neko/internal/member/object" - "github.com/demodesk/neko/pkg/types" + "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" ) 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 aeb55f17..fe1f258e 100644 --- a/server/internal/member/multiuser/provider.go +++ b/server/internal/member/multiuser/provider.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/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 dfdedfb3..98020962 100644 --- a/server/internal/member/multiuser/types.go +++ b/server/internal/member/multiuser/types.go @@ -1,6 +1,6 @@ package multiuser -import "github.com/demodesk/neko/pkg/types" +import "m1k1o/neko/pkg/types" type Config struct { AdminPassword string diff --git a/server/internal/member/noauth/provider.go b/server/internal/member/noauth/provider.go index 4abc0a43..dc664c4e 100644 --- a/server/internal/member/noauth/provider.go +++ b/server/internal/member/noauth/provider.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) func New() types.MemberProvider { diff --git a/server/internal/member/object/provider.go b/server/internal/member/object/provider.go index 5e93500e..e2f0c649 100644 --- a/server/internal/member/object/provider.go +++ b/server/internal/member/object/provider.go @@ -1,7 +1,7 @@ package object import ( - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/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 a21c2209..ab7096d7 100644 --- a/server/internal/member/object/types.go +++ b/server/internal/member/object/types.go @@ -1,7 +1,7 @@ package object import ( - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) type memberEntry struct { diff --git a/server/internal/plugins/chat/manager.go b/server/internal/plugins/chat/manager.go index 93e3c1bd..37069725 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" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) func NewManager( diff --git a/server/internal/plugins/chat/plugin.go b/server/internal/plugins/chat/plugin.go index d4bc9463..8e278ccc 100644 --- a/server/internal/plugins/chat/plugin.go +++ b/server/internal/plugins/chat/plugin.go @@ -1,7 +1,7 @@ package chat import ( - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) type Plugin struct { diff --git a/server/internal/plugins/dependency.go b/server/internal/plugins/dependency.go index d31b2919..ec4524ca 100644 --- a/server/internal/plugins/dependency.go +++ b/server/internal/plugins/dependency.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) type dependency struct { diff --git a/server/internal/plugins/dependency_test.go b/server/internal/plugins/dependency_test.go index 11ae279e..dbeb959a 100644 --- a/server/internal/plugins/dependency_test.go +++ b/server/internal/plugins/dependency_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/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 0a6603e4..555c8c9e 100644 --- a/server/internal/plugins/filetransfer/manager.go +++ b/server/internal/plugins/filetransfer/manager.go @@ -11,9 +11,10 @@ import ( "sync" "time" - "github.com/demodesk/neko/pkg/auth" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/auth" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" + "github.com/fsnotify/fsnotify" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/server/internal/plugins/filetransfer/plugin.go b/server/internal/plugins/filetransfer/plugin.go index a98672a1..44cda501 100644 --- a/server/internal/plugins/filetransfer/plugin.go +++ b/server/internal/plugins/filetransfer/plugin.go @@ -1,7 +1,7 @@ package filetransfer import ( - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) type Plugin struct { diff --git a/server/internal/plugins/manager.go b/server/internal/plugins/manager.go index 24ada08f..14f7f4af 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" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/plugins/chat" - "github.com/demodesk/neko/internal/plugins/filetransfer" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/internal/config" + "m1k1o/neko/internal/plugins/chat" + "m1k1o/neko/internal/plugins/filetransfer" + "m1k1o/neko/pkg/types" ) type ManagerCtx struct { diff --git a/server/internal/session/auth.go b/server/internal/session/auth.go index 1248fad9..682c03bb 100644 --- a/server/internal/session/auth.go +++ b/server/internal/session/auth.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/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 db6aaa8d..aa0d63b5 100644 --- a/server/internal/session/manager.go +++ b/server/internal/session/manager.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/internal/config" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) func New(config *config.Session) *SessionManagerCtx { diff --git a/server/internal/session/serialize.go b/server/internal/session/serialize.go index 2d550b5c..9d3b7607 100644 --- a/server/internal/session/serialize.go +++ b/server/internal/session/serialize.go @@ -5,7 +5,7 @@ import ( "errors" "os" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) func (manager *SessionManagerCtx) save() { diff --git a/server/internal/session/session.go b/server/internal/session/session.go index 76d7eff6..93a6a220 100644 --- a/server/internal/session/session.go +++ b/server/internal/session/session.go @@ -6,8 +6,8 @@ import ( "github.com/rs/zerolog" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" + "m1k1o/neko/pkg/types" + "m1k1o/neko/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 78049099..ba134b02 100644 --- a/server/internal/webrtc/cursor/image.go +++ b/server/internal/webrtc/cursor/image.go @@ -6,8 +6,8 @@ import ( "github.com/rs/zerolog" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type ImageListener interface { diff --git a/server/internal/webrtc/handler.go b/server/internal/webrtc/handler.go index 4222cc18..c7a69ce5 100644 --- a/server/internal/webrtc/handler.go +++ b/server/internal/webrtc/handler.go @@ -6,8 +6,9 @@ import ( "math" "time" - "github.com/demodesk/neko/internal/webrtc/payload" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/internal/webrtc/payload" + "m1k1o/neko/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 c085b3e6..01c5284a 100644 --- a/server/internal/webrtc/legacyhandler.go +++ b/server/internal/webrtc/legacyhandler.go @@ -5,7 +5,8 @@ import ( "encoding/binary" "strconv" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" + "github.com/rs/zerolog" ) diff --git a/server/internal/webrtc/manager.go b/server/internal/webrtc/manager.go index af4161a5..4c514a91 100644 --- a/server/internal/webrtc/manager.go +++ b/server/internal/webrtc/manager.go @@ -17,14 +17,14 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/webrtc/cursor" - "github.com/demodesk/neko/internal/webrtc/pionlog" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "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" ) const ( diff --git a/server/internal/webrtc/metrics.go b/server/internal/webrtc/metrics.go index cc212575..0841cd10 100644 --- a/server/internal/webrtc/metrics.go +++ b/server/internal/webrtc/metrics.go @@ -4,7 +4,8 @@ import ( "sync" "time" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" + "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/prometheus/client_golang/prometheus" diff --git a/server/internal/webrtc/peer.go b/server/internal/webrtc/peer.go index 6abd4952..0439d5a1 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" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/webrtc/payload" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/internal/config" + "m1k1o/neko/internal/webrtc/payload" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/utils" ) type WebRTCPeerCtx struct { diff --git a/server/internal/webrtc/track.go b/server/internal/webrtc/track.go index 907d6ad5..05e70ab0 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/codec" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/codec" ) type Track struct { diff --git a/server/internal/websocket/filechooserdialog.go b/server/internal/websocket/filechooserdialog.go index e134930e..1e3bc0a3 100644 --- a/server/internal/websocket/filechooserdialog.go +++ b/server/internal/websocket/filechooserdialog.go @@ -1,9 +1,9 @@ package websocket import ( - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" ) func (manager *WebSocketManagerCtx) fileChooserDialogEvents() { diff --git a/server/internal/websocket/handler/clipboard.go b/server/internal/websocket/handler/clipboard.go index 97935cea..546c1341 100644 --- a/server/internal/websocket/handler/clipboard.go +++ b/server/internal/websocket/handler/clipboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/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 80e90c66..05592c65 100644 --- a/server/internal/websocket/handler/control.go +++ b/server/internal/websocket/handler/control.go @@ -3,10 +3,10 @@ package handler import ( "errors" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/xorg" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/pkg/xorg" ) var ( diff --git a/server/internal/websocket/handler/handler.go b/server/internal/websocket/handler/handler.go index 43ea2a17..576584a5 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/pkg/utils" ) func New( diff --git a/server/internal/websocket/handler/keyboard.go b/server/internal/websocket/handler/keyboard.go index 1e1d6ad3..7468b959 100644 --- a/server/internal/websocket/handler/keyboard.go +++ b/server/internal/websocket/handler/keyboard.go @@ -3,8 +3,8 @@ package handler import ( "errors" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/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 4419cd92..9eb03068 100644 --- a/server/internal/websocket/handler/screen.go +++ b/server/internal/websocket/handler/screen.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/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 d836e952..19c3d51c 100644 --- a/server/internal/websocket/handler/send.go +++ b/server/internal/websocket/handler/send.go @@ -3,9 +3,9 @@ package handler import ( "errors" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/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 321f6342..ae1c0568 100644 --- a/server/internal/websocket/handler/session.go +++ b/server/internal/websocket/handler/session.go @@ -1,9 +1,9 @@ package handler import ( - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/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 e0e5fb88..cb0ff4f1 100644 --- a/server/internal/websocket/handler/signal.go +++ b/server/internal/websocket/handler/signal.go @@ -3,9 +3,10 @@ package handler import ( "errors" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/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 3ec60489..9b56beab 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/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 d2721721..1d09fad4 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" - "github.com/demodesk/neko/internal/websocket/handler" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/internal/websocket/handler" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/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 8722acb6..7f40c963 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" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/types/event" - "github.com/demodesk/neko/pkg/types/message" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/types/event" + "m1k1o/neko/pkg/types/message" + "m1k1o/neko/pkg/utils" ) type WebSocketPeerCtx struct { diff --git a/server/pkg/auth/auth.go b/server/pkg/auth/auth.go index e3e6ddd4..834b344e 100644 --- a/server/pkg/auth/auth.go +++ b/server/pkg/auth/auth.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/demodesk/neko/pkg/types" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/types" + "m1k1o/neko/pkg/utils" ) type key int diff --git a/server/pkg/auth/auth_test.go b/server/pkg/auth/auth_test.go index dd22d472..7218c728 100644 --- a/server/pkg/auth/auth_test.go +++ b/server/pkg/auth/auth_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "github.com/demodesk/neko/internal/config" - "github.com/demodesk/neko/internal/session" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/internal/config" + "m1k1o/neko/internal/session" + "m1k1o/neko/pkg/types" ) var i = 0 diff --git a/server/pkg/gst/gst.go b/server/pkg/gst/gst.go index 45432b4f..29028860 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" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) var ( diff --git a/server/pkg/types/capture.go b/server/pkg/types/capture.go index 4fbc68da..c2f21070 100644 --- a/server/pkg/types/capture.go +++ b/server/pkg/types/capture.go @@ -8,8 +8,9 @@ import ( "strings" "time" + "m1k1o/neko/pkg/types/codec" + "github.com/PaesslerAG/gval" - "github.com/demodesk/neko/pkg/types/codec" ) var ( diff --git a/server/pkg/types/message/messages.go b/server/pkg/types/message/messages.go index a35c07d7..af08e072 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" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) ///////////////////////////// diff --git a/server/pkg/types/plugins.go b/server/pkg/types/plugins.go index c94131ef..a5833045 100644 --- a/server/pkg/types/plugins.go +++ b/server/pkg/types/plugins.go @@ -5,7 +5,8 @@ import ( "fmt" "strings" - "github.com/demodesk/neko/pkg/utils" + "m1k1o/neko/pkg/utils" + "github.com/spf13/cobra" ) diff --git a/server/pkg/xorg/xorg.go b/server/pkg/xorg/xorg.go index 41a9b42c..b948ed9a 100644 --- a/server/pkg/xorg/xorg.go +++ b/server/pkg/xorg/xorg.go @@ -15,7 +15,7 @@ import ( "time" "unsafe" - "github.com/demodesk/neko/pkg/types" + "m1k1o/neko/pkg/types" ) //go:generate ./keysymdef.sh diff --git a/server/xorg/xf86-input-neko/README.md b/server/xorg/xf86-input-neko/README.md index 1deace7b..5ed64d0a 100644 --- a/server/xorg/xf86-input-neko/README.md +++ b/server/xorg/xf86-input-neko/README.md @@ -1,11 +1,11 @@ # xf86-input-neko -[X.org](https://x.org/) [neko](http://github.com/demodesk/neko) input driver +[X.org](https://x.org/) [neko](http://m1k1o/neko) input driver ### how to use xf86-input-neko assumes you have only one virtual touchscreen device available, see `80-neko.conf`. If there are multiple in your system, please specify one config section for each. -xf86-input-neko aims to make [neko](http://github.com/demodesk/neko) easy to use and doesn't +xf86-input-neko aims to make [neko](http://m1k1o/neko) easy to use and doesn't offer special configuration options. * `./configure --prefix=/usr` diff --git a/server/xorg/xf86-input-neko/configure.ac b/server/xorg/xf86-input-neko/configure.ac index 98e9aeeb..c0a2e907 100644 --- a/server/xorg/xf86-input-neko/configure.ac +++ b/server/xorg/xf86-input-neko/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.59) -AC_INIT([xf86-input-neko],[0.0.1],[https://github.com/demodesk/neko/issues],[xf86-input-neko],[https://github.com/demodesk/neko]) +AC_INIT([xf86-input-neko],[0.0.1],[https://github.com/m1k1o/neko/issues],[xf86-input-neko],[https://github.com/m1k1o/neko]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.)