refactor: hide utils to settings

darklab8 · Oct 29, 2023 · acbb761 · acbb761
1 parent 3e343db
commit acbb761
Show file tree

Hide file tree

Showing 47 changed files with 49 additions and 49 deletions.
diff --git a/api/web/not_found.go b/api/web/not_found.go
@@ -1,7 +1,7 @@
 package web
 
 import (
-	"darkbot/utils"
+	"darkbot/settings/utils"
 	_ "embed"
 	"net/http"
 	"text/template"

diff --git a/configurator/alerts_test.go b/configurator/alerts_test.go
@@ -2,7 +2,7 @@ package configurator
 
 import (
 	"darkbot/dtypes"
-	"darkbot/utils"
+	"darkbot/settings/utils"
 	"fmt"
 	"testing"
 

diff --git a/configurator/channel.go b/configurator/channel.go
@@ -2,8 +2,8 @@ package configurator
 
 import (
 	"darkbot/configurator/models"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 )
 
 type ConfiguratorChannel struct {

diff --git a/configurator/connection.go b/configurator/connection.go
@@ -8,7 +8,7 @@ import (
 	"darkbot/configurator/models"
 	"darkbot/dtypes"
 	"darkbot/settings"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"

diff --git a/configurator/fixtures.go b/configurator/fixtures.go
@@ -3,7 +3,7 @@ package configurator
 import (
 	"darkbot/dtypes"
 	"darkbot/settings"
-	"darkbot/utils"
+	"darkbot/settings/utils"
 	"fmt"
 	"os"
 )

diff --git a/configurator/tags.go b/configurator/tags.go
@@ -2,8 +2,8 @@ package configurator
 
 import (
 	"darkbot/configurator/models"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"fmt"
 )
 

diff --git a/discorder/main.go b/discorder/main.go
@@ -9,7 +9,7 @@ package discorder
 
 import (
 	"darkbot/settings"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"time"
 
 	"github.com/bwmarrin/discordgo"

diff --git a/listener/main.go b/listener/main.go
@@ -8,8 +8,8 @@ import (
 	"darkbot/consoler"
 	"darkbot/consoler/helper"
 	"darkbot/settings"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"strings"
 

diff --git a/management/run.go b/management/run.go
@@ -10,8 +10,8 @@ import (
 	"darkbot/scrappy/base"
 	"darkbot/scrappy/player"
 	"darkbot/settings"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer"
 	"runtime"
 	"time"

diff --git a/scrappy/base/mock.go b/scrappy/base/mock.go
@@ -3,7 +3,7 @@ package base
 import (
 	"darkbot/scrappy/shared/api"
 	"darkbot/scrappy/tests"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"io/ioutil"
 	"path"
 )

diff --git a/scrappy/base/mock_test.go b/scrappy/base/mock_test.go
@@ -2,8 +2,8 @@ package base
 
 import (
 	"darkbot/scrappy/tests"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"io/ioutil"
 	"os"
 	"path"

diff --git a/scrappy/base/parser.go b/scrappy/base/parser.go
@@ -2,7 +2,7 @@ package base
 
 import (
 	"darkbot/scrappy/shared/records"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"encoding/json"
 )
 

diff --git a/scrappy/base/storage.go b/scrappy/base/storage.go
@@ -5,7 +5,7 @@ import (
 	"darkbot/scrappy/shared/parser"
 	"darkbot/scrappy/shared/records"
 
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 )
 
 type Base struct {

diff --git a/scrappy/base/storage_test.go b/scrappy/base/storage_test.go
@@ -1,7 +1,7 @@
 package base
 
 import (
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"testing"
 

diff --git a/scrappy/baseattack/api.go b/scrappy/baseattack/api.go
@@ -3,7 +3,7 @@ package baseattack
 import (
 	"darkbot/scrappy/shared/api"
 	"darkbot/settings"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 )
 
 type basesattackAPI struct {

diff --git a/scrappy/baseattack/mock.go b/scrappy/baseattack/mock.go
@@ -3,7 +3,7 @@ package baseattack
 import (
 	"darkbot/scrappy/shared/api"
 	"darkbot/scrappy/tests"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"io/ioutil"
 	"path"
 )

diff --git a/scrappy/baseattack/mock_test.go b/scrappy/baseattack/mock_test.go
@@ -2,8 +2,8 @@ package baseattack
 
 import (
 	"darkbot/scrappy/tests"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"io/ioutil"
 	"os"
 	"path"

diff --git a/scrappy/main.go b/scrappy/main.go
@@ -5,7 +5,7 @@ import (
 	"darkbot/scrappy/baseattack"
 	"darkbot/scrappy/player"
 	"darkbot/settings"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"time"
 )
 

diff --git a/scrappy/player/mock.go b/scrappy/player/mock.go
@@ -3,8 +3,8 @@ package player
 import (
 	"darkbot/scrappy/shared/api"
 	"darkbot/scrappy/tests"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"io/ioutil"
 	"os"
 	"path"

diff --git a/scrappy/player/parser.go b/scrappy/player/parser.go
@@ -2,7 +2,7 @@ package player
 
 import (
 	"darkbot/scrappy/shared/records"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"encoding/json"
 )
 

diff --git a/scrappy/player/storage.go b/scrappy/player/storage.go
@@ -4,7 +4,7 @@ import (
 	"darkbot/scrappy/shared/api"
 	"darkbot/scrappy/shared/parser"
 	"darkbot/scrappy/shared/records"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 )
 
 type Player struct {

diff --git a/scrappy/player/storage_test.go b/scrappy/player/storage_test.go
@@ -1,7 +1,7 @@
 package player
 
 import (
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"testing"
 

diff --git a/scrappy/shared/api/request.go b/scrappy/shared/api/request.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"io/ioutil"
 	"net/http"
 )

diff --git a/scrappy/shared/records/generic_records.go b/scrappy/shared/records/generic_records.go
@@ -1,8 +1,8 @@
 package records
 
 import (
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"sync"
 )
 

diff --git a/settings/main.go b/settings/main.go
@@ -1,8 +1,8 @@
 package settings
 
 import (
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"path/filepath"
 	"strconv"
 

diff --git a/utils/comprehension.go → settings/utils/comprehension.go b/utils/comprehension.go → settings/utils/comprehension.go
diff --git a/utils/exceptions.go → settings/utils/exceptions.go b/utils/exceptions.go → settings/utils/exceptions.go
diff --git a/utils/file.go → settings/utils/file.go b/utils/file.go → settings/utils/file.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"bufio"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"os"
 )

diff --git a/utils/logger/logger.go → settings/utils/logger/logger.go b/utils/logger/logger.go → settings/utils/logger/logger.go
diff --git a/utils/logger/logger_test.go → settings/utils/logger/logger_test.go b/utils/logger/logger_test.go → settings/utils/logger/logger_test.go
diff --git a/utils/os.go → settings/utils/os.go b/utils/os.go → settings/utils/os.go
diff --git a/utils/ptr.go → settings/utils/ptr.go b/utils/ptr.go → settings/utils/ptr.go
diff --git a/utils/regex.go → settings/utils/regex.go b/utils/regex.go → settings/utils/regex.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"regexp"
 )

diff --git a/utils/secrets.go → settings/utils/secrets.go b/utils/secrets.go → settings/utils/secrets.go
diff --git a/utils/shell.go → settings/utils/shell.go b/utils/shell.go → settings/utils/shell.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"os"
 	"os/exec"

diff --git a/utils/sleep.go → settings/utils/sleep.go b/utils/sleep.go → settings/utils/sleep.go
diff --git a/utils/template.go → settings/utils/template.go b/utils/template.go → settings/utils/template.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"bytes"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"strings"
 	"text/template"
 )

diff --git a/utils/tests.go → settings/utils/tests.go b/utils/tests.go → settings/utils/tests.go
diff --git a/viewer/channel.go b/viewer/channel.go
@@ -3,7 +3,7 @@ package viewer
 import (
 	"darkbot/discorder"
 	"darkbot/dtypes"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer/apis"
 	"darkbot/viewer/templ"
 	"strings"

diff --git a/viewer/run.go b/viewer/run.go
@@ -6,7 +6,7 @@ package viewer
 
 import (
 	"darkbot/settings"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 )
 
 func Run() {

diff --git a/viewer/templ/alert.go b/viewer/templ/alert.go
@@ -1,8 +1,8 @@
 package templ
 
 import (
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer/apis"
 	_ "embed"
 	"fmt"

diff --git a/viewer/templ/base.go b/viewer/templ/base.go
@@ -3,7 +3,7 @@ package templ
 import (
 	"darkbot/dtypes"
 	"darkbot/scrappy/base"
-	"darkbot/utils"
+	"darkbot/settings/utils"
 	"darkbot/viewer/apis"
 	_ "embed"
 	"fmt"

diff --git a/viewer/templ/base_test.go b/viewer/templ/base_test.go
@@ -8,7 +8,7 @@ import (
 	"darkbot/scrappy/baseattack"
 	"darkbot/scrappy/player"
 	"darkbot/scrappy/shared/records"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer/apis"
 	"fmt"
 	"strings"

diff --git a/viewer/templ/derivatives.go b/viewer/templ/derivatives.go
@@ -3,7 +3,7 @@ package templ
 import (
 	"darkbot/scrappy/base"
 	"darkbot/scrappy/shared/records"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer/apis"
 	"math"
 )

diff --git a/viewer/templ/player.go b/viewer/templ/player.go
@@ -3,8 +3,8 @@ package templ
 import (
 	"darkbot/dtypes"
 	"darkbot/scrappy/player"
-	"darkbot/utils"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer/apis"
 	_ "embed"
 	"fmt"

diff --git a/viewer/templ/shared.go b/viewer/templ/shared.go
@@ -1,7 +1,7 @@
 package templ
 
 import (
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"darkbot/viewer/apis"
 	"fmt"
 	"strings"

diff --git a/viewer/viewer.go b/viewer/viewer.go
@@ -4,7 +4,7 @@ import (
 	"darkbot/configurator"
 	"darkbot/dtypes"
 	"darkbot/settings"
-	"darkbot/utils/logger"
+	"darkbot/settings/utils/logger"
 	"fmt"
 	"time"
 )