move config from types.

server/cmd/serve.go

@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"m1k1o/neko"
-	"m1k1o/neko/internal/types/config"
+	"m1k1o/neko/internal/config"
 )
 
 func init() {

server/internal/capture/broadcast.go

@@ -7,7 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"m1k1o/neko/internal/capture/gst"
-	"m1k1o/neko/internal/types/config"
+	"m1k1o/neko/internal/config"
 )
 
 type BroadcastManager struct {

server/internal/capture/manager.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"m1k1o/neko/internal/capture/gst"
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/desktop/xorg"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 
 	"github.com/kataras/go-events"
 	"github.com/rs/zerolog"

server/internal/desktop/manager.go

@@ -4,9 +4,9 @@ import (
 	"sync"
 	"time"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/desktop/xorg"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

server/internal/http/http.go

@@ -11,8 +11,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 )
 
 type Server struct {

server/internal/types/desktop.go

@@ -1,5 +1,17 @@
 package types
 
+type ScreenSize struct {
+	Width  int   `json:"width"`
+	Height int   `json:"height"`
+	Rate   int16 `json:"rate"`
+}
+
+type ScreenConfiguration struct {
+	Width  int           `json:"width"`
+	Height int           `json:"height"`
+	Rates  map[int]int16 `json:"rates"`
+}
+
 type DesktopManager interface {
 	Start()
 	Shutdown() error

server/internal/types/xorg.go

@@ -1,13 +0,0 @@
-package types
-
-type ScreenSize struct {
-	Width  int   `json:"width"`
-	Height int   `json:"height"`
-	Rate   int16 `json:"rate"`
-}
-
-type ScreenConfiguration struct {
-	Width  int           `json:"width"`
-	Height int           `json:"height"`
-	Rates  map[int]int16 `json:"rates"`
-}

server/internal/webrtc/webrtc.go

@@ -14,8 +14,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 )
 
 func New(sessions types.SessionManager, capture types.CaptureManager, desktop types.DesktopManager, config *config.WebRTC) *WebRTCManager {

server/internal/websocket/websocket.go

@@ -11,8 +11,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
-	"m1k1o/neko/internal/types/config"
 	"m1k1o/neko/internal/types/event"
 	"m1k1o/neko/internal/types/message"
 	"m1k1o/neko/internal/utils"

server/neko.go

@@ -7,10 +7,10 @@ import (
 	"runtime"
 
 	"m1k1o/neko/internal/capture"
+	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/desktop"
 	"m1k1o/neko/internal/http"
 	"m1k1o/neko/internal/session"
-	"m1k1o/neko/internal/types/config"
 	"m1k1o/neko/internal/webrtc"
 	"m1k1o/neko/internal/websocket"