From 7168f6e8df442a153f77efc3dbd527d1b14ef44f Mon Sep 17 00:00:00 2001
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Date: Sat, 26 Oct 2019 23:01:09 -0700
Subject: [PATCH] Update and fix linters

---
 .golangci.yml           | 27 ++++++++++++++++-----------
 pkg/builders/youtube.go |  8 ++++----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 7c85881..44b50e0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,15 +1,20 @@
 linters:
-  presets:
-    - bugs
+  enable:
+    - structcheck
+    - varcheck
+    - staticcheck
+    - unconvert
+    - gofmt
+    - goimports
+    - golint
+    - ineffassign
+    - vet
     - unused
-    - format
-    - style
-    - complexity
-    - performance
+    - misspell
   disable:
     - errcheck
-    - gochecknoglobals
-    - lll
-issues:
-  exclude:
-    - if block ends with a return statement, so drop this else and outdent its block
+
+run:
+  skip-dirs:
+    - bin
+    - docs
\ No newline at end of file
diff --git a/pkg/builders/youtube.go b/pkg/builders/youtube.go
index 7e9e119..4d00c29 100644
--- a/pkg/builders/youtube.go
+++ b/pkg/builders/youtube.go
@@ -146,7 +146,7 @@ func (yt *YouTubeBuilder) GetVideoCount(feed *model.Feed) (uint64, error) {
 		// Cost: 3 units
 		if channel, err := yt.listChannels(feed.LinkType, feed.ItemID, "id,statistics"); err != nil {
 			return 0, err
-		} else {
+		} else { // nolint:golint
 			return channel.Statistics.VideoCount, nil
 		}
 
@@ -154,7 +154,7 @@ func (yt *YouTubeBuilder) GetVideoCount(feed *model.Feed) (uint64, error) {
 		// Cost: 3 units
 		if playlist, err := yt.listPlaylists(feed.ItemID, "", "id,contentDetails"); err != nil {
 			return 0, err
-		} else {
+		} else { // nolint:golint
 			return uint64(playlist.ContentDetails.ItemCount), nil
 		}
 
@@ -197,7 +197,7 @@ func (yt *YouTubeBuilder) queryFeed(feed *model.Feed) (string, error) {
 
 		if date, err := yt.parseDate(channel.Snippet.PublishedAt); err != nil {
 			return "", err
-		} else {
+		} else { // nolint:golint
 			pubDate = date
 		}
 
@@ -221,7 +221,7 @@ func (yt *YouTubeBuilder) queryFeed(feed *model.Feed) (string, error) {
 
 		if date, err := yt.parseDate(playlist.Snippet.PublishedAt); err != nil {
 			return "", err
-		} else {
+		} else { // nolint:golint
 			pubDate = date
 		}