refactor from pkg to internal

cmd/bot/channel.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"github.com/lyx0/nourybot/internal/data"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
 )
 
 // AddChannel takes in a channel name, then calls GetIdByLogin for the

cmd/bot/command.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"github.com/gempir/go-twitch-irc/v3"
+	"github.com/lyx0/nourybot/internal/common"
 	"github.com/lyx0/nourybot/internal/data"
-	"github.com/lyx0/nourybot/pkg/common"
 )
 
 // AddCommand takes in a name parameter and a twitch.PrivateMessage. It slices the

cmd/bot/commands.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 // handleCommand takes in a twitch.PrivateMessage and then routes the message to

cmd/bot/main.go

@@ -11,8 +11,8 @@ import (
 	"github.com/jakecoffman/cron"
 	"github.com/joho/godotenv"
 	_ "github.com/lib/pq"
+	"github.com/lyx0/nourybot/internal/common"
 	"github.com/lyx0/nourybot/internal/data"
-	"github.com/lyx0/nourybot/pkg/common"
 	"github.com/nicklaw5/helix"
 	"go.uber.org/zap"
 )

cmd/bot/timer.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/gempir/go-twitch-irc/v3"
+	"github.com/lyx0/nourybot/internal/common"
 	"github.com/lyx0/nourybot/internal/data"
-	"github.com/lyx0/nourybot/pkg/common"
 )
 
 // AddTimer slices the message into relevant parts, adding the values onto a

cmd/bot/user.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	"github.com/gempir/go-twitch-irc/v3"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"github.com/lyx0/nourybot/internal/data"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
 )
 
 // AddUser calls GetIdByLogin to get the twitch id of the login name and then adds

internal/commands/bttv.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func Bttv(target, query string, tc *twitch.Client) {

internal/commands/bttvemotes.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )
 

internal/commands/coinflip.go

@@ -2,7 +2,7 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func Coinflip(target string, tc *twitch.Client) {

internal/commands/currency.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )
 

internal/commands/echo.go

@@ -2,7 +2,7 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func Echo(target, message string, tc *twitch.Client) {

internal/commands/ffz.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func Ffz(target, query string, tc *twitch.Client) {

internal/commands/ffzemotes.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )
 

internal/commands/firstline.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands/ivr"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands/ivr"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func FirstLine(target, channel, username string, tc *twitch.Client) {

internal/commands/followage.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )
 

internal/commands/ping.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
-	"github.com/lyx0/nourybot/pkg/humanize"
+	"github.com/lyx0/nourybot/internal/common"
+	"github.com/lyx0/nourybot/internal/humanize"
 )
 
 func Ping(target string, tc *twitch.Client) {

internal/commands/preview.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func Preview(target, channel string, tc *twitch.Client) {

internal/commands/seventv.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 )
 
 func Seventv(target, emote string, tc *twitch.Client) {

internal/commands/tweet.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/commands/decapi"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/commands/decapi"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )
 

internal/commands/weather.go

@@ -7,7 +7,7 @@ import (
 	owm "github.com/briandowns/openweathermap"
 	"github.com/gempir/go-twitch-irc/v3"
 	"github.com/joho/godotenv"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )
 

internal/commands/xkcd.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/lyx0/nourybot/pkg/common"
+	"github.com/lyx0/nourybot/internal/common"
 	"go.uber.org/zap"
 )