gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

After FollowService, re-fetch remote account asynchronously, do nothing

Browse source 
if account lock info was up to date, otherwise re-do the FollowService
with now updated information
This commit is contained in:
Eugen Rochko 2017-02-11 14:12:29 +01:00
parent e610555e10
commit 00b5731ecb
5 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/fetch_remote_account_service.rb
View file

@ -22,7 +22,9 @@ class FetchRemoteAccountService < BaseService
Rails.logger.debug "Going to webfinger #{username}@#{domain}"
return FollowRemoteAccountService.new.call("#{username}@#{domain}")
account = FollowRemoteAccountService.new.call("#{username}@#{domain}")
UpdateRemoteProfileService.new.call(xml, account) unless account.nil?
account
rescue TypeError
Rails.logger.debug "Unparseable URL given: #{url}"
nil

2
app/services/follow_service.rb
View file

@ -28,6 +28,7 @@ class FollowService < BaseService
NotifyService.new.call(target_account, follow_request)
else
NotificationWorker.perform_async(stream_entry_to_xml(follow_request.stream_entry), source_account.id, target_account.id)
AfterRemoteFollowRequestWorker.perform_async(follow_request.id)
end
follow_request
@ -41,6 +42,7 @@ class FollowService < BaseService
else
subscribe_service.call(target_account) unless target_account.subscribed?
NotificationWorker.perform_async(stream_entry_to_xml(follow.stream_entry), source_account.id, target_account.id)
AfterRemoteFollowWorker.perform_async(follow.id)
end
MergeWorker.perform_async(target_account.id, source_account.id)