Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,

slightly optimized FanOutOnWriteService again
This commit is contained in:
Eugen Rochko 2017-04-06 02:26:59 +02:00
parent dea6e47de0
commit dbd529109e
3 changed files with 21 additions and 18 deletions

View File

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

View File

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

View File

@ -4,6 +4,8 @@ class RemoveStatusService < BaseService
include StreamEntryRenderer include StreamEntryRenderer
def call(status) def call(status)
@payload = Oj.dump(event: :delete, payload: status.id)
remove_from_self(status) if status.account.local? remove_from_self(status) if status.account.local?
remove_from_followers(status) remove_from_followers(status)
remove_from_mentioned(status) remove_from_mentioned(status)
@ -25,27 +27,25 @@ class RemoveStatusService < BaseService
end end
def remove_from_followers(status) def remove_from_followers(status)
status.account.followers.each do |follower| status.account.followers.where(domain: nil).each do |follower|
next unless follower.local?
unpush(:home, follower, status) unpush(:home, follower, status)
end end
end end
def remove_from_mentioned(status) def remove_from_mentioned(status)
return unless status.local?
notified_domains = [] notified_domains = []
status.mentions.each do |mention| status.mentions.each do |mention|
mentioned_account = mention.account mentioned_account = mention.account
if mentioned_account.local? next if mentioned_account.local?
unpush(:mentions, mentioned_account, status)
else
next if notified_domains.include?(mentioned_account.domain) next if notified_domains.include?(mentioned_account.domain)
notified_domains << mentioned_account.domain notified_domains << mentioned_account.domain
send_delete_salmon(mentioned_account, status) send_delete_salmon(mentioned_account, status)
end end
end end
end
def send_delete_salmon(account, status) def send_delete_salmon(account, status)
return unless status.local? return unless status.local?
@ -65,17 +65,19 @@ class RemoveStatusService < BaseService
redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id) redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)
end end
Redis.current.publish(receiver.id, Oj.dump(event: :delete, payload: status.id)) Redis.current.publish("timeline:#{receiver.id}", @payload)
end end
def remove_from_hashtags(status) def remove_from_hashtags(status)
status.tags.each do |tag| status.tags.pluck(:name) do |hashtag|
Redis.current.publish("hashtag:#{tag.name}", Oj.dump(event: :delete, payload: status.id)) Redis.current.publish("hashtag:#{hashtag}", @payload)
Redis.current.publish("hashtag:#{hashtag}:local", @payload) if status.local?
end end
end end
def remove_from_public(status) def remove_from_public(status)
Redis.current.publish('public', Oj.dump(event: :delete, payload: status.id)) Redis.current.publish('public', @payload)
Redis.current.publish('public:local', @payload) if status.local?
end end
def redis def redis