From 76d94f385013855c46b9e1e8a9c2ae94c78d02d3 Mon Sep 17 00:00:00 2001
From: nachtjasmin <nachtjasmin@posteo.de>
Date: Wed, 22 Nov 2023 21:56:05 +0100
Subject: [PATCH] Update setting migration to include Hometown settings

Fixes: a9b5598c97fc4d3302b61b260097ef41c2ebe377
---
 app/models/concerns/has_user_settings.rb        | 8 ++++++++
 app/models/user_settings.rb                     | 8 ++++++++
 db/migrate/20230215074423_move_user_settings.rb | 5 +++++
 3 files changed, 21 insertions(+)

diff --git a/app/models/concerns/has_user_settings.rb b/app/models/concerns/has_user_settings.rb
index 5d05019f6..1ec34845f 100644
--- a/app/models/concerns/has_user_settings.rb
+++ b/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
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 030cbec4d..db03d4243 100644
--- a/app/models/user_settings.rb
+++ b/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
diff --git a/db/migrate/20230215074423_move_user_settings.rb b/db/migrate/20230215074423_move_user_settings.rb
index 27caac101..34722778f 100644
--- a/db/migrate/20230215074423_move_user_settings.rb
+++ b/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