ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
78 lines
1.9 KiB
Ruby
78 lines
1.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Settings
|
|
class ScopedSettings
|
|
DEFAULTING_TO_UNSCOPED = %w(
|
|
flavour
|
|
skin
|
|
noindex
|
|
).freeze
|
|
|
|
def initialize(object)
|
|
@object = object
|
|
end
|
|
|
|
def method_missing(method, *args)
|
|
method_name = method.to_s
|
|
# set a value for a variable
|
|
if method_name[-1] == '='
|
|
var_name = method_name.sub('=', '')
|
|
value = args.first
|
|
self[var_name] = value
|
|
else
|
|
# retrieve a value
|
|
self[method_name]
|
|
end
|
|
end
|
|
|
|
def respond_to_missing?(*)
|
|
true
|
|
end
|
|
|
|
def all_as_records
|
|
vars = thing_scoped
|
|
records = vars.each_with_object({}) { |r, h| h[r.var] = r }
|
|
|
|
Setting.default_settings.each do |key, default_value|
|
|
next if records.key?(key) || default_value.is_a?(Hash)
|
|
records[key] = Setting.new(var: key, value: default_value)
|
|
end
|
|
|
|
records
|
|
end
|
|
|
|
def []=(key, value)
|
|
key = key.to_s
|
|
record = thing_scoped.find_or_initialize_by(var: key)
|
|
record.update!(value: value)
|
|
|
|
Rails.cache.write(Setting.cache_key(key, @object), value)
|
|
end
|
|
|
|
def [](key)
|
|
Rails.cache.fetch(Setting.cache_key(key, @object)) do
|
|
db_val = thing_scoped.find_by(var: key.to_s)
|
|
if db_val
|
|
default_value = ScopedSettings.default_settings[key]
|
|
return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash)
|
|
db_val.value
|
|
else
|
|
ScopedSettings.default_settings[key]
|
|
end
|
|
end
|
|
end
|
|
|
|
class << self
|
|
def default_settings
|
|
defaulting = DEFAULTING_TO_UNSCOPED.each_with_object({}) { |k, h| h[k] = Setting[k] }
|
|
Setting.default_settings.merge!(defaulting)
|
|
end
|
|
end
|
|
|
|
protected
|
|
|
|
def thing_scoped
|
|
Setting.unscoped.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
|
|
end
|
|
end
|
|
end
|