cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Merge pull request #437 from krainboltgreene/patch-1

Browse source 
Simplifying followers mappings
This commit is contained in:
Eugen 2017-01-08 04:14:54 +01:00 • committed by GitHub
commit 69643338f6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/account.rb
View file

@ -175,19 +175,23 @@ class Account < ApplicationRecord
end end
def following_map(target_account_ids, account_id) def following_map(target_account_ids, account_id)
Follow.where(target_account_id: target_account_ids).where(account_id: account_id).map { |f| [f.target_account_id, true] }.to_h follow_mapping(Follow.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
end end
def followed_by_map(target_account_ids, account_id) def followed_by_map(target_account_ids, account_id)
Follow.where(account_id: target_account_ids).where(target_account_id: account_id).map { |f| [f.account_id, true] }.to_h follow_mapping(Follow.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
end end
def blocking_map(target_account_ids, account_id) def blocking_map(target_account_ids, account_id)
Block.where(target_account_id: target_account_ids).where(account_id: account_id).map { |b| [b.target_account_id, true] }.to_h follow_mapping(Block.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
end end
def requested_map(target_account_ids, account_id) def requested_map(target_account_ids, account_id)
FollowRequest.where(target_account_id: target_account_ids).where(account_id: account_id).map { |r| [r.target_account_id, true] }.to_h follow_mapping(FollowRequest.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
end
private def follow_mapping(query, field)
query.pluck(field).inject({}) { |mapping, id| mapping[id] = true }
end end
end end