Upstream sync

app/controllers/broadcast_recording_starrings_controller.rb

@@ -1,34 +0,0 @@
-class BroadcastRecordingStarringsController < ApplicationController
-  layout "project"
-
-  before_action :set_project
-  before_action :set_broadcast
-  before_action :set_recording
-
-  def create
-    @recording.toggle_star
-    set_recordings
-  end
-
-  private
-
-  def broadcast_recording_params
-    params.require(:broadcast_recording).permit(:name, :description)
-  end
-
-  def set_project
-    @project = policy_scope(Project).find(params[:project_id])
-  end
-
-  def set_broadcast
-    @broadcast = authorize policy_scope(@project.broadcasts).find(params[:broadcast_id])
-  end
-
-  def set_recording
-    @recording = authorize policy_scope(@broadcast.broadcast_recordings).find(params[:broadcast_recording_id])
-  end
-
-  def set_recordings
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-end

app/controllers/broadcast_recordings_controller.rb

@@ -5,14 +5,6 @@ class BroadcastRecordingsController < ApplicationController
   before_action :set_broadcast
   before_action :set_recording
 
-  def edit
-  end
-
-  def update
-    @recording.update(broadcast_recording_params)
-    set_recordings
-  end
-
   def destroy
     @recording.update(hidden: true)
     set_recordings
@@ -20,10 +12,6 @@ class BroadcastRecordingsController < ApplicationController
 
   private
 
-  def broadcast_recording_params
-    params.require(:broadcast_recording).permit(:name, :description)
-  end
-
   def set_project
     @project = policy_scope(Project).find(params[:project_id])
   end

app/controllers/public/broadcast_recording_starrings_controller.rb

@@ -0,0 +1,24 @@
+class Public::BroadcastRecordingStarringsController < Public::BaseController
+  skip_after_action :verify_authorized
+  before_action :set_broadcast
+  before_action :set_recording
+  
+  def create
+    @recording.toggle_star
+    set_recordings
+  end
+
+  private
+
+  def set_broadcast
+    @broadcast = Broadcast.find_by_token(params[:broadcast_token])
+  end
+
+  def set_recording
+    @recording = @broadcast.broadcast_recordings.find(params[:broadcast_recording_id])
+  end
+
+  def set_recordings
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+end

app/controllers/public/broadcast_recordings_controller.rb

@@ -0,0 +1,31 @@
+class Public::BroadcastRecordingsController < Public::BaseController
+  skip_after_action :verify_authorized
+  before_action :set_broadcast, only: [:edit, :update]
+  before_action :set_recording, only: [:edit, :update]
+  
+  def edit
+  end
+
+  def update
+    @recording.update(broadcast_recording_params)
+    set_recordings
+  end
+
+  private
+
+  def broadcast_recording_params
+    params.require(:broadcast_recording).permit(:name, :description)
+  end
+
+  def set_broadcast
+    @broadcast = Broadcast.find_by_token(params[:broadcast_token])
+  end
+
+  def set_recording
+    @recording = @broadcast.broadcast_recordings.find(params[:id])
+  end
+
+  def set_recordings
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+end

app/controllers/video_analyses/acquired_media_releases_controller.rb

@@ -2,7 +2,7 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
   before_action :set_video
 
   def index
-    @acquired_media_file_infos = filtered_file_infos
+    @acquired_media_files = filtered_files
   end
 
   private
@@ -15,12 +15,12 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
     params[:query]
   end
   
-  def filtered_file_infos
+  def filtered_files
     releasables = policy_scope(@video.acquired_media_releases)
-    results = FileInfo.where(releasable: releasables)
+    results = ActiveStorage::Attachment.where(record: releasables, name: "files")
 
     if query_param.present?
-      results = results.search_filename(query_param)
+      results = results.joins(:blob).where("active_storage_blobs.filename ILIKE ?", "%#{query_param}%")
     end
 
     results

app/controllers/video_release_confirmations_controller.rb

@@ -74,6 +74,7 @@ class VideoReleaseConfirmationsController < ApplicationController
     params.require(:video_release_confirmation).permit(
       :time_elapsed,
       :file_info_id,
+      :file_id,
       :channel,
       :timecode_in,
       :timecode_out,