From 8f6e6d52413a5bf97cec893af924b0cdb7ba2157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 3 Aug 2022 22:40:47 +0200 Subject: [PATCH] remove api config, --- cmd/serve.go | 1 - internal/api/api.go | 5 +---- internal/config/api.go | 23 ----------------------- neko.go | 3 --- 4 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 internal/config/api.go diff --git a/cmd/serve.go b/cmd/serve.go index 7a8b5b3..06ad02f 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -18,7 +18,6 @@ func init() { configs := []config.Config{ nekoRooms.Service.Configs.Server, - nekoRooms.Service.Configs.API, nekoRooms.Service.Configs.Room, } diff --git a/internal/api/api.go b/internal/api/api.go index e82fda1..490f00c 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -5,7 +5,6 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/m1k1o/neko-rooms/internal/config" "github.com/m1k1o/neko-rooms/internal/types" ) @@ -13,15 +12,13 @@ type ApiManagerCtx struct { logger zerolog.Logger rooms types.RoomManager pull types.PullManager - conf *config.API } -func New(rooms types.RoomManager, pull types.PullManager, conf *config.API) *ApiManagerCtx { +func New(rooms types.RoomManager, pull types.PullManager) *ApiManagerCtx { return &ApiManagerCtx{ logger: log.With().Str("module", "api").Logger(), rooms: rooms, pull: pull, - conf: conf, } } diff --git a/internal/config/api.go b/internal/config/api.go deleted file mode 100644 index 0331d47..0000000 --- a/internal/config/api.go +++ /dev/null @@ -1,23 +0,0 @@ -package config - -import ( - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -type API struct { - Lobby bool -} - -func (API) Init(cmd *cobra.Command) error { - cmd.PersistentFlags().Bool("lobby", true, "show lobby when room is not started yet; in order to show lobby, neko-rooms must run on the same subdomain where rooms are published") - if err := viper.BindPFlag("lobby", cmd.PersistentFlags().Lookup("lobby")); err != nil { - return err - } - - return nil -} - -func (s *API) Set() { - s.Lobby = viper.GetBool("lobby") -} diff --git a/neko.go b/neko.go index 58276fb..da8c7d6 100644 --- a/neko.go +++ b/neko.go @@ -63,7 +63,6 @@ func init() { Configs: &Configs{ Root: &config.Root{}, Server: &config.Server{}, - API: &config.API{}, Room: &config.Room{}, }, } @@ -101,7 +100,6 @@ func (i *Version) Details() string { type Configs struct { Root *config.Root Server *config.Server - API *config.API Room *config.Room } @@ -142,7 +140,6 @@ func (main *MainCtx) Start() { main.apiManager = api.New( main.roomManager, main.pullManager, - main.Configs.API, ) main.proxyManager = proxy.New(