Browse Source

Update setting migration to include Hometown settings

Fixes: a9b5598c97
lets-bump-hometown-to-mastodon-4.2
nachtjasmin 2 years ago
parent
commit
76d94f3850
No known key found for this signature in database
  1. 8
      app/models/concerns/has_user_settings.rb
  2. 8
      app/models/user_settings.rb
  3. 5
      db/migrate/20230215074423_move_user_settings.rb

8
app/models/concerns/has_user_settings.rb

@ -134,4 +134,12 @@ module HasUserSettings
def hide_all_media?
settings['web.display_media'] == 'hide_all'
end
def setting_expand_usernames
settings['web.auto_play']
end
def setting_default_federation
settings['default_federation']
end
end

8
app/models/user_settings.rb

@ -16,6 +16,11 @@ class UserSettings
setting :default_sensitive, default: false
setting :default_privacy, default: nil, in: %w(public unlisted private)
# Hometown-specific: Opt-out of RSS feeds for public posts
setting :norss, default: false
# Hometown: New posts should federate by default
setting :default_federation, default: true
setting_inverse_alias :indexable, :noindex
namespace :web do
@ -32,6 +37,9 @@ class UserSettings
setting :expand_content_warnings, default: false
setting :display_media, default: 'default', in: %w(default show_all hide_all)
setting :auto_play, default: false
# Hometown: Show full username (including domain) for remote users
setting :expand_usernames, default: true
end
namespace :notification_emails do

5
db/migrate/20230215074423_move_user_settings.rb

@ -44,6 +44,11 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
must_be_following: 'interactions.must_be_following',
must_be_following_dm: 'interactions.must_be_following_dm',
}.freeze,
# Hometown-specific fields
norss: 'norss',
default_federation: 'default_federation',
expand_usernames: 'web.expand_usernames',
}.freeze
class LegacySetting < ApplicationRecord

Loading…
Cancel
Save