Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
This commit is contained in:
Claire
2023-08-13 18:47:15 +02:00
194 changed files with 3931 additions and 2110 deletions

View File

@ -5,7 +5,7 @@ class ApplicationRecord < ActiveRecord::Base
include Remotable
connects_to database: { writing: :primary, reading: ENV['DB_REPLICA_NAME'] || ENV['READ_DATABASE_URL'] ? :read : :primary }
connects_to database: { writing: :primary, reading: ENV['REPLICA_DB_NAME'] || ENV['REPLICA_DATABASE_URL'] ? :replica : :primary }
class << self
def update_index(_type_name, *_args, &_block)

View File

@ -10,7 +10,7 @@
# created_at :datetime not null
# updated_at :datetime not null
# replies_policy :integer default("list"), not null
# exclusive :boolean default(FALSE)
# exclusive :boolean default(FALSE), not null
#
class List < ApplicationRecord

View File

@ -31,6 +31,7 @@
# trendable :boolean
# link_type :integer
# published_at :datetime
# image_description :string default(""), not null
#
class PreviewCard < ApplicationRecord

View File

@ -169,7 +169,7 @@ class Status < ApplicationRecord
REAL_TIME_WINDOW = 6.hours
def cache_key
"v2:#{super}"
"v3:#{super}"
end
def searchable_by(preloaded = nil)