diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-06 21:44:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 21:44:34 +0200 |
| commit | c47be5bd864a1f5244f35122ba7fae31a149c73d (patch) | |
| tree | c8e9e95a36ffb2346e3168d00364e4b614bee92a /app/models/status.rb | |
| parent | 6e426267a762f3cd1efa2c5fb120a13543567775 (diff) | |
| parent | 9101254d0a70bc6f899c093f33300cffceb7c8ac (diff) | |
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index a78717d0c..31e77770d 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -429,7 +429,7 @@ class Status < ApplicationRecord if TagManager.instance.local_url?(url) ActivityPub::TagManager.instance.uri_to_resource(url, Status) else - Status.find_by(uri: url) || Status.find_by(url: url) + EntityCache.instance.status(url) end end status&.distributable? ? status : nil |