From 542ab71a57b2ea8b308cfa18aa10fddf64a7af1f Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 12 Apr 2019 09:30:37 +0200 Subject: [PATCH 1/3] Sync files with github --- bot.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/bot.go b/bot.go index 53204b0..5b76c6e 100644 --- a/bot.go +++ b/bot.go @@ -2,14 +2,13 @@ package main import ( "fmt" + "github.com/bwmarrin/discordgo" + "github.com/kiliankoe/openmensa" "os" "os/signal" "strings" "syscall" "time" - - "github.com/bwmarrin/discordgo" - "github.com/kiliankoe/openmensa" ) var ( @@ -31,18 +30,14 @@ var ( ) func main() { - token := os.Getenv("MENSABOT_TOKEN") - if len(token) == 0 || token == "token" { - println("Please add token as environment variable: MENSABOT_TOKEN.") + if len(os.Args) <= 0 { + println("Please add token as cli argument.") return } - dg, err := discordgo.New(fmt.Sprintf("Bot %s", token)) - if err != nil { - fmt.Println("error creating dicord bot: ", err) - } + dg, err := discordgo.New(fmt.Sprintf("Bot %s", os.Args[1])) canteens, err := openmensa.GetCanteens(175) if err != nil { - fmt.Println("error getting mensa: ", err) + fmt.Println("error creating discord bot: ", err) return } dg.AddHandler(messageCreate) -- 2.36.2 From 47a2ff06148bbefccd0f29e6db6174f3be5e6bf1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 12 Apr 2019 09:41:08 +0200 Subject: [PATCH 2/3] Sync files with github --- bot.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bot.go b/bot.go index 5b76c6e..42992e9 100644 --- a/bot.go +++ b/bot.go @@ -30,16 +30,21 @@ var ( ) func main() { - if len(os.Args) <= 0 { - println("Please add token as cli argument.") + token := os.Getenv("MENSABOT_TOKEN") + if len(token) == 0 || token == "token" || len(os.Args) <= 0 { + println("Please add token as environment variable: (MENSABOT_TOKEN). or cli argument.") return } dg, err := discordgo.New(fmt.Sprintf("Bot %s", os.Args[1])) - canteens, err := openmensa.GetCanteens(175) if err != nil { fmt.Println("error creating discord bot: ", err) return } + canteens, err := openmensa.GetCanteens(175) + if err != nil { + fmt.Println("error getting mensa: ", err) + return + } dg.AddHandler(messageCreate) canteen = canteens[0] -- 2.36.2 From 4ca5b98a436a3ee27e727f25013b8767b512d57c Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 12 Apr 2019 09:42:48 +0200 Subject: [PATCH 3/3] Added token via cli or env --- bot.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bot.go b/bot.go index 42992e9..32cd046 100644 --- a/bot.go +++ b/bot.go @@ -32,10 +32,15 @@ var ( func main() { token := os.Getenv("MENSABOT_TOKEN") if len(token) == 0 || token == "token" || len(os.Args) <= 0 { - println("Please add token as environment variable: (MENSABOT_TOKEN). or cli argument.") + println("Please add token as environment variable (MENSABOT_TOKEN) or cli argument.") return } - dg, err := discordgo.New(fmt.Sprintf("Bot %s", os.Args[1])) + + if len(os.Args) > 0 { + token = os.Args[0] + } + + dg, err := discordgo.New(fmt.Sprintf("Bot %s", token)) if err != nil { fmt.Println("error creating discord bot: ", err) return -- 2.36.2