mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve config serializer for Keybase (#10338) 

- Regex must no longer be surrounded by `/`
- Description must be short and cannot contain HTML tags
pull/965/head^2
Eugen Rochko 2019-03-21 23:33:28 +01:00 committed by GitHub
parent 2361917944
commit 3411fbef19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/proof_provider/keybase/config_serializer.rb
View File

@ -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

2
app/serializers/manifest_serializer.rb
View File

@ -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