diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-10 13:34:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-10 13:34:14 -0400 |
commit | c9df53044a333276853f7dc7ef2aed6d48df087f (patch) | |
tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/lib/activitypub | |
parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
parent | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (diff) |
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r-- | app/lib/activitypub/tag_manager.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb index de575d9e6..929e87852 100644 --- a/app/lib/activitypub/tag_manager.rb +++ b/app/lib/activitypub/tag_manager.rb @@ -96,12 +96,14 @@ class ActivityPub::TagManager when 'Account' klass.find_local(uri_to_local_id(uri, :username)) else - klass.find_by(id: uri_to_local_id(uri)) + StatusFinder.new(uri).status end elsif ::TagManager.instance.local_id?(uri) klass.find_by(id: ::TagManager.instance.unique_tag_to_local_id(uri, klass.to_s)) else klass.find_by(uri: uri.split('#').first) end + rescue ActiveRecord::RecordNotFound + nil end end |