From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 16 May 2022 17:13:36 +0000 (+0200)
Subject: Fix preferred posting language returning unusable value in REST API
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3199b1d2e312e12ad090cc3a661ae6ecd817235f;p=mastodon.git

Fix preferred posting language returning unusable value in REST API

https://github.com/mastodon/mastodon/pull/18428
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 953286e35..f80b47ad7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,6 +53,7 @@ class User < ApplicationRecord
   include Settings::Extend
   include UserRoles
   include Redisable
+  include LanguagesHelper
 
   # The home and list feeds will be stored in Redis for this amount
   # of time, and status fan-out to followers will include only people
@@ -248,7 +249,7 @@ class User < ApplicationRecord
   end
 
   def preferred_posting_language
-    settings.default_language || locale
+    valid_locale_cascade(settings.default_language, locale)
   end
 
   def setting_default_privacy
diff --git a/app/serializers/rest/preferences_serializer.rb b/app/serializers/rest/preferences_serializer.rb
index 119f0e06d..874bd990d 100644
--- a/app/serializers/rest/preferences_serializer.rb
+++ b/app/serializers/rest/preferences_serializer.rb
@@ -17,7 +17,7 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
   end
 
   def posting_default_language
-    object.user.setting_default_language.presence
+    object.user.preferred_posting_language
   end
 
   def reading_default_sensitive_media