From 54359c61daadf1d61730d224675c3b4595a5b83a Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Thu, 27 Jul 2017 21:54:59 -0400 Subject: some more updates --- util.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'util.go') diff --git a/util.go b/util.go index bd44d8d..8e6de1e 100644 --- a/util.go +++ b/util.go @@ -2,12 +2,9 @@ package thulani import ( "encoding/json" - "os" - "net/url" - + "os" "strconv" - "sync" "github.com/bwmarrin/discordgo" @@ -49,7 +46,7 @@ func handle(err error) { } func LoadConfig(filename string) (*Config, error) { - file, err := os.Open("config.json") + file, err := os.Open(filename) if err != nil { return nil, err } @@ -59,9 +56,6 @@ func LoadConfig(filename string) (*Config, error) { return &conf, err } -var _oauthUrl string -var oauthOnce sync.Once - const requestedPerms = discordgo.PermissionEmbedLinks | discordgo.PermissionReadMessages | discordgo.PermissionAddReactions | @@ -75,6 +69,9 @@ const requestedPerms = discordgo.PermissionEmbedLinks | discordgo.PermissionVoiceUseVAD | discordgo.PermissionAttachFiles +var _oauthUrl string +var oauthOnce sync.Once + func oauthUrl() string { oauthOnce.Do(func() { oUrl, err := url.Parse("https://discordapp.com/api/oauth2/authorize") -- cgit v1.3.1