diff --git a/bot.go b/bot.go index 90dcb65..ed8d92f 100644 --- a/bot.go +++ b/bot.go @@ -1,12 +1,13 @@ package main import ( - "github.com/rs/zerolog/log" "time" - "watn3y/bloaterbotv3/botIO" - "watn3y/bloaterbotv3/commands" - "watn3y/bloaterbotv3/commands/notify" - "watn3y/bloaterbotv3/text" + "watn3y/bloaterbot/botIO" + "watn3y/bloaterbot/commands" + "watn3y/bloaterbot/commands/notify" + "watn3y/bloaterbot/text" + + "github.com/rs/zerolog/log" ) func bot() { diff --git a/botIO/authenticate.go b/botIO/authenticate.go index 0d7b569..2c7a1b1 100644 --- a/botIO/authenticate.go +++ b/botIO/authenticate.go @@ -1,9 +1,10 @@ package botIO import ( + "watn3y/bloaterbot/config" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" "github.com/rs/zerolog/log" - "watn3y/bloaterbotv3/config" ) func Authenticate() (tgbotapi.UpdatesChannel, *tgbotapi.BotAPI) { diff --git a/commands/commands.go b/commands/commands.go index a07e693..5a10540 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -1,17 +1,18 @@ package commands import ( - tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" - "github.com/rs/zerolog/log" "os" "strconv" "strings" "time" - "watn3y/bloaterbotv3/botIO" - "watn3y/bloaterbotv3/commands/download" - "watn3y/bloaterbotv3/commands/gaypoints" - "watn3y/bloaterbotv3/commands/notify" - "watn3y/bloaterbotv3/config" + "watn3y/bloaterbot/botIO" + "watn3y/bloaterbot/commands/download" + "watn3y/bloaterbot/commands/gaypoints" + "watn3y/bloaterbot/commands/notify" + "watn3y/bloaterbot/config" + + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/rs/zerolog/log" ) func Commands(update tgbotapi.Update, bot *tgbotapi.BotAPI) { diff --git a/commands/download/download.go b/commands/download/download.go index bb0d370..cf733fa 100644 --- a/commands/download/download.go +++ b/commands/download/download.go @@ -2,8 +2,6 @@ package download import ( "errors" - tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" - "github.com/rs/zerolog/log" "io" log2 "log" "math/rand" @@ -16,9 +14,12 @@ import ( "strconv" "strings" "time" - "watn3y/bloaterbotv3/botIO" - "watn3y/bloaterbotv3/commonlogic" - "watn3y/bloaterbotv3/config" + "watn3y/bloaterbot/botIO" + "watn3y/bloaterbot/commonlogic" + "watn3y/bloaterbot/config" + + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/rs/zerolog/log" ) func Download(update tgbotapi.Update, bot *tgbotapi.BotAPI) { diff --git a/commands/gaypoints/gaypoints.go b/commands/gaypoints/gaypoints.go index 153393d..1669064 100644 --- a/commands/gaypoints/gaypoints.go +++ b/commands/gaypoints/gaypoints.go @@ -1,13 +1,14 @@ package gaypoints import ( - tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" - "github.com/rs/zerolog/log" "strconv" "strings" - "watn3y/bloaterbotv3/botIO" - "watn3y/bloaterbotv3/commonlogic" - "watn3y/bloaterbotv3/config" + "watn3y/bloaterbot/botIO" + "watn3y/bloaterbot/commonlogic" + "watn3y/bloaterbot/config" + + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/rs/zerolog/log" ) func GetGP(update tgbotapi.Update, bot *tgbotapi.BotAPI) { diff --git a/commands/notify/notify.go b/commands/notify/notify.go index 3297a67..0de42a7 100644 --- a/commands/notify/notify.go +++ b/commands/notify/notify.go @@ -1,13 +1,14 @@ package notify import ( - tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" - "github.com/rs/zerolog/log" "regexp" "strconv" "strings" "time" - "watn3y/bloaterbotv3/botIO" + "watn3y/bloaterbot/botIO" + + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/rs/zerolog/log" ) func Reminder(update tgbotapi.Update, bot *tgbotapi.BotAPI) { diff --git a/go.mod b/go.mod index 5d4c2ba..a58c5b6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module watn3y/bloaterbotv3 +module watn3y/bloaterbot go 1.21 diff --git a/main.go b/main.go index 22789b1..16865fe 100644 --- a/main.go +++ b/main.go @@ -5,10 +5,10 @@ import ( "fmt" "os" "time" - "watn3y/bloaterbotv3/commands/gaypoints" - "watn3y/bloaterbotv3/commands/notify" - "watn3y/bloaterbotv3/config" - "watn3y/bloaterbotv3/webserver" + "watn3y/bloaterbot/commands/gaypoints" + "watn3y/bloaterbot/commands/notify" + "watn3y/bloaterbot/config" + "watn3y/bloaterbot/webserver" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/text/balonlyl/balonlyl.go b/text/balonlyl/balonlyl.go index c96e122..6049c2e 100644 --- a/text/balonlyl/balonlyl.go +++ b/text/balonlyl/balonlyl.go @@ -1,9 +1,10 @@ package balonlyl import ( + "watn3y/bloaterbot/botIO" + "watn3y/bloaterbot/config" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" - "watn3y/bloaterbotv3/botIO" - "watn3y/bloaterbotv3/config" ) func Balonlyl(update tgbotapi.Update, bot *tgbotapi.BotAPI) { diff --git a/text/matcher.go b/text/matcher.go index ba3aa70..3ac23d5 100644 --- a/text/matcher.go +++ b/text/matcher.go @@ -1,13 +1,14 @@ package text import ( - tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" - "github.com/rs/zerolog/log" "strings" "time" - "watn3y/bloaterbotv3/commonlogic" - "watn3y/bloaterbotv3/config" - "watn3y/bloaterbotv3/text/balonlyl" + "watn3y/bloaterbot/commonlogic" + "watn3y/bloaterbot/config" + "watn3y/bloaterbot/text/balonlyl" + + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/rs/zerolog/log" ) func Matcher(update tgbotapi.Update, bot *tgbotapi.BotAPI) { diff --git a/webserver/webserver.go b/webserver/webserver.go index 0f62970..5e9fc83 100644 --- a/webserver/webserver.go +++ b/webserver/webserver.go @@ -2,7 +2,7 @@ package webserver import ( "net/http" - "watn3y/bloaterbotv3/config" + "watn3y/bloaterbot/config" "github.com/rs/zerolog/log" ) @@ -13,7 +13,7 @@ func RunWeb() { log.Info().Str("port", config.BotConfig.Webserver.Port).Str("path", "./videos").Msg("Starting webserver") - err := http.ListenAndServe(":" + config.BotConfig.Webserver.Port, nil) + err := http.ListenAndServe(":"+config.BotConfig.Webserver.Port, nil) if err != nil { log.Panic().Err(err).Msg("Failed to start webserver")