diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-25 01:29:40 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-25 01:29:40 +0100 |
| commit | ca28d9c2aec0764dc9190e2802e5e6e23cf6d8c3 (patch) | |
| tree | 51d86739522f79ee545f7c821507997f0a4914cb /app/lib | |
| parent | 8a880a3d464daf486a10d85b8ee49305aa6b1e5b (diff) | |
| parent | 999cde94a6a2d67cf36160365378951d3b55b868 (diff) | |
Merge branch 'blackle-master'
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/formatter.rb | 2 | ||||
| -rw-r--r-- | app/lib/status_length_validator.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 1fa5b83fb..ff2a16f1b 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -14,7 +14,7 @@ class Formatter html = status.text html = encode(html) - html = simple_format(html, sanitize: false) + html = simple_format(html, {}, sanitize: false) html = html.gsub(/\n/, '') html = link_urls(html) html = link_mentions(html, status.mentions) diff --git a/app/lib/status_length_validator.rb b/app/lib/status_length_validator.rb new file mode 100644 index 000000000..55135a598 --- /dev/null +++ b/app/lib/status_length_validator.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class StatusLengthValidator < ActiveModel::Validator + MAX_CHARS = 500 + + def validate(status) + return unless status.local? && !status.reblog? + status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.length > MAX_CHARS + end +end |