diff --git a/.woodpecker/pipeline.yaml b/.woodpecker/pipeline.yaml index 93c53ac..1d0a97a 100644 --- a/.woodpecker/pipeline.yaml +++ b/.woodpecker/pipeline.yaml @@ -15,9 +15,9 @@ steps: - mkdir -p ~/.ssh - echo "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - ssh -o StrictHostKeyChecking=no uncertainty@192.168.0.44 "rm $COPY_TO || true" - - scp -o StrictHostKeyChecking=no $COPY_FROM uncertainty@192.168.0.44:$COPY_TO - - ssh -o StrictHostKeyChecking=no uncertainty@192.168.0.44 "doas service lynxie restart" + - ssh -o StrictHostKeyChecking=no uncertainty@192.168.178.31 "rm $COPY_TO || true" + - scp -o StrictHostKeyChecking=no $COPY_FROM uncertainty@192.168.178.31:$COPY_TO + - ssh -o StrictHostKeyChecking=no uncertainty@192.168.178.31 "doas service lynxie restart" environment: COPY_FROM: lynxie COPY_TO: /home/uncertainty/lynxie diff --git a/app/app.go b/app/app.go index 40b7939..8975c5b 100644 --- a/app/app.go +++ b/app/app.go @@ -8,7 +8,7 @@ import ( "strings" "syscall" - "github.com/Fluffy-Bean/lynxie/utils" + "github.com/Fluffy-Bean/lynxie/internal/color" "github.com/bwmarrin/discordgo" ) @@ -132,7 +132,7 @@ func printHelp(a *App, h *Handler) { Embed: &discordgo.MessageEmbed{ Title: "Help", Description: strings.Join(commands, "\n"), - Color: utils.ColorFromRGB(255, 255, 255), + Color: color.RGBToDiscord(255, 255, 255), }, Reference: h.Reference, }) @@ -145,7 +145,7 @@ func printError(a *App, h *Handler, e Error) { Embed: &discordgo.MessageEmbed{ Title: "Error", Description: e.Msg, - Color: utils.ColorFromRGB(255, 0, 0), + Color: color.RGBToDiscord(255, 0, 0), }, Reference: h.Reference, }) diff --git a/internal/color/color.go b/internal/color/color.go new file mode 100644 index 0000000..947950b --- /dev/null +++ b/internal/color/color.go @@ -0,0 +1,5 @@ +package color + +func RGBToDiscord(r, g, b int) int { + return (r << 16) + (g << 8) + b +} diff --git a/internal/err/err.go b/internal/err/err.go new file mode 100644 index 0000000..ab6de65 --- /dev/null +++ b/internal/err/err.go @@ -0,0 +1,10 @@ +package err + +type Error struct { + Msg string + Err error +} + +func (e *Error) Ok() bool { + return e.Err == nil +} diff --git a/main.go b/main.go deleted file mode 100644 index e7dd65d..0000000 --- a/main.go +++ /dev/null @@ -1,36 +0,0 @@ -package main - -import ( - "os" - - "github.com/Fluffy-Bean/lynxie/app" - "github.com/Fluffy-Bean/lynxie/commands/debug" - "github.com/Fluffy-Bean/lynxie/commands/img" - "github.com/Fluffy-Bean/lynxie/commands/porb" - "github.com/Fluffy-Bean/lynxie/commands/tinyfox" - "github.com/bwmarrin/discordgo" -) - -var ConfigBuildHash string -var ConfigBuildPipeline string - -func main() { - a := app.NewApp(app.Config{ - BotPrefix: ">", - BotToken: os.Getenv("TOKEN"), - BotIntents: discordgo.IntentsGuildMessages, - CommandExtras: map[string]string{ - "debug_build-hash": ConfigBuildHash, - "debug_build-pipeline": ConfigBuildPipeline, - "e621_username": os.Getenv("E621_USERNAME"), - "e621_password": os.Getenv("E621_PASSWORD"), - }, - }) - - debug.RegisterDebugCommands(a) - img.RegisterImgCommands(a) - tinyfox.RegisterTinyfoxCommands(a) - porb.RegisterPorbCommands(a) - - a.Run() -} diff --git a/commands/debug/debug.go b/pkg/commands/debug/debug.go similarity index 94% rename from commands/debug/debug.go rename to pkg/commands/debug/debug.go index d273178..0d32c49 100644 --- a/commands/debug/debug.go +++ b/pkg/commands/debug/debug.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/Fluffy-Bean/lynxie/app" - "github.com/Fluffy-Bean/lynxie/utils" + "github.com/Fluffy-Bean/lynxie/internal/color" "github.com/bwmarrin/discordgo" ) @@ -67,7 +67,7 @@ func registerDebug(a *app.App) app.Callback { Inline: false, }, }, - Color: utils.ColorFromRGB(255, 255, 255), + Color: color.RGBToDiscord(255, 255, 255), }, Reference: h.Reference, }) diff --git a/commands/img/img.go b/pkg/commands/img/img.go similarity index 95% rename from commands/img/img.go rename to pkg/commands/img/img.go index c7d9fd1..e4bf100 100644 --- a/commands/img/img.go +++ b/pkg/commands/img/img.go @@ -6,7 +6,6 @@ import ( _ "embed" "errors" "image" - "image/color" "image/jpeg" "image/png" "io" @@ -16,7 +15,7 @@ import ( "git.sr.ht/~sbinet/gg" "github.com/Fluffy-Bean/lynxie/app" - "github.com/Fluffy-Bean/lynxie/utils" + "github.com/Fluffy-Bean/lynxie/internal/color" "github.com/bwmarrin/discordgo" ) @@ -78,7 +77,7 @@ func registerSaveable(a *app.App) app.Callback { Image: &discordgo.MessageEmbedImage{ URL: "attachment://saveable.gif", }, - Color: utils.ColorFromRGB(255, 255, 255), + Color: color.RGBToDiscord(255, 255, 255), }, Files: []*discordgo.File{ { @@ -179,10 +178,10 @@ func registerCaption(a *app.App) app.Callback { } } - canvas.SetColor(color.RGBA{R: 255, G: 255, B: 255, A: 255}) + canvas.SetRGBA(255, 255, 255, 255) canvas.Clear() - canvas.SetColor(color.RGBA{R: 0, G: 0, B: 0, A: 255}) + canvas.SetRGBA(0, 0, 0, 255) canvas.DrawStringWrapped( strings.Join(args, " "), float64(img.Bounds().Dx()/2), @@ -213,7 +212,7 @@ func registerCaption(a *app.App) app.Callback { Image: &discordgo.MessageEmbedImage{ URL: "attachment://caption.jpeg", }, - Color: utils.ColorFromRGB(255, 255, 255), + Color: color.RGBToDiscord(255, 255, 255), }, Files: []*discordgo.File{ { diff --git a/commands/img/resources/Impact.ttf b/pkg/commands/img/resources/Impact.ttf similarity index 100% rename from commands/img/resources/Impact.ttf rename to pkg/commands/img/resources/Impact.ttf diff --git a/commands/porb/porb.go b/pkg/commands/porb/porb.go similarity index 97% rename from commands/porb/porb.go rename to pkg/commands/porb/porb.go index 1772323..083f856 100644 --- a/commands/porb/porb.go +++ b/pkg/commands/porb/porb.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Fluffy-Bean/lynxie/app" - "github.com/Fluffy-Bean/lynxie/utils" + "github.com/Fluffy-Bean/lynxie/internal/color" "github.com/bwmarrin/discordgo" ) @@ -180,7 +180,7 @@ func registerE621(a *app.App) app.Callback { data.Posts[0].CreatedAt.Format(time.DateTime), ), }, - Color: utils.ColorFromRGB(255, 255, 255), + Color: color.RGBToDiscord(255, 255, 255), }, Reference: h.Reference, }) diff --git a/commands/tinyfox/tinyfox.go b/pkg/commands/tinyfox/tinyfox.go similarity index 96% rename from commands/tinyfox/tinyfox.go rename to pkg/commands/tinyfox/tinyfox.go index 0efa8e3..da599a6 100644 --- a/commands/tinyfox/tinyfox.go +++ b/pkg/commands/tinyfox/tinyfox.go @@ -9,7 +9,7 @@ import ( "time" "github.com/Fluffy-Bean/lynxie/app" - "github.com/Fluffy-Bean/lynxie/utils" + "github.com/Fluffy-Bean/lynxie/internal/color" "github.com/bwmarrin/discordgo" ) @@ -131,7 +131,7 @@ func registerAnimal(a *app.App) app.Callback { Image: &discordgo.MessageEmbedImage{ URL: "attachment://animal.png", }, - Color: utils.ColorFromRGB(255, 255, 255), + Color: color.RGBToDiscord(255, 255, 255), }, Files: []*discordgo.File{ { diff --git a/utils/color.go b/utils/color.go deleted file mode 100644 index 38ccb34..0000000 --- a/utils/color.go +++ /dev/null @@ -1,5 +0,0 @@ -package utils - -func ColorFromRGB(r, g, b int) int { - return (r << 16) + (g << 8) + b -}