specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Integrating block relationships into the API (read-only for now)

Browse source
This commit is contained in:
Eugen Rochko 2016-10-03 17:16:58 +02:00
parent 9d59d7b463
commit 2c9e672ee2
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/accounts_controller.rb
View file

@ -40,7 +40,7 @@ class Api::V1::AccountsController < ApiController
@accounts = Account.find(ids) @accounts = Account.find(ids)
@following = Account.following_map(ids, current_user.account_id) @following = Account.following_map(ids, current_user.account_id)
@followed_by = Account.followed_by_map(ids, current_user.account_id) @followed_by = Account.followed_by_map(ids, current_user.account_id)
@blocking = {} @blocking = Account.blocking_map(ids, current_user.account_id)
end end
private private
@ -52,6 +52,6 @@ class Api::V1::AccountsController < ApiController
def set_relationship def set_relationship
@following = Account.following_map([@account.id], current_user.account_id) @following = Account.following_map([@account.id], current_user.account_id)
@followed_by = Account.followed_by_map([@account.id], current_user.account_id) @followed_by = Account.followed_by_map([@account.id], current_user.account_id)
@blocking = {} @blocking = Account.blocking_map([@account.id], current_user.account_id)
end end
end end

13
app/models/account.rb
View file

@ -52,11 +52,20 @@ class Account < ApplicationRecord
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account) active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
end end
def block!(other_account)
block_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
end
def unfollow!(other_account) def unfollow!(other_account)
follow = active_relationships.find_by(target_account: other_account) follow = active_relationships.find_by(target_account: other_account)
follow.destroy unless follow.nil? follow.destroy unless follow.nil?
end end
def unblock!(other_account)
block = block_relationships.find_by(target_account: other_account)
block.destroy unless block.nil?
end
def following?(other_account) def following?(other_account)
following.include?(other_account) following.include?(other_account)
end end
@ -139,6 +148,10 @@ class Account < ApplicationRecord
Follow.where(account_id: target_account_ids).where(target_account_id: account_id).map { |f| [f.account_id, true] }.to_h Follow.where(account_id: target_account_ids).where(target_account_id: account_id).map { |f| [f.account_id, true] }.to_h
end end
def self.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
end
before_create do before_create do
if local? if local?
keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048) keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048)