commit: e809caa0e1633cede15b2578d1582d9878eae291
parent: 750662d9e2e2276495e692825422f4326bbb6e80
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 2 Apr 2017 15:46:31 +0200
Fix feed regeneration bug
Diffstat:
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/components/features/compose/index.jsx b/app/assets/javascripts/components/features/compose/index.jsx
@@ -72,7 +72,7 @@ const Compose = React.createClass({
<Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
{({ x }) =>
- <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)` }}>
+ <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
<SearchResultsContainer />
</div>
}
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
@@ -6,7 +6,11 @@ class FanOutOnWriteService < BaseService
def call(status)
deliver_to_self(status) if status.account.local?
- status.direct_visibility? ? deliver_to_mentioned_followers(status) : deliver_to_followers(status)
+ if status.direct_visibility?
+ deliver_to_mentioned_followers(status)
+ else
+ deliver_to_followers(status)
+ end
return if status.account.silenced? || !status.public_visibility? || status.reblog?
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
@@ -4,10 +4,10 @@ class PrecomputeFeedService < BaseService
# Fill up a user's home/mentions feed from DB and return a subset
# @param [Symbol] type :home or :mentions
# @param [Account] account
- def call(type, account)
- Status.send("as_#{type}_timeline", account).limit(FeedManager::MAX_ITEMS).each do |status|
- next if FeedManager.instance.filter?(type, status, account)
- redis.zadd(FeedManager.instance.key(type, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
+ def call(_, account)
+ Status.as_home_timeline(account).limit(FeedManager::MAX_ITEMS).each do |status|
+ next if (status.direct_visibility? && !status.permitted?(account)) || FeedManager.instance.filter?(:home, status, account)
+ redis.zadd(FeedManager.instance.key(:home, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
end
end