gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Replace calls to FeedManager#inline_render and #broadcast

Browse source
This commit is contained in:
Eugen Rochko 2017-04-05 19:45:18 +02:00
parent d755ce96da
commit 5b95be1c42
6 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/services/fan_out_on_write_service.rb
View file

@ -50,22 +50,22 @@ class FanOutOnWriteService < BaseService
end
def render_anonymous_payload(status)
@payload = FeedManager.instance.inline_render(nil, 'api/v1/statuses/show', status)
@payload = InlineRenderer.render(status, nil, 'api/v1/statuses/show')
end
def deliver_to_hashtags(status)
Rails.logger.debug "Delivering status #{status.id} to hashtags"
status.tags.pluck(:name).each do |hashtag|
FeedManager.instance.broadcast("hashtag:#{hashtag}", event: 'update', payload: @payload)
FeedManager.instance.broadcast("hashtag:#{hashtag}:local", event: 'update', payload: @payload) if status.account.local?
Redis.current.publish("hashtag:#{hashtag}", Oj.dump(event: :update, payload: @payload))
Redis.current.publish("hashtag:#{hashtag}:local", Oj.dump(event: :update, payload: @payload)) if status.account.local?
end
end
def deliver_to_public(status)
Rails.logger.debug "Delivering status #{status.id} to public timeline"
FeedManager.instance.broadcast(:public, event: 'update', payload: @payload)
FeedManager.instance.broadcast('public:local', event: 'update', payload: @payload) if status.account.local?
Redis.current.publish('public', Oj.dump(event: 'update', payload: @payload))
Redis.current.publish('public:local', Oj.dump(event: 'update', payload: @payload)) if status.account.local?
end
end

2
app/services/notify_service.rb
View file

@ -50,7 +50,7 @@ class NotifyService < BaseService
def create_notification
@notification.save!
return unless @notification.browserable?
FeedManager.instance.broadcast(@recipient.id, event: 'notification', payload: FeedManager.instance.inline_render(@recipient, 'api/v1/notifications/show', @notification))
Redis.current.publish(@recipient.id, Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, 'api/v1/notifications/show')))
end
def send_email

6
app/services/remove_status_service.rb
View file

@ -65,17 +65,17 @@ class RemoveStatusService < BaseService
redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)
end
FeedManager.instance.broadcast(receiver.id, event: 'delete', payload: status.id)
Redis.current.publish(receiver.id, Oj.dump(event: :delete, payload: status.id))
end
def remove_from_hashtags(status)
status.tags.each do |tag|
FeedManager.instance.broadcast("hashtag:#{tag.name}", event: 'delete', payload: status.id)
Redis.current.publish("hashtag:#{tag.name}", Oj.dump(event: :delete, payload: status.id))
end
end
def remove_from_public(status)
FeedManager.instance.broadcast(:public, event: 'delete', payload: status.id)
Redis.current.publish('public', Oj.dump(event: :delete, payload: status.id))
end
def redis