diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-12 09:27:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 09:27:38 +0100 |
| commit | 54d4e5252be8cd9fa780df46e06541da8263d368 (patch) | |
| tree | 36ea8ee8f190ed388b7eb5f789ff1d305230b0fd /app/lib | |
| parent | 7bed25f3eabecc84268a4b6c254cc3e0738926b6 (diff) | |
Use Rails' index_by where it makes sense (#15542)
* Use Rails' index_by where it makes sense * Fix tests Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/entity_cache.rb | 2 | ||||
| -rw-r--r-- | app/lib/settings/scoped_settings.rb | 2 | ||||
| -rw-r--r-- | app/lib/webfinger.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb index e38a3adcd..5d51e8585 100644 --- a/app/lib/entity_cache.rb +++ b/app/lib/entity_cache.rb @@ -25,7 +25,7 @@ class EntityCache end unless uncached_ids.empty? - uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).each_with_object({}) { |item, h| h[item.shortcode] = item } + uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).index_by(&:shortcode) uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) } end diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb index ef694205c..acabf0c8e 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -30,7 +30,7 @@ module Settings def all_as_records vars = thing_scoped - records = vars.each_with_object({}) { |r, h| h[r.var] = r } + records = vars.index_by(&:var) Setting.default_settings.each do |key, default_value| next if records.key?(key) || default_value.is_a?(Hash) diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb index c7aa43bb3..702365939 100644 --- a/app/lib/webfinger.rb +++ b/app/lib/webfinger.rb @@ -21,7 +21,7 @@ class Webfinger private def links - @links ||= @json['links'].map { |link| [link['rel'], link] }.to_h + @links ||= @json['links'].index_by { |link| link['rel'] } end end |