diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/announcement.rb | 9 | ||||
| -rw-r--r-- | app/models/report.rb | 3 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
3 files changed, 12 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/report.rb b/app/models/report.rb index 356c23d68..f31bcfd2e 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -18,6 +18,9 @@ class Report < ApplicationRecord include Paginable + include RateLimitable + + rate_limit by: :account, family: :reports belongs_to :account belongs_to :target_account, class_name: 'Account' 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 |