From 3411fbef19c71f3a60e9fbb175a0728a6cfc2ed8 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 21 Mar 2019 23:33:28 +0100 Subject: Improve config serializer for Keybase (#10338) - Regex must no longer be surrounded by `/` - Description must be short and cannot contain HTML tags --- app/lib/proof_provider/keybase/config_serializer.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/lib/proof_provider') diff --git a/app/lib/proof_provider/keybase/config_serializer.rb b/app/lib/proof_provider/keybase/config_serializer.rb index 474ea74e2..557bafe84 100644 --- a/app/lib/proof_provider/keybase/config_serializer.rb +++ b/app/lib/proof_provider/keybase/config_serializer.rb @@ -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 -- cgit