commit: 139fc994e218f3d2e95f38d5f6dae11e8b0b8d58
parent: 1c6b02f936b984a17343b85a5cfb07ed93dd1cfb
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 28 Mar 2017 14:16:08 +0200
Fix #408 - link @ names in bios
Diffstat:
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
@@ -9,8 +9,6 @@ class Formatter
include ActionView::Helpers::TextHelper
include ActionView::Helpers::SanitizeHelper
- AUTOLINK_RE = /https?:\/\/([\S]+\.[!#$&-;=?-[\]_a-z~]|%[\w\d]{2}]+[\w])/i
-
def format(status)
return reformat(status.content) unless status.local?
@@ -39,6 +37,7 @@ class Formatter
html = encode(account.note)
html = link_urls(html)
+ html = link_accounts(html)
html = link_hashtags(html)
html.html_safe # rubocop:disable Rails/OutputSafety
@@ -59,12 +58,23 @@ class Formatter
def link_mentions(html, mentions)
html.gsub(Account::MENTION_RE) do |match|
acct = Account::MENTION_RE.match(match)[1]
- mention = mentions.find { |item| item.account.acct.casecmp(acct).zero? }
+ mention = mentions.find { |item| TagManager.instance.same_acct?(item.account.acct, acct) }
mention.nil? ? match : mention_html(match, mention.account)
end
end
+ def link_accounts(html)
+ html.gsub(Account::MENTION_RE) do |match|
+ acct = Account::MENTION_RE.match(match)[1]
+ username, domain = acct.split('@')
+ domain = nil if TagManager.instance.local_domain?(domain)
+ account = Account.find_remote(username, domain)
+
+ account.nil? ? match : mention_html(match, account)
+ end
+ end
+
def link_hashtags(html)
html.gsub(Tag::HASHTAG_RE) do |match|
hashtag_html(match)
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb
@@ -60,6 +60,12 @@ class TagManager
domain.nil? || domain.gsub(/[\/]/, '').casecmp(Rails.configuration.x.local_domain).zero?
end
+ def same_acct?(canonical, needle)
+ return true if canonical.casecmp(needle).zero?
+ username, domain = needle.split('@')
+ local_domain?(domain) && canonical.casecmp(username).zero?
+ end
+
def local_url?(url)
uri = Addressable::URI.parse(url)
domain = uri.host + (uri.port ? ":#{uri.port}" : '')