about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-04-05 12:51:22 +0200
committerGitHub <noreply@github.com>2020-04-05 12:51:22 +0200
commit89e28c76744dc888e7c5f85aef305452681fd6be (patch)
treea8912717fa31375c5898786e370ed022e3c43c5c /app/models
parenta889756dd5f72a1423a613d8ce141f5347da48bc (diff)
Fix PostgreSQL load when linking in announcements (#13250)
* Fix PostgreSQL load when linking in announcements

Fixes #13245 by caching status lookups

Since statuses are supposed to be known already and we only
need their URLs and a few other things, caching them should
be fine.

Since it's only used by announcements so far, there won't
be much statuses to cache.

* Perform status lookup when saving announcements, not when rendering them

* Change EntityCache#status to fetch URLs instead of looking into the database

* Move announcement link lookup to publishing worker

* Address issues pointed out during review
Diffstat (limited to 'app/models')
-rw-r--r--app/models/announcement.rb9
-rw-r--r--app/models/status.rb2
2 files changed, 9 insertions, 2 deletions
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index f8ac4e09d..a4e427b49 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -14,6 +14,7 @@
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  published_at :datetime
+#  status_ids   :bigint           is an Array
 #
 
 class Announcement < ApplicationRecord
@@ -49,7 +50,13 @@ class Announcement < ApplicationRecord
   end
 
   def statuses
-    @statuses ||= Status.from_text(text)
+    @statuses ||= begin
+      if status_ids.nil?
+        []
+      else
+        Status.where(id: status_ids, visibility: [:public, :unlisted])
+      end
+    end
   end
 
   def tags
diff --git a/app/models/status.rb b/app/models/status.rb
index ff653100a..fef4e2596 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -379,7 +379,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