treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix preferred posting language returning unusable value in REST API (#18428)

lolsob-rspec
Eugen Rochko 2022-05-16 19:13:36 +02:00 committed by GitHub
parent e4a9aa1ab4
commit 9d160dae82
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@ -53,6 +53,7 @@ class User < ApplicationRecord
include Settings::Extend include Settings::Extend
include UserRoles include UserRoles
include Redisable include Redisable
include LanguagesHelper
# The home and list feeds will be stored in Redis for this amount # 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 # of time, and status fan-out to followers will include only people
@ -248,7 +249,7 @@ class User < ApplicationRecord
end end
def preferred_posting_language def preferred_posting_language
settings.default_language || locale valid_locale_cascade(settings.default_language, locale)
end end
def setting_default_privacy def setting_default_privacy

2
app/serializers/rest/preferences_serializer.rb
View File

@ -17,7 +17,7 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
end end
def posting_default_language def posting_default_language
object.user.setting_default_language.presence object.user.preferred_posting_language
end end
def reading_default_sensitive_media def reading_default_sensitive_media