cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Validations for local profiles

This commit is contained in:
Eugen Rochko 2016-03-16 11:18:09 +01:00
parent 5c99e304e5
commit a9db42a956
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -13,3 +13,5 @@ ADD Gemfile.lock /mastodon/Gemfile.lock
RUN bundle install --deployment --without test --without development RUN bundle install --deployment --without test --without development
ADD . /mastodon ADD . /mastodon
VOLUME ['/mastodon/public/system']

2
app/helpers/stream_entries_helper.rb
View File

@ -25,7 +25,7 @@ module StreamEntriesHelper
status.mentions.each { |m| mention_hash[m.acct] = m } status.mentions.each { |m| mention_hash[m.acct] = m }
coder = HTMLEntities.new coder = HTMLEntities.new
auto_link(coder.encode(status.text), link: :urls, html: { target: '_blank', rel: 'nofollow' }).gsub(Account::MENTION_RE) do |m| auto_link(coder.encode(status.text), link: :urls, html: { rel: 'nofollow noopener' }).gsub(Account::MENTION_RE) do |m|
account = mention_hash[Account::MENTION_RE.match(m)[1]] account = mention_hash[Account::MENTION_RE.match(m)[1]]
"#{m.split('@').first}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>" "#{m.split('@').first}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>"
end.html_safe end.html_safe

4
app/models/account.rb
View File

@ -12,6 +12,10 @@ class Account < ActiveRecord::Base
has_attached_file :header, styles: { medium: '700x335#' } has_attached_file :header, styles: { medium: '700x335#' }
validates_attachment_content_type :header, content_type: /\Aimage\/.*\Z/ validates_attachment_content_type :header, content_type: /\Aimage\/.*\Z/
# Local user profile validations
validates :display_name, length: { maximum: 30 }, if: 'local?'
validates :note, length: { maximum: 124 }, if: 'local?'
# Timelines # Timelines
has_many :stream_entries, inverse_of: :account has_many :stream_entries, inverse_of: :account
has_many :statuses, inverse_of: :account has_many :statuses, inverse_of: :account