diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 10:17:15 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 10:17:15 +0000 |
commit | f839ac694c3f8050e4c7ec84884283e35f6ac662 (patch) | |
tree | 68ab420feffbfc99de00d72f2e6b0beae4a7b7a0 /app/lib/activitypub/tag_manager.rb | |
parent | 722b3f567f18ae31b05f320441c73279b4f5ad11 (diff) | |
parent | dbda87c31f7d7ede7312ba422940841d8c96c171 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib/activitypub/tag_manager.rb')
-rw-r--r-- | app/lib/activitypub/tag_manager.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb index 1c35e1672..0708713e6 100644 --- a/app/lib/activitypub/tag_manager.rb +++ b/app/lib/activitypub/tag_manager.rb @@ -28,8 +28,6 @@ class ActivityPub::TagManager return target.uri if target.respond_to?(:local?) && !target.local? case target.object_type - when :follow - account_follow_url(target.account.username, target) when :person account_url(target) when :note, :comment, :activity @@ -99,12 +97,6 @@ class ActivityPub::TagManager case klass.name when 'Account' klass.find_local(uri_to_local_id(uri, :username)) - when 'FollowRequest' - params = Rails.application.routes.recognize_path(uri) - klass.joins(:account).find_by!( - accounts: { domain: nil, username: params[:account_username] }, - id: params[:id] - ) else StatusFinder.new(uri).status end |