diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 19:39:00 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 19:39:00 +0100 |
| commit | eee8afb0b711205b793cb881ad6e875305d6d45e (patch) | |
| tree | 0a1ea309ed33d7e7eb95d4728812616aa6ef076d /app | |
| parent | c5a08eb56e11175630014837b41e17d72f0a67a1 (diff) | |
Remove bios from blocked users list, filter out broken entries from API response
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/components/account.jsx | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/blocks_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/components/account.jsx b/app/assets/javascripts/components/components/account.jsx index 108401b2f..13ffab49b 100644 --- a/app/assets/javascripts/components/components/account.jsx +++ b/app/assets/javascripts/components/components/account.jsx @@ -51,7 +51,7 @@ const Account = React.createClass({ getDefaultProps () { return { - withNote: true + withNote: false }; }, diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb index b9816e052..08aefc175 100644 --- a/app/controllers/api/v1/blocks_controller.rb +++ b/app/controllers/api/v1/blocks_controller.rb @@ -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) |