Upstream sync

.env.sample

@@ -7,8 +7,6 @@ AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
 
 BRAYNIAC_AI_API_ENDPOINT=https://z99cprg2eg.execute-api.us-east-1.amazonaws.com/dev/v0.0.1
-SOURCE_AUDIO_API_ENDPOINT=https://bigmedia.sourceaudio.com/api
-SOURCE_AUDIO_TOKEN=
 
 # Optional
 REDIS_URL=
@@ -18,7 +16,7 @@ ZOOM_API_KEY=
 ZOOM_API_SECRET=
 ZOOM_PRO_USERS_LIMIT= # defaults to 3
 ZOOM_USER_TYPE= # 'pro' / 'basic'
-ZOOM_ENABLE_RECORDINGS=0 # 0 / 1
+ZOOM_ENABLE_RECORDINGS= # true / false (default: false)
 # Token for webhooks authorization
 ZOOM_VERIFICATION_TOKEN=
 
@@ -27,3 +25,10 @@ MUX_TOKEN_ID=
 MUX_TOKEN_SECRET=
 MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
 MUX_TEST_MODE_DISABLED=
+
+# Required for creating user through API
+CUSTOM_API_TOKEN=
+
+# Required for simulcasting to Millicast for director mode
+MILLICAST_API_SECRET=
+MILLICAST_ACCOUNT_ID=

app/assets/javascripts/bs_component_init.js

@@ -0,0 +1,7 @@
+$(document).on("turbolinks:load", function() {
+  bsCustomFileInput.init();
+})
+
+$(document).on("turbolinks:load", function() {
+  $(".toast").toast('show');
+})

app/assets/javascripts/channels/broadcasts.coffee.erb

@@ -21,11 +21,15 @@ $(document).on "turbolinks:load", ->
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content
-      if data.streamer_status == 'recording' && data.status == 'active'
+      stream_selected = $("#broadcast_video").data('videoType') == 'stream';
+      if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
         $("#broadcast_video").html data.video_content
+        $("#recording_status").html data.recording_status_content
+
         new (Clappr.Player)(
+          <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
           parentId: '#broadcast_video'
-          source: data.playback_url
+          source: data.full_live_stream_playback_url
           width: '100%',
           height: '100%',
           mute: true,
@@ -33,11 +37,13 @@ $(document).on "turbolinks:load", ->
           hlsMinimumDvrSize: 1)
       if data.streamer_status == "idle" && data.status == "idle"
         $("#broadcast_video").html data.video_content
+        $("#recording_status").html data.recording_status_content
 
     showBroadcastRecordings: (data) ->
       $(".flash-message").html data.flash_content
       $("#broadcast_recordings").html data.recordings_content
       $("#broadcast_recordings_nav").html data.recordings_nav_content
+      $(".toast").toast('show')
 
     refreshBroadcastFilesTab: (data) ->
       $("#broadcast_file_list_#{data.broadcast_token}").html data.files_content

app/assets/javascripts/channels/projects.coffee

@@ -23,3 +23,4 @@ $(document).on "turbolinks:load", ->
 
     showDownloadStatusUpdate: (content) ->
       $(".flash-message").html content
+      $(".toast").toast('show')

app/assets/javascripts/custom_file_input.js

@@ -1,3 +0,0 @@
-$(document).on("turbolinks:load", function() {
-  bsCustomFileInput.init()
-})

app/assets/javascripts/directory_files_input.js

@@ -0,0 +1,9 @@
+$(document).on("turbolinks:load", function() {
+    $("#upload_directory_files").on('click', function(e){
+        const newFilesCount = $('input[name = "directory[files][]"][type = "hidden"]').length;
+
+        if (newFilesCount === 0){
+            e.preventDefault();
+        }
+    });
+});

app/assets/javascripts/download_releases.js

@@ -0,0 +1,20 @@
+$(document).on("click", "#download_releases", function(event) {
+    event.preventDefault();
+
+    const releasable_ids = JSON.parse($("#selected_releases_form").attr('data-releasable-ids'));
+    const total_entries = $('#total_entries').val();
+
+    const input_ids = $('<input>').attr({ type: 'hidden', name: 'release_ids', value: JSON.stringify(releasable_ids) });
+    const search_query = $('<input>').attr({ type: 'hidden', name: 'search_query', value: $("form input[type='search']").val() });
+    const type_filter = $('<input>').attr({ type: 'hidden', name: 'type_filter', value: $('#type_filter_value').val() });
+
+    const download_count = releasable_ids.length > 0 ? releasable_ids.length : total_entries;
+
+    $(this).parent().append(input_ids);
+    $(this).parent().append(search_query);
+    $(this).parent().append(type_filter);
+
+    if (confirm(`${download_count} release(s) will be downloaded. Is this correct?`)){
+        Rails.fire($(this).parent()[0], 'submit');
+    }
+});

app/assets/javascripts/group_qr_code.js

@@ -0,0 +1,50 @@
+$(document).on("click", "[data-behavior=select_contract_template]", function() {
+  var _this = this;
+  var checkbox = $(this).children("input:checkbox");
+
+  selectContractTemplate(_this, checkbox);
+});
+
+$(document).on("click", "[data-behavior=select_contract_template] input[type='checkbox']", function(e) {
+  e.stopPropagation();
+
+  var _this = this;
+  var checkbox = $(this);
+
+  selectContractTemplate(_this, checkbox);
+});
+
+function selectContractTemplate(clicked_element, checkbox) {
+  if (clicked_element.hasChildNodes()) {
+    if(checkbox.prop("checked")) {
+      checkbox.prop('checked', false);
+    } else {
+      checkbox.prop('checked', true);
+    }
+  }
+
+  var checked = checkbox.prop("checked");
+  var project_id = JSON.parse($('#group_qr_code').attr('data-project-id'));
+  var contract_template_ids = JSON.parse($('#group_qr_code').attr('data-contract-template-ids'));
+  var selected_contract_template_id = checkbox.val();
+
+  if (checked && !contract_template_ids.includes(selected_contract_template_id)) {
+    contract_template_ids.push(selected_contract_template_id);
+  } else if(!checked && contract_template_ids.includes(selected_contract_template_id)) {
+    contract_template_ids.splice( $.inArray(selected_contract_template_id, contract_template_ids), 1 );
+  }
+  
+  $('#group_qr_code').attr('data-contract-template-ids', JSON.stringify(contract_template_ids));
+
+  if (contract_template_ids.length >= 2) {
+    multi_sign_ids = $.param({multi_sign_ids: contract_template_ids});
+    contract_template_url = "/en/contract_templates/" + contract_template_ids[0] + "/qr_codes?" + multi_sign_ids
+
+    $("#group_qr_code").attr("href", contract_template_url);
+    $("#group_qr_code").attr("target", "_blank");
+    $("#group_qr_code").removeClass('disabled');
+  } else if (contract_template_ids.length < 2) {
+    $("#group_qr_code").attr("href", "javascript:void(0);");
+    $("#group_qr_code").addClass('disabled');
+  }
+}

app/assets/javascripts/play_previous_recordings.js.erb

@@ -1,26 +0,0 @@
-$(document).on("click", "[data-behavior=play_recording]", function() {
-    if ($(this).hasClass('active')){
-        return false;
-    }
-
-    console.warn('Play prev : ', playback_url);
-
-    var playback_url = $(this).attr("data-playback-url")
-    $("#broadcast_video").empty();
-
-    new Clappr.Player({
-        <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
-        parentId: '#broadcast_video',
-        source: playback_url,
-        width: '100%',
-        height: '100%',
-        autoPlay: true
-    });
-
-    $(".dropdown-menu").children().removeClass('active');
-    $(".dropdown-menu").children().children('i').remove();
-    $(this).siblings().removeClass('active');
-    $(this).siblings().children("i").remove();
-    $(this).addClass('active');
-    $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
-});

app/assets/javascripts/stream_player.js.erb

@@ -0,0 +1,27 @@
+$(document).on("click", "[data-behavior=play_recording]", function() {
+    clearPlayingHighlight();
+    $(this).parent().parent().addClass('playing-highlight');
+
+    $("#broadcast_video").data('videoType', 'recording');
+
+    var playback_url = $(this).attr("data-playback-url")
+    $("#broadcast_video").empty();
+
+    new Clappr.Player({
+        <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
+        parentId: '#broadcast_video',
+        source: playback_url,
+        width: '100%',
+        height: '100%',
+        autoPlay: true
+    });
+});
+
+$(document).on("click", "[data-behavior=play_stream]", function() {
+//    clearPlayingHighlight();
+    $("#broadcast_video").data('videoType', 'stream');
+});
+
+function clearPlayingHighlight() {
+    $(".playing-highlight").removeClass("playing-highlight");
+}

app/assets/javascripts/switch_director_mode.js

@@ -0,0 +1,4 @@
+$(document).on("click", "#director_mode_switch", function() {
+  // JQuery click event trigger was not working.
+  document.getElementById("director_mode_link").click();
+});

app/assets/javascripts/trix.js

@@ -1,4 +1,30 @@
 // Do not allow file attachments in rich text content
 addEventListener("trix-file-accept", function(event) {
   event.preventDefault();
-})
+});
+
+Trix.config.textAttributes.underline = {
+    style: { "textDecoration": "underline" },
+    inheritable: true,
+    parser: function (element) {
+        var style = window.getComputedStyle(element);
+        return style.textDecoration === "underline";
+    }
+}
+
+document.addEventListener('trix-initialize', function (e) {
+    const trix = e.target;
+    const toolBar = trix.toolbarElement;
+
+    // // Creation of the button
+    const button = document.createElement("button");
+    button.setAttribute("type", "button");
+    button.setAttribute("class", "trix-button trix-button--icon trix-button--icon-underline");
+    button.setAttribute("data-trix-attribute", "underline");
+    button.setAttribute("title", "underline");
+    button.setAttribute("tabindex", "-1");
+    button.innerText = "U";
+
+    // Attachment of the button to the toolBar
+    toolBar.querySelector('.trix-button-group--text-tools').appendChild(button);
+});

app/assets/stylesheets/application.scss

@@ -412,6 +412,16 @@ a[data-behavior=seekable-timecode] {
   background-color: rgba($black, 0.05);
 }
 
+// Black background
+.bg-black {
+  background-color: $black;
+}
+
+// White background
+.bg-white {
+  background-color: $white;
+}
+
 // Custom width
 .w-65 {
   width: 65% !important;
@@ -422,8 +432,93 @@ a[data-behavior=seekable-timecode] {
   max-height: 30rem;
 }
 
+// Max-width 75%
+.max-w-75 {
+  max-width: 75%;
+}
+
 // Fix height and width
 .fix-h-and-w {
   width: 308px;
   height:308px;
 }
+
+// Dropdown shown state overrride
+.override-dropdown-show-state {
+  color: $white !important;
+  background-color: $black !important;
+  border-color: transparent !important;
+}
+
+// Override custom switch color
+.override-custom-control-label::before {
+  background-color: #000000;
+}
+
+// Override nav tab design
+.override-nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
+  background: transparent;
+  border-color: transparent;
+  border-bottom: 3px solid #ff0000;
+}
+
+//Trix underline style
+trix-toolbar {
+  .trix-button--icon-underline::before {
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 17c3.31 0 6-2.69 6-6V3h-2.5v8c0 1.93-1.57 3.5-3.5 3.5S8.5 12.93 8.5 11V3H6v8c0 3.31 2.69 6 6 6zm-7 2v2h14v-2H5z'/%3E%3C/svg%3E");
+  }
+}
+
+// Play button SVG
+.play-btn {
+  width: 60%;
+  height: auto;
+}
+
+.play-btn-svg{
+  transition: 0.3s;
+  stroke:#fedfc2;
+  opacity: 0;
+}
+
+.play-btn:hover .play-btn-svg {
+  fill-opacity: 0;
+  opacity: 1;
+}
+
+// Play button in video thumbnail preview
+.play-thumbnail { position: relative; }
+.play-thumbnail img { display: block; }
+.play-thumbnail .play-btn { position: absolute; bottom:5px; left:10px; }
+
+// Active recording highlight
+.playing-highlight {
+  background-color: scale-color($primary, $lightness: 80%);
+}
+
+// Toast min width and border radius
+.toast-min-w-border-radius {
+  min-width: 18rem; 
+  border-radius: 0.8rem;
+}
+
+// Toast left border primary
+.toast-border-left-primary {
+  border-left: 8px solid $primary;
+}
+
+// Toast left border danger
+.toast-border-left-danger {
+  border-left: 8px solid $danger;
+}
+
+// Change link color to primary on toast notifications
+.toast {
+  a {
+    color: $primary;
+  }
+
+  a.btn {
+    color: white;
+  }
+}

app/assets/stylesheets/contract_pdf.scss

@@ -48,6 +48,10 @@ u {
   margin-right: -30px;
 }
 
+.embed-person-photo {
+  text-align: right;
+}
+
 .do-not-copy-warning {
   padding-right: 15px;
 }

app/channels/broadcasts_channel.rb

@@ -11,12 +11,15 @@ class BroadcastsChannel < ApplicationCable::Channel
   def self.broadcast_stream_updates(broadcast)
     status_content = ApplicationController.render partial: "broadcasts/broadcast_status", locals: { broadcast: broadcast }
     video_content = ApplicationController.render partial: "broadcasts/video", locals: { broadcast: broadcast }
+    recording_status_content = ApplicationController.render partial: "broadcasts/recording_status", locals: { broadcast: broadcast }
 
     broadcast_to broadcast, {
       event: :broadcast_stream_update,
       status: broadcast.status,
       playback_url: broadcast.stream_playback_url,
+      full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
       video_content: video_content,
+      recording_status_content: recording_status_content,
       status_content: status_content,
       streamer_status: broadcast.streamer_status
     }

app/controllers/account_sessions_controller.rb

@@ -1,4 +1,5 @@
 class AccountSessionsController < ApplicationController
+  skip_before_action :redirect_locked_accounts
   def update
     authorize :account_session, :update?
     session[:active_account] = account_session_params[:account_id]

app/controllers/acquired_media_releases_controller.rb

@@ -18,7 +18,6 @@ class AcquiredMediaReleasesController < ApplicationController
     @acquired_media_release = build_acquired_media_release(acquired_media_release_params)
 
     if @acquired_media_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@acquired_media_release)
       redirect_to [@project, :acquired_media_releases], notice: t(".notice")
     else
@@ -56,35 +55,71 @@ class AcquiredMediaReleasesController < ApplicationController
     end
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(
+    params.require(:acquired_media_release).permit(person_params,
-      :name,
+                                                   guardian_params,
-      :territory,
+                                                   second_guardian_params,
-      :term,
+                                                   :minor,
-      :person_first_name,
+                                                   :name,
-      :person_last_name,
+                                                   :territory,
-      :person_phone,
+                                                   :term,
-      :person_email,
+                                                   :contract,
-      :person_company,
+                                                   :applicable_medium_id, :applicable_medium_text,
-      :person_title,
+                                                   :territory_id, :territory_text,
-      :person_address_street1,
+                                                   :term_id, :term_text,
-      :person_address_street2,
+                                                   :restriction_id, :restriction_text,
-      :person_address_city,
+                                                   categories: [],
-      :person_address_state,
+                                                   files: []
-      :person_address_zip,
+                                                  )
-      :person_address_country,
-      :contract,
-      :applicable_medium_id, :applicable_medium_text,
-      :territory_id, :territory_text,
-      :term_id, :term_text,
-      :restriction_id, :restriction_text,
-      categories: [],
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ]
-    )
   end
 
   def build_acquired_media_release(attrs = {})
@@ -100,8 +135,4 @@ class AcquiredMediaReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AcquiredMediaRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/admin/account_locks_controller.rb

@@ -0,0 +1,31 @@
+class Admin::AccountLocksController < Admin::ApplicationController
+  before_action :set_account
+
+  def create
+    authorize :account_lock, :create?
+    @account.update(locked: true)
+    redirect_to admin_accounts_path, notice: 'Account locked'
+  end
+
+  def destroy
+    authorize :account_lock, :destroy?
+    @account.update(locked: false)
+    redirect_to admin_accounts_path, notice: 'Account unlocked'
+  end
+
+  private
+
+  def set_account
+    if params[:account_id].present?
+      @account = Account.find_by(slug: params[:account_id])
+    else
+      failure_redirect
+    end
+  rescue ActiveRecord::RecordNotFound
+    failure_redirect
+  end
+
+  def failure_redirect
+    redirect_to admin_accounts_path, alert: 'Failed to find the account'
+  end
+end

app/controllers/admin/accounts_controller.rb

@@ -20,6 +20,7 @@ class Admin::AccountsController < Admin::ApplicationController
 
   def show
     @videos = filtered_account_videos.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
+    @broadcasts = account_broadcasts.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
   end
 
   def edit
@@ -70,4 +71,8 @@ class Admin::AccountsController < Admin::ApplicationController
       @account.videos
     end
   end
+
+  def account_broadcasts
+    @account.broadcasts
+  end
 end

app/controllers/admin/broadcasts_controller.rb

@@ -0,0 +1,29 @@
+class Admin::BroadcastsController < Admin::ApplicationController
+  before_action :set_broadcast, only: [:edit, :update]
+
+  def edit
+  end
+
+  def update
+    if @broadcast.update(broadcast_update_params)
+      redirect_to [:admin, @broadcast.project.account], notice: t(".notice")
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(Broadcast).find(params[:id])
+  end
+
+  def broadcast_update_params
+    params.require(:broadcast).permit(
+      :video_conference_url_override,
+      :stream_url_override, 
+      :stream_key_override, 
+      :director_mode_video_embed
+    )
+  end
+end

app/controllers/api/releases_controller.rb

@@ -21,7 +21,6 @@ class Api::ReleasesController < Api::ApiController
     release.contract_template_id = @contract_template.id
     handle_attachments(release, release_create_params[:photos])
     release.save!(context: :native)
-    log_create_analytics
     after_create(release)
     handle_response(release, :created)
   end
@@ -46,13 +45,14 @@ class Api::ReleasesController < Api::ApiController
     if model_name == "acquired_media_release"
       mapping = {
         "#{model_name.camelize}": SerializableAcquiredMediaRelease,
-        FileInfo: SerializableFileInfo
+        FileInfo: SerializableFileInfo,
+        "ActiveStorage::Attachment".to_sym => ActiveStorage::SerializableAttachment,
       }
 
       render jsonapi: release,
            status: status,
            class: mapping,
-           include: [:file_infos]
+           include: [:files, :file_infos]
     else
       mapping = {
         "#{model_name.camelize}": show_serializable,
@@ -181,8 +181,4 @@ class Api::ReleasesController < Api::ApiController
     parameters = parameters.slice(*keys).except(:created_at, :updated_at, :id, :user_id, :signature)
     parameters
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_native_release, release_type: model_constant.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip, application: :ios)
-  end
 end

app/controllers/api/user_token_controller.rb

@@ -1,5 +1,13 @@
+# frozen_string_literal: true
+
+require './lib/knock_monkeypatch'
+
 class Api::UserTokenController < Knock::AuthTokenController
+  include Oath::ControllerHelpers
+  include RememberMe::Controller
+
   skip_before_action :verify_authenticity_token
+  before_action :sign_in_user
 
   rescue_from Exception, :with => :return_error
 
@@ -10,7 +18,7 @@ class Api::UserTokenController < Knock::AuthTokenController
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
-    logger.error "==Handled=======" 
+    logger.error "==Handled======="
     case exception
     when ActiveRecord::RecordNotFound
       @status = 404
@@ -27,12 +35,18 @@ class Api::UserTokenController < Knock::AuthTokenController
     end
 
     # for some reason render json_errors is not working
-    # simulating JSON API support 
+    # simulating JSON API support
-    render json: { 
+    render json: {
       errors: [{
         status: @status.to_s,
         title: @message
       }]
     }
   end
+
+  private
+
+  def sign_in_user
+    sign_in(entity)
+  end
 end

app/controllers/api/users_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::UsersController < Api::ApiController
+  skip_before_action :authenticate_user
+  before_action :verify_custom_token, only: :create
+
+  def create
+    if user_params[:email].nil? || user_params[:password].nil?
+      raise ActionController::ParameterMissing.new 'Missing email or password'
+    end
+
+    user = Oath::Services::SignUp.new(user_params).perform
+    render json: user.slice(:email, :created_at, :first_name, :last_name)
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(%i[
+                                   email
+                                   password
+                                   first_name
+                                   last_name
+                                 ])
+  end
+
+  def verify_custom_token
+    if token.blank? || token != ENV['CUSTOM_API_TOKEN']
+      unauthorized_entity(:user)
+    end
+  end
+
+end

app/controllers/appearance_releases_controller.rb

@@ -18,7 +18,6 @@ class AppearanceReleasesController < ApplicationController
     @appearance_release = build_appearance_release(appearance_release_params)
 
     if @appearance_release.save(context: :non_native)
-      log_create_analytics
       AddHeadshotCollectionUidToProjectJob.perform_later(@project)
       SetTagsForReleasableJob.perform_later(@appearance_release)
       redirect_to [@project, :appearance_releases], notice: "The release has been imported. #{link_to_import_another}"
@@ -127,8 +126,4 @@ class AppearanceReleasesController < ApplicationController
   def link_to_import_another
     view_context.link_to "Import Another", [:new, @project, :appearance_release]
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AppearanceRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/application_controller.rb

@@ -13,6 +13,7 @@ class ApplicationController < ActionController::Base
 
   include SetCurrentRequestDetails
   before_action :redirect_accountless
+  before_action :redirect_locked_accounts
 
   private
 
@@ -29,6 +30,12 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def redirect_locked_accounts
+    if Current.user && !Current.user.admin? && Current.account.present? && Current.account.locked?
+      redirect_to locked_account_path
+    end
+  end
+
   def signed_in_as_admin?
     signed_in? && current_user.admin?
   end

app/controllers/approvals_controller.rb

@@ -1,21 +1,48 @@
 class ApprovalsController < ApplicationController
-  include MedicalReleaseContext
+  before_action :set_releasable
-
-  before_action :set_medical_release
   before_action :set_project
 
   layout "project"
 
   def create
-    @medical_release.approve_by(current_user)
+    @releasable.approve_by(current_user)
-    if @medical_release.save
+    @releasable.approved_by_user_signature.attach(approved_by_user_signature_params) if signature_data.present?
-      redirect_to [@project, :medical_releases], notice: t('.release_approved')
+
+    if @releasable.save(context: :approval)
+      redirect_to [@project, "#{@releasable_param.name.pluralize}"], notice: t('.release_approved', release_type: @releasable.model_name.human)
+    else
+      render :new
     end
   end
 
   private
 
+  def releasable_param
+    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
+  end
+
+  def set_releasable
+    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id)
+  end
+
   def set_project
-    @project = @medical_release.project
+    @project = @releasable.project
+  end
+
+  def releasable_params
+    params.require(releasable_param.name).permit(approved_by_user_signature: :data)
+  end
+
+  def signature_data
+    releasable_params.dig(:approved_by_user_signature, :data)
+  end
+
+  def approved_by_user_signature_params
+    {
+      data: signature_data,
+      filename: "approved_by_user_signature.png",
+      content_type: "image/png",
+      identify: false,
+    }
   end
 end

app/controllers/broadcast_recordings_controller.rb

@@ -0,0 +1,30 @@
+class BroadcastRecordingsController < ApplicationController
+  layout "project"
+
+  before_action :set_project
+  before_action :set_broadcast
+  before_action :set_recording
+
+  def destroy
+    @recording.update(hidden: true)
+    set_recordings
+  end
+
+  private
+
+  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[:id])
+  end
+
+  def set_recordings
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+end

app/controllers/broadcasts_controller.rb

@@ -3,7 +3,7 @@ class BroadcastsController < ApplicationController
 
   before_action :set_project
   before_action :build_broadcast, only: [:new, :create]
-  before_action :set_broadcast, only: [:show, :destroy, :update]
+  before_action :set_broadcast, only: [:show, :destroy, :update, :destroy_file]
   before_action :set_multi_view_broadcasts, only: [:show]
   before_action :show_splash_screen, only: :index
 
@@ -23,12 +23,16 @@ class BroadcastsController < ApplicationController
     else
       render :new
     end
+  rescue MuxRuby::ApiError, ActiveResource::ConnectionError => e
+    Raven.capture_exception(e)
+    redirect_to [@project, :broadcasts], alert: t(".alert")
   end
 
   def show
-    @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
+    @conference_url = conference_url_for(@broadcast)
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
+
     render layout: 'application'
   end
 
@@ -39,10 +43,7 @@ class BroadcastsController < ApplicationController
     end
 
     @broadcast.update(broadcast_params)
-    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+    update_files_section
-
-    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
-    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
   end
 
   def destroy
@@ -53,14 +54,29 @@ class BroadcastsController < ApplicationController
     end
   end
 
+  def destroy_file
+    authorize Broadcast
+    file = ActiveStorage::Attachment.find(params[:file_id])
+    file.destroy
+
+    update_files_section
+  end
+
   private
 
+  def update_files_section
+    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+  end
+
   def show_splash_screen
     render :splash if broadcasts.count.zero?
   end
 
   def broadcast_params
-    params.require(:broadcast).permit(:name, files: [])
+    params.require(:broadcast).permit(:name, :shoot_location_time_zone, files: [])
   end
 
   def set_project
@@ -97,6 +113,10 @@ class BroadcastsController < ApplicationController
     results
   end
 
+  def conference_url_for(broadcast)
+    broadcast.video_conference_url_override.presence || url_for([broadcast.project, broadcast, :zoom_meeting])
+  end
+
   def log_create_analytics
     TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_live_stream, user_agent: request.user_agent, user_ip: request.remote_ip)
   end

app/controllers/contract_downloads_controller.rb

@@ -7,28 +7,41 @@ class ContractDownloadsController < ApplicationController
 
   def create
     authorize policy_scope(Download).create
-    fetch_releases
+
-    
+    download = @project.downloads.create!(release_type: release_type)
-    download = @project.downloads.create!(release_type: params[:release_type])
     other_downloads_in_progress = @project.downloads.unfinished_desc_order.offset(1)
 
     if other_downloads_in_progress.any?
-      in_progress_downloads_details = render_to_string "_other_pending_downloads", locals: { downloads: other_downloads_in_progress, release_type: params[:release_type] }, :layout => false
+      in_progress_downloads_details = render_to_string "_other_pending_downloads", locals: { downloads: other_downloads_in_progress, release_type: release_type }, :layout => false
       ProjectsChannel.broadcast_download_generation_update(download, in_progress_downloads_details)
     else
-      ProjectsChannel.broadcast_download_generation_update(download, I18n.t("contract_downloads.download.pending", release_type: params[:release_type].titleize))
+      ProjectsChannel.broadcast_download_generation_update(download, I18n.t("contract_downloads.download.pending", release_type: release_type.titleize))
     end
 
-    GenerateContractsZipJob.perform_later(@project, download, params[:release_type], @releases.ids)
+    GenerateContractsZipJob.perform_later(@project, download, release_type, release_ids, search_query, type_filter)
   end
 
   private
 
-  def fetch_releases
+  def release_type
-    @releases = policy_scope(@project.public_send(releases))
+    params[:release_type]
   end
 
-  def releases
+  def search_query
-    params[:release_type].constantize.model_name.plural
+    params[:search_query]
+  end
+
+  def type_filter
+    params[:type_filter]
+  end
+
+  def release_ids
+    JSON.parse(params[:release_ids])
+  rescue StandardError
+    []
+  end
+
+  def release_name(release_type)
+    release_type.constantize.model_name.plural
   end
 end

app/controllers/contract_templates/duplicates_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class ContractTemplates::DuplicatesController < ApplicationController
+  before_action :set_contract_template
+
+  def create
+    authorize(ContractTemplate)
+    new_contract_template = @contract_template.dup
+    new_contract_template.name = I18n.t('contract_templates.duplicate.name_prefix', template_name: @contract_template.name)
+
+    # Duplicate rich text fields
+
+    new_contract_template.body = @contract_template.body
+    new_contract_template.guardian_clause = @contract_template.guardian_clause
+    new_contract_template.signature_legal_text = @contract_template.signature_legal_text
+
+    if new_contract_template.save
+      redirect_to [:edit, new_contract_template]
+    else
+      redirect_to [@contract_template.project, :contract_templates], alert: t('.error')
+    end
+  end
+
+  private
+
+  def contract_templates
+    policy_scope(ContractTemplate)
+  end
+
+  def set_contract_template
+    @contract_template = contract_templates.find(params[:contract_template_id])
+  end
+end

app/controllers/contract_templates/qr_codes_controller.rb

@@ -16,7 +16,12 @@ class ContractTemplates::QrCodesController < ApplicationController
   end
 
   def qr_code
-    authorize QrCode.build_from_contract_template(@contract_template)
+    if params[:multi_sign_ids].present?
+      contract_templates_group = authorize contract_templates.where(id: params[:multi_sign_ids]).order_by_recent
+      authorize QrCode.build_from_multiple_contract_templates(contract_templates_group, @contract_template.project)
+    else
+      authorize QrCode.build_from_contract_template(@contract_template)
+    end
   end
 
   def download_attributes

app/controllers/contract_templates_controller.rb

@@ -5,8 +5,9 @@ class ContractTemplatesController < ApplicationController
 
   layout 'project'
 
-  before_action :set_project, except: [:destroy]
+  before_action :set_project, except: [:destroy, :edit, :update]
-  before_action :set_contract_template, only: [:destroy]
+  before_action :set_contract_template, only: [:destroy, :edit, :update]
+  before_action :set_project_from_contract_template, only: [:edit, :update]
   before_action :show_splash_screen, only: :index
 
   def index
@@ -25,6 +26,7 @@ class ContractTemplatesController < ApplicationController
       contract = Contract.new releasable_instance, true
       send_file contract.to_pdf, download_attributes
     elsif @contract_template.save
+      log_create_analytics
       redirect_to [@project, :contract_templates], notice: t('.notice')
     else
       @release_type = contract_template_params[:release_type]
@@ -32,6 +34,20 @@ class ContractTemplatesController < ApplicationController
     end
   end
 
+  def edit
+    @release_type = @contract_template.release_type
+  end
+
+  def update
+    @contract_template.attributes = contract_template_params
+
+    if @contract_template.save
+      redirect_to [@project, :contract_templates], notice: t('.notice')
+    else
+      render :edit
+    end
+  end
+
   def destroy
     @contract_template.archive
     redirect_to [@contract_template.project, :contract_templates], alert: t('.archived_notice')
@@ -39,6 +55,10 @@ class ContractTemplatesController < ApplicationController
 
   private
 
+  def set_project_from_contract_template
+    @project = @contract_template.project
+  end
+
   def show_splash_screen
     render :splash if contract_templates.non_archived.count.zero?
   end
@@ -63,7 +83,7 @@ class ContractTemplatesController < ApplicationController
     params
       .require(:contract_template)
       .permit(:name, :release_type, :body, :guardian_clause,
-              :signature_legal_text, :fee,
+              :signature_legal_text, :fee, :amendment_clause,
               :applicable_medium_id, :applicable_medium_text,
               :territory_id, :territory_text,
               :term_id, :term_text, :accessibility,
@@ -75,7 +95,9 @@ class ContractTemplatesController < ApplicationController
               :question_9_text, :question_10_text,
               :question_11_text, :question_12_text,
               :question_13_text, :question_14_text,
-              :question_15_text)
+              :question_15_text, :questionnaire_legal_text,
+              :exhibit_a_legal_text, :exhibit_a_question_text,
+              :exhibit_b_legal_text, :exhibit_b_question_text)
   end
 
   def download_attributes
@@ -85,4 +107,8 @@ class ContractTemplatesController < ApplicationController
       type: 'application/pdf'
     }
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_contract_template, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/contracts_controller.rb

@@ -3,7 +3,7 @@ class ContractsController < ApplicationController
     respond_to do |format|
       format.pdf { send_contract_pdf }
 
-      if Rails.env.development?
+      if Rails.env.development? || Rails.env.test?
         format.html { render_sample_html }
       end
     end

app/controllers/files_controller.rb

@@ -1,4 +1,4 @@
-class FileInfosController < ApplicationController
+class FilesController < ApplicationController
   before_action :set_releasable
 
   layout "project"
@@ -16,7 +16,7 @@ class FileInfosController < ApplicationController
     
     if @releasable.update(releasable_params)
       SetTagsForReleasableJob.perform_later(@releasable)
-      redirect_to [@project, @releasable.model_name.plural], notice: t(".notice")
+      redirect_to [@project, @releasable.model_name.plural], notice: "Files added successfully to the release."
     else
       render :edit
     end
@@ -29,16 +29,10 @@ class FileInfosController < ApplicationController
   end
 
   def set_releasable
-    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id), :"#{action_name}_file_infos?"
+    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id), :edit_files?
   end
 
   def releasable_params
-    params.fetch(releasable_param.name, {}).permit(
+    params.fetch(releasable_param.name, {}).permit(files: [])
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ],
-    )
   end
 end

app/controllers/location_releases_controller.rb

@@ -18,7 +18,6 @@ class LocationReleasesController < ApplicationController
     @location_release = build_location_release(location_release_params)
 
     if @location_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@location_release)
       redirect_to [@project, :location_releases], notice: t(".notice")
     else
@@ -90,8 +89,4 @@ class LocationReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: LocationRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/locked_accounts_controller.rb

@@ -0,0 +1,10 @@
+class LockedAccountsController < ApplicationController
+  skip_before_action :redirect_locked_accounts
+  skip_after_action :verify_policy_scoped
+
+  def index
+    unless Current.account.locked?
+      redirect_to projects_path
+    end
+  end
+end

app/controllers/material_releases_controller.rb

@@ -18,7 +18,6 @@ class MaterialReleasesController < ApplicationController
     @material_release = build_material_release(material_release_params)
 
     if @material_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@material_release)
       redirect_to [@project, :material_releases], notice: t(".notice")
     else
@@ -50,17 +49,64 @@ class MaterialReleasesController < ApplicationController
 
   private
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :applicable_medium_id, :applicable_medium_text,
       :territory_id, :territory_text,
       :term_id, :term_text,
       :restriction_id, :restriction_text,
       :description,
-      :contract, { photos: [] }
+      :contract, files: []
     )
   end
 
@@ -89,8 +135,4 @@ class MaterialReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: MaterialRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/music_releases_controller.rb

@@ -22,7 +22,6 @@ class MusicReleasesController < ApplicationController
     @music_release = build_music_release(music_release_params)
 
     if @music_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@music_release)
       redirect_to [@project, :music_releases], notice: t(".notice")
     else
@@ -111,8 +110,4 @@ class MusicReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: MusicRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/pages_controller.rb

@@ -4,4 +4,16 @@ class PagesController < ApplicationController
   skip_after_action :verify_authorized
   skip_after_action :verify_policy_scoped
   skip_before_action :require_login
+
+  layout :layout_for_page
+
+  private
+
+  def layout_for_page
+    case params[:id]
+    when 'nanocosmos_player'
+      false
+    else
+    end
+  end
 end

app/controllers/projects_controller.rb

@@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
   before_action :set_project, only: [:show, :edit, :update, :destroy]
 
   def index
-    @projects = policy_scope(Current.account.projects).order_by_name
+    @projects = filtered_projects.order_by_name
   end
 
   def new
@@ -46,6 +46,20 @@ class ProjectsController < ApplicationController
 
   private
 
+  def filtered_projects
+    results = projects
+    
+    if params[:query].present?
+      results = results.search(params[:query])
+    end
+
+    results
+  end
+
+  def projects
+    authorize policy_scope(Current.account.projects)
+  end
+
   def set_project
     @project = authorize projects.find(params[:id])
   end

app/controllers/public/acquired_media_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     @acquired_media_release = build_acquired_media_release(acquired_media_release_params_with_locale_and_contract_template)
 
     if @acquired_media_release.save(context: :native)
-      log_create_analytics
       after_create(@acquired_media_release)
     else
       render :new
@@ -41,31 +40,67 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     end
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_fax
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(
+    params.require(:acquired_media_release).permit(person_params,
-      :name, 
+                                                   guardian_params,
-      :description,
+                                                   second_guardian_params,
-      :person_first_name,
+                                                   :minor,
-      :person_last_name,
+                                                   :name,
-      :person_email,
+                                                   :description,
-      :person_title,
+                                                   :signature_base64,
-      :person_phone,
+                                                   :locale, :contract_template,
-      :person_fax,
+                                                   categories: [],
-      :person_address_street1, 
+                                                   files: []
-      :person_address_street2, 
+                                                  )
-      :person_address_city, 
-      :person_address_state, 
-      :person_address_zip, 
-      :person_address_country,
-      :signature_base64,
-      :locale, :contract_template,
-      categories: [],
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ]
-    )
   end
 
   def acquired_media_release_params_with_locale
@@ -75,8 +110,4 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
   def acquired_media_release_params_with_locale_and_contract_template
     acquired_media_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: AcquiredMediaRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/amendments_controller.rb

@@ -0,0 +1,47 @@
+class Public::AmendmentsController < Public::BaseController
+  skip_after_action :verify_authorized, :verify_policy_scoped
+  before_action :set_account, :set_project, :set_contract_template, :set_release
+
+  def new
+    if @release.amendment_signed?
+      render :create, locals: { already_signed: true }
+    end
+  end
+
+  def create
+    if @release.amendment_signed?
+      render :create, locals: { already_signed: true }
+      return
+    end
+
+    @release.attributes = amendment_params
+
+    render :new unless @release.save(context: :amendment)
+  end
+
+  private
+
+  def amendment_params
+    params.require(releasable_param.name).permit(:amendment_signer_name, :amendment_signature_base64)
+  end
+
+  def releasable_param
+    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
+  end
+
+  def set_release
+    @release = @contract_template.releases.find(releasable_param.id)
+  end
+
+  def set_contract_template
+    @contract_template = @project.contract_templates.find(params[:contract_template_id])
+  end
+
+  def set_project
+    @project = @account.projects.find(params[:project_id])
+  end
+
+  def set_account
+    @account = Account.find_by(slug: params[:account_id])
+  end
+end

app/controllers/public/appearance_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::AppearanceReleasesController < Public::BaseController
     @appearance_release = build_appearance_release(appearance_release_params_with_locale_and_contract_template)
 
     if @appearance_release.save(context: :native)
-      log_create_analytics
       after_create(@appearance_release)
     else
       render :new
@@ -87,12 +86,35 @@ class Public::AppearanceReleasesController < Public::BaseController
     ]
   end
 
+  def questionnaire_params
+    [
+      :question_1_answer,
+      :question_2_answer,
+      :question_3_answer,
+      :question_4_answer,
+      :question_5_answer,
+      :question_6_answer,
+      :question_7_answer,
+      :question_8_answer,
+      :question_9_answer,
+      :question_10_answer,
+      :question_11_answer,
+      :question_12_answer,
+      :question_13_answer,
+      :question_14_answer,
+      :question_15_answer,
+    ]
+  end
+
   def appearance_release_params
     params.require(:appearance_release).permit(person_params, guardian_params,
                                                second_guardian_params,
+                                               questionnaire_params,
                                                :minor, :signature_base64,
                                                :person_date_of_birth,
-                                               :locale, :contract_template)
+                                               :locale, :contract_template,
+                                               :exhibit_a_answer, :exhibit_b_answer
+                                              )
   end
 
   def appearance_release_params_with_locale
@@ -102,8 +124,4 @@ class Public::AppearanceReleasesController < Public::BaseController
   def appearance_release_params_with_locale_and_contract_template
     appearance_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: AppearanceRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 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/public/broadcasts_controller.rb

@@ -3,9 +3,9 @@ class Public::BroadcastsController < Public::BaseController
   before_action :set_broadcast, only: [:show, :update]
 
   def show
-    @conference_url = broadcast_zoom_meeting_url(@broadcast.token)
+    @conference_url = conference_url_for(@broadcast)
     @multi_view_broadcasts = multi_view_broadcasts
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
 
     render 'broadcasts/show'
@@ -43,6 +43,10 @@ class Public::BroadcastsController < Public::BaseController
     end
   end
 
+  def conference_url_for(broadcast)
+    broadcast.video_conference_url_override.presence || broadcast_zoom_meeting_url(broadcast.token)
+  end
+
   class MultiViewBroadcast
     include Rails.application.routes.url_helpers
 

app/controllers/public/contract_templates_controller.rb

@@ -0,0 +1,18 @@
+class Public::ContractTemplatesController < Public::BaseController
+  skip_after_action :verify_authorized, :verify_policy_scoped
+  before_action :set_account, :set_project
+
+  def index
+    @contract_templates = @project.contract_templates.where(id: params[:contract_template_ids]).order_by_name.paginate(page: params[:page])
+  end
+
+  private
+
+  def set_project
+    @project = @account.projects.find(params[:project_id])
+  end
+
+  def set_account
+    @account = Account.find_by(slug: params[:account_id])
+  end
+end

app/controllers/public/location_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::LocationReleasesController < Public::BaseController
     @location_release = build_location_release(location_release_params_with_locale_and_contract_template)
 
     if @location_release.save(context: :native)
-      log_create_analytics
       after_create(@location_release)
     else
       render :new
@@ -76,8 +75,4 @@ class Public::LocationReleasesController < Public::BaseController
   def location_release_params_with_locale_and_contract_template
     location_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: LocationRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/material_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::MaterialReleasesController < Public::BaseController
     @material_release = build_material_release(material_release_params_with_locale_and_contract_template)
 
     if @material_release.save(context: :native)
-      log_create_analytics
       after_create(@material_release)
     else
       render :new
@@ -39,13 +38,61 @@ class Public::MaterialReleasesController < Public::BaseController
     authorize material_releases.build(params)
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_title
+      person_company
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :signature_base64,
-      :locale, :contract_template, :description, photos: []
+      :locale, :contract_template, :description, files: []
     )
   end
 
@@ -56,8 +103,4 @@ class Public::MaterialReleasesController < Public::BaseController
   def material_release_params_with_locale_and_contract_template
     material_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MaterialRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/medical_releases_controller.rb

@@ -12,7 +12,6 @@ class Public::MedicalReleasesController < Public::BaseController
       if @medical_release.contract_template.present?
         AttachContractToReleasableJob.perform_later(@medical_release)
       end
-      log_create_analytics
     else
       render :new
     end
@@ -116,8 +115,4 @@ class Public::MedicalReleasesController < Public::BaseController
   def medical_release_params_with_locale_and_contract_template
     medical_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MedicalRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/misc_releases_controller.rb

@@ -12,7 +12,6 @@ class Public::MiscReleasesController < Public::BaseController
       if @misc_release.contract_template.present?
         AttachContractToReleasableJob.perform_later(@misc_release)
       end
-      log_create_analytics
     else
       render :new
     end
@@ -50,6 +49,14 @@ class Public::MiscReleasesController < Public::BaseController
         :signature_base64,
         :locale,
         :contract_template,
+        :applicable_medium_id,
+        :applicable_medium_text,
+        :territory_id,
+        :territory_text,
+        :term_id,
+        :term_text,
+        :restriction_id,
+        :restriction_text,
         photos: [],
       )
   end
@@ -113,8 +120,4 @@ class Public::MiscReleasesController < Public::BaseController
   def misc_release_params_with_locale_and_contract_template
     misc_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MiscRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/talent_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::TalentReleasesController < Public::BaseController
     @talent_release = build_talent_release(talent_release_params_with_locale_and_contract_template)
 
     if @talent_release.save(context: :native)
-      log_create_analytics
       after_create(@talent_release)
     else
       render :new
@@ -108,8 +107,4 @@ class Public::TalentReleasesController < Public::BaseController
   def talent_release_params_with_locale_and_contract_template
     talent_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: TalentRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/stream_notifications_controller.rb

@@ -14,6 +14,10 @@ class StreamNotificationsController < ApplicationController
     when "video.live_stream.recording"
       @broadcast.streamer_recording!
       notify_users
+    when "video.asset.ready"
+      full_live_stream_playback_uid = notification.dig(:data, :playback_ids, 0, :id)
+      @broadcast.update(full_live_stream_playback_uid: full_live_stream_playback_uid)
+      notify_users
     when "video.live_stream.active"
       @broadcast.active!
       notify_users
@@ -31,7 +35,7 @@ class StreamNotificationsController < ApplicationController
       duration = notification.dig(:data, :duration)
 
       recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
-      recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+      recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
       message = "Your recent live stream has been recorded and is available for download here: #{link}"
@@ -59,7 +63,8 @@ class StreamNotificationsController < ApplicationController
   end
 
   def set_broadcast
-    if notification_type == "video.asset.static_renditions.ready"
+    case notification_type
+    when "video.asset.static_renditions.ready", "video.asset.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
       @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
     else

app/controllers/talent_releases_controller.rb

@@ -18,7 +18,6 @@ class TalentReleasesController < ApplicationController
     @talent_release = build_talent_release(talent_release_params)
 
     if @talent_release.save
-      log_create_analytics
       AddHeadshotCollectionUidToProjectJob.perform_later(@project)
       SetTagsForReleasableJob.perform_later(@talent_release)
       redirect_to [@project, :talent_releases], notice: t(".notice")
@@ -137,8 +136,4 @@ class TalentReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: TalentRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  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,

app/helpers/dropzone_helper.rb

@@ -40,4 +40,13 @@ module DropzoneHelper
       { name: file_info.filename, size: file_info.byte_size, type: file_info.content_type }
     end.to_json
   end
+  
+  def dropzone_file_size_limit_for(releasable)
+    case releasable.model_name.param_key
+    when "material_release", "acquired_media_release"
+      1000000
+    else
+      256
+    end
+  end
 end

app/helpers/mail_helper.rb

@@ -6,6 +6,6 @@ module MailHelper
       "1. Tell us the name of the video: \n\n" \
       "2. Attach each EDL to this email. Please make sure to indicate whether the EDL is a Video Only, Graphics Only, or Audio Only EDL."
 
-    mail_to "info@bigmedia.ai", content, subject: subject, body: body
+    mail_to "info@mesuite.ai", content, subject: subject, body: body
   end
 end

app/helpers/tags_helper.rb

@@ -17,6 +17,7 @@ module TagsHelper
         disable_with: disabled_content,
       },
       form: {
+        id: "selected_releases_form",
         data: {
           releasable_ids: [],
         },

app/helpers/tooltip_helper.rb

@@ -6,11 +6,11 @@ module TooltipHelper
     end
   end
 
-  def get_approval_data_for_medical_release(medical_release)
+  def get_approval_data_for_releasable(release)
-    if medical_release.approved_by_user_name.present?
+    if release.approved_by_user_name.present?
-      "#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]"
+      "#{release.approved_by_user_name} [#{release.approved_by_user_email}]"
     else
-      medical_release.approved_by_user_email
+      release.approved_by_user_email
     end
   end
 end

app/javascript/packs/active_storage_dropzone.js

@@ -12,6 +12,7 @@ class ActiveStorageDropzone {
     var acceptedFiles = $(element).data("accepted-files") || "image/*";
     var dictDefaultMessage = $(element).data("placeholder") || "Drop files here";
     var submitButton = $($(element).data("submit-button"));
+    var maxFileSize = $(element).data("max-file-size");
     var that = this;
 
     this.myDropzone = new this.DropzoneClass(element, {
@@ -20,6 +21,7 @@ class ActiveStorageDropzone {
       acceptedFiles: acceptedFiles,
       parallelUploads: 30,
       dictDefaultMessage: dictDefaultMessage,
+      maxFilesize: maxFileSize,
 
       init: function () {
         this.on("sending", (file, xhr, formData) => {
@@ -67,6 +69,23 @@ class ActiveStorageDropzone {
           var upload = new that.UploaderClass(file, url, delegate);
           createUpload(this, upload);
         });
+
+        this.on("addedfile", function(file) {
+          // Show download link in dropzone previews
+
+          let div = document.createElement("div");
+          let anchor = document.createElement("a");
+          let download_icon = "<i class='fa fa-download' aria-hidden='true'></i> Download";
+
+          anchor.innerHTML = download_icon;
+          anchor.href = file.dataURL;
+          anchor.setAttribute('target', '_blank');
+          anchor.setAttribute('style', 'background-color: rgba(255, 255, 255, 0.4); padding: 0 0.4em; border: 1px solid transparent; text-decoration: none;');
+          div.append(anchor);
+          div.setAttribute('class', 'dz-download-link')
+          div.setAttribute('style', 'margin-top: 1em;')
+          $(file.previewElement.childNodes[3]).append(div);
+        });
       },
     });
 

app/jobs/generate_contracts_zip_job.rb

@@ -7,13 +7,14 @@ class GenerateContractsZipJob < ApplicationJob
     @project = job.arguments.first
     @download = job.arguments.second
     @release_type = job.arguments.third
-    @folder_name = "#{@project.name.parameterize}_#{get_release_name(@release_type).gsub('_', '-')}"
+    @release_ids = job.arguments.fourth
+    @search_query = job.arguments.fifth
+    @type_filter = job.arguments[5]
+    @folder_name = "#{@project.name.parameterize}_#{release_name.gsub('_', '-')}"
     @download.update!(name: @folder_name, status: :pending)
   end
 
-  def perform(project, download, release_type, release_ids)
+  def perform(project, download, release_type, release_ids, search_query, type_filter)
-    releases = project.public_send(get_release_name(release_type)).where(id: release_ids)
-
     ::ReleaseContractCollectionService.new(releases, @folder_name).build do |dir, files|
       zipfile_name = "#{dir}/#{@folder_name}.zip"
       Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
@@ -31,7 +32,7 @@ class GenerateContractsZipJob < ApplicationJob
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
-    
+
     @download.failure!
     ProjectsChannel.broadcast_download_generation_update(@download, I18n.t("contract_downloads.download.failure"))
   end
@@ -61,7 +62,32 @@ class GenerateContractsZipJob < ApplicationJob
     end
   end
 
-  def get_release_name(release_type)
+  def release_name
-    release_type.constantize.model_name.plural
+    @release_type.constantize.model_name.plural
+  end
+
+  def all_releases
+    @project.public_send(release_name)
+  end
+
+  def releases
+    if @release_ids.any?
+      return all_releases.where(id: @release_ids)
+    end
+
+    results = all_releases
+    if all_releases.respond_to?(:complete, :incomplete)
+      results = case @type_filter
+                when 'complete'
+                  all_releases.complete
+                when 'incomplete'
+                  all_releases.incomplete
+                else
+                  all_releases
+                end
+    end
+
+    results = results.search(@search_query) if @search_query.present?
+    results
   end
 end

app/jobs/match_appearance_releases_job.rb

@@ -15,6 +15,7 @@ class MatchAppearanceReleasesJob < ApplicationJob
     matches = response.matches || []
     key_signed_id_hash = Hash[filtered_attachments_object[:keys].zip(filtered_attachments_object[:signed_ids])]
     handle_matches matches, project, key_signed_id_hash
+    handle_unmatches matches, project, key_signed_id_hash
     matching_request.destroy
   end
 
@@ -40,6 +41,21 @@ class MatchAppearanceReleasesJob < ApplicationJob
     end
   end
 
+  def handle_unmatches(matches, project, key_signed_id_hash)
+    matched_keys = matches.flat_map { |match| match.contracts + match.headshots }
+    unmatches = key_signed_id_hash.find_all { |key, _| !key.in?(matched_keys) }
+
+    unmatches.each do |key, signed_id|
+      blob = ActiveStorage::Blob.find_signed signed_id
+
+      if blob.image?
+        create_release(project, nil, signed_id, nil)
+      else
+        create_release(project, signed_id, nil, nil)
+      end
+    end
+  end
+
   def create_release(project, contract, headshot, identifier)
     random_contract_no = AppearanceRelease.random_contract_number.to_s
     is_incomplete = contract.nil? || headshot.nil?

app/mailers/admin_mailer.rb

@@ -1,5 +1,5 @@
 class AdminMailer < ApplicationMailer
-  default to: %w(bray@bigmedia.ai lee@bigmedia.ai)
+  default to: %w[bray@mesuite.ai]
 
   def new_video(video)
     @video = video

app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@bigmedia.ai" }
+  default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@mesuite.ai" }
   layout "mailer"
 end

app/models/account.rb

@@ -5,6 +5,7 @@ class Account < ApplicationRecord
   has_many :users, through: :account_auths
   has_many :projects, dependent: :destroy
   has_many :videos, through: :projects
+  has_many :broadcasts, through: :projects
   has_many :contract_templates, through: :projects
 
   validates :name, presence: true
@@ -63,6 +64,19 @@ class Account < ApplicationRecord
       ])).sum(:byte_size).to_f
   end
 
+  def total_number_of_releases
+    [
+      MiscRelease.where(project: projects).size,
+      AppearanceRelease.where(project: projects).size,
+      TalentRelease.where(project: projects).size,
+      MaterialRelease.where(project: projects).size,
+      MedicalRelease.where(project: projects).size, 
+      LocationRelease.where(project: projects).size,
+      AcquiredMediaRelease.where(project: projects).size,
+      MusicRelease.where(project: projects).size
+    ].sum
+  end
+
   def to_param
     slug
   end
@@ -84,7 +98,7 @@ class Account < ApplicationRecord
   end
 
   def taskme_enabled?
-    ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
+    plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme"
   end
 
   def plan_name

app/models/acquired_media_release.rb

@@ -10,16 +10,23 @@ class AcquiredMediaRelease < ApplicationRecord
   include Syncable
   include PersonName
   include CsvExportable
-
+  include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+  include FilesFilterable
+  
   class << self
     def custom_csv_exportable_headers
-      %i[name file_infos_count]
+      %i[name files_count owner_info]
     end
   end
 
+  # This association needs to be removed after changing the API. Removing it right now will cause failure in API specs.
   has_many :file_infos, as: :releasable, dependent: :destroy
 
-  accepts_nested_attributes_for :file_infos
+  has_many_attached :files
 
   composed_of :person_address,
               class_name: "Address",
@@ -32,6 +39,38 @@ class AcquiredMediaRelease < ApplicationRecord
                 %w(person_address_country country) 
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -53,8 +92,8 @@ class AcquiredMediaRelease < ApplicationRecord
   # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
   CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
 
-  def minor?
+  def second_guardian_present?
-    false
+    guardian_2_first_name.present?
   end
 
   def contact_person
@@ -65,7 +104,7 @@ class AcquiredMediaRelease < ApplicationRecord
     true
   end
 
-  def file_infos_count
+  def files_count
-    file_infos.any? ? file_infos.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
+    files.any? ? files.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
   end
 end

app/models/app_host.rb

@@ -40,7 +40,7 @@ class AppHost
       use_ssl: false,
     },
     production: {
-      host: "bigmedia.ai",
+      host: "mesuite.ai",
       use_ssl: true,
     }
   }

app/models/appearance_release.rb

@@ -16,6 +16,10 @@ class AppearanceRelease < ApplicationRecord
   include GuardianName
   include SecondGuardianName
   include CsvExportable
+  include Approvable
+  include Amendmenable
+
+  NUMBER_OF_CUSTOM_FIELDS = 15
 
   class << self
     def custom_csv_exportable_headers

app/models/broadcast.rb

@@ -30,8 +30,16 @@ class Broadcast < ApplicationRecord
     "https://stream.mux.com/#{stream_playback_uid}.m3u8"
   end
 
+  def full_live_stream_playback_url
+    full_live_stream_playback_uid.blank? ? stream_playback_url : "https://stream.mux.com/#{full_live_stream_playback_uid}.m3u8"
+  end
+
   def stream_server_url
-    ENV['MUX_BROADCAST_SERVER_URL']
+    stream_url_override.presence || ENV["MUX_BROADCAST_SERVER_URL"]
+  end
+
+  def stream_server_key
+    stream_key_override.presence || stream_key
   end
 
   def zoom_meeting_url
@@ -41,11 +49,13 @@ class Broadcast < ApplicationRecord
   private
 
   def create_mux_live_stream
-    stream = MuxLiveStream.new
+    stream = MuxLiveStream.create_with_simulcast
 
     self.stream_uid = stream.id
     self.stream_key = stream.key
     self.stream_playback_uid = stream.playback_id
+    self.simulcast_uid = stream.simulcast_id
+    self.director_mode_video_embed ||= stream.simulcast_destination.try(:playback_embed)
     self.save!
   end
 

app/models/broadcast_recording.rb

@@ -5,8 +5,12 @@ class BroadcastRecording < ApplicationRecord
 
   validates :asset_uid, uniqueness: true
 
+  scope :visible, -> { where(hidden: false) }
+
+  before_save :set_title_and_description
+
   def download_url
-    "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}"
+    "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{name}"
   end
 
   def playback_url
@@ -14,6 +18,21 @@ class BroadcastRecording < ApplicationRecord
   end
 
   def download_file_name
-    "#{broadcast_name}_Date_#{created_at.strftime("%Y-%m-%d")}_Time_#{created_at.strftime("%T")}".parameterize
+    "#{broadcast_name}_Date_#{Time.now.in_time_zone(broadcast.shoot_location_time_zone).strftime("%Y-%m-%d")}_Time_#{Time.now.in_time_zone(broadcast.shoot_location_time_zone).strftime("%T")}".parameterize
+  end
+
+  def toggle_star
+    toggle! :starred
+  end
+
+  def thumbnail_url(width = 300)
+    "https://image.mux.com/#{asset_playback_uid}/thumbnail.jpg?width=#{width}"
+  end
+
+  private
+
+  def set_title_and_description
+    self.name ||= download_file_name
+    self.description ||= "No description provided for this recording."
   end
 end

app/models/concerns/amendmenable.rb

@@ -0,0 +1,32 @@
+module Amendmenable
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveStorageSupport::SupportForBase64
+
+    has_one_base64_attached :amendment_signature
+
+    with_options on: :amendment do
+      validates :amendment_signer_name, presence: true
+      validates :amendment_signature, attached: true
+    end
+  end
+
+  def amendment_signable?
+    contract_template.present? && contract_template.amendment_clause.present?
+  end
+
+  def amendment_signed?
+    amendment_signature.attached?
+  end
+
+  def amendment_signature_base64
+    nil
+  end
+
+  def amendment_signature_base64=(data_uri)
+    return if data_uri.blank?
+
+    amendment_signature.attach(data: data_uri, filename: "amendment_signature.png", content_type: "image/png", identify: "false")
+  end
+end

app/models/concerns/approvable.rb

@@ -0,0 +1,26 @@
+module Approvable
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveStorageSupport::SupportForBase64
+
+    has_one_base64_attached :approved_by_user_signature
+
+    # Requires signature when saving in the approval context
+    with_options on: :approval do
+      validates :approved_by_user_signature, attached: true
+    end
+
+    def approve_by(user)
+      return unless approved_at.nil?
+
+      self.approved_by_user_name = user.full_name
+      self.approved_by_user_email = user.email
+      self.approved_at = BigMediaTime.time_zone_now
+    end
+
+    def approved?
+      self.approved_at.present?
+    end
+  end
+end

app/models/concerns/csv_exportable.rb

@@ -3,8 +3,8 @@
 module CsvExportable
   extend ActiveSupport::Concern
 
-  COMMON_HEADERS = %i[notes tags signed_at].freeze
+  COMMON_HEADERS = %i[approved notes tags signed_at].freeze
-  COMMON_VALUES = %w[clean_notes clean_tags signed_on].freeze
+  COMMON_VALUES = %w[approved? clean_notes clean_tags signed_on].freeze
 
   included do
     class << self
@@ -29,11 +29,20 @@ module CsvExportable
 
     private
 
+    def owner_info
+      compact_contact_info(name: person_name, address: person_address, phone: person_phone, email: person_email)
+    end
+
     def contact_info
+      owner_info
+    end
+
+    def compact_contact_info(name: nil, address: nil, phone: nil, email: nil)
       contact_info = ''
-      contact_info += "#{person_address}; " if person_address.present?
+      contact_info += "#{name}; " if name.present?
-      contact_info += "P: #{person_phone}; " if person_phone.present?
+      contact_info += "#{address}; " if address.present?
-      contact_info += "E: #{person_email}" if person_email.present?
+      contact_info += "P: #{phone}; " if phone.present?
+      contact_info += "E: #{email}" if email.present?
       contact_info.delete_suffix '; '
     end
 

app/models/concerns/files_filterable.rb

@@ -0,0 +1,17 @@
+module FilesFilterable
+  extend ActiveSupport::Concern
+
+  included do
+    def image_files
+      files_blobs.where("content_type ILIKE ?", "%image%")
+    end
+  
+    def video_files
+      files_blobs.where("content_type ILIKE ?", "%video%")
+    end
+  
+    def other_files
+      files_blobs.where("NOT content_type ILIKE ANY (array[?])", ["%image%", "%video%"])
+    end
+  end
+end

app/models/contract_template.rb

@@ -18,14 +18,18 @@ class ContractTemplate < ApplicationRecord
   has_many :medical_releases, dependent: :restrict_with_error
   has_many :misc_releases, dependent: :restrict_with_error
 
-  monetize :fee_cents
+  monetize :fee_old_cents
   has_rich_text :body
   has_rich_text :guardian_clause
   has_rich_text :signature_legal_text
+  has_rich_text :amendment_clause
+  has_rich_text :exhibit_a_legal_text
+  has_rich_text :exhibit_b_legal_text
+  has_rich_text :questionnaire_legal_text
 
   validates :name, presence: true
   validates :release_type, presence: true
-  validates :fee_cents, numericality: {
+  validates :fee_old_cents, numericality: {
     greater_than_or_equal_to: 0,
     less_than_or_equal_to: 99_999_999_99
   }
@@ -46,7 +50,11 @@ class ContractTemplate < ApplicationRecord
   enum accessibility: [:public_template, :private_template]
 
   def fee?
-    !fee.zero?
+    fee.present?
+  end
+
+  def fee_old?
+    !fee_old.zero?
   end
 
   def releases
@@ -69,9 +77,21 @@ class ContractTemplate < ApplicationRecord
     (1..NUMBER_OF_CUSTOM_FIELDS).any? { |n| public_send("question_#{n}_text").presence }
   end
 
+  def has_exhibit_a?
+    exhibit_a_legal_text.present?
+  end
+
+  def has_exhibit_b?
+    exhibit_b_legal_text.present?
+  end
+
+  def editable?
+    releases.size.zero?
+  end
+
   def attributes
     result = super()
-    result[:signature_legal_text] = signature_legal_text.as_json 
+    result[:signature_legal_text] = signature_legal_text.as_json
     result
   end
 end

app/models/location_release.rb

@@ -11,10 +11,12 @@ class LocationRelease < ApplicationRecord
   include Taggable
   include PersonName
   include CsvExportable
+  include Approvable
+  include Amendmenable
 
   class << self
     def custom_csv_exportable_headers
-      %i[name address]
+      %i[location_info owner_info amendment_signed_column]
     end
   end
 
@@ -65,6 +67,18 @@ class LocationRelease < ApplicationRecord
     true
   end
 
+  def location_info
+    compact_contact_info(name: name, address: address)
+  end
+
+  def amendment_signed_column
+    if amendment_signable?
+      amendment_signed?
+    else
+      I18n.t('location_releases.csv.no_amendment_clause')
+    end
+  end
+
   private
 
   def end_date_after_start_date

app/models/material_release.rb

@@ -3,7 +3,7 @@ class MaterialRelease < ApplicationRecord
   include Contractable
   include Exploitable
   include Notable
-  include Photoable
+  include Photoable # This association needs to be removed after changing the API. Removing it right now will cause failure in API specs.
   include Releasable
   include Searchable
   include Signable
@@ -11,10 +11,16 @@ class MaterialRelease < ApplicationRecord
   include Taggable
   include PersonName
   include CsvExportable
+  include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+  include FilesFilterable
 
   class << self
     def custom_csv_exportable_headers
-      %i[name]
+      %i[name owner_info files_count]
     end
   end
 
@@ -29,6 +35,41 @@ class MaterialRelease < ApplicationRecord
                 %w(person_address_country country)
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+  
+  has_many_attached :files
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -46,11 +87,15 @@ class MaterialRelease < ApplicationRecord
     @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
   end
 
-  def minor?
+  def second_guardian_present?
-    false
+    guardian_2_first_name.present?
   end
 
   def uses_edl?
     true
   end
+
+  def files_count
+    files.any? ? files.size : I18n.t('material_releases.material_release.no_media')
+  end
 end

app/models/medical_release.rb

@@ -12,10 +12,11 @@ class MedicalRelease < ApplicationRecord
   include GuardianName
   include SecondGuardianName
   include CsvExportable
+  include Approvable
 
   class << self
     def custom_csv_exportable_headers
-      %i[approved? name contact_info]
+      %i[name contact_info]
     end
   end
 
@@ -107,18 +108,6 @@ class MedicalRelease < ApplicationRecord
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
   end
 
-  def approve_by(user)
-    return unless approved_at.nil?
-
-    self.approved_by_user_name = user.full_name
-    self.approved_by_user_email = user.email
-    self.approved_at = Time.zone.now
-  end
-
-  def approved?
-    approved_at.present?
-  end
-
   private
 
   def valid_answers

app/models/millicast_destination.rb

@@ -0,0 +1,41 @@
+class MillicastDestination
+  attr_reader :name, :token
+  
+  def self.create
+    token_stream_name = SecureRandom.urlsafe_base64
+
+    publish_token = Millicast::PublishToken.create(
+      label: SecureRandom.urlsafe_base64, 
+      streams: [
+        { streamName: token_stream_name }
+      ]
+    )
+
+    new(token_stream_name, publish_token.data.token)
+  end
+
+  def initialize(name, token)
+    @name = name
+    @token = token
+  end
+
+  def account_id
+    ENV["MILLICAST_ACCOUNT_ID"]
+  end
+
+  def key
+    "#{name}?token=#{token}"
+  end
+
+  def url
+    "rtmp://live-rtmp-pub.millicast.com:1935/v2/pub"
+  end
+
+  def playback_url
+    "https://viewer.millicast.com/v2?streamId=#{account_id}/#{name}"
+  end
+
+  def playback_embed
+    "<iframe src=\"#{playback_url}\" allowfullscreen width=\"640\" height=\"480\"></iframe>"
+  end
+end

app/models/misc_release.rb

@@ -10,6 +10,8 @@ class MiscRelease < ApplicationRecord
   include GuardianName
   include GuardianPhotoable
   include CsvExportable
+  include Approvable
+  include Exploitable
 
   class << self
     def custom_csv_exportable_headers

app/models/music_release.rb

@@ -8,6 +8,7 @@ class MusicRelease < ApplicationRecord
   include Taggable
   include PersonName
   include CsvExportable
+  include Approvable
 
   class << self
     def custom_csv_exportable_headers

app/models/mux_live_stream.rb

@@ -1,4 +1,15 @@
 class MuxLiveStream
+  attr_accessor :simulcast_id, :simulcast_destination
+
+  def self.create_with_simulcast(destination = nil)
+    destination ||= MillicastDestination.create
+
+    MuxLiveStream.new.tap do |stream|
+      stream.id # force the live stream to be created by calling for its id
+      stream.create_simulcast(destination)
+    end
+  end
+
   def id
     live_stream.data.id
   end
@@ -15,6 +26,15 @@ class MuxLiveStream
     client.delete_live_stream(stream_uid)
   end
 
+  def create_simulcast(destination)
+    return if test_mode_enabled?
+
+    request = MuxRuby::CreateSimulcastTargetRequest.new(stream_key: destination.key, url: destination.url)
+    result = client.create_live_stream_simulcast_target(id, request)
+    self.simulcast_destination = destination
+    self.simulcast_id = result.data.id
+  end
+
   private
 
   def live_stream

app/models/project.rb

@@ -2,6 +2,7 @@ class Project < ApplicationRecord
   include Archivable
   include Filterable
   include Syncable
+  include PgSearch
 
   SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material medical misc)
   AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music medical misc)
@@ -42,6 +43,15 @@ class Project < ApplicationRecord
     }
   end
 
+  pg_search_scope :search, {
+    against: [:name],
+    using: {
+      tsearch: {any_word: true, prefix: true},
+      trigram: {},
+      dmetaphone: {any_word: true}
+    }
+  }
+
   validates :name, presence: true, uniqueness: { scope: :account_id }
 
   filterable_by :active, :inactive, :archived

app/models/qr_code.rb

@@ -13,6 +13,18 @@ class QrCode
     new(url, "#{filename}.png")
   end
 
+  def self.build_from_multiple_contract_templates(contract_templates, project)
+    account   = project.account
+    locale    = I18n.locale
+    host      = AppHost.new.domain_with_port
+    route     = [account, project, :contract_templates, contract_template_ids: contract_templates.ids, locale: I18n.locale, host: AppHost.new.domain_with_port]
+
+    url       = Rails.application.routes.url_helpers.url_for(route)
+    filename  = [project.account.name, project.name].map(&:parameterize).join("_")
+
+    new(url, "#{filename}.png")
+  end
+
   def initialize(url, filename = "qrcode.png")
     @url = url
     @filename = filename

app/models/talent_release.rb

@@ -15,6 +15,7 @@ class TalentRelease < ApplicationRecord
   include GuardianName
   include SecondGuardianName
   include CsvExportable
+  include Approvable
 
   class << self
     def custom_csv_exportable_headers
@@ -110,7 +111,7 @@ class TalentRelease < ApplicationRecord
   end
 
   def uses_edl?
-    false
+    true
   end
 
   def second_guardian_present?

app/models/task_request.rb

@@ -6,5 +6,5 @@ class TaskRequest < ApplicationRecord
 
   scope :order_by_recent, -> { order(created_at: :desc) }
 
-  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }
+  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }, allow_blank: true
 end

app/models/video_release_confirmation.rb

@@ -9,6 +9,10 @@ class VideoReleaseConfirmation < ApplicationRecord
     Timecode.from_seconds(time_elapsed.to_f).to_s
   end
 
+  def file
+    ActiveStorage::Attachment.find(file_id)
+  end
+
   private
 
   class ReleaseRankOrder

app/policies/account_lock_policy.rb

@@ -0,0 +1,9 @@
+class AccountLockPolicy < ApplicationPolicy
+  def create?
+    user.admin?
+  end
+
+  def destroy?
+    user.admin?
+  end
+end

app/policies/acquired_media_release_policy.rb

@@ -19,15 +19,19 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
     true
   end
 
-  def edit_file_infos?
+  def edit_files?
-    true
-  end
-
-  def update_file_infos?
     true
   end
 
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/appearance_release_policy.rb

@@ -26,4 +26,16 @@ class AppearanceReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
+
+  def sign_amendment?
+    user.manager? || user.account_manager?
+  end
 end

app/policies/broadcast_policy.rb

@@ -18,4 +18,12 @@ class BroadcastPolicy < ApplicationPolicy
   def update?
     true
   end
+
+  def destroy_file?
+    if user.nil? || user.user.nil?
+      return false
+    end
+
+    user.manager? || user.account_manager?
+  end
 end

app/policies/broadcast_recording_policy.rb

@@ -0,0 +1,21 @@
+class BroadcastRecordingPolicy < ApplicationPolicy
+  def create?
+    true
+  end
+
+  def destroy?
+    if user.nil? || user.user.nil?
+      return false
+    end
+
+    user.manager? || user.account_manager?
+  end
+
+  def edit?
+    true
+  end
+
+  def update?
+    true
+  end
+end

app/policies/contract_template_policy.rb

@@ -23,6 +23,18 @@ class ContractTemplatePolicy < ApplicationPolicy
     create?
   end
 
+  def edit?
+    record.editable? && create?
+  end
+
+  def update?
+    edit?
+  end
+
+  def duplicate?
+    create?
+  end
+
   def import?
     if user.account_manager?
       record.project.account = user.account

app/policies/location_release_policy.rb

@@ -34,4 +34,16 @@ class LocationReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def sign_amendment?
+    user.manager? || user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/material_release_policy.rb

@@ -19,12 +19,16 @@ class MaterialReleasePolicy < ReleasePolicy
     user.manager? || user.account_manager?
   end
 
-  def edit_photos?
+  def edit_files?
     true
   end
 
+  def update_files?
+    edit_files?
+  end
+
   def update_photos?
-    edit_photos?
+    edit_files?
   end
 
   def tag_multiple?
@@ -34,4 +38,12 @@ class MaterialReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/misc_release_policy.rb

@@ -38,4 +38,12 @@ class MiscReleasePolicy < ReleasePolicy
   def download_multiple?
     download_single?
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/music_release_policy.rb

@@ -22,4 +22,12 @@ class MusicReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end