diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-10 18:36:48 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-10 18:36:48 +0200 |
commit | 0077fc26df2982720e5fb278af6540a47859386f (patch) | |
tree | c7de413748f9a235779cd354f06d291f84498183 /app/services/follow_service.rb | |
parent | 35b6c4b36aa483e9936315cb72c2cf1fd2f477f6 (diff) |
Merge and unmerge timelines on follow/unfollow, solves #21, #22
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r-- | app/services/follow_service.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index b775d3519..5ac758e69 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -15,12 +15,27 @@ class FollowService < BaseService NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) end + merge_into_timeline(target_account, source_account) source_account.ping!(account_url(source_account, format: 'atom'), [Rails.configuration.x.hub_url]) follow end private + def merge_into_timeline(from_account, into_account) + timeline_key = FeedManager.instance.key(:home, into_account.id) + + from_account.statuses.find_each do |status| + redis.zadd(timeline_key, status.id, status.id) + end + + FeedManager.instance.trim(:home, into_account.id) + end + + def redis + $redis + end + def follow_remote_account_service @follow_remote_account_service ||= FollowRemoteAccountService.new end |