diff options
| -rw-r--r-- | app/assets/stylesheets/components.scss | 1 | ||||
| -rw-r--r-- | app/lib/feed_manager.rb | 20 | ||||
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 4 | ||||
| -rw-r--r-- | app/services/precompute_feed_service.rb | 2 | ||||
| -rw-r--r-- | spec/lib/feed_manager_spec.rb | 4 |
5 files changed, 22 insertions, 9 deletions
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index fa11f94ab..7c111e04a 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -24,6 +24,7 @@ &:disabled { background-color: #9baec8; + cursor: default; } &.button-secondary { diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 6e6df0359..779a31f0b 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -9,10 +9,12 @@ class FeedManager "feed:#{type}:#{id}" end - # Filter status out of the home feed if it is a reply to someone the user doesn't follow - def filter_status?(status, follower) - replied_to_user = status.reply? ? status.thread.account : nil - (status.reply? && !(follower.id == replied_to_user.id || replied_to_user.id == status.account_id || follower.following?(replied_to_user))) + def filter?(timeline_type, status, receiver) + if timeline_type == :home + filter_from_home?(status, receiver) + else + filter_from_mentions?(status, receiver) + end end def push(timeline_type, account, status) @@ -37,6 +39,16 @@ class FeedManager $redis end + # Filter status out of the home feed if it is a reply to someone the user doesn't follow + def filter_from_home?(status, follower) + replied_to_user = status.reply? ? status.thread.account : nil + (status.reply? && !(follower.id == replied_to_user.id || replied_to_user.id == status.account_id || follower.following?(replied_to_user))) + end + + def filter_from_mentions?(status, follower) + false + end + def inline_render(target_account, status) rabl_scope = Class.new do include RoutingHelper diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 2d18709d6..29b093ef8 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -15,7 +15,7 @@ class FanOutOnWriteService < BaseService def deliver_to_followers(status) status.account.followers.each do |follower| - next if !follower.local? || FeedManager.instance.filter_status?(status, follower) + next if !follower.local? || FeedManager.instance.filter?(:home, status, follower) FeedManager.instance.push(:home, follower, status) end end @@ -23,7 +23,7 @@ class FanOutOnWriteService < BaseService def deliver_to_mentioned(status) status.mentions.each do |mention| mentioned_account = mention.account - next if !mentioned_account.local? || mentioned_account.id == status.account_id + next if !mentioned_account.local? || mentioned_account.id == status.account_id || FeedManager.instance.filter?(:mentions, status, mentioned_account) FeedManager.instance.push(:mentions, mentioned_account, status) end end diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb index 84d655437..cdeb4a92f 100644 --- a/app/services/precompute_feed_service.rb +++ b/app/services/precompute_feed_service.rb @@ -7,7 +7,7 @@ class PrecomputeFeedService < BaseService instant_return = [] Status.send("as_#{type}_timeline", account).order('created_at desc').limit(FeedManager::MAX_ITEMS).find_each do |status| - next if type == :home && FeedManager.instance.filter_status?(status, account) + next FeedManager.instance.filter?(type, status, account) redis.zadd(FeedManager.instance.key(type, account.id), status.id, status.id) instant_return << status unless instant_return.size > limit end diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb index 4501e27b7..14553221f 100644 --- a/spec/lib/feed_manager_spec.rb +++ b/spec/lib/feed_manager_spec.rb @@ -9,12 +9,12 @@ RSpec.describe FeedManager do end end - describe '#filter_status?' do + describe '#filter?' do let(:followee) { Fabricate(:account, username: 'alice') } let(:status) { Fabricate(:status, text: 'Hello world', account: followee) } let(:follower) { Fabricate(:account, username: 'bob') } - subject { FeedManager.instance.filter_status?(status, follower) } + subject { FeedManager.instance.filter?(:home, status, follower) } it 'returns a boolean value' do expect(subject).to be false |