From 2b3c57142293c347e5264f71c1b48b25d2ba87a0 Mon Sep 17 00:00:00 2001 From: Fosco Marotto Date: Sun, 27 Dec 2020 01:57:18 -0500 Subject: [PATCH] [stick to master] Re-enable stick to master for media attachments, enable stick to master for user sessions --- app/controllers/auth/sessions_controller.rb | 1 + app/services/post_status_service.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 686e154c..233f47f0 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -36,6 +36,7 @@ class Auth::SessionsController < Devise::SessionsController protected def find_user + User.connection.stick_to_master! if session[:otp_user_id] User.find(session[:otp_user_id]) elsif user_params[:email] diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index ed818488..5edc67bd 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -151,7 +151,7 @@ class PostStatusService < BaseService raise GabSocial::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present? - # @account.media_attachments.connection.stick_to_master! + @account.media_attachments.connection.stick_to_master! @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)) hasVideoOrGif = @media.find(&:video?) || @media.find(&:gifv?)