djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-30 03:50:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use mastodon config namespace to load software update default value via config_for (#30534)

Browse Source
This commit is contained in:
Matt Jankowski 2024-11-12 03:28:31 -05:00 committed by GitHub
parent aeae152006
commit c099797700
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/software_update.rb
View File

@ -24,7 +24,7 @@ class SoftwareUpdate < ApplicationRecord
class << self class << self
def check_enabled? def check_enabled?
ENV['UPDATE_CHECK_URL'] != '' Rails.configuration.x.mastodon.software_update_url.present?
end end
def pending_to_a def pending_to_a

2
app/services/software_update_check_service.rb
View File

@ -27,7 +27,7 @@ class SoftwareUpdateCheckService < BaseService
end end
def api_url def api_url
ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check') Rails.configuration.x.mastodon.software_update_url
end end
def version def version

1
config/application.rb
View File

@ -105,6 +105,7 @@ module Mastodon
end end
config.x.captcha = config_for(:captcha) config.x.captcha = config_for(:captcha)
config.x.mastodon = config_for(:mastodon)
config.x.translation = config_for(:translation) config.x.translation = config_for(:translation)
config.to_prepare do config.to_prepare do

3
config/mastodon.yml Normal file
View File

@ -0,0 +1,3 @@
---
shared:
software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check') %>

6
config/navigation.rb
View File

@ -6,7 +6,11 @@ SimpleNavigation::Configuration.run do |navigation|
navigation.items do |n| navigation.items do |n|
n.item :web, safe_join([material_symbol('chevron_left'), t('settings.back')]), root_path n.item :web, safe_join([material_symbol('chevron_left'), t('settings.back')]), root_path
n.item :software_updates, safe_join([material_symbol('report'), t('admin.critical_update_pending')]), admin_software_updates_path, if: -> { ENV['UPDATE_CHECK_URL'] != '' && current_user.can?(:view_devops) && SoftwareUpdate.urgent_pending? }, html: { class: 'warning' } n.item :software_updates,
safe_join([material_symbol('report'), t('admin.critical_update_pending')]),
admin_software_updates_path,
if: -> { Rails.configuration.x.mastodon.software_update_url.present? && current_user.can?(:view_devops) && SoftwareUpdate.urgent_pending? },
html: { class: 'warning' }
n.item :profile, safe_join([material_symbol('person'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? && !self_destruct }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification|/settings/privacy} n.item :profile, safe_join([material_symbol('person'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? && !self_destruct }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification|/settings/privacy}

5
spec/lib/admin/system_check/software_version_check_spec.rb
View File

@ -27,9 +27,10 @@ RSpec.describe Admin::SystemCheck::SoftwareVersionCheck do
context 'when checks are disabled' do context 'when checks are disabled' do
around do |example| around do |example|
ClimateControl.modify UPDATE_CHECK_URL: '' do original = Rails.configuration.x.mastodon.software_update_url
Rails.configuration.x.mastodon.software_update_url = ''
example.run example.run
end Rails.configuration.x.mastodon.software_update_url = original
end end
it 'returns true' do it 'returns true' do

10
spec/services/software_update_check_service_spec.rb
View File

@ -124,9 +124,10 @@ RSpec.describe SoftwareUpdateCheckService do
context 'when update checking is disabled' do context 'when update checking is disabled' do
around do |example| around do |example|
ClimateControl.modify UPDATE_CHECK_URL: '' do original = Rails.configuration.x.mastodon.software_update_url
Rails.configuration.x.mastodon.software_update_url = ''
example.run example.run
end Rails.configuration.x.mastodon.software_update_url = original
end end
before do before do
@ -148,9 +149,10 @@ RSpec.describe SoftwareUpdateCheckService do
let(:update_check_url) { 'https://api.example.com/update_check' } let(:update_check_url) { 'https://api.example.com/update_check' }
around do |example| around do |example|
ClimateControl.modify UPDATE_CHECK_URL: 'https://api.example.com/update_check' do original = Rails.configuration.x.mastodon.software_update_url
Rails.configuration.x.mastodon.software_update_url = 'https://api.example.com/update_check'
example.run example.run
end Rails.configuration.x.mastodon.software_update_url = original
end end
it_behaves_like 'when the feature is enabled' it_behaves_like 'when the feature is enabled'