diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-03 17:11:54 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-03 17:12:13 +0200 |
commit | 9d59d7b463e7f31ceedf27775a7ee3e8e071b4a1 (patch) | |
tree | 6623a9795e3b6fc755b11caa132211f56acfed32 /app/models/account.rb | |
parent | a488b05726b2e93b5f66e93ef700a6bc32a3a029 (diff) |
Adding a block model and filter mentions from blocked users (fix #60)
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 2fbd5a655..518b55f19 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -33,8 +33,12 @@ class Account < ApplicationRecord has_many :active_relationships, class_name: 'Follow', foreign_key: 'account_id', dependent: :destroy has_many :passive_relationships, class_name: 'Follow', foreign_key: 'target_account_id', dependent: :destroy - has_many :following, through: :active_relationships, source: :target_account - has_many :followers, through: :passive_relationships, source: :account + has_many :following, -> { order('follows.created_at desc') }, through: :active_relationships, source: :target_account + has_many :followers, -> { order('follows.created_at desc') }, through: :passive_relationships, source: :account + + # Block relationships + has_many :block_relationships, class_name: 'Block', foreign_key: 'account_id', dependent: :destroy + has_many :blocking, -> { order('blocks.created_at desc') }, through: :block_relationships, source: :target_account has_many :media_attachments, dependent: :destroy @@ -57,6 +61,10 @@ class Account < ApplicationRecord following.include?(other_account) end + def blocking?(other_account) + blocking.include?(other_account) + end + def local? domain.nil? end |