Move norss settings to privacy subpage

app/models/concerns/has_user_settings.rb

@@ -135,11 +135,16 @@ module HasUserSettings
     settings['web.display_media'] == 'hide_all'
   end
 
+  ## --- Hometown-specific settings from here on ---
   def setting_expand_usernames
-    settings['web.auto_play']
+    settings['web.expand_usernames']
   end
 
   def setting_default_federation
     settings['default_federation']
   end
+
+  def setting_norss
+    settings['norss']
+  end
 end

app/views/settings/preferences/other/show.html.haml

@@ -11,12 +11,6 @@
     .fields-group
       = ff.input :noindex, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_noindex'), hint: I18n.t('simple_form.hints.defaults.setting_noindex')
 
-    .fields-group
-      = ff.input :norss, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_norss'), hint: I18n.t('simple_form.hints.defaults.setting_norss')
-
-    .fields-group
-      = ff.input :noindex, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_noindex'), hint: I18n.t('simple_form.hints.defaults.setting_noindex')
-
     .fields-group
       = ff.input :aggregate_reblogs, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_aggregate_reblogs'), hint: I18n.t('simple_form.hints.defaults.setting_aggregate_reblogs')
 

app/views/settings/privacy/show.html.haml

@@ -20,6 +20,10 @@
   .fields-group
     = f.input :unlocked, as: :boolean, wrapper: :with_label
 
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .fields-group
+      = ff.input :norss, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_norss')
+
   %h4= t('privacy.search')
 
   %p.lead= t('privacy.search_hint_html')