diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-22 13:05:17 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-22 13:05:17 +0100 |
| commit | edd54411124b271622d7a2af4efdfe1a0a35cac4 (patch) | |
| tree | 681e3e5a0c0206210e71a187a11c010646d82050 /app/lib/proof_provider/keybase | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
| parent | 3411fbef19c71f3a60e9fbb175a0728a6cfc2ed8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib/proof_provider/keybase')
| -rw-r--r-- | app/lib/proof_provider/keybase/config_serializer.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 |