Revert DM support in HomeFeed#from_database

Fixes #1746

Queries could get prohibitively expensive.

1 files changed, 12 insertions, 27 deletions

diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb
index 565357d7b..20756633c 100644
--- a/spec/models/home_feed_spec.rb
+++ b/spec/models/home_feed_spec.rb
@@ -19,32 +19,23 @@ RSpec.describe HomeFeed, type: :model do
       Fabricate(:status, account: other,    id: 11)
       Fabricate(:status, account: followed, id: 12, visibility: :private)
       Fabricate(:status, account: followed, id: 13, visibility: :direct)
-      Fabricate(:status, account: account,  id: 14, visibility: :direct)
-      dm = Fabricate(:status, account: followed, id: 15, visibility: :direct)
-      Fabricate(:mention, account: account, status: dm)
     end
 
     context 'when feed is generated' do
       before do
         FeedManager.instance.populate_home(account)
-
-        # Add direct messages because populate_home does not do that
-        Redis.current.zadd(
-          FeedManager.instance.key(:home, account.id),
-          [[14, 14], [15, 15]]
-        )
       end
 
       it 'gets statuses with ids in the range from redis with database' do
-        results = subject.get(5)
+        results = subject.get(3)
 
-        expect(results.map(&:id)).to eq [15, 14, 12, 10, 3]
+        expect(results.map(&:id)).to eq [12, 10, 3]
         expect(results.first.attributes.keys).to eq %w(id updated_at)
       end
 
       it 'with since_id present' do
-        results = subject.get(5, nil, 3, nil)
-        expect(results.map(&:id)).to eq [15, 14, 12, 10]
+        results = subject.get(3, nil, 3, nil)
+        expect(results.map(&:id)).to eq [12, 10]
       end
 
       it 'with min_id present' do
@@ -57,25 +48,19 @@ RSpec.describe HomeFeed, type: :model do
       before do
         FeedManager.instance.populate_home(account)
 
-        # Add direct messages because populate_home does not do that
-        Redis.current.zadd(
-          FeedManager.instance.key(:home, account.id),
-          [[14, 14], [15, 15]]
-        )
-
         Redis.current.zremrangebyrank(FeedManager.instance.key(:home, account.id), 0, -2)
       end
 
       it 'gets statuses with ids in the range from redis with database' do
-        results = subject.get(5)
+        results = subject.get(3)
 
-        expect(results.map(&:id)).to eq [15, 14, 12, 10, 3]
+        expect(results.map(&:id)).to eq [12, 10, 3]
         expect(results.first.attributes.keys).to eq %w(id updated_at)
       end
 
       it 'with since_id present' do
-        results = subject.get(5, nil, 3, nil)
-        expect(results.map(&:id)).to eq [15, 14, 12, 10]
+        results = subject.get(3, nil, 3, nil)
+        expect(results.map(&:id)).to eq [12, 10]
       end
 
       it 'with min_id present' do
@@ -90,14 +75,14 @@ RSpec.describe HomeFeed, type: :model do
       end
 
       it 'returns from database' do
-        results = subject.get(5)
+        results = subject.get(3)
 
-        expect(results.map(&:id)).to eq [15, 14, 12, 10, 3]
+        expect(results.map(&:id)).to eq [12, 10, 3]
       end
 
       it 'with since_id present' do
-        results = subject.get(5, nil, 3, nil)
-        expect(results.map(&:id)).to eq [15, 14, 12, 10]
+        results = subject.get(3, nil, 3, nil)
+        expect(results.map(&:id)).to eq [12, 10]
       end
 
       it 'with min_id present' do