group posts in feed db builder

app/models/concerns/account_interactions.rb

@@ -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

app/models/status.rb

@@ -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)