Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix Rubocop offences (#2630)

Browse source 
* disable Bundler/OrderedGems

* fix rubocop Lint/UselessAssignment

* fix rubocop Style/BlockDelimiters

* fix rubocop Style/AlignHash

* fix rubocop Style/AlignParameters, Style/EachWithObject

* fix rubocop Style/SpaceInLambdaLiteral
This commit is contained in:
yhirano 2017-05-01 23:31:02 +09:00 • committed by Eugen Rochko
parent 1899cf5f04
commit 3988f2dade
6 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/account.rb
View file

@ -75,12 +75,12 @@ class Account < ApplicationRecord
scope :by_domain_accounts, -> { group(:domain).select(:domain, 'COUNT(*) AS accounts_count').order('accounts_count desc') }
delegate :email,
:current_sign_in_ip,
:current_sign_in_at,
:confirmed?,
to: :user,
prefix: true,
allow_nil: true
:current_sign_in_ip,
:current_sign_in_at,
:confirmed?,
to: :user,
prefix: true,
allow_nil: true
def follow!(other_account)
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
@ -329,7 +329,7 @@ class Account < ApplicationRecord
private
def follow_mapping(query, field)
query.pluck(field).inject({}) { |mapping, id| mapping[id] = true; mapping }
query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true }
end
def avatar_styles(file)

2
app/models/concerns/paginable.rb
View file

@ -4,7 +4,7 @@ module Paginable
extend ActiveSupport::Concern
included do
scope :paginate_by_max_id, -> (limit, max_id = nil, since_id = nil) {
scope :paginate_by_max_id, ->(limit, max_id = nil, since_id = nil) {
query = order(arel_table[:id].desc).limit(limit)
query = query.where(arel_table[:id].lt(max_id)) unless max_id.blank?
query = query.where(arel_table[:id].gt(since_id)) unless since_id.blank?