From 70beb7288d297a897f1cf4a2182d677aa137cad6 Mon Sep 17 00:00:00 2001
From: lllusion3469 <31420484+lllusion3469@users.noreply.github.com>
Date: Mon, 11 May 2020 01:08:18 +0200
Subject: [PATCH] rubocop: fix various issues

---
 app/logical/deviant_art_api_client.rb         |  2 +-
 app/logical/sources/strategies/deviant_art.rb |  6 ++----
 app/logical/sources/strategies/stash.rb       | 14 +++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/logical/deviant_art_api_client.rb b/app/logical/deviant_art_api_client.rb
index 769690942..53abf1c8a 100644
--- a/app/logical/deviant_art_api_client.rb
+++ b/app/logical/deviant_art_api_client.rb
@@ -40,7 +40,7 @@ class DeviantArtApiClient
       mature_content: mature_content,
       ext_submission: ext_submission,
       ext_camera: ext_camera,
-      ext_stats: ext_stats,
+      ext_stats: ext_stats
     }
 
     request("deviation/metadata", **params)
diff --git a/app/logical/sources/strategies/deviant_art.rb b/app/logical/sources/strategies/deviant_art.rb
index e69ee913c..c11c69e61 100644
--- a/app/logical/sources/strategies/deviant_art.rb
+++ b/app/logical/sources/strategies/deviant_art.rb
@@ -201,8 +201,6 @@ module Sources
         end.gsub(/\A[[:space:]]+|[[:space:]]+\z/, "")
       end
 
-    public
-
       def self.deviation_id_from_url(url)
         if url =~ ASSET
           $~[:base36_deviation_id].try(:to_i, 36)
@@ -276,7 +274,7 @@ module Sources
 
       def api_client
         api_client = DeviantArtApiClient.new(
-          Danbooru.config.deviantart_client_id, 
+          Danbooru.config.deviantart_client_id,
           Danbooru.config.deviantart_client_secret
         )
         api_client.access_token = Cache.get("da-access-token", 11.weeks) do
@@ -308,7 +306,7 @@ module Sources
         {
           deviation: api_deviation,
           metadata: api_metadata,
-          download: api_download,
+          download: api_download
         }
       end
     end
diff --git a/app/logical/sources/strategies/stash.rb b/app/logical/sources/strategies/stash.rb
index d27fb89ad..76b5cf2c7 100644
--- a/app/logical/sources/strategies/stash.rb
+++ b/app/logical/sources/strategies/stash.rb
@@ -40,15 +40,15 @@ module Sources
       end
 
       def self.stash_id_from_url(url)
-       if url =~ STASH
-         $~[:post_id].downcase
-       else
-         nil
-       end
-     end
+        if url =~ STASH
+          $~[:post_id].downcase
+        else
+          nil
+        end
+      end
 
       def stash_id
-        [url, referer_url].map{ |x| self.class.stash_id_from_url(x) }.compact.first
+        [url, referer_url].map { |x| self.class.stash_id_from_url(x) }.compact.first
       end
     end
   end