Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - `package.json`
2019-11-06 14:38:28 +01:00
parent 00793a86bc 42d9ca21de
commit 0ae7d84273
31 changed files with 492 additions and 312 deletions
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@ -127,7 +127,7 @@ class AccountSearchService < BaseService
  end

  def following_ids
-    @following_ids ||= account.active_relationships.pluck(:target_account_id)
+    @following_ids ||= account.active_relationships.pluck(:target_account_id) + [account.id]
  end

  def limit_for_non_exact_results