From 3cc47beb6e1f646baca64fdf56168e2f2e2bc726 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 9 Sep 2016 20:04:34 +0200 Subject: Refactored generation of unique tags, URIs and object URLs into own classes, as well as formatting of content --- app/services/fan_out_on_write_service.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/services/fan_out_on_write_service.rb') diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index d51681e53..973451e33 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.filter_status?(status, follower) + next if !follower.local? || FeedManager.instance.filter_status?(status, follower) push(:home, follower, status) end end @@ -29,16 +29,16 @@ class FanOutOnWriteService < BaseService end def push(type, receiver, status) - redis.zadd(FeedManager.key(type, receiver.id), status.id, status.id) + redis.zadd(FeedManager.instance.key(type, receiver.id), status.id, status.id) trim(type, receiver) ActionCable.server.broadcast("timeline:#{receiver.id}", type: 'update', timeline: type, message: inline_render(receiver, status)) end def trim(type, receiver) - return unless redis.zcard(FeedManager.key(type, receiver.id)) > FeedManager::MAX_ITEMS + return unless redis.zcard(FeedManager.instance.key(type, receiver.id)) > FeedManager::MAX_ITEMS - last = redis.zrevrange(FeedManager.key(type, receiver.id), FeedManager::MAX_ITEMS - 1, FeedManager::MAX_ITEMS - 1) - redis.zremrangebyscore(FeedManager.key(type, receiver.id), '-inf', "(#{last.last}") + last = redis.zrevrange(FeedManager.instance.key(type, receiver.id), FeedManager::MAX_ITEMS - 1, FeedManager::MAX_ITEMS - 1) + redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), '-inf', "(#{last.last}") end def redis -- cgit