Fix rubocop warning (mastodon#14288)

* Fix rubocop warning * use limit variable * use ContextCreatingMethods option
CrossGate-Pawoo · Jan 14, 2022 · 519927d · 519927d
1 parent bc24451
commit 519927d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -28,6 +28,10 @@ Layout/EmptyLineAfterMagicComment:
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: space
 
+Lint/UselessAccessModifier:
+  ContextCreatingMethods:
+    - class_methods
+
 Metrics/AbcSize:
   Max: 100
 

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -27,7 +27,7 @@ def show
         expires_in 0, public: true
 
         limit     = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
-        @statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(PAGE_SIZE)
+        @statuses = HashtagQueryService.new.call(@tag, filter_params, nil, @local).limit(limit)
         @statuses = cache_collection(@statuses, Status)
 
         render xml: RSS::TagSerializer.render(@tag, @statuses)

diff --git a/app/lib/request.rb b/app/lib/request.rb
@@ -231,7 +231,7 @@ def open(host, *args)
             begin
               sock.connect_nonblock(addr_by_socket[sock])
             rescue Errno::EISCONN
-              # nothing to do
+              # Do nothing
             rescue => e
               sock.close
               outer_e = e

diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb
@@ -11,6 +11,7 @@ def initialize(object)
       @object = object
     end
 
+    # rubocop:disable Style/MethodMissingSuper
     def method_missing(method, *args)
       method_name = method.to_s
       # set a value for a variable
@@ -23,6 +24,7 @@ def method_missing(method, *args)
         self[method_name]
       end
     end
+    # rubocop:enable Style/MethodMissingSuper
 
     def respond_to_missing?(*)
       true