diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-15 08:58:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 08:58:12 +0100 |
| commit | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (patch) | |
| tree | 0bbd3318c61cf062f17386f4da166864c9db8138 /app/serializers | |
| parent | bb4e211c86270de6de8a78da96295208ee77dce1 (diff) | |
| parent | 7f96391eaef601ea34672551bb06915acec7e492 (diff) | |
Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 1 | ||||
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 2cac42e8d..45ee06e12 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -44,7 +44,6 @@ class InitialStateSerializer < ActiveModel::Serializer timeline_preview: Setting.timeline_preview, activity_api_enabled: Setting.activity_api_enabled, single_user_mode: Rails.configuration.x.single_user_mode, - translation_enabled: TranslationService.configured?, trends_as_landing_page: Setting.trends_as_landing_page, status_page_url: Setting.status_page_url, } diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 659c45b83..ce08b6db8 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -4,7 +4,7 @@ class REST::StatusSerializer < ActiveModel::Serializer include FormattingHelper attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, - :sensitive, :spoiler_text, :visibility, :language, + :sensitive, :spoiler_text, :visibility, :language, :translatable, :uri, :url, :replies_count, :reblogs_count, :favourites_count, :edited_at @@ -52,6 +52,10 @@ class REST::StatusSerializer < ActiveModel::Serializer object.account.user_shows_application? || (current_user? && current_user.account_id == object.account_id) end + def translatable + current_user? && object.translatable? + end + def visibility # This visibility is masked behind "private" # to avoid API changes because there are no |