From eee8afb0b711205b793cb881ad6e875305d6d45e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 5 Feb 2017 19:39:00 +0100
Subject: [PATCH] Remove bios from blocked users list, filter out broken
entries from API response
---
app/assets/javascripts/components/components/account.jsx | 2 +-
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 108401b2fd..13ffab49b5 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 b9816e052b..08aefc175c 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)
--
GitLab