From fb663ac348dd4af92f82178b5a43145e2b7acbb0 Mon Sep 17 00:00:00 2001 From: Bruce Marriner Date: Fri, 17 Jun 2016 15:44:01 -0500 Subject: [PATCH] Linting --- examples/airhorn/main.go | 10 +++++----- examples/appmaker/main.go | 21 +++++++++++---------- examples/avatar/localfile/main.go | 3 ++- examples/avatar/url/main.go | 13 ++++++++----- examples/mytoken/main.go | 1 + examples/new_basic/main.go | 8 ++++++-- examples/pingpong/main.go | 11 ++++++++--- restapi.go | 4 ++-- wsapi.go | 8 ++++---- 9 files changed, 47 insertions(+), 32 deletions(-) diff --git a/examples/airhorn/main.go b/examples/airhorn/main.go index 2033001..cc61301 100644 --- a/examples/airhorn/main.go +++ b/examples/airhorn/main.go @@ -64,7 +64,7 @@ func main() { func ready(s *discordgo.Session, event *discordgo.Ready) { // Set the playing status. - s.UpdateStatus(0, "!airhorn") + _ = s.UpdateStatus(0, "!airhorn") } // This function will be called (due to AddHandler above) every time a new @@ -108,7 +108,7 @@ func guildCreate(s *discordgo.Session, event *discordgo.GuildCreate) { for _, channel := range event.Guild.Channels { if channel.ID == event.Guild.ID { - s.ChannelMessageSend(channel.ID, "Airhorn is ready! Type !airhorn while in a voice channel to play a sound.") + _, _ = s.ChannelMessageSend(channel.ID, "Airhorn is ready! Type !airhorn while in a voice channel to play a sound.") return } } @@ -166,7 +166,7 @@ func playSound(s *discordgo.Session, guildID, channelID string) (err error) { time.Sleep(250 * time.Millisecond) // Start speaking. - vc.Speaking(true) + _ = vc.Speaking(true) // Send the buffer data. for _, buff := range buffer { @@ -174,13 +174,13 @@ func playSound(s *discordgo.Session, guildID, channelID string) (err error) { } // Stop speaking - vc.Speaking(false) + _ = vc.Speaking(false) // Sleep for a specificed amount of time before ending. time.Sleep(250 * time.Millisecond) // Disconnect from the provided voice channel. - vc.Disconnect() + _ = vc.Disconnect() return nil } diff --git a/examples/appmaker/main.go b/examples/appmaker/main.go index dbbb050..bd0e3b8 100644 --- a/examples/appmaker/main.go +++ b/examples/appmaker/main.go @@ -7,14 +7,14 @@ import ( "github.com/bwmarrin/discordgo" ) +// Variables used for command line options var ( - Email string - Password string - Token string - AppName string - ConvToken string - DeleteID string - ListOnly bool + Email string + Password string + Token string + AppName string + DeleteID string + ListOnly bool ) func init() { @@ -30,6 +30,7 @@ func init() { func main() { + var err error // Create a new Discord session using the provided login information. dg, err := discordgo.New(Email, Password, Token) if err != nil { @@ -40,8 +41,8 @@ func main() { // If -l set, only display a list of existing applications // for the given account. if ListOnly { - aps, err := dg.Applications() - if err != nil { + aps, err2 := dg.Applications() + if err2 != nil { fmt.Println("error fetching applications,", err) return } @@ -58,7 +59,7 @@ func main() { // if -d set, delete the given Application if DeleteID != "" { - err := dg.ApplicationDelete(DeleteID) + err = dg.ApplicationDelete(DeleteID) if err != nil { fmt.Println("error deleting application,", err) } diff --git a/examples/avatar/localfile/main.go b/examples/avatar/localfile/main.go index 616546c..adfe0b1 100644 --- a/examples/avatar/localfile/main.go +++ b/examples/avatar/localfile/main.go @@ -10,6 +10,7 @@ import ( "github.com/bwmarrin/discordgo" ) +// Variables used for command line parameters var ( Email string Password string @@ -63,7 +64,7 @@ func changeAvatar(s *discordgo.Session) { base64 := base64.StdEncoding.EncodeToString(img) - avatar := fmt.Sprintf("data:%s;base64,%s", http.DetectContentType(img), string(base64)) + avatar := fmt.Sprintf("data:%s;base64,%s", http.DetectContentType(img), base64) _, err = s.UserUpdate("", "", BotUsername, avatar, "") if err != nil { diff --git a/examples/avatar/url/main.go b/examples/avatar/url/main.go index 0caf478..26170df 100644 --- a/examples/avatar/url/main.go +++ b/examples/avatar/url/main.go @@ -10,11 +10,12 @@ import ( "github.com/bwmarrin/discordgo" ) +// Variables used for command line parameters var ( Email string Password string Token string - Url string + URL string BotID string BotUsername string ) @@ -24,7 +25,7 @@ func init() { flag.StringVar(&Email, "e", "", "Account Email") flag.StringVar(&Password, "p", "", "Account Password") flag.StringVar(&Token, "t", "", "Account Token") - flag.StringVar(&Url, "l", "http://bwmarrin.github.io/discordgo/img/discordgo.png", "Link to the avatar image") + flag.StringVar(&URL, "l", "http://bwmarrin.github.io/discordgo/img/discordgo.png", "Link to the avatar image") flag.Parse() } @@ -57,13 +58,15 @@ func main() { // Helper function to change the avatar func changeAvatar(s *discordgo.Session) { - resp, err := http.Get(Url) + resp, err := http.Get(URL) if err != nil { fmt.Println("Error retrieving the file, ", err) return } - defer resp.Body.Close() + defer func() { + _ = resp.Body.Close() + }() img, err := ioutil.ReadAll(resp.Body) if err != nil { @@ -73,7 +76,7 @@ func changeAvatar(s *discordgo.Session) { base64 := base64.StdEncoding.EncodeToString(img) - avatar := fmt.Sprintf("data:%s;base64,%s", http.DetectContentType(img), string(base64)) + avatar := fmt.Sprintf("data:%s;base64,%s", http.DetectContentType(img), base64) _, err = s.UserUpdate("", "", BotUsername, avatar, "") if err != nil { diff --git a/examples/mytoken/main.go b/examples/mytoken/main.go index f278778..5914fc8 100644 --- a/examples/mytoken/main.go +++ b/examples/mytoken/main.go @@ -7,6 +7,7 @@ import ( "github.com/bwmarrin/discordgo" ) +// Variables used for command line parameters var ( Email string Password string diff --git a/examples/new_basic/main.go b/examples/new_basic/main.go index 7b2dc73..c3861ac 100644 --- a/examples/new_basic/main.go +++ b/examples/new_basic/main.go @@ -8,11 +8,11 @@ import ( "github.com/bwmarrin/discordgo" ) +// Variables used for command line parameters var ( Email string Password string Token string - BotID string ) func init() { @@ -37,7 +37,11 @@ func main() { dg.AddHandler(messageCreate) // Open the websocket and begin listening. - dg.Open() + err = dg.Open() + if err != nil { + fmt.Println("error opening connection,", err) + return + } fmt.Println("Bot is now running. Press CTRL-C to exit.") // Simple way to keep program running until CTRL-C is pressed. diff --git a/examples/pingpong/main.go b/examples/pingpong/main.go index 1a6d8ec..e6893ca 100644 --- a/examples/pingpong/main.go +++ b/examples/pingpong/main.go @@ -7,6 +7,7 @@ import ( "github.com/bwmarrin/discordgo" ) +// Variables used for command line parameters var ( Email string Password string @@ -44,7 +45,11 @@ func main() { dg.AddHandler(messageCreate) // Open the websocket and begin listening. - dg.Open() + err = dg.Open() + if err != nil { + fmt.Println("error opening connection,", err) + return + } fmt.Println("Bot is now running. Press CTRL-C to exit.") // Simple way to keep program running until CTRL-C is pressed. @@ -63,11 +68,11 @@ func messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) { // If the message is "ping" reply with "Pong!" if m.Content == "ping" { - s.ChannelMessageSend(m.ChannelID, "Pong!") + _, _ = s.ChannelMessageSend(m.ChannelID, "Pong!") } // If the message is "pong" reply with "Ping!" if m.Content == "pong" { - s.ChannelMessageSend(m.ChannelID, "Ping!") + _, _ = s.ChannelMessageSend(m.ChannelID, "Ping!") } } diff --git a/restapi.go b/restapi.go index fd671c3..779efa7 100644 --- a/restapi.go +++ b/restapi.go @@ -107,8 +107,8 @@ func (s *Session) request(method, urlStr, contentType string, b []byte) (respons return } defer func() { - err := resp.Body.Close() - if err != nil { + err2 := resp.Body.Close() + if err2 != nil { log.Println("error closing resp body") } }() diff --git a/wsapi.go b/wsapi.go index 6917bf7..5e05d2a 100644 --- a/wsapi.go +++ b/wsapi.go @@ -288,15 +288,15 @@ func (s *Session) onEvent(messageType int, message []byte) { // If this is a compressed message, uncompress it. if messageType == websocket.BinaryMessage { - z, err := zlib.NewReader(reader) - if err != nil { + z, err2 := zlib.NewReader(reader) + if err2 != nil { s.log(LogError, "error uncompressing websocket message, %s", err) return } defer func() { - err := z.Close() - if err != nil { + err3 := z.Close() + if err3 != nil { s.log(LogWarning, "error closing zlib, %s", err) } }()