diff options
author | ThibG <thib@sitedethib.com> | 2020-01-25 12:23:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-25 12:23:47 +0100 |
commit | 340cb4a04c94f9403673d59e552be909fce25ece (patch) | |
tree | 6b5f1b95e8b8bd9dcdbad167e3f74097a6bea3c6 /app/workers | |
parent | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (diff) | |
parent | 4e1efacfac29cbd4ba3ff675abaa923bb53fcbc8 (diff) |
Merge pull request #1266 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/publish_announcement_reaction_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/publish_announcement_reaction_worker.rb b/app/workers/publish_announcement_reaction_worker.rb index 6f3b6dc5b..e01deb64d 100644 --- a/app/workers/publish_announcement_reaction_worker.rb +++ b/app/workers/publish_announcement_reaction_worker.rb @@ -10,7 +10,7 @@ class PublishAnnouncementReactionWorker reaction, = announcement.announcement_reactions.where(name: name).group(:announcement_id, :name, :custom_emoji_id).select('name, custom_emoji_id, count(*) as count, false as me') reaction ||= announcement.announcement_reactions.new(name: name) - payload = InlineRenderer.render(reaction, nil, :reaction).tap { |h| h[:announcement_id] = announcement_id } + payload = InlineRenderer.render(reaction, nil, :reaction).tap { |h| h[:announcement_id] = announcement_id.to_s } payload = Oj.dump(event: :'announcement.reaction', payload: payload) Account.joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).find_each do |account| |