mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-04-30 14:37:46 +08:00
d69cc29979
### What is this change? Some time back we went through an exercise to turn trust-level based access to group-level based for better configurability. This involved deprecating, mapping, and replacing site settings. We marked the old settings for removal in 3.3, which was released over a year ago now. This PR removes the deprecated settings, their descriptions, the mapping helpers, and updates a few test cases we missed in the original conversion. ### Due diligence: - [x] Search through logs for recent deprecation warnings. (@Drenmi) - There are some false positives due to `UserMerger` looping through all site settings (including deprecated ones.) - [ ] Search through public and private repos for latent references. (@Drenmi) --------- Co-authored-by: Martin Brennan <martin@discourse.org>
58 lines
2 KiB
Ruby
58 lines
2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module SiteSettings
|
|
end
|
|
|
|
module SiteSettings::DeprecatedSettings
|
|
SETTINGS = [
|
|
# [<old setting>, <new_setting>, <override>, <version to drop>]
|
|
["min_first_post_typing_time", "fast_typing_threshold", false, "3.4"],
|
|
["twitter_summary_large_image", "x_summary_large_image", false, "3.4"],
|
|
["external_system_avatars_enabled", "external_system_avatars_url", false, "3.5"],
|
|
]
|
|
|
|
def setup_deprecated_methods
|
|
SETTINGS.each { |s| setup_deprecated_method(*s) }
|
|
end
|
|
|
|
def setup_deprecated_method(old_setting, new_setting, override, version)
|
|
SiteSetting.singleton_class.alias_method(:"_#{old_setting}", :"#{old_setting}") if !override
|
|
|
|
define_singleton_method old_setting do |scoped_to = nil, warn: true|
|
|
if warn
|
|
Discourse.deprecate(
|
|
"`SiteSetting.#{old_setting}` has been deprecated. Please use `SiteSetting.#{new_setting}` instead.",
|
|
drop_from: version,
|
|
)
|
|
end
|
|
|
|
self.public_send(override ? new_setting : "_#{old_setting}", scoped_to)
|
|
end
|
|
|
|
SiteSetting.singleton_class.alias_method(:"_#{old_setting}?", :"#{old_setting}?") if !override
|
|
|
|
define_singleton_method "#{old_setting}?" do |scoped_to = nil, warn: true|
|
|
if warn
|
|
Discourse.deprecate(
|
|
"`SiteSetting.#{old_setting}?` has been deprecated. Please use `SiteSetting.#{new_setting}?` instead.",
|
|
drop_from: version,
|
|
)
|
|
end
|
|
|
|
self.public_send("#{override ? new_setting : "_" + old_setting}?", scoped_to)
|
|
end
|
|
|
|
SiteSetting.singleton_class.alias_method(:"_#{old_setting}=", :"#{old_setting}=") if !override
|
|
|
|
define_singleton_method "#{old_setting}=" do |val, warn: true|
|
|
if warn
|
|
Discourse.deprecate(
|
|
"`SiteSetting.#{old_setting}=` has been deprecated. Please use `SiteSetting.#{new_setting}=` instead.",
|
|
drop_from: version,
|
|
)
|
|
end
|
|
|
|
self.public_send("#{override ? new_setting : "_" + old_setting}=", val)
|
|
end
|
|
end
|
|
end
|
