Fixing image upload limits, allowing webm, merge/unmerge events trigger

timeline reload in UI, other small fixes

2 files changed, 3 insertions, 0 deletions

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