d4c94fa004
Checking reblog vs original status was happening in multiple places across the app. For views, this logic was encapsulated in a helper method named `proper_status` but in the other layers of the app, the logic was duplicated. Because the logic is used at all layers of the app, we extracted it into a `Status#proper` method on the model and changed all uses of the logic to use this method. There is now a single source of truth for this condition. We added test coverage to untested methods that got refactored.
49 lines
1.5 KiB
Ruby
49 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module StreamEntriesHelper
|
|
def display_name(account)
|
|
account.display_name.blank? ? account.username : account.display_name
|
|
end
|
|
|
|
def acct(account)
|
|
"@#{account.acct}#{@external_links && account.local? ? "@#{Rails.configuration.x.local_domain}" : ''}"
|
|
end
|
|
|
|
def avatar_for_status_url(status)
|
|
status.reblog? ? status.reblog.account.avatar.url(:original) : status.account.avatar.url(:original)
|
|
end
|
|
|
|
def entry_classes(status, is_predecessor, is_successor, include_threads)
|
|
classes = ['entry']
|
|
classes << 'entry-reblog u-repost-of h-cite' if status.reblog?
|
|
classes << 'entry-predecessor u-in-reply-to h-cite' if is_predecessor
|
|
classes << 'entry-successor u-comment h-cite' if is_successor
|
|
classes << 'entry-center h-entry' if include_threads
|
|
classes.join(' ')
|
|
end
|
|
|
|
def relative_time(date)
|
|
date < 5.days.ago ? date.strftime('%d.%m.%Y') : "#{time_ago_in_words(date)} ago"
|
|
end
|
|
|
|
def reblogged_by_me_class(status)
|
|
user_signed_in? && @reblogged.key?(status.id) ? 'reblogged' : ''
|
|
end
|
|
|
|
def favourited_by_me_class(status)
|
|
user_signed_in? && @favourited.key?(status.id) ? 'favourited' : ''
|
|
end
|
|
|
|
def rtl?(text)
|
|
return false if text.empty?
|
|
|
|
matches = /[\p{Hebrew}|\p{Arabic}|\p{Syriac}|\p{Thaana}|\p{Nko}]+/m.match(text)
|
|
|
|
return false unless matches
|
|
|
|
rtl_size = matches.to_a.reduce(0) { |acc, elem| acc + elem.size }.to_f
|
|
ltr_size = text.strip.size.to_f
|
|
|
|
rtl_size / ltr_size > 0.3
|
|
end
|
|
end
|