Merge remote-tracking branch 'parent/main' into kb_migration

app/models/form/admin_settings.rb

@@ -3,6 +3,8 @@
 class Form::AdminSettings
   include ActiveModel::Model
 
+  include AuthorizedFetchHelper
+
   KEYS = %i(
     site_contact_username
     site_contact_email
@@ -40,6 +42,7 @@ class Form::AdminSettings
     post_hash_tags_max
     sensitive_words
     sensitive_words_for_full
+    authorized_fetch
   ).freeze
 
   INTEGER_KEYS = %i(
@@ -63,6 +66,7 @@ class Form::AdminSettings
     captcha_enabled
     enable_block_emoji_reaction_settings
     hide_local_users_for_anonymous
+    authorized_fetch
   ).freeze
 
   UPLOAD_KEYS = %i(
@@ -70,6 +74,10 @@ class Form::AdminSettings
     mascot
   ).freeze
 
+  OVERRIDEN_SETTINGS = {
+    authorized_fetch: :authorized_fetch_mode?,
+  }.freeze
+
   STRING_ARRAY_KEYS = %i(
     ng_words
     sensitive_words
@@ -97,6 +105,8 @@ class Form::AdminSettings
                        SiteUpload.where(var: key).first_or_initialize(var: key)
                      elsif STRING_ARRAY_KEYS.include?(key)
                        Setting.public_send(key)&.join("\n") || ''
+                     elsif OVERRIDEN_SETTINGS.include?(key)
+                       public_send(OVERRIDEN_SETTINGS[key])
                      else
                        Setting.public_send(key)
                      end

app/models/media_attachment.rb

@@ -107,6 +107,7 @@ class MediaAttachment < ApplicationRecord
         'preset' => 'veryfast',
         'movflags' => 'faststart', # Move metadata to start of file so playback can begin before download finishes
         'pix_fmt' => 'yuv420p', # Ensure color space for cross-browser compatibility
+        'vf' => 'crop=floor(iw/2)*2:floor(ih/2)*2', # h264 requires width and height to be even. Crop instead of scale to avoid blurring
         'c:v' => 'h264',
         'c:a' => 'aac',
         'b:a' => '192k',

app/models/software_update.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: software_updates
+#
+#  id            :bigint(8)        not null, primary key
+#  version       :string           not null
+#  urgent        :boolean          default(FALSE), not null
+#  type          :integer          default("patch"), not null
+#  release_notes :string           default(""), not null
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#
+
+class SoftwareUpdate < ApplicationRecord
+  self.inheritance_column = nil
+
+  enum type: { patch: 0, minor: 1, major: 2 }, _suffix: :type
+
+  def gem_version
+    Gem::Version.new(version)
+  end
+
+  class << self
+    def check_enabled?
+      ENV['UPDATE_CHECK_URL'] != ''
+    end
+
+    def pending_to_a
+      return [] unless check_enabled?
+
+      all.to_a.filter { |update| update.gem_version > Mastodon::Version.gem_version }
+    end
+
+    def urgent_pending?
+      pending_to_a.any?(&:urgent?)
+    end
+  end
+end

app/models/user_settings.rb

@@ -69,6 +69,7 @@ class UserSettings
     setting :trends, default: true
     setting :appeal, default: true
     setting :warning, default: true
+    setting :software_updates, default: 'critical', in: %w(none critical patch all)
   end
 
   namespace :interactions do