Skip to content
Snippets Groups Projects
Unverified Commit 3411fbef authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Improve config serializer for Keybase (#10338)

- Regex must no longer be surrounded by `/`
- Description must be short and cannot contain HTML tags
parent 23619179
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
include RoutingHelper
include ActionView::Helpers::TextHelper
attributes :version, :domain, :display_name, :username,
:brand_color, :logo, :description, :prefill_url,
......@@ -29,11 +30,11 @@ class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
end
def description
Setting.site_short_description.presence || Setting.site_description.presence || I18n.t('about.about_mastodon_html')
strip_tags(Setting.site_short_description.presence || I18n.t('about.about_mastodon_html'))
end
def username
{ min: 1, max: 30, re: Account::USERNAME_RE.inspect }
{ min: 1, max: 30, re: '[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?' }
end
def prefill_url
......
......@@ -18,7 +18,7 @@ class ManifestSerializer < ActiveModel::Serializer
end
def description
strip_tags(object.site_description.presence || I18n.t('about.about_mastodon_html'))
strip_tags(object.site_short_description.presence || I18n.t('about.about_mastodon_html'))
end
def icons
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment