From ce29624c6df83699a01808d68c19a2492864ffe8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 12 Sep 2016 18:22:43 +0200 Subject: Fixing image upload limits, allowing webm, merge/unmerge events trigger timeline reload in UI, other small fixes --- app/services/follow_service.rb | 1 + app/services/unfollow_service.rb | 2 ++ 2 files changed, 3 insertions(+) (limited to 'app/services') diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 5ac758e69..45f145df3 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -30,6 +30,7 @@ class FollowService < BaseService end FeedManager.instance.trim(:home, into_account.id) + FeedManager.instance.broadcast(into_account.id, type: 'merge') end def redis diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index 4d9c2a9a7..feaf28ceb 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -16,6 +16,8 @@ class UnfollowService < BaseService from_account.statuses.find_each do |status| redis.zrem(timeline_key, status.id) end + + FeedManager.instance.broadcast(into_account.id, type: 'unmerge') end def redis -- cgit