ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bios from blocked users list, filter out broken entries from API response

rebase/4.0.0rc2 glitch/v1.0
Eugen Rochko 2017-02-05 19:39:00 +01:00
parent c5a08eb56e
commit eee8afb0b7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/account.jsx
View File

@ -51,7 +51,7 @@ const Account = React.createClass({
getDefaultProps () {
return {
withNote: true
withNote: false
};
},

2
app/controllers/api/v1/blocks_controller.rb
View File

@ -9,7 +9,7 @@ class Api::V1::BlocksController < ApiController
def index
results = Block.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
accounts = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |f| accounts[f.target_account_id] }
@accounts = results.map { |f| accounts[f.target_account_id] }.compact
set_account_counters_maps(@accounts)