From e33195e11c42ed6e451c4a40dc6fd8b61b8c75be Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Mon, 20 Jan 2020 20:19:38 +0100
Subject: [PATCH] Fix: The character limit now correctly reports to mobile
clients.
---
app/serializers/initial_state_serializer.rb | 6 +++++-
app/serializers/rest/instance_serializer.rb | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index fb53ea3145..e74f0b7406 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -2,10 +2,14 @@
class InitialStateSerializer < ActiveModel::Serializer
attributes :meta, :compose, :accounts,
- :media_attachments, :settings
+ :media_attachments, :settings, :max_toot_chars
has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
+ def max_toot_chars
+ StatusLengthValidator::MAX_CHARS
+ end
+
def meta
store = {
streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 1bd71683ce..e2a65c1789 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -5,12 +5,16 @@ class REST::InstanceSerializer < ActiveModel::Serializer
attributes :uri, :title, :short_description, :description, :email,
:version, :urls, :stats, :thumbnail,
- :languages, :registrations, :approval_required
+ :languages, :registrations, :approval_required, :max_toot_chars
has_one :contact_account, serializer: REST::AccountSerializer
delegate :contact_account, to: :instance_presenter
+ def max_toot_chars
+ StatusLengthValidator::MAX_CHARS
+ end
+
def uri
Rails.configuration.x.local_domain
end
--
GitLab