Validations for local profiles

diff --git a/Dockerfile b/Dockerfile
index f569dbea906fdf15a4cca34ccafac6908ef27a13..7c0e81afbc09924a957faf86d5e10505a9ffa6d6 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,3 +13,5 @@ ADD Gemfile.lock /mastodon/Gemfile.lock
 RUN bundle install --deployment --without test --without development
 
 ADD . /mastodon
+
+VOLUME ['/mastodon/public/system']

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 60955a0a7e880b77136ab79cd9eba612dfbf4a1e..5adb09f7746c90c1782a228ff032cb096d07f4d6 100644 (file)
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -25,7 +25,7 @@ module StreamEntriesHelper
     status.mentions.each { |m| mention_hash[m.acct] = m }
     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]]
       "#{m.split('@').first}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>"
     end.html_safe

diff --git a/app/models/account.rb b/app/models/account.rb
index 7577d7bd87e6d47eef8ae3039f01c963bab888c4..b3917e6e816ce26f46d1916098ef82f9860cb325 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -12,6 +12,10 @@ class Account < ActiveRecord::Base
   has_attached_file :header, styles: { medium: '700x335#' }
   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
   has_many :stream_entries, inverse_of: :account
   has_many :statuses, inverse_of: :account