Fix most rubocop issues (#2165)
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues
This commit is contained in:
@ -32,6 +32,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
|
||||
|
||||
def id
|
||||
raise Mastodon::NotPermittedError, 'Local-only statuses should not be serialized' if object.local_only? && !instance_options[:allow_local_only]
|
||||
|
||||
ActivityPub::TagManager.instance.uri_for(object)
|
||||
end
|
||||
|
||||
|
@ -91,7 +91,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
|
||||
end
|
||||
|
||||
def followers_count
|
||||
(Setting.hide_followers_count || object.user&.setting_hide_followers_count) ? -1 : object.followers_count
|
||||
Setting.hide_followers_count || object.user&.setting_hide_followers_count ? -1 : object.followers_count
|
||||
end
|
||||
|
||||
def display_name
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
class REST::MuteSerializer < ActiveModel::Serializer
|
||||
include RoutingHelper
|
||||
|
||||
|
||||
attributes :id, :account, :target_account, :created_at, :hide_notifications
|
||||
|
||||
def account
|
||||
@ -12,4 +12,4 @@ class REST::MuteSerializer < ActiveModel::Serializer
|
||||
def target_account
|
||||
REST::AccountSerializer.new(object.target_account)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -13,7 +13,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
||||
attribute :muted, if: :current_user?
|
||||
attribute :bookmarked, if: :current_user?
|
||||
attribute :pinned, if: :pinnable?
|
||||
attribute :local_only if :local?
|
||||
attribute :local_only, if: :local?
|
||||
has_many :filtered, serializer: REST::FilterResultSerializer, if: :current_user?
|
||||
|
||||
attribute :content, unless: :source_requested?
|
||||
@ -32,6 +32,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
||||
has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
|
||||
has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
|
||||
|
||||
delegate :local?, to: :object
|
||||
|
||||
def id
|
||||
object.id.to_s
|
||||
end
|
||||
|
Reference in New Issue
Block a user