diff options
| author | Starfall <us@starfall.systems> | 2021-01-26 16:42:38 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-01-26 16:42:38 -0600 |
| commit | 3ef928029d94a2b3c6abf96a2935de85c4eed6c8 (patch) | |
| tree | d8697b527a0a42e51634b1fef68f0162fe2ccbe2 /app/controllers | |
| parent | 65263e6309fb4dea1a93d4b4806af629d317c156 (diff) | |
| parent | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (diff) | |
Merge remote-tracking branch 'glitchsoc/main' into main
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/markers_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/cache_concern.rb | 2 | ||||
| -rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/markers_controller.rb b/app/controllers/api/v1/markers_controller.rb index 28c2ec791..867e6facf 100644 --- a/app/controllers/api/v1/markers_controller.rb +++ b/app/controllers/api/v1/markers_controller.rb @@ -7,7 +7,7 @@ class Api::V1::MarkersController < Api::BaseController before_action :require_user! def index - @markers = current_user.markers.where(timeline: Array(params[:timeline])).each_with_object({}) { |marker, h| h[marker.timeline] = marker } + @markers = current_user.markers.where(timeline: Array(params[:timeline])).index_by(&:timeline) render json: serialize_map(@markers) end diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb index 8d82eda5c..3fb4b962a 100644 --- a/app/controllers/concerns/cache_concern.rb +++ b/app/controllers/concerns/cache_concern.rb @@ -38,7 +38,7 @@ module CacheConcern klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!) unless uncached_ids.empty? - uncached = klass.where(id: uncached_ids).with_includes.each_with_object({}) { |item, h| h[item.id] = item } + uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id) uncached.each_value do |item| Rails.cache.write(item, item) diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index a6ab8828f..3290224b4 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -8,7 +8,7 @@ class StatusesController < ApplicationController layout 'public' - before_action :require_signature!, only: :show, if: -> { request.format == :json && authorized_fetch_mode? } + before_action :require_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? } before_action :set_status before_action :set_instance_presenter before_action :set_link_headers |