random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

group posts in feed db builder

This commit is contained in:
2458773093 2019-08-20 02:25:10 +03:00
parent 213d5862ac
commit 1f0f96415e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/concerns/account_interactions.rb
View File

@ -71,6 +71,9 @@ module AccountInteractions
has_many :following, -> { order('follows.id desc') }, through: :active_relationships, source: :target_account
has_many :followers, -> { order('follows.id desc') }, through: :passive_relationships, source: :account
has_many :group_accounts, inverse_of: :account, dependent: :destroy, source: :account
has_many :groups, through: :group_accounts
# Block relationships
has_many :block_relationships, class_name: 'Block', foreign_key: 'account_id', dependent: :destroy
has_many :blocking, -> { order('blocks.id desc') }, through: :block_relationships, source: :target_account

2
app/models/status.rb
View File

@ -283,7 +283,7 @@ class Status < ApplicationRecord
end
def as_home_timeline(account)
where(account: [account] + account.following).where(visibility: [:public, :unlisted, :private])
where(account: [account] + account.following).or(where(group: account.groups)).where(visibility: [:public, :unlisted, :private])
end
def as_group_timeline(group)