Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-22 14:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix code style issues

Browse Source
This commit is contained in:
Surinna Curtis
2017-09-25 01:15:44 +00:00
committed by aschmitz
parent 290c6b0f2e
commit f39bba9a90
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/api/v1/mutes_controller.rb
View File

@@ -44,19 +44,15 @@ class Api::V1::MutesController < Api::BaseController
end
def next_path
if records_continue?
url_for pagination_params(max_id: pagination_max_id)
end
url_for pagination_params(max_id: pagination_max_id) if records_continue?
end
def prev_path
unless@data.empty?
url_for pagination_params(since_id: pagination_since_id)
end
url_for pagination_params(since_id: pagination_since_id) unless @data.empty?
end
def pagination_max_id
if params[:action] == "details"
if params[:action] == 'details'
@mutes.last.id
else
@accounts.last.muted_by_ids.last
@@ -64,7 +60,7 @@ class Api::V1::MutesController < Api::BaseController
end
def pagination_since_id
if params[:action] == "details"
if params[:action] == 'details'
@mutes.first.id
else
@accounts.first.muted_by_ids.first

2
app/models/concerns/account_interactions.rb
View File

@@ -19,7 +19,7 @@ module AccountInteractions
def muting_map(target_account_ids, account_id)
Mute.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |mute, mapping|
mapping[mute.target_account_id] = {
notifications: mute.hide_notifications?
notifications: mute.hide_notifications?,
}
end
end

1
app/serializers/rest/mute_serializer.rb
View File

@@ -13,3 +13,4 @@ class REST::MuteSerializer < ActiveModel::Serializer
REST::AccountSerializer.new(object.target_account)
end
end