Fix subscriptions:clear task, refactor feeds, refactor streamable activites
and atom feed generation to some extent, as well as the way mentions are stored
This commit is contained in:
		@@ -20,13 +20,25 @@ module ApplicationHelper
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def linkify(status)
 | 
			
		||||
    mention_hash = {}
 | 
			
		||||
    status.mentions.each { |m| mention_hash[m.acct] = m }
 | 
			
		||||
    coder = HTMLEntities.new
 | 
			
		||||
  def account_from_mentions(search_string, mentions)
 | 
			
		||||
    mentions.each { |x| return x.account if x.account.acct.eql?(search_string) }
 | 
			
		||||
 | 
			
		||||
    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]]
 | 
			
		||||
    # If that was unsuccessful, try fetching user from db separately
 | 
			
		||||
    # But this shouldn't ever happen if the mentions were created correctly!
 | 
			
		||||
    username, domain = search_string.split('@')
 | 
			
		||||
 | 
			
		||||
    if domain == Rails.configuration.x.local_domain
 | 
			
		||||
      account = Account.find_local(username)
 | 
			
		||||
    else
 | 
			
		||||
      account = Account.find_by(username: username, domain: domain)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    account
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def linkify(status)
 | 
			
		||||
    auto_link(HTMLEntities.new.encode(status.text), link: :urls, html: { rel: 'nofollow noopener' }).gsub(Account::MENTION_RE) do |m|
 | 
			
		||||
      account = account_from_mentions(Account::MENTION_RE.match(m)[1], status.mentions)
 | 
			
		||||
      "#{m.split('@').first}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>"
 | 
			
		||||
    end.html_safe
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user