From db4671fd3fa36b2855f35bddcefd5573976144a6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 15 Oct 2016 17:34:00 +0200
Subject: [PATCH] Fix suggestions fallback

---
 app/models/follow_suggestion.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/follow_suggestion.rb b/app/models/follow_suggestion.rb
index df1d77e6c..719270318 100644
--- a/app/models/follow_suggestion.rb
+++ b/app/models/follow_suggestion.rb
@@ -14,7 +14,7 @@ END
 
     results = neo.execute_query(query, id: for_account_id, limit: limit)
 
-    return fallback(for_account_id, limit) if results.empty?
+    return fallback(for_account_id, limit) if results.empty? || results['data'].empty?
 
     map_to_accounts(for_account_id, results)
   rescue Neography::NeographyError, Excon::Error::Socket => e
@@ -36,7 +36,7 @@ END
   end
 
   def self.map_to_accounts(for_account_id, results)
-    return [] if results.empty?
+    return [] if results.empty? || results['data'].empty?
 
     account_ids  = results['data'].map(&:first)
     blocked_ids  = Block.where(account_id: for_account_id).pluck(:target_account_id)