From 06d7409a46f77692a2f5c4e135ec5ba2d24d019c Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 21 Mar 2016 22:00:46 +0100 Subject: Make lint a little bit happier --- blame.go | 4 ++-- duck.go | 6 +++--- help.go | 4 ++-- href.go | 12 ++++++------ ivy.go | 4 ++-- last.go | 4 ++-- rfc.go | 4 ++-- urban.go | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/blame.go b/blame.go index 85059ff..3d86882 100644 --- a/blame.go +++ b/blame.go @@ -6,7 +6,7 @@ import ( type Blame struct{} -func (_ Blame) Handle(conn *irc.Conn, line *irc.Line) { +func (Blame) Handle(conn *irc.Conn, line *irc.Line) { src := []string{ "Author: Dimitri Sokolyuk ", "Source: http://cgit.dim13.org/bot.git", @@ -17,7 +17,7 @@ func (_ Blame) Handle(conn *irc.Conn, line *irc.Line) { } } -func (_ Blame) Help() string { +func (Blame) Help() string { return "Blame author and return link to source code" } diff --git a/duck.go b/duck.go index 7c534b0..8f45a42 100644 --- a/duck.go +++ b/duck.go @@ -9,9 +9,9 @@ import ( type Duck struct{} -func (_ Duck) WithArgs(_ int) bool { return true } +func (Duck) WithArgs(_ int) bool { return true } -func (_ Duck) Handle(conn *irc.Conn, line *irc.Line) { +func (Duck) Handle(conn *irc.Conn, line *irc.Line) { if q := strings.SplitN(line.Text(), " ", 2); len(q) == 2 { if a, err := duck.Abstract(q[1]); err != nil { conn.Notice(line.Target(), err.Error()) @@ -21,7 +21,7 @@ func (_ Duck) Handle(conn *irc.Conn, line *irc.Line) { } } -func (_ Duck) Help() string { +func (Duck) Help() string { return "Perform duckduckgo instant answer search" } diff --git a/help.go b/help.go index 1aaf444..7dc41ee 100644 --- a/help.go +++ b/help.go @@ -9,7 +9,7 @@ import ( type Help struct{} -func (_ Help) Handle(conn *irc.Conn, line *irc.Line) { +func (Help) Handle(conn *irc.Conn, line *irc.Line) { var msg []string for k, v := range commands { msg = append(msg, fmt.Sprintf("%-8s%v", k, v.Help())) @@ -20,7 +20,7 @@ func (_ Help) Handle(conn *irc.Conn, line *irc.Line) { } } -func (_ Help) Help() string { +func (Help) Help() string { return "This help" } diff --git a/href.go b/href.go index 49b613c..d06d04c 100644 --- a/href.go +++ b/href.go @@ -14,9 +14,9 @@ import ( ) var ( - notHTML = errors.New("not HTML content") - tooBig = errors.New("content too big") - iconvErr = errors.New("charset converter error") + errNotHTML = errors.New("not HTML content") + errTooBig = errors.New("content too big") + errIconv = errors.New("charset converter error") ) const ( @@ -60,16 +60,16 @@ func FetchTitle(uri string) (string, error) { ct := resp.Header.Get("Content-Type") if !strings.HasPrefix(ct, "text/html") { - return "", notHTML + return "", errNotHTML } if resp.ContentLength > 8*MB { - return "", tooBig + return "", errTooBig } r, err := charset.NewReader(resp.Body, ct) if err != nil { - return "", iconvErr + return "", errIconv } doc, err := html.Parse(r) diff --git a/ivy.go b/ivy.go index 7b2ff70..afe31de 100644 --- a/ivy.go +++ b/ivy.go @@ -9,7 +9,7 @@ import ( type Ivy struct{} -func (_ Ivy) Handle(conn *irc.Conn, line *irc.Line) { +func (Ivy) Handle(conn *irc.Conn, line *irc.Line) { switch q := strings.SplitN(line.Text(), " ", 2); len(q) { case 1: ivy.Reset() @@ -32,7 +32,7 @@ func (_ Ivy) Handle(conn *irc.Conn, line *irc.Line) { } } -func (_ Ivy) Help() string { +func (Ivy) Help() string { return "APL like interpreter. See robpike.io/ivy" } diff --git a/last.go b/last.go index 7218330..0c47cb6 100644 --- a/last.go +++ b/last.go @@ -11,7 +11,7 @@ type Last struct{} var buffer = ring.New(10) -func (_ Last) Handle(conn *irc.Conn, line *irc.Line) { +func (Last) Handle(conn *irc.Conn, line *irc.Line) { buffer.Do(func(v interface{}) { if v != nil { l := v.(*irc.Line) @@ -23,7 +23,7 @@ func (_ Last) Handle(conn *irc.Conn, line *irc.Line) { }) } -func (_ Last) Help() string { +func (Last) Help() string { return "Renurn last 10 messages" } diff --git a/rfc.go b/rfc.go index 9ec363d..ceeef45 100644 --- a/rfc.go +++ b/rfc.go @@ -16,7 +16,7 @@ var ( rfcKW = make(map[string][]string) ) -func (_ RFC) Handle(conn *irc.Conn, line *irc.Line) { +func (RFC) Handle(conn *irc.Conn, line *irc.Line) { if f := strings.Fields(line.Text()); len(f) > 1 { kw := strings.ToLower(f[1]) if e, ok := rfcKW[kw]; ok { @@ -32,7 +32,7 @@ func (_ RFC) Handle(conn *irc.Conn, line *irc.Line) { } } -func (_ RFC) Help() string { +func (RFC) Help() string { return "search rfc by keyword (msg privat to see all matches)" } diff --git a/urban.go b/urban.go index 680bf13..b550bd4 100644 --- a/urban.go +++ b/urban.go @@ -10,7 +10,7 @@ import ( type Urban struct{} -func (_ Urban) Handle(conn *irc.Conn, line *irc.Line) { +func (Urban) Handle(conn *irc.Conn, line *irc.Line) { if q := strings.SplitN(line.Text(), " ", 2); len(q) == 2 { if u, err := urban.QueryTop(q[1]); err != nil { conn.Notice(line.Target(), err.Error()) @@ -24,7 +24,7 @@ func (_ Urban) Handle(conn *irc.Conn, line *irc.Line) { } } -func (_ Urban) Help() string { +func (Urban) Help() string { return "Perform urban dictionary search" } -- cgit v1.2.3